From 6b79106cd19b21d6f8d12af1a9a57feb608acc9d Mon Sep 17 00:00:00 2001 From: Mix <32300164+mnixry@users.noreply.github.com> Date: Sun, 3 Oct 2021 16:26:55 +0800 Subject: [PATCH 001/174] :sparkles: support use `MessageSegment` method as template format spec --- nonebot/adapters/_template.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nonebot/adapters/_template.py b/nonebot/adapters/_template.py index 38a2dbc1..d914ee8a 100644 --- a/nonebot/adapters/_template.py +++ b/nonebot/adapters/_template.py @@ -1,3 +1,4 @@ +import inspect import functools from string import Formatter from typing import (TYPE_CHECKING, Any, Set, List, Type, Tuple, Union, Generic, @@ -114,8 +115,14 @@ class MessageTemplate(Formatter, Generic[TM]): [""])), auto_arg_index def format_field(self, value: Any, format_spec: str) -> Any: - return super().format_field(value, - format_spec) if format_spec else value + segment_class: Type[MessageSegment] = self.factory.get_segment_class() + method = getattr(segment_class, format_spec, None) + method_type = inspect.getattr_static(segment_class, format_spec, None) + return (super().format_field(value, format_spec) if + ((method is None) or + (not isinstance(method_type, (classmethod, staticmethod)) + ) # Only Call staticmethod or classmethod + ) else method(value)) if format_spec else value def _add(self, a: Any, b: Any) -> Any: try: From b9c91dc5c3a64f7e5c15c93b9ab4a1429f91decb Mon Sep 17 00:00:00 2001 From: Mix <32300164+mnixry@users.noreply.github.com> Date: Sun, 3 Oct 2021 16:39:43 +0800 Subject: [PATCH 002/174] :bulb: add document for extended format spec --- nonebot/adapters/_message.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nonebot/adapters/_message.py b/nonebot/adapters/_message.py index 6f209343..3c8ee79e 100644 --- a/nonebot/adapters/_message.py +++ b/nonebot/adapters/_message.py @@ -109,22 +109,24 @@ class Message(List[TMS], abc.ABC): :说明: 根据创建消息模板, 用法和 ``str.format`` 大致相同, 但是可以输出消息对象, 并且支持以 ``Message`` 对象作为消息模板 + 并且提供了拓展的格式化控制符, 可以用适用于该消息类型的 ``MessageSegment`` 的工厂方法创建消息 :示例: .. code-block:: python - >>> Message.template("{} {}").format("hello", "world") + >>> Message.template("{} {}").format("hello", "world") # 基础演示 Message(MessageSegment(type='text', data={'text': 'hello world'})) - >>> Message.template("{} {}").format(MessageSegment.image("file///..."), "world") + >>> Message.template("{} {}").format(MessageSegment.image("file///..."), "world") # 支持消息段等对象 Message(MessageSegment(type='image', data={'file': 'file///...'}), MessageSegment(type='text', data={'text': 'world'})) - >>> Message.template( + >>> Message.template( # 支持以Message对象作为消息模板 ... MessageSegment.text('test {event.user_id}') + MessageSegment.face(233) + - ... MessageSegment.text('test {event.message}')).format(event={'user_id':123456, 'message':'hello world'} - ... ) + ... MessageSegment.text('test {event.message}')).format(event={'user_id':123456, 'message':'hello world'}) Message(MessageSegment(type='text', data={'text': 'test 123456'}), MessageSegment(type='face', data={'face': 233}), MessageSegment(type='text', data={'text': 'test hello world'})) + >>> Message.template("{link:image}").format(link='https://...') # 支持拓展格式化控制符 + Message(MessageSegment(type='image', data={'file': 'https://...'})) :参数: From 2a08f6bdf69547388842c5e631810af8850ff607 Mon Sep 17 00:00:00 2001 From: nonebot Date: Sun, 3 Oct 2021 08:41:04 +0000 Subject: [PATCH 003/174] :memo: update api docs --- docs/api/adapters/README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/api/adapters/README.md b/docs/api/adapters/README.md index 3c1bcc8b..f9c99f6b 100644 --- a/docs/api/adapters/README.md +++ b/docs/api/adapters/README.md @@ -306,6 +306,7 @@ await bot.send_msg(message="hello world") * **说明** 根据创建消息模板, 用法和 `str.format` 大致相同, 但是可以输出消息对象, 并且支持以 `Message` 对象作为消息模板 + 并且提供了拓展的格式化控制符, 可以用适用于该消息类型的 `MessageSegment` 的工厂方法创建消息 @@ -313,17 +314,18 @@ await bot.send_msg(message="hello world") ```python ->>> Message.template("{} {}").format("hello", "world") +>>> Message.template("{} {}").format("hello", "world") # 基础演示 Message(MessageSegment(type='text', data={'text': 'hello world'})) ->>> Message.template("{} {}").format(MessageSegment.image("file///..."), "world") +>>> Message.template("{} {}").format(MessageSegment.image("file///..."), "world") # 支持消息段等对象 Message(MessageSegment(type='image', data={'file': 'file///...'}), MessageSegment(type='text', data={'text': 'world'})) ->>> Message.template( +>>> Message.template( # 支持以Message对象作为消息模板 ... MessageSegment.text('test {event.user_id}') + MessageSegment.face(233) + -... MessageSegment.text('test {event.message}')).format(event={'user_id':123456, 'message':'hello world'} -... ) +... MessageSegment.text('test {event.message}')).format(event={'user_id':123456, 'message':'hello world'}) Message(MessageSegment(type='text', data={'text': 'test 123456'}), MessageSegment(type='face', data={'face': 233}), MessageSegment(type='text', data={'text': 'test hello world'})) +>>> Message.template("{link:image}").format(link='https://...') # 支持拓展格式化控制符 +Message(MessageSegment(type='image', data={'file': 'https://...'})) ``` From ac871075560e9a5e3a9654ffb2080cc1c79ef4ad Mon Sep 17 00:00:00 2001 From: AkiraXie Date: Sun, 3 Oct 2021 23:20:17 +0800 Subject: [PATCH 004/174] :bug: fix bug in cqhttp MessageSegment --- .../nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py index 42cbc8ac..19803cf3 100644 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py +++ b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py @@ -164,7 +164,7 @@ class MessageSegment(BaseMessageSegment["Message"]): proxy: Optional[bool] = None, timeout: Optional[int] = None) -> "MessageSegment": if isinstance(file, BytesIO): - file = file.read() + file = file.getvalue() if isinstance(file, bytes): file = f"base64://{b64encode(file).decode()}" elif isinstance(file, Path): @@ -212,7 +212,7 @@ class MessageSegment(BaseMessageSegment["Message"]): proxy: Optional[bool] = None, timeout: Optional[int] = None) -> "MessageSegment": if isinstance(file, BytesIO): - file = file.read() + file = file.getvalue() if isinstance(file, bytes): file = f"base64://{b64encode(file).decode()}" elif isinstance(file, Path): From e12e18022b92529c3af5532119b6f5886f31a78d Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 4 Oct 2021 22:00:32 +0800 Subject: [PATCH 005/174] :alembic: template support raw string --- docs/api/adapters/README.md | 27 +++++++++++++++++--- nonebot/adapters/_message.py | 8 +++--- nonebot/adapters/_template.py | 46 ++++++++++++++++++++++++++--------- pages/changelog.md | 6 +++++ 4 files changed, 68 insertions(+), 19 deletions(-) diff --git a/docs/api/adapters/README.md b/docs/api/adapters/README.md index f9c99f6b..98692156 100644 --- a/docs/api/adapters/README.md +++ b/docs/api/adapters/README.md @@ -320,9 +320,9 @@ Message(MessageSegment(type='text', data={'text': 'hello world'})) Message(MessageSegment(type='image', data={'file': 'file///...'}), MessageSegment(type='text', data={'text': 'world'})) >>> Message.template( # 支持以Message对象作为消息模板 ... MessageSegment.text('test {event.user_id}') + MessageSegment.face(233) + -... MessageSegment.text('test {event.message}')).format(event={'user_id':123456, 'message':'hello world'}) -Message(MessageSegment(type='text', data={'text': 'test 123456'}), - MessageSegment(type='face', data={'face': 233}), +... MessageSegment.text('test {event.message}')).format(event={'user_id':123456, 'message':'hello world'}) +Message(MessageSegment(type='text', data={'text': 'test 123456'}), + MessageSegment(type='face', data={'face': 233}), MessageSegment(type='text', data={'text': 'test hello world'})) >>> Message.template("{link:image}").format(link='https://...') # 支持拓展格式化控制符 Message(MessageSegment(type='image', data={'file': 'https://...'})) @@ -547,11 +547,30 @@ Event 基类。提供获取关键信息的方法，其余信息可直接获取 ## _class_ `MessageTemplate` -基类：`string.Formatter`, `Generic`[`nonebot.adapters._template.TM`] +基类：`string.Formatter`, `Generic`[`nonebot.adapters._template.TF`] 消息模板格式化实现类 +### `__init__(template, factory=)` + + +* **说明** + + 创建一个模板 + + + +* **参数** + + + * `template: Union[str, Message]`: 模板 + + + * `factory: Union[str, Message]`: 消息构造类型，默认为 str + + + ### `format(*args, **kwargs)` diff --git a/nonebot/adapters/_message.py b/nonebot/adapters/_message.py index 3c8ee79e..b05a35a6 100644 --- a/nonebot/adapters/_message.py +++ b/nonebot/adapters/_message.py @@ -121,9 +121,9 @@ class Message(List[TMS], abc.ABC): Message(MessageSegment(type='image', data={'file': 'file///...'}), MessageSegment(type='text', data={'text': 'world'})) >>> Message.template( # 支持以Message对象作为消息模板 ... MessageSegment.text('test {event.user_id}') + MessageSegment.face(233) + - ... MessageSegment.text('test {event.message}')).format(event={'user_id':123456, 'message':'hello world'}) - Message(MessageSegment(type='text', data={'text': 'test 123456'}), - MessageSegment(type='face', data={'face': 233}), + ... MessageSegment.text('test {event.message}')).format(event={'user_id':123456, 'message':'hello world'}) + Message(MessageSegment(type='text', data={'text': 'test 123456'}), + MessageSegment(type='face', data={'face': 233}), MessageSegment(type='text', data={'text': 'test hello world'})) >>> Message.template("{link:image}").format(link='https://...') # 支持拓展格式化控制符 Message(MessageSegment(type='image', data={'file': 'https://...'})) @@ -136,7 +136,7 @@ class Message(List[TMS], abc.ABC): - ``MessageFormatter[TM]``: 消息格式化器 """ - return MessageTemplate(cls, format_string) + return MessageTemplate(format_string, cls) @classmethod @abc.abstractmethod diff --git a/nonebot/adapters/_template.py b/nonebot/adapters/_template.py index d914ee8a..94472018 100644 --- a/nonebot/adapters/_template.py +++ b/nonebot/adapters/_template.py @@ -2,22 +2,44 @@ import inspect import functools from string import Formatter from typing import (TYPE_CHECKING, Any, Set, List, Type, Tuple, Union, Generic, - Mapping, TypeVar, Sequence) + Mapping, TypeVar, Sequence, cast, overload) if TYPE_CHECKING: from . import Message, MessageSegment TM = TypeVar("TM", bound="Message") +TF = TypeVar("TF", str, "Message") -class MessageTemplate(Formatter, Generic[TM]): +class MessageTemplate(Formatter, Generic[TF]): """消息模板格式化实现类""" - def __init__(self, factory: Type[TM], template: Union[str, TM]) -> None: - self.template = template - self.factory = factory + @overload + def __init__(self: "MessageTemplate[str]", + template: str, + factory: Type[str] = str) -> None: + ... - def format(self, *args: Any, **kwargs: Any) -> TM: + @overload + def __init__(self: "MessageTemplate[TM]", template: Union[str, TM], + factory: Type[TM]) -> None: + ... + + def __init__(self, template, factory=str) -> None: + """ + :说明: + + 创建一个模板 + + :参数: + + * ``template: Union[str, Message]``: 模板 + * ``factory: Union[str, Message]``: 消息构造类型，默认为 `str` + """ + self.template: Union[str, TF] = template + self.factory: Type[TF] = factory + + def format(self, *args: Any, **kwargs: Any) -> TF: """ :说明: @@ -27,8 +49,8 @@ class MessageTemplate(Formatter, Generic[TM]): if isinstance(self.template, str): msg += self.vformat(self.template, args, kwargs) elif isinstance(self.template, self.factory): - for seg in self.template: - seg: "MessageSegment" + template = cast("Message[MessageSegment]", self.template) + for seg in template: msg += self.vformat(str(seg), args, kwargs) if seg.is_text() else seg else: @@ -37,7 +59,7 @@ class MessageTemplate(Formatter, Generic[TM]): return msg def vformat(self, format_string: str, args: Sequence[Any], - kwargs: Mapping[str, Any]) -> TM: + kwargs: Mapping[str, Any]) -> TF: used_args = set() result, _ = self._vformat(format_string, args, kwargs, used_args, 2) self.check_unused_args(list(used_args), args, kwargs) @@ -51,8 +73,7 @@ class MessageTemplate(Formatter, Generic[TM]): used_args: Set[Union[int, str]], recursion_depth: int, auto_arg_index: int = 0, - ) -> Tuple[TM, int]: - + ) -> Tuple[TF, int]: if recursion_depth < 0: raise ValueError("Max string recursion exceeded") @@ -115,6 +136,9 @@ class MessageTemplate(Formatter, Generic[TM]): [""])), auto_arg_index def format_field(self, value: Any, format_spec: str) -> Any: + if issubclass(self.factory, str): + return super().format_field(value, format_spec) + segment_class: Type[MessageSegment] = self.factory.get_segment_class() method = getattr(segment_class, format_spec, None) method_type = inspect.getattr_static(segment_class, format_spec, None) diff --git a/pages/changelog.md b/pages/changelog.md index 9b609dac..b5012389 100644 --- a/pages/changelog.md +++ b/pages/changelog.md @@ -4,6 +4,10 @@ sidebar: auto # 更新日志 +## v2.0.0a17 + +- 新增 `MessageTemplate` 对于 `str` 普通模板的支持 + ## v2.0.0a16 - 新增 `MessageTemplate` 可用于 `Message` 的模板生成 @@ -13,6 +17,8 @@ sidebar: auto - 修复 `fastapi` Driver Websocket 未能正确提供请求头部 - 新增 `fastapi` Driver 更多的 uvicorn 相关配置项 - 新增 `quart` Driver 更多的 uvicorn 相关配置项 +- 修复 `endswith` Rule 错误的正则匹配 +- 修复 `cqhttp` Adapter `image`, `record`, `video` 对 `BytesIO` 不正常的读取操作 ## v2.0.0a15 From c81c0578e33fbb7273091e72534f3c58830f77a7 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 11 Oct 2021 17:53:49 +0800 Subject: [PATCH 006/174] :bug: fix fastapi forward header duplicate (fix #560) --- nonebot/drivers/fastapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index 024df15c..00091f0f 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -480,7 +480,7 @@ class Driver(ReverseDriver, ForwardDriver): ) return - headers = {**setup_.headers, "host": url.netloc.decode("ascii")} + headers = setup_.headers.copy() logger.debug( f"Bot {setup_.self_id} from adapter {setup_.adapter} connecting to {url}" ) From 32e3c175521de94be7ef2361407d5d1173c37f18 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 21 Oct 2021 00:08:37 +0800 Subject: [PATCH 007/174] :rotating_light: remove linter warning --- nonebot/plugin/manager.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nonebot/plugin/manager.py b/nonebot/plugin/manager.py index b91d932f..d7485c72 100644 --- a/nonebot/plugin/manager.py +++ b/nonebot/plugin/manager.py @@ -8,8 +8,8 @@ from types import ModuleType from collections import Counter from contextvars import ContextVar from importlib.abc import MetaPathFinder -from typing import Set, List, Iterable, Optional from importlib.machinery import PathFinder, SourceFileLoader +from typing import Set, List, Union, Iterable, Optional, Sequence from .export import Export, _export @@ -200,7 +200,10 @@ class PluginManager: class PluginFinder(MetaPathFinder): - def find_spec(self, fullname: str, path, target): + def find_spec(self, + fullname: str, + path: Optional[Sequence[Union[bytes, str]]], + target: Optional[ModuleType] = None): if _manager_stack: index = -1 origin_spec = PathFinder.find_spec(fullname, path, target) From d10f557212766016ede1f28309048d4c36367281 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 21 Oct 2021 00:37:02 +0800 Subject: [PATCH 008/174] :arrow_up: upgrade dependencies --- nonebot/drivers/fastapi.py | 3 +- .../nonebot/adapters/cqhttp/bot.py | 16 +- packages/nonebot-adapter-cqhttp/poetry.lock | 151 +++-- .../nonebot-adapter-cqhttp/pyproject.toml | 2 +- .../nonebot/adapters/ding/bot.py | 20 +- packages/nonebot-adapter-ding/poetry.lock | 151 +++-- packages/nonebot-adapter-ding/pyproject.toml | 2 +- .../nonebot/adapters/feishu/bot.py | 36 +- packages/nonebot-adapter-feishu/poetry.lock | 213 +++--- .../nonebot-adapter-feishu/pyproject.toml | 2 +- .../nonebot/adapters/mirai/bot.py | 22 +- packages/nonebot-adapter-mirai/poetry.lock | 151 +++-- packages/nonebot-adapter-mirai/pyproject.toml | 2 +- poetry.lock | 612 ++++++++++-------- pyproject.toml | 4 +- 15 files changed, 757 insertions(+), 630 deletions(-) diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index 00091f0f..0ace2e31 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -393,7 +393,8 @@ class Driver(ReverseDriver, ForwardDriver): f"Bot {escape_tag(setup.self_id)}") try: - async with httpx.AsyncClient(http2=True) as session: + async with httpx.AsyncClient(http2=True, + follow_redirects=True) as session: while not self.shutdown.is_set(): try: diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.py index a927c7ab..554e1209 100644 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.py +++ b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.py @@ -3,22 +3,23 @@ import sys import hmac import json import asyncio -from typing import Any, Dict, Tuple, Union, Optional, TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Dict, Tuple, Union, Optional import httpx + from nonebot.log import logger from nonebot.typing import overrides from nonebot.message import handle_event from nonebot.adapters import Bot as BaseBot -from nonebot.utils import escape_tag, DataclassEncoder -from nonebot.drivers import Driver, ForwardDriver, WebSocketSetup -from nonebot.drivers import HTTPConnection, HTTPRequest, HTTPResponse, WebSocket +from nonebot.utils import DataclassEncoder, escape_tag +from nonebot.drivers import (Driver, WebSocket, HTTPRequest, HTTPResponse, + ForwardDriver, HTTPConnection, WebSocketSetup) from .utils import log, escape from .config import Config as CQHTTPConfig from .message import Message, MessageSegment -from .event import Reply, Event, MessageEvent, get_event_model -from .exception import NetworkError, ApiNotAvailable, ActionFailed +from .event import Event, Reply, MessageEvent, get_event_model +from .exception import ActionFailed, NetworkError, ApiNotAvailable if TYPE_CHECKING: from nonebot.config import Config @@ -376,7 +377,8 @@ class Bot(BaseBot): "Authorization"] = "Bearer " + self.cqhttp_config.access_token try: - async with httpx.AsyncClient(headers=headers) as client: + async with httpx.AsyncClient(headers=headers, + follow_redirects=True) as client: response = await client.post( api_root + api, content=json.dumps(data, cls=DataclassEncoder), diff --git a/packages/nonebot-adapter-cqhttp/poetry.lock b/packages/nonebot-adapter-cqhttp/poetry.lock index 5dbe23f0..9945f985 100644 --- a/packages/nonebot-adapter-cqhttp/poetry.lock +++ b/packages/nonebot-adapter-cqhttp/poetry.lock @@ -1,6 +1,6 @@ [[package]] name = "anyio" -version = "3.3.2" +version = "3.3.4" description = "High level compatibility layer for multiple asynchronous event loop implementations" category = "main" optional = false @@ -32,7 +32,7 @@ tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] [[package]] name = "certifi" -version = "2021.5.30" +version = "2021.10.8" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false @@ -40,7 +40,7 @@ python-versions = "*" [[package]] name = "charset-normalizer" -version = "2.0.6" +version = "2.0.7" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false @@ -51,7 +51,7 @@ unicode_backport = ["unicodedata2"] [[package]] name = "click" -version = "8.0.1" +version = "8.0.3" description = "Composable command line interface toolkit" category = "main" optional = false @@ -71,21 +71,21 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "fastapi" -version = "0.68.1" +version = "0.70.0" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" category = "main" optional = false -python-versions = ">=3.6" +python-versions = ">=3.6.1" [package.dependencies] pydantic = ">=1.6.2,<1.7 || >1.7,<1.7.1 || >1.7.1,<1.7.2 || >1.7.2,<1.7.3 || >1.7.3,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0" -starlette = "0.14.2" +starlette = "0.16.0" [package.extras] -all = ["requests (>=2.24.0,<3.0.0)", "aiofiles (>=0.5.0,<0.6.0)", "jinja2 (>=2.11.2,<3.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<2.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "graphene (>=2.1.8,<3.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.14.0)", "async_exit_stack (>=1.0.1,<2.0.0)", "async_generator (>=1.10,<2.0.0)"] -dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.3.1,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.14.0)", "graphene (>=2.1.8,<3.0.0)"] -doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.2.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"] -test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<3.0.0)", "pytest-asyncio (>=0.14.0,<0.15.0)", "mypy (==0.812)", "flake8 (>=3.8.3,<4.0.0)", "black (==20.8b1)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.15.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.4.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.4.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "async_exit_stack (>=1.0.1,<2.0.0)", "async_generator (>=1.10,<2.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "aiofiles (>=0.5.0,<0.6.0)", "flask (>=1.1.2,<2.0.0)"] +all = ["requests (>=2.24.0,<3.0.0)", "jinja2 (>=2.11.2,<4.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<3.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] +dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.4.0,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] +doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"] +test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<4.0.0)", "mypy (==0.910)", "flake8 (>=3.8.3,<4.0.0)", "black (==21.9b0)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.19.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.5.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.6.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "flask (>=1.1.2,<3.0.0)", "anyio[trio] (>=3.2.1,<4.0.0)", "types-ujson (==0.1.1)", "types-orjson (==3.6.0)", "types-dataclasses (==0.1.7)"] [[package]] name = "h11" @@ -97,7 +97,7 @@ python-versions = ">=3.6" [[package]] name = "h2" -version = "4.0.0" +version = "4.1.0" description = "HTTP/2 State-Machine based protocol implementation" category = "main" optional = false @@ -144,7 +144,7 @@ test = ["Cython (==0.29.22)"] [[package]] name = "httpx" -version = "0.19.0" +version = "0.20.0" description = "The next generation HTTP client." category = "main" optional = false @@ -160,6 +160,7 @@ sniffio = "*" [package.extras] brotli = ["brotlicffi", "brotli"] +cli = ["click (>=8.0.0,<9.0.0)", "rich (>=10.0.0,<11.0.0)", "pygments (>=2.0.0,<3.0.0)"] http2 = ["h2 (>=3,<5)"] [[package]] @@ -172,7 +173,7 @@ python-versions = ">=3.6.1" [[package]] name = "idna" -version = "3.2" +version = "3.3" description = "Internationalized Domain Names in Applications (IDNA)" category = "main" optional = false @@ -220,8 +221,8 @@ python-versions = "^3.7.3" develop = true [package.dependencies] -fastapi = "^0.68.0" -httpx = {version = ">=0.18.0, <1.0.0", extras = ["http2"]} +fastapi = "^0.70.0" +httpx = {version = ">=0.20.0, <1.0.0", extras = ["http2"]} loguru = "^0.5.1" pydantic = {version = "~1.8.0", extras = ["dotenv"]} pygtrie = "^2.4.1" @@ -264,7 +265,7 @@ python-versions = "*" [[package]] name = "python-dotenv" -version = "0.19.0" +version = "0.19.1" description = "Read key-value pairs from a .env file and set them as environment variables" category = "main" optional = false @@ -275,11 +276,11 @@ cli = ["click (>=5.0)"] [[package]] name = "pyyaml" -version = "5.4.1" +version = "6.0" description = "YAML parser and emitter for Python" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.6" [[package]] name = "rfc3986" @@ -305,14 +306,18 @@ python-versions = ">=3.5" [[package]] name = "starlette" -version = "0.14.2" +version = "0.16.0" description = "The little ASGI library that shines." category = "main" optional = false python-versions = ">=3.6" +[package.dependencies] +anyio = ">=3.0.0,<4" +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} + [package.extras] -full = ["aiofiles", "graphene", "itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests"] +full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "graphene"] [[package]] name = "tomlkit" @@ -409,44 +414,44 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "247a88fc820098c6f136bce8604366d37cd1230264a6f9859bdea2ac30f1e034" +content-hash = "0cc9df471eb39cfb9b3225370913296535c45171158adc19753cebb7fe791ae3" [metadata.files] anyio = [ - {file = "anyio-3.3.2-py3-none-any.whl", hash = "sha256:c32da314c510b34a862f5afeaf8a446ffed2c2fde21583e654bd71ecfb5b744b"}, - {file = "anyio-3.3.2.tar.gz", hash = "sha256:0b993a2ef6c1dc456815c2b5ca2819f382f20af98087cc2090a4afed3a501436"}, + {file = "anyio-3.3.4-py3-none-any.whl", hash = "sha256:4fd09a25ab7fa01d34512b7249e366cd10358cdafc95022c7ff8c8f8a5026d66"}, + {file = "anyio-3.3.4.tar.gz", hash = "sha256:67da67b5b21f96b9d3d65daa6ea99f5d5282cb09f50eb4456f8fb51dffefc3ff"}, ] asgiref = [ {file = "asgiref-3.4.1-py3-none-any.whl", hash = "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"}, {file = "asgiref-3.4.1.tar.gz", hash = "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9"}, ] certifi = [ - {file = "certifi-2021.5.30-py2.py3-none-any.whl", hash = "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"}, - {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, + {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, + {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, ] charset-normalizer = [ - {file = "charset-normalizer-2.0.6.tar.gz", hash = "sha256:5ec46d183433dcbd0ab716f2d7f29d8dee50505b3fdb40c6b985c7c4f5a3591f"}, - {file = "charset_normalizer-2.0.6-py3-none-any.whl", hash = "sha256:5d209c0a931f215cee683b6445e2d77677e7e75e159f78def0db09d68fafcaa6"}, + {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"}, + {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"}, ] click = [ - {file = "click-8.0.1-py3-none-any.whl", hash = "sha256:fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6"}, - {file = "click-8.0.1.tar.gz", hash = "sha256:8c04c11192119b1ef78ea049e0a6f0463e4c48ef00a30160c704337586f3ad7a"}, + {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"}, + {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] fastapi = [ - {file = "fastapi-0.68.1-py3-none-any.whl", hash = "sha256:94d2820906c36b9b8303796fb7271337ec89c74223229e3cfcf056b5a7d59e23"}, - {file = "fastapi-0.68.1.tar.gz", hash = "sha256:644bb815bae326575c4b2842469fb83053a4b974b82fa792ff9283d17fbbd99d"}, + {file = "fastapi-0.70.0-py3-none-any.whl", hash = "sha256:a36d5f2fad931aa3575c07a3472c784e81f3e664e3bb5c8b9c88d0ec1104f59c"}, + {file = "fastapi-0.70.0.tar.gz", hash = "sha256:66da43cfe5185ea1df99552acffd201f1832c6b364e0f4136c0a99f933466ced"}, ] h11 = [ {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, ] h2 = [ - {file = "h2-4.0.0-py3-none-any.whl", hash = "sha256:ac9e293a1990b339d5d71b19c5fe630e3dd4d768c620d1730d355485323f1b25"}, - {file = "h2-4.0.0.tar.gz", hash = "sha256:bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d"}, + {file = "h2-4.1.0-py3-none-any.whl", hash = "sha256:03a46bcf682256c95b5fd9e9a99c1323584c3eec6440d379b9903d709476bc6d"}, + {file = "h2-4.1.0.tar.gz", hash = "sha256:a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb"}, ] hpack = [ {file = "hpack-4.0.0-py3-none-any.whl", hash = "sha256:84a076fad3dc9a9f8063ccb8041ef100867b1878b25ef0ee63847a5d53818a6c"}, @@ -474,16 +479,16 @@ httptools = [ {file = "httptools-0.2.0.tar.gz", hash = "sha256:94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"}, ] httpx = [ - {file = "httpx-0.19.0-py3-none-any.whl", hash = "sha256:9bd728a6c5ec0a9e243932a9983d57d3cc4a87bb4f554e1360fce407f78f9435"}, - {file = "httpx-0.19.0.tar.gz", hash = "sha256:92ecd2c00c688b529eda11cedb15161eaf02dee9116712f621c70d9a40b2cdd0"}, + {file = "httpx-0.20.0-py3-none-any.whl", hash = "sha256:33af5aad9bdc82ef1fc89219c1e36f5693bf9cd0ebe330884df563445682c0f8"}, + {file = "httpx-0.20.0.tar.gz", hash = "sha256:09606d630f070d07f9ff28104fbcea429ea0014c1e89ac90b4d8de8286c40e7b"}, ] hyperframe = [ {file = "hyperframe-6.0.1-py3-none-any.whl", hash = "sha256:0ec6bafd80d8ad2195c4f03aacba3a8265e57bc4cff261e802bf39970ed02a15"}, {file = "hyperframe-6.0.1.tar.gz", hash = "sha256:ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914"}, ] idna = [ - {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"}, - {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"}, + {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, + {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, ] importlib-metadata = [ {file = "importlib_metadata-4.8.1-py3-none-any.whl", hash = "sha256:b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15"}, @@ -522,39 +527,43 @@ pygtrie = [ {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, ] python-dotenv = [ - {file = "python-dotenv-0.19.0.tar.gz", hash = "sha256:f521bc2ac9a8e03c736f62911605c5d83970021e3fa95b37d769e2bbbe9b6172"}, - {file = "python_dotenv-0.19.0-py2.py3-none-any.whl", hash = "sha256:aae25dc1ebe97c420f50b81fb0e5c949659af713f31fdb63c749ca68748f34b1"}, + {file = "python-dotenv-0.19.1.tar.gz", hash = "sha256:14f8185cc8d494662683e6914addcb7e95374771e707601dfc70166946b4c4b8"}, + {file = "python_dotenv-0.19.1-py2.py3-none-any.whl", hash = "sha256:bbd3da593fc49c249397cbfbcc449cf36cb02e75afc8157fcc6a81df6fb7750a"}, ] pyyaml = [ - {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, - {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"}, - {file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"}, - {file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"}, - {file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"}, - {file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"}, - {file = "PyYAML-5.4.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347"}, - {file = "PyYAML-5.4.1-cp36-cp36m-manylinux2014_s390x.whl", hash = "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541"}, - {file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"}, - {file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"}, - {file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"}, - {file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"}, - {file = "PyYAML-5.4.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa"}, - {file = "PyYAML-5.4.1-cp37-cp37m-manylinux2014_s390x.whl", hash = "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0"}, - {file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"}, - {file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"}, - {file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"}, - {file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"}, - {file = "PyYAML-5.4.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247"}, - {file = "PyYAML-5.4.1-cp38-cp38-manylinux2014_s390x.whl", hash = "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc"}, - {file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"}, - {file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"}, - {file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"}, - {file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"}, - {file = "PyYAML-5.4.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122"}, - {file = "PyYAML-5.4.1-cp39-cp39-manylinux2014_s390x.whl", hash = "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6"}, - {file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"}, - {file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"}, - {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, + {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, + {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, + {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, + {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, + {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, + {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, + {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, + {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, + {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, + {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, + {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, + {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, + {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, + {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, + {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, + {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, ] rfc3986 = [ {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"}, @@ -565,8 +574,8 @@ sniffio = [ {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, ] starlette = [ - {file = "starlette-0.14.2-py3-none-any.whl", hash = "sha256:3c8e48e52736b3161e34c9f0e8153b4f32ec5d8995a3ee1d59410d92f75162ed"}, - {file = "starlette-0.14.2.tar.gz", hash = "sha256:7d49f4a27f8742262ef1470608c59ddbc66baf37c148e938c7038e6bc7a998aa"}, + {file = "starlette-0.16.0-py3-none-any.whl", hash = "sha256:38eb24bf705a2c317e15868e384c1b8a12ca396e5a3c3a003db7e667c43f939f"}, + {file = "starlette-0.16.0.tar.gz", hash = "sha256:e1904b5d0007aee24bdd3c43994be9b3b729f4f58e740200de1d623f8c3a8870"}, ] tomlkit = [ {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"}, diff --git a/packages/nonebot-adapter-cqhttp/pyproject.toml b/packages/nonebot-adapter-cqhttp/pyproject.toml index f2caa5ed..a500f04a 100644 --- a/packages/nonebot-adapter-cqhttp/pyproject.toml +++ b/packages/nonebot-adapter-cqhttp/pyproject.toml @@ -23,7 +23,7 @@ exclude = ["nonebot/__init__.py", "nonebot/adapters/__init__.py"] [tool.poetry.dependencies] python = "^3.7.3" -httpx = ">=0.18.0, <1.0.0" +httpx = ">=0.20.0, <1.0.0" nonebot2 = "^2.0.0-alpha.14" [tool.poetry.dev-dependencies] diff --git a/packages/nonebot-adapter-ding/nonebot/adapters/ding/bot.py b/packages/nonebot-adapter-ding/nonebot/adapters/ding/bot.py index 2900a8d3..dd8663f5 100644 --- a/packages/nonebot-adapter-ding/nonebot/adapters/ding/bot.py +++ b/packages/nonebot-adapter-ding/nonebot/adapters/ding/bot.py @@ -1,24 +1,25 @@ import json -import urllib.parse - import time +import urllib.parse from datetime import datetime -from typing import Any, Tuple, Union, Optional, TYPE_CHECKING +from typing import TYPE_CHECKING, Any, Tuple, Union, Optional import httpx from nonebot.log import logger -from nonebot.utils import escape_tag from nonebot.typing import overrides +from nonebot.utils import escape_tag from nonebot.message import handle_event from nonebot.adapters import Bot as BaseBot -from nonebot.drivers import Driver, HTTPConnection, HTTPRequest, HTTPResponse +from nonebot.drivers import Driver, HTTPRequest, HTTPResponse, HTTPConnection -from .utils import calc_hmac_base64, log from .config import Config as DingConfig +from .utils import log, calc_hmac_base64 from .message import Message, MessageSegment -from .exception import NetworkError, ApiNotAvailable, ActionFailed, SessionExpired -from .event import MessageEvent, PrivateMessageEvent, GroupMessageEvent, ConversationType +from .exception import (ActionFailed, NetworkError, SessionExpired, + ApiNotAvailable) +from .event import (MessageEvent, ConversationType, GroupMessageEvent, + PrivateMessageEvent) if TYPE_CHECKING: from nonebot.config import Config @@ -149,7 +150,8 @@ class Bot(BaseBot): if not message: raise ValueError("Message not found") try: - async with httpx.AsyncClient(headers=headers) as client: + async with httpx.AsyncClient(headers=headers, + follow_redirects=True) as client: response = await client.post(webhook, params=params, json=message._produce(), diff --git a/packages/nonebot-adapter-ding/poetry.lock b/packages/nonebot-adapter-ding/poetry.lock index 5dbe23f0..9945f985 100644 --- a/packages/nonebot-adapter-ding/poetry.lock +++ b/packages/nonebot-adapter-ding/poetry.lock @@ -1,6 +1,6 @@ [[package]] name = "anyio" -version = "3.3.2" +version = "3.3.4" description = "High level compatibility layer for multiple asynchronous event loop implementations" category = "main" optional = false @@ -32,7 +32,7 @@ tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] [[package]] name = "certifi" -version = "2021.5.30" +version = "2021.10.8" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false @@ -40,7 +40,7 @@ python-versions = "*" [[package]] name = "charset-normalizer" -version = "2.0.6" +version = "2.0.7" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false @@ -51,7 +51,7 @@ unicode_backport = ["unicodedata2"] [[package]] name = "click" -version = "8.0.1" +version = "8.0.3" description = "Composable command line interface toolkit" category = "main" optional = false @@ -71,21 +71,21 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "fastapi" -version = "0.68.1" +version = "0.70.0" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" category = "main" optional = false -python-versions = ">=3.6" +python-versions = ">=3.6.1" [package.dependencies] pydantic = ">=1.6.2,<1.7 || >1.7,<1.7.1 || >1.7.1,<1.7.2 || >1.7.2,<1.7.3 || >1.7.3,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0" -starlette = "0.14.2" +starlette = "0.16.0" [package.extras] -all = ["requests (>=2.24.0,<3.0.0)", "aiofiles (>=0.5.0,<0.6.0)", "jinja2 (>=2.11.2,<3.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<2.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "graphene (>=2.1.8,<3.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.14.0)", "async_exit_stack (>=1.0.1,<2.0.0)", "async_generator (>=1.10,<2.0.0)"] -dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.3.1,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.14.0)", "graphene (>=2.1.8,<3.0.0)"] -doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.2.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"] -test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<3.0.0)", "pytest-asyncio (>=0.14.0,<0.15.0)", "mypy (==0.812)", "flake8 (>=3.8.3,<4.0.0)", "black (==20.8b1)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.15.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.4.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.4.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "async_exit_stack (>=1.0.1,<2.0.0)", "async_generator (>=1.10,<2.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "aiofiles (>=0.5.0,<0.6.0)", "flask (>=1.1.2,<2.0.0)"] +all = ["requests (>=2.24.0,<3.0.0)", "jinja2 (>=2.11.2,<4.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<3.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] +dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.4.0,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] +doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"] +test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<4.0.0)", "mypy (==0.910)", "flake8 (>=3.8.3,<4.0.0)", "black (==21.9b0)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.19.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.5.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.6.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "flask (>=1.1.2,<3.0.0)", "anyio[trio] (>=3.2.1,<4.0.0)", "types-ujson (==0.1.1)", "types-orjson (==3.6.0)", "types-dataclasses (==0.1.7)"] [[package]] name = "h11" @@ -97,7 +97,7 @@ python-versions = ">=3.6" [[package]] name = "h2" -version = "4.0.0" +version = "4.1.0" description = "HTTP/2 State-Machine based protocol implementation" category = "main" optional = false @@ -144,7 +144,7 @@ test = ["Cython (==0.29.22)"] [[package]] name = "httpx" -version = "0.19.0" +version = "0.20.0" description = "The next generation HTTP client." category = "main" optional = false @@ -160,6 +160,7 @@ sniffio = "*" [package.extras] brotli = ["brotlicffi", "brotli"] +cli = ["click (>=8.0.0,<9.0.0)", "rich (>=10.0.0,<11.0.0)", "pygments (>=2.0.0,<3.0.0)"] http2 = ["h2 (>=3,<5)"] [[package]] @@ -172,7 +173,7 @@ python-versions = ">=3.6.1" [[package]] name = "idna" -version = "3.2" +version = "3.3" description = "Internationalized Domain Names in Applications (IDNA)" category = "main" optional = false @@ -220,8 +221,8 @@ python-versions = "^3.7.3" develop = true [package.dependencies] -fastapi = "^0.68.0" -httpx = {version = ">=0.18.0, <1.0.0", extras = ["http2"]} +fastapi = "^0.70.0" +httpx = {version = ">=0.20.0, <1.0.0", extras = ["http2"]} loguru = "^0.5.1" pydantic = {version = "~1.8.0", extras = ["dotenv"]} pygtrie = "^2.4.1" @@ -264,7 +265,7 @@ python-versions = "*" [[package]] name = "python-dotenv" -version = "0.19.0" +version = "0.19.1" description = "Read key-value pairs from a .env file and set them as environment variables" category = "main" optional = false @@ -275,11 +276,11 @@ cli = ["click (>=5.0)"] [[package]] name = "pyyaml" -version = "5.4.1" +version = "6.0" description = "YAML parser and emitter for Python" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.6" [[package]] name = "rfc3986" @@ -305,14 +306,18 @@ python-versions = ">=3.5" [[package]] name = "starlette" -version = "0.14.2" +version = "0.16.0" description = "The little ASGI library that shines." category = "main" optional = false python-versions = ">=3.6" +[package.dependencies] +anyio = ">=3.0.0,<4" +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} + [package.extras] -full = ["aiofiles", "graphene", "itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests"] +full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "graphene"] [[package]] name = "tomlkit" @@ -409,44 +414,44 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "247a88fc820098c6f136bce8604366d37cd1230264a6f9859bdea2ac30f1e034" +content-hash = "0cc9df471eb39cfb9b3225370913296535c45171158adc19753cebb7fe791ae3" [metadata.files] anyio = [ - {file = "anyio-3.3.2-py3-none-any.whl", hash = "sha256:c32da314c510b34a862f5afeaf8a446ffed2c2fde21583e654bd71ecfb5b744b"}, - {file = "anyio-3.3.2.tar.gz", hash = "sha256:0b993a2ef6c1dc456815c2b5ca2819f382f20af98087cc2090a4afed3a501436"}, + {file = "anyio-3.3.4-py3-none-any.whl", hash = "sha256:4fd09a25ab7fa01d34512b7249e366cd10358cdafc95022c7ff8c8f8a5026d66"}, + {file = "anyio-3.3.4.tar.gz", hash = "sha256:67da67b5b21f96b9d3d65daa6ea99f5d5282cb09f50eb4456f8fb51dffefc3ff"}, ] asgiref = [ {file = "asgiref-3.4.1-py3-none-any.whl", hash = "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"}, {file = "asgiref-3.4.1.tar.gz", hash = "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9"}, ] certifi = [ - {file = "certifi-2021.5.30-py2.py3-none-any.whl", hash = "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"}, - {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, + {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, + {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, ] charset-normalizer = [ - {file = "charset-normalizer-2.0.6.tar.gz", hash = "sha256:5ec46d183433dcbd0ab716f2d7f29d8dee50505b3fdb40c6b985c7c4f5a3591f"}, - {file = "charset_normalizer-2.0.6-py3-none-any.whl", hash = "sha256:5d209c0a931f215cee683b6445e2d77677e7e75e159f78def0db09d68fafcaa6"}, + {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"}, + {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"}, ] click = [ - {file = "click-8.0.1-py3-none-any.whl", hash = "sha256:fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6"}, - {file = "click-8.0.1.tar.gz", hash = "sha256:8c04c11192119b1ef78ea049e0a6f0463e4c48ef00a30160c704337586f3ad7a"}, + {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"}, + {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] fastapi = [ - {file = "fastapi-0.68.1-py3-none-any.whl", hash = "sha256:94d2820906c36b9b8303796fb7271337ec89c74223229e3cfcf056b5a7d59e23"}, - {file = "fastapi-0.68.1.tar.gz", hash = "sha256:644bb815bae326575c4b2842469fb83053a4b974b82fa792ff9283d17fbbd99d"}, + {file = "fastapi-0.70.0-py3-none-any.whl", hash = "sha256:a36d5f2fad931aa3575c07a3472c784e81f3e664e3bb5c8b9c88d0ec1104f59c"}, + {file = "fastapi-0.70.0.tar.gz", hash = "sha256:66da43cfe5185ea1df99552acffd201f1832c6b364e0f4136c0a99f933466ced"}, ] h11 = [ {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, ] h2 = [ - {file = "h2-4.0.0-py3-none-any.whl", hash = "sha256:ac9e293a1990b339d5d71b19c5fe630e3dd4d768c620d1730d355485323f1b25"}, - {file = "h2-4.0.0.tar.gz", hash = "sha256:bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d"}, + {file = "h2-4.1.0-py3-none-any.whl", hash = "sha256:03a46bcf682256c95b5fd9e9a99c1323584c3eec6440d379b9903d709476bc6d"}, + {file = "h2-4.1.0.tar.gz", hash = "sha256:a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb"}, ] hpack = [ {file = "hpack-4.0.0-py3-none-any.whl", hash = "sha256:84a076fad3dc9a9f8063ccb8041ef100867b1878b25ef0ee63847a5d53818a6c"}, @@ -474,16 +479,16 @@ httptools = [ {file = "httptools-0.2.0.tar.gz", hash = "sha256:94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"}, ] httpx = [ - {file = "httpx-0.19.0-py3-none-any.whl", hash = "sha256:9bd728a6c5ec0a9e243932a9983d57d3cc4a87bb4f554e1360fce407f78f9435"}, - {file = "httpx-0.19.0.tar.gz", hash = "sha256:92ecd2c00c688b529eda11cedb15161eaf02dee9116712f621c70d9a40b2cdd0"}, + {file = "httpx-0.20.0-py3-none-any.whl", hash = "sha256:33af5aad9bdc82ef1fc89219c1e36f5693bf9cd0ebe330884df563445682c0f8"}, + {file = "httpx-0.20.0.tar.gz", hash = "sha256:09606d630f070d07f9ff28104fbcea429ea0014c1e89ac90b4d8de8286c40e7b"}, ] hyperframe = [ {file = "hyperframe-6.0.1-py3-none-any.whl", hash = "sha256:0ec6bafd80d8ad2195c4f03aacba3a8265e57bc4cff261e802bf39970ed02a15"}, {file = "hyperframe-6.0.1.tar.gz", hash = "sha256:ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914"}, ] idna = [ - {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"}, - {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"}, + {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, + {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, ] importlib-metadata = [ {file = "importlib_metadata-4.8.1-py3-none-any.whl", hash = "sha256:b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15"}, @@ -522,39 +527,43 @@ pygtrie = [ {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, ] python-dotenv = [ - {file = "python-dotenv-0.19.0.tar.gz", hash = "sha256:f521bc2ac9a8e03c736f62911605c5d83970021e3fa95b37d769e2bbbe9b6172"}, - {file = "python_dotenv-0.19.0-py2.py3-none-any.whl", hash = "sha256:aae25dc1ebe97c420f50b81fb0e5c949659af713f31fdb63c749ca68748f34b1"}, + {file = "python-dotenv-0.19.1.tar.gz", hash = "sha256:14f8185cc8d494662683e6914addcb7e95374771e707601dfc70166946b4c4b8"}, + {file = "python_dotenv-0.19.1-py2.py3-none-any.whl", hash = "sha256:bbd3da593fc49c249397cbfbcc449cf36cb02e75afc8157fcc6a81df6fb7750a"}, ] pyyaml = [ - {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, - {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"}, - {file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"}, - {file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"}, - {file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"}, - {file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"}, - {file = "PyYAML-5.4.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347"}, - {file = "PyYAML-5.4.1-cp36-cp36m-manylinux2014_s390x.whl", hash = "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541"}, - {file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"}, - {file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"}, - {file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"}, - {file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"}, - {file = "PyYAML-5.4.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa"}, - {file = "PyYAML-5.4.1-cp37-cp37m-manylinux2014_s390x.whl", hash = "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0"}, - {file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"}, - {file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"}, - {file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"}, - {file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"}, - {file = "PyYAML-5.4.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247"}, - {file = "PyYAML-5.4.1-cp38-cp38-manylinux2014_s390x.whl", hash = "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc"}, - {file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"}, - {file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"}, - {file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"}, - {file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"}, - {file = "PyYAML-5.4.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122"}, - {file = "PyYAML-5.4.1-cp39-cp39-manylinux2014_s390x.whl", hash = "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6"}, - {file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"}, - {file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"}, - {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, + {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, + {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, + {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, + {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, + {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, + {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, + {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, + {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, + {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, + {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, + {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, + {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, + {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, + {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, + {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, + {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, ] rfc3986 = [ {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"}, @@ -565,8 +574,8 @@ sniffio = [ {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, ] starlette = [ - {file = "starlette-0.14.2-py3-none-any.whl", hash = "sha256:3c8e48e52736b3161e34c9f0e8153b4f32ec5d8995a3ee1d59410d92f75162ed"}, - {file = "starlette-0.14.2.tar.gz", hash = "sha256:7d49f4a27f8742262ef1470608c59ddbc66baf37c148e938c7038e6bc7a998aa"}, + {file = "starlette-0.16.0-py3-none-any.whl", hash = "sha256:38eb24bf705a2c317e15868e384c1b8a12ca396e5a3c3a003db7e667c43f939f"}, + {file = "starlette-0.16.0.tar.gz", hash = "sha256:e1904b5d0007aee24bdd3c43994be9b3b729f4f58e740200de1d623f8c3a8870"}, ] tomlkit = [ {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"}, diff --git a/packages/nonebot-adapter-ding/pyproject.toml b/packages/nonebot-adapter-ding/pyproject.toml index 7c15e7a4..755499ec 100644 --- a/packages/nonebot-adapter-ding/pyproject.toml +++ b/packages/nonebot-adapter-ding/pyproject.toml @@ -23,7 +23,7 @@ exclude = ["nonebot/__init__.py", "nonebot/adapters/__init__.py"] [tool.poetry.dependencies] python = "^3.7.3" -httpx = ">=0.18.0, <1.0.0" +httpx = ">=0.20.0, <1.0.0" nonebot2 = "^2.0.0-alpha.14" [tool.poetry.dev-dependencies] diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py index eb47bffc..f5a60cc8 100644 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py +++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py @@ -1,25 +1,25 @@ -import json import re -from typing import (TYPE_CHECKING, Any, AsyncIterable, Dict, Iterable, - Optional, Tuple, Union) +import json +from typing import (TYPE_CHECKING, Any, Dict, Tuple, Union, Iterable, Optional, + AsyncIterable) import httpx from aiocache import Cache, cached from aiocache.serializers import PickleSerializer -from nonebot.adapters import Bot as BaseBot -from nonebot.drivers import Driver, HTTPRequest, HTTPResponse from nonebot.log import logger -from nonebot.message import handle_event from nonebot.typing import overrides from nonebot.utils import escape_tag +from nonebot.message import handle_event +from nonebot.adapters import Bot as BaseBot +from nonebot.drivers import Driver, HTTPRequest, HTTPResponse -from .config import Config as FeishuConfig -from .event import (Event, GroupMessageEvent, MessageEvent, - PrivateMessageEvent, get_event_model) -from .exception import ActionFailed, ApiNotAvailable, NetworkError -from .message import Message, MessageSegment, MessageSerializer from .utils import AESCipher, log +from .config import Config as FeishuConfig +from .message import Message, MessageSegment, MessageSerializer +from .exception import ActionFailed, NetworkError, ApiNotAvailable +from .event import (Event, MessageEvent, GroupMessageEvent, PrivateMessageEvent, + get_event_model) if TYPE_CHECKING: from nonebot.config import Config @@ -102,7 +102,10 @@ def _check_nickname(bot: "Bot", event: "Event"): first_msg_seg.data["text"] = first_text[m.end():] -def _handle_api_result(result: Union[Optional[Dict[str, Any]], str, bytes, Iterable[bytes], AsyncIterable[bytes]]) -> Any: +def _handle_api_result( + result: Union[Optional[Dict[str, Any]], str, bytes, Iterable[bytes], + AsyncIterable[bytes]] +) -> Any: """ :说明: @@ -248,7 +251,7 @@ class Bot(BaseBot): serializer=PickleSerializer()) async def _fetch_tenant_access_token(self) -> str: try: - async with httpx.AsyncClient() as client: + async with httpx.AsyncClient(follow_redirects=True) as client: response = await client.post( self._construct_url( "auth/v3/tenant_access_token/internal/"), @@ -283,8 +286,8 @@ class Bot(BaseBot): "Authorization"] = "Bearer " + self.feishu_config.tenant_access_token try: - async with httpx.AsyncClient( - timeout=self.config.api_timeout) as client: + async with httpx.AsyncClient(timeout=self.config.api_timeout, + follow_redirects=True) as client: response = await client.send( httpx.Request(data["method"], self.api_root + api, @@ -292,7 +295,8 @@ class Bot(BaseBot): params=data.get("query", {}), headers=headers)) if 200 <= response.status_code < 300: - if response.headers["content-type"].startswith("application/json"): + if response.headers["content-type"].startswith( + "application/json"): result = response.json() else: result = response.content diff --git a/packages/nonebot-adapter-feishu/poetry.lock b/packages/nonebot-adapter-feishu/poetry.lock index 3ce6674b..0f9b972f 100644 --- a/packages/nonebot-adapter-feishu/poetry.lock +++ b/packages/nonebot-adapter-feishu/poetry.lock @@ -14,7 +14,7 @@ redis = ["aioredis (>=0.3.3)", "aioredis (>=1.0.0)"] [[package]] name = "anyio" -version = "3.3.2" +version = "3.3.4" description = "High level compatibility layer for multiple asynchronous event loop implementations" category = "main" optional = false @@ -46,7 +46,7 @@ tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] [[package]] name = "certifi" -version = "2021.5.30" +version = "2021.10.8" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false @@ -54,7 +54,7 @@ python-versions = "*" [[package]] name = "charset-normalizer" -version = "2.0.6" +version = "2.0.7" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false @@ -65,7 +65,7 @@ unicode_backport = ["unicodedata2"] [[package]] name = "click" -version = "8.0.1" +version = "8.0.3" description = "Composable command line interface toolkit" category = "main" optional = false @@ -85,21 +85,21 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "fastapi" -version = "0.68.1" +version = "0.70.0" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" category = "main" optional = false -python-versions = ">=3.6" +python-versions = ">=3.6.1" [package.dependencies] pydantic = ">=1.6.2,<1.7 || >1.7,<1.7.1 || >1.7.1,<1.7.2 || >1.7.2,<1.7.3 || >1.7.3,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0" -starlette = "0.14.2" +starlette = "0.16.0" [package.extras] -all = ["requests (>=2.24.0,<3.0.0)", "aiofiles (>=0.5.0,<0.6.0)", "jinja2 (>=2.11.2,<3.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<2.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "graphene (>=2.1.8,<3.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.14.0)", "async_exit_stack (>=1.0.1,<2.0.0)", "async_generator (>=1.10,<2.0.0)"] -dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.3.1,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.14.0)", "graphene (>=2.1.8,<3.0.0)"] -doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.2.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"] -test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<3.0.0)", "pytest-asyncio (>=0.14.0,<0.15.0)", "mypy (==0.812)", "flake8 (>=3.8.3,<4.0.0)", "black (==20.8b1)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.15.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.4.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.4.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "async_exit_stack (>=1.0.1,<2.0.0)", "async_generator (>=1.10,<2.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "aiofiles (>=0.5.0,<0.6.0)", "flask (>=1.1.2,<2.0.0)"] +all = ["requests (>=2.24.0,<3.0.0)", "jinja2 (>=2.11.2,<4.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<3.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] +dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.4.0,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] +doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"] +test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<4.0.0)", "mypy (==0.910)", "flake8 (>=3.8.3,<4.0.0)", "black (==21.9b0)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.19.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.5.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.6.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "flask (>=1.1.2,<3.0.0)", "anyio[trio] (>=3.2.1,<4.0.0)", "types-ujson (==0.1.1)", "types-orjson (==3.6.0)", "types-dataclasses (==0.1.7)"] [[package]] name = "h11" @@ -111,7 +111,7 @@ python-versions = ">=3.6" [[package]] name = "h2" -version = "4.0.0" +version = "4.1.0" description = "HTTP/2 State-Machine based protocol implementation" category = "main" optional = false @@ -158,7 +158,7 @@ test = ["Cython (==0.29.22)"] [[package]] name = "httpx" -version = "0.19.0" +version = "0.20.0" description = "The next generation HTTP client." category = "main" optional = false @@ -174,6 +174,7 @@ sniffio = "*" [package.extras] brotli = ["brotlicffi", "brotli"] +cli = ["click (>=8.0.0,<9.0.0)", "rich (>=10.0.0,<11.0.0)", "pygments (>=2.0.0,<3.0.0)"] http2 = ["h2 (>=3,<5)"] [[package]] @@ -186,7 +187,7 @@ python-versions = ">=3.6.1" [[package]] name = "idna" -version = "3.2" +version = "3.3" description = "Internationalized Domain Names in Applications (IDNA)" category = "main" optional = false @@ -234,8 +235,8 @@ python-versions = "^3.7.3" develop = true [package.dependencies] -fastapi = "^0.68.0" -httpx = {version = ">=0.18.0, <1.0.0", extras = ["http2"]} +fastapi = "^0.70.0" +httpx = {version = ">=0.20.0, <1.0.0", extras = ["http2"]} loguru = "^0.5.1" pydantic = {version = "~1.8.0", extras = ["dotenv"]} pygtrie = "^2.4.1" @@ -254,7 +255,7 @@ url = "../.." [[package]] name = "pycryptodome" -version = "3.10.4" +version = "3.11.0" description = "Cryptographic library for Python" category = "main" optional = false @@ -286,7 +287,7 @@ python-versions = "*" [[package]] name = "python-dotenv" -version = "0.19.0" +version = "0.19.1" description = "Read key-value pairs from a .env file and set them as environment variables" category = "main" optional = false @@ -297,11 +298,11 @@ cli = ["click (>=5.0)"] [[package]] name = "pyyaml" -version = "5.4.1" +version = "6.0" description = "YAML parser and emitter for Python" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.6" [[package]] name = "rfc3986" @@ -327,14 +328,18 @@ python-versions = ">=3.5" [[package]] name = "starlette" -version = "0.14.2" +version = "0.16.0" description = "The little ASGI library that shines." category = "main" optional = false python-versions = ">=3.6" +[package.dependencies] +anyio = ">=3.0.0,<4" +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} + [package.extras] -full = ["aiofiles", "graphene", "itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests"] +full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "graphene"] [[package]] name = "tomlkit" @@ -431,7 +436,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "40139e2d91c72d2eddada950b80f6b6d2912dc4c9bb15e644080b0319c430607" +content-hash = "c25fec9564d96a549db4b8828e75458d1980e192bdbbcaebeba1e2f35326ea40" [metadata.files] aiocache = [ @@ -439,40 +444,40 @@ aiocache = [ {file = "aiocache-0.11.1.tar.gz", hash = "sha256:f2ebe0b05cec45782e7b5ea0bb74640f157dd4bb1028b4565364dda9fe33be7f"}, ] anyio = [ - {file = "anyio-3.3.2-py3-none-any.whl", hash = "sha256:c32da314c510b34a862f5afeaf8a446ffed2c2fde21583e654bd71ecfb5b744b"}, - {file = "anyio-3.3.2.tar.gz", hash = "sha256:0b993a2ef6c1dc456815c2b5ca2819f382f20af98087cc2090a4afed3a501436"}, + {file = "anyio-3.3.4-py3-none-any.whl", hash = "sha256:4fd09a25ab7fa01d34512b7249e366cd10358cdafc95022c7ff8c8f8a5026d66"}, + {file = "anyio-3.3.4.tar.gz", hash = "sha256:67da67b5b21f96b9d3d65daa6ea99f5d5282cb09f50eb4456f8fb51dffefc3ff"}, ] asgiref = [ {file = "asgiref-3.4.1-py3-none-any.whl", hash = "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"}, {file = "asgiref-3.4.1.tar.gz", hash = "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9"}, ] certifi = [ - {file = "certifi-2021.5.30-py2.py3-none-any.whl", hash = "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"}, - {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, + {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, + {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, ] charset-normalizer = [ - {file = "charset-normalizer-2.0.6.tar.gz", hash = "sha256:5ec46d183433dcbd0ab716f2d7f29d8dee50505b3fdb40c6b985c7c4f5a3591f"}, - {file = "charset_normalizer-2.0.6-py3-none-any.whl", hash = "sha256:5d209c0a931f215cee683b6445e2d77677e7e75e159f78def0db09d68fafcaa6"}, + {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"}, + {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"}, ] click = [ - {file = "click-8.0.1-py3-none-any.whl", hash = "sha256:fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6"}, - {file = "click-8.0.1.tar.gz", hash = "sha256:8c04c11192119b1ef78ea049e0a6f0463e4c48ef00a30160c704337586f3ad7a"}, + {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"}, + {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] fastapi = [ - {file = "fastapi-0.68.1-py3-none-any.whl", hash = "sha256:94d2820906c36b9b8303796fb7271337ec89c74223229e3cfcf056b5a7d59e23"}, - {file = "fastapi-0.68.1.tar.gz", hash = "sha256:644bb815bae326575c4b2842469fb83053a4b974b82fa792ff9283d17fbbd99d"}, + {file = "fastapi-0.70.0-py3-none-any.whl", hash = "sha256:a36d5f2fad931aa3575c07a3472c784e81f3e664e3bb5c8b9c88d0ec1104f59c"}, + {file = "fastapi-0.70.0.tar.gz", hash = "sha256:66da43cfe5185ea1df99552acffd201f1832c6b364e0f4136c0a99f933466ced"}, ] h11 = [ {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, ] h2 = [ - {file = "h2-4.0.0-py3-none-any.whl", hash = "sha256:ac9e293a1990b339d5d71b19c5fe630e3dd4d768c620d1730d355485323f1b25"}, - {file = "h2-4.0.0.tar.gz", hash = "sha256:bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d"}, + {file = "h2-4.1.0-py3-none-any.whl", hash = "sha256:03a46bcf682256c95b5fd9e9a99c1323584c3eec6440d379b9903d709476bc6d"}, + {file = "h2-4.1.0.tar.gz", hash = "sha256:a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb"}, ] hpack = [ {file = "hpack-4.0.0-py3-none-any.whl", hash = "sha256:84a076fad3dc9a9f8063ccb8041ef100867b1878b25ef0ee63847a5d53818a6c"}, @@ -500,16 +505,16 @@ httptools = [ {file = "httptools-0.2.0.tar.gz", hash = "sha256:94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"}, ] httpx = [ - {file = "httpx-0.19.0-py3-none-any.whl", hash = "sha256:9bd728a6c5ec0a9e243932a9983d57d3cc4a87bb4f554e1360fce407f78f9435"}, - {file = "httpx-0.19.0.tar.gz", hash = "sha256:92ecd2c00c688b529eda11cedb15161eaf02dee9116712f621c70d9a40b2cdd0"}, + {file = "httpx-0.20.0-py3-none-any.whl", hash = "sha256:33af5aad9bdc82ef1fc89219c1e36f5693bf9cd0ebe330884df563445682c0f8"}, + {file = "httpx-0.20.0.tar.gz", hash = "sha256:09606d630f070d07f9ff28104fbcea429ea0014c1e89ac90b4d8de8286c40e7b"}, ] hyperframe = [ {file = "hyperframe-6.0.1-py3-none-any.whl", hash = "sha256:0ec6bafd80d8ad2195c4f03aacba3a8265e57bc4cff261e802bf39970ed02a15"}, {file = "hyperframe-6.0.1.tar.gz", hash = "sha256:ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914"}, ] idna = [ - {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"}, - {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"}, + {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, + {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, ] importlib-metadata = [ {file = "importlib_metadata-4.8.1-py3-none-any.whl", hash = "sha256:b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15"}, @@ -521,36 +526,36 @@ loguru = [ ] nonebot2 = [] pycryptodome = [ - {file = "pycryptodome-3.10.4-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:91ba4215a1f37d0f371fe43bc88c5ff49c274849f3868321c889313787de7672"}, - {file = "pycryptodome-3.10.4-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:66301e4c42dee43ee2da256625d3fe81ef98cc9924c2bd535008cc3ad8ded77b"}, - {file = "pycryptodome-3.10.4-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:8ec154ec445412df31acf0096e7f715e30e167c8f2318b8f5b1ab7c28f4c82f7"}, - {file = "pycryptodome-3.10.4-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:8e82524e7c354033508891405574d12e612cc4fdd3b55d2c238fc1a3e300b606"}, - {file = "pycryptodome-3.10.4-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:b217b4525e60e1af552d62bec01b4685095436d4de5ecde0f05d75b2f95ba6d4"}, - {file = "pycryptodome-3.10.4-cp27-cp27m-manylinux2014_aarch64.whl", hash = "sha256:3a153658d97258ca20bf18f7fe31c09cc7c558b6f8974a6ec74e19f6c634bd64"}, - {file = "pycryptodome-3.10.4-cp27-cp27m-win32.whl", hash = "sha256:c6469d1453f5864e3321a172b0aa671b938d753cbf2376b99fa2ab8841539bb8"}, - {file = "pycryptodome-3.10.4-cp27-cp27m-win_amd64.whl", hash = "sha256:6b45fcace5a5d9c57ba87cf804b161adc62aa826295ce7f7acbcbdc0df74ed37"}, - {file = "pycryptodome-3.10.4-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:b1daf251395af7336ddde6a0015ba5e632c18fe646ba930ef87402537358e3b4"}, - {file = "pycryptodome-3.10.4-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:9a2312440057bf29b9582f72f14d79692044e63bfbc4b4bbea8559355f44f3dd"}, - {file = "pycryptodome-3.10.4-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:54d4e4d45f349d8c4e2f31c2734637ff62a844af391b833f789da88e43a8f338"}, - {file = "pycryptodome-3.10.4-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:97e7df67a4da2e3f60612bbfd6c3f243a63a15d8f4797dd275e1d7b44a65cb12"}, - {file = "pycryptodome-3.10.4-cp27-cp27mu-manylinux2014_aarch64.whl", hash = "sha256:db15fa07d2a4c00beeb5e9acdfdbc1c79f9ccfbdc1a8f36c82c4aa44951b33c9"}, - {file = "pycryptodome-3.10.4-cp35-abi3-macosx_10_9_x86_64.whl", hash = "sha256:217dcc0c92503f7dd4b3d3b7d974331a4419f97f555c99a845c3b366fed7056b"}, - {file = "pycryptodome-3.10.4-cp35-abi3-manylinux1_i686.whl", hash = "sha256:a7471646d8cd1a58bb696d667dcb3853e5c9b341b68dcf3c3cc0893d0f98ca5f"}, - {file = "pycryptodome-3.10.4-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:d713dc0910e5ded07852a05e9b75f1dd9d3a31895eebee0668f612779b2a748c"}, - {file = "pycryptodome-3.10.4-cp35-abi3-manylinux2010_i686.whl", hash = "sha256:ac3012c36633564b2b5539bb7c6d9175f31d2ce74844e9abe654c428f02d0fd8"}, - {file = "pycryptodome-3.10.4-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:3f9fb499e267039262569d08658132c9cd8b136bf1d8c56b72f70ed05551e526"}, - {file = "pycryptodome-3.10.4-cp35-abi3-manylinux2014_aarch64.whl", hash = "sha256:309529d2526f3fb47102aeef376b3459110a6af7efb162e860b32e3a17a46f06"}, - {file = "pycryptodome-3.10.4-cp35-abi3-win32.whl", hash = "sha256:7efec2418e9746ec48e264eea431f8e422d931f71c57b1c96ee202b117f58fa9"}, - {file = "pycryptodome-3.10.4-cp35-abi3-win_amd64.whl", hash = "sha256:49e54f2245befb0193848c8c8031d8d1358ed4af5a1ae8d0a3ba669a5cdd3a72"}, - {file = "pycryptodome-3.10.4-pp27-pypy_73-macosx_10_9_x86_64.whl", hash = "sha256:4e8fc4c48365ce8a542fe48bf1360da05bb2851df12f64fc94d751705e7cdbe7"}, - {file = "pycryptodome-3.10.4-pp27-pypy_73-manylinux1_x86_64.whl", hash = "sha256:851e6d4930b160417235955322db44adbdb19589918670d63f4acd5d92959ac0"}, - {file = "pycryptodome-3.10.4-pp27-pypy_73-manylinux2010_x86_64.whl", hash = "sha256:04e14c732c3693d2830839feed5129286ce47ffa8bfe90e4ae042c773e51c677"}, - {file = "pycryptodome-3.10.4-pp27-pypy_73-win32.whl", hash = "sha256:cefe6b267b8e5c3c72e11adec35a9c7285b62e8ea141b63e87055e9a9e5f2f8c"}, - {file = "pycryptodome-3.10.4-pp36-pypy36_pp73-macosx_10_9_x86_64.whl", hash = "sha256:24c1b7705d19d8ae3e7255431efd2e526006855df62620118dd7b5374c6372f6"}, - {file = "pycryptodome-3.10.4-pp36-pypy36_pp73-manylinux1_x86_64.whl", hash = "sha256:c61ea053bd5d4c12a063d7e704fbe1c45abb5d2510dab55bd95d166ba661604f"}, - {file = "pycryptodome-3.10.4-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:11d3164fb49fdee000fde05baecce103c0c698168ef1a18d9c7429dd66f0f5bb"}, - {file = "pycryptodome-3.10.4-pp36-pypy36_pp73-win32.whl", hash = "sha256:3faa6ebd35c61718f3f8862569c1f38450c24f3ededb213e1a64806f02f584bc"}, - {file = "pycryptodome-3.10.4.tar.gz", hash = "sha256:40083b0d7f277452c7f2dd4841801f058cc12a74c219ee4110d65774c6a58bef"}, + {file = "pycryptodome-3.11.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:ffd0cac13ff41f2d15ed39dc6ba1d2ad88dd2905d656c33d8235852f5d6151fd"}, + {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:ead516e03dfe062aefeafe4a29445a6449b0fc43bc8cb30194b2754917a63798"}, + {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:4ce6b09547bf2c7cede3a017f79502eaed3e819c13cdb3cb357aea1b004e4cc6"}, + {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:014c758af7fa38cab85b357a496b76f4fc9dda1f731eb28358d66fef7ad4a3e1"}, + {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:a843350d08c3d22f6c09c2f17f020d8dcfa59496165d7425a3fba0045543dda7"}, + {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux2014_aarch64.whl", hash = "sha256:53989477044be41fa4a63da09d5038c2a34b2f4554cfea2e3933b17186ee9e19"}, + {file = "pycryptodome-3.11.0-cp27-cp27m-win32.whl", hash = "sha256:f9bad2220b80b4ed74f089db012ab5ab5419143a33fad6c8aedcc2a9341eac70"}, + {file = "pycryptodome-3.11.0-cp27-cp27m-win_amd64.whl", hash = "sha256:3c7ed5b07274535979c730daf5817db5e983ea80b04c22579eee8da4ca3ae4f8"}, + {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:8f3a60926be78422e662b0d0b18351b426ce27657101c8a50bad80300de6a701"}, + {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:fce7e22d96030b35345637c563246c24d4513bd3b413e1c40293114837ab8912"}, + {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:bc3c61ff92efdcc14af4a7b81da71d849c9acee51d8fd8ac9841a7620140d6c6"}, + {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:b33c9b3d1327d821e28e9cc3a6512c14f8b17570ddb4cfb9a52247ed0fcc5d8b"}, + {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux2014_aarch64.whl", hash = "sha256:75e78360d1dd6d02eb288fd8275bb4d147d6e3f5337935c096d11dba1fa84748"}, + {file = "pycryptodome-3.11.0-cp35-abi3-macosx_10_9_x86_64.whl", hash = "sha256:621a90147a5e255fdc2a0fec2d56626b76b5d72ea9e60164c9a5a8976d45b0c9"}, + {file = "pycryptodome-3.11.0-cp35-abi3-manylinux1_i686.whl", hash = "sha256:0ca7a6b4fc1f9fafe990b95c8cda89099797e2cfbf40e55607f2f2f5a3355dcb"}, + {file = "pycryptodome-3.11.0-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:b59bf823cfafde8ef1105d8984f26d1694dff165adb7198b12e3e068d7999b15"}, + {file = "pycryptodome-3.11.0-cp35-abi3-manylinux2010_i686.whl", hash = "sha256:ce81b9c6aaa0f920e2ab05eb2b9f4ccd102e3016b2f37125593b16a83a4b0cc2"}, + {file = "pycryptodome-3.11.0-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:ae29fcd56152f417bfba50a36a56a7a5f9fb74ff80bab98704cac704de6568ab"}, + {file = "pycryptodome-3.11.0-cp35-abi3-manylinux2014_aarch64.whl", hash = "sha256:ae31cb874f6f0cedbed457c6374e7e54d7ed45c1a4e11a65a9c80968da90a650"}, + {file = "pycryptodome-3.11.0-cp35-abi3-win32.whl", hash = "sha256:6db1f9fa1f52226621905f004278ce7bd90c8f5363ffd5d7ab3755363d98549a"}, + {file = "pycryptodome-3.11.0-cp35-abi3-win_amd64.whl", hash = "sha256:d7e5f6f692421e5219aa3b545eb0cffd832cd589a4b9dcd4a5eb4260e2c0d68a"}, + {file = "pycryptodome-3.11.0-pp27-pypy_73-macosx_10_9_x86_64.whl", hash = "sha256:da796e9221dda61a0019d01742337eb8a322de8598b678a4344ca0a436380315"}, + {file = "pycryptodome-3.11.0-pp27-pypy_73-manylinux1_x86_64.whl", hash = "sha256:ed45ef92d21db33685b789de2c015e9d9a18a74760a8df1fc152faee88cdf741"}, + {file = "pycryptodome-3.11.0-pp27-pypy_73-manylinux2010_x86_64.whl", hash = "sha256:4169ed515742425ff21e4bd3fabbb6994ffb64434472fb72230019bdfa36b939"}, + {file = "pycryptodome-3.11.0-pp27-pypy_73-win32.whl", hash = "sha256:f19edd42368e9057c39492947bb99570dc927123e210008f2af7cf9b505c6892"}, + {file = "pycryptodome-3.11.0-pp36-pypy36_pp73-macosx_10_9_x86_64.whl", hash = "sha256:06162fcfed2f9deee8383fd59eaeabc7b7ffc3af50d3fad4000032deb8f700b0"}, + {file = "pycryptodome-3.11.0-pp36-pypy36_pp73-manylinux1_x86_64.whl", hash = "sha256:6eda8a3157c91ba60b26a07bedd6c44ab8bda6cd79b6b5ea9744ba62c39b7b1e"}, + {file = "pycryptodome-3.11.0-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:7ff701fc283412e651eaab4319b3cd4eaa0827e94569cd37ee9075d5c05fe655"}, + {file = "pycryptodome-3.11.0-pp36-pypy36_pp73-win32.whl", hash = "sha256:2a4bcc8a9977fee0979079cd33a9e9f0d3ddba5660d35ffe874cf84f1dd399d2"}, + {file = "pycryptodome-3.11.0.tar.gz", hash = "sha256:428096bbf7a77e207f418dfd4d7c284df8ade81d2dc80f010e92753a3e406ad0"}, ] pydantic = [ {file = "pydantic-1.8.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:05ddfd37c1720c392f4e0d43c484217b7521558302e7069ce8d318438d297739"}, @@ -580,39 +585,43 @@ pygtrie = [ {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, ] python-dotenv = [ - {file = "python-dotenv-0.19.0.tar.gz", hash = "sha256:f521bc2ac9a8e03c736f62911605c5d83970021e3fa95b37d769e2bbbe9b6172"}, - {file = "python_dotenv-0.19.0-py2.py3-none-any.whl", hash = "sha256:aae25dc1ebe97c420f50b81fb0e5c949659af713f31fdb63c749ca68748f34b1"}, + {file = "python-dotenv-0.19.1.tar.gz", hash = "sha256:14f8185cc8d494662683e6914addcb7e95374771e707601dfc70166946b4c4b8"}, + {file = "python_dotenv-0.19.1-py2.py3-none-any.whl", hash = "sha256:bbd3da593fc49c249397cbfbcc449cf36cb02e75afc8157fcc6a81df6fb7750a"}, ] pyyaml = [ - {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, - {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"}, - {file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"}, - {file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"}, - {file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"}, - {file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"}, - {file = "PyYAML-5.4.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347"}, - {file = "PyYAML-5.4.1-cp36-cp36m-manylinux2014_s390x.whl", hash = "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541"}, - {file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"}, - {file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"}, - {file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"}, - {file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"}, - {file = "PyYAML-5.4.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa"}, - {file = "PyYAML-5.4.1-cp37-cp37m-manylinux2014_s390x.whl", hash = "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0"}, - {file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"}, - {file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"}, - {file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"}, - {file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"}, - {file = "PyYAML-5.4.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247"}, - {file = "PyYAML-5.4.1-cp38-cp38-manylinux2014_s390x.whl", hash = "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc"}, - {file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"}, - {file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"}, - {file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"}, - {file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"}, - {file = "PyYAML-5.4.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122"}, - {file = "PyYAML-5.4.1-cp39-cp39-manylinux2014_s390x.whl", hash = "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6"}, - {file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"}, - {file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"}, - {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, + {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, + {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, + {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, + {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, + {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, + {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, + {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, + {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, + {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, + {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, + {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, + {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, + {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, + {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, + {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, + {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, ] rfc3986 = [ {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"}, @@ -623,8 +632,8 @@ sniffio = [ {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, ] starlette = [ - {file = "starlette-0.14.2-py3-none-any.whl", hash = "sha256:3c8e48e52736b3161e34c9f0e8153b4f32ec5d8995a3ee1d59410d92f75162ed"}, - {file = "starlette-0.14.2.tar.gz", hash = "sha256:7d49f4a27f8742262ef1470608c59ddbc66baf37c148e938c7038e6bc7a998aa"}, + {file = "starlette-0.16.0-py3-none-any.whl", hash = "sha256:38eb24bf705a2c317e15868e384c1b8a12ca396e5a3c3a003db7e667c43f939f"}, + {file = "starlette-0.16.0.tar.gz", hash = "sha256:e1904b5d0007aee24bdd3c43994be9b3b729f4f58e740200de1d623f8c3a8870"}, ] tomlkit = [ {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"}, diff --git a/packages/nonebot-adapter-feishu/pyproject.toml b/packages/nonebot-adapter-feishu/pyproject.toml index bfcd8012..030852e9 100644 --- a/packages/nonebot-adapter-feishu/pyproject.toml +++ b/packages/nonebot-adapter-feishu/pyproject.toml @@ -25,7 +25,7 @@ exclude = ["nonebot/__init__.py", "nonebot/adapters/__init__.py"] python = "^3.7.3" aiocache = "^0.11.1" pycryptodome = "^3.10.1" -httpx = ">=0.18.0, <1.0.0" +httpx = ">=0.20.0, <1.0.0" nonebot2 = "^2.0.0-alpha.14" [tool.poetry.dev-dependencies] diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/bot.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/bot.py index aa1e1c5c..9e197079 100644 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/bot.py +++ b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/bot.py @@ -1,25 +1,24 @@ -import asyncio import json -from functools import partial +import asyncio from io import BytesIO +from functools import partial from ipaddress import IPv4Address -from typing import Any, Dict, List, NoReturn, Optional, Tuple, Union +from typing import Any, Dict, List, Tuple, Union, NoReturn, Optional import httpx from loguru import logger -from nonebot.adapters import Bot as BaseBot from nonebot.config import Config -from nonebot.drivers import (Driver, ForwardDriver, HTTPConnection, - HTTPResponse, ReverseDriver, WebSocket, - WebSocketSetup) -from nonebot.exception import ApiNotAvailable from nonebot.typing import overrides +from nonebot.adapters import Bot as BaseBot +from nonebot.exception import ApiNotAvailable +from nonebot.drivers import (Driver, WebSocket, HTTPResponse, ForwardDriver, + ReverseDriver, HTTPConnection, WebSocketSetup) from .config import Config as MiraiConfig -from .event import Event, FriendMessage, GroupMessage, TempMessage from .message import MessageChain, MessageSegment -from .utils import Log, argument_validation, catch_network_error, process_event +from .event import Event, TempMessage, GroupMessage, FriendMessage +from .utils import Log, process_event, argument_validation, catch_network_error class SessionManager: @@ -116,7 +115,8 @@ class SessionManager: if session is not None: return session - client = httpx.AsyncClient(base_url=f'http://{host}:{port}') + client = httpx.AsyncClient(base_url=f'http://{host}:{port}', + follow_redirects=True) response = await client.post('/auth', json={'authKey': auth_key}) response.raise_for_status() auth = response.json() diff --git a/packages/nonebot-adapter-mirai/poetry.lock b/packages/nonebot-adapter-mirai/poetry.lock index 5dbe23f0..9945f985 100644 --- a/packages/nonebot-adapter-mirai/poetry.lock +++ b/packages/nonebot-adapter-mirai/poetry.lock @@ -1,6 +1,6 @@ [[package]] name = "anyio" -version = "3.3.2" +version = "3.3.4" description = "High level compatibility layer for multiple asynchronous event loop implementations" category = "main" optional = false @@ -32,7 +32,7 @@ tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] [[package]] name = "certifi" -version = "2021.5.30" +version = "2021.10.8" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false @@ -40,7 +40,7 @@ python-versions = "*" [[package]] name = "charset-normalizer" -version = "2.0.6" +version = "2.0.7" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false @@ -51,7 +51,7 @@ unicode_backport = ["unicodedata2"] [[package]] name = "click" -version = "8.0.1" +version = "8.0.3" description = "Composable command line interface toolkit" category = "main" optional = false @@ -71,21 +71,21 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "fastapi" -version = "0.68.1" +version = "0.70.0" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" category = "main" optional = false -python-versions = ">=3.6" +python-versions = ">=3.6.1" [package.dependencies] pydantic = ">=1.6.2,<1.7 || >1.7,<1.7.1 || >1.7.1,<1.7.2 || >1.7.2,<1.7.3 || >1.7.3,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0" -starlette = "0.14.2" +starlette = "0.16.0" [package.extras] -all = ["requests (>=2.24.0,<3.0.0)", "aiofiles (>=0.5.0,<0.6.0)", "jinja2 (>=2.11.2,<3.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<2.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "graphene (>=2.1.8,<3.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.14.0)", "async_exit_stack (>=1.0.1,<2.0.0)", "async_generator (>=1.10,<2.0.0)"] -dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.3.1,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.14.0)", "graphene (>=2.1.8,<3.0.0)"] -doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.2.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"] -test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<3.0.0)", "pytest-asyncio (>=0.14.0,<0.15.0)", "mypy (==0.812)", "flake8 (>=3.8.3,<4.0.0)", "black (==20.8b1)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.15.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.4.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.4.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "async_exit_stack (>=1.0.1,<2.0.0)", "async_generator (>=1.10,<2.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "aiofiles (>=0.5.0,<0.6.0)", "flask (>=1.1.2,<2.0.0)"] +all = ["requests (>=2.24.0,<3.0.0)", "jinja2 (>=2.11.2,<4.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<3.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] +dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.4.0,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] +doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"] +test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<4.0.0)", "mypy (==0.910)", "flake8 (>=3.8.3,<4.0.0)", "black (==21.9b0)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.19.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.5.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.6.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "flask (>=1.1.2,<3.0.0)", "anyio[trio] (>=3.2.1,<4.0.0)", "types-ujson (==0.1.1)", "types-orjson (==3.6.0)", "types-dataclasses (==0.1.7)"] [[package]] name = "h11" @@ -97,7 +97,7 @@ python-versions = ">=3.6" [[package]] name = "h2" -version = "4.0.0" +version = "4.1.0" description = "HTTP/2 State-Machine based protocol implementation" category = "main" optional = false @@ -144,7 +144,7 @@ test = ["Cython (==0.29.22)"] [[package]] name = "httpx" -version = "0.19.0" +version = "0.20.0" description = "The next generation HTTP client." category = "main" optional = false @@ -160,6 +160,7 @@ sniffio = "*" [package.extras] brotli = ["brotlicffi", "brotli"] +cli = ["click (>=8.0.0,<9.0.0)", "rich (>=10.0.0,<11.0.0)", "pygments (>=2.0.0,<3.0.0)"] http2 = ["h2 (>=3,<5)"] [[package]] @@ -172,7 +173,7 @@ python-versions = ">=3.6.1" [[package]] name = "idna" -version = "3.2" +version = "3.3" description = "Internationalized Domain Names in Applications (IDNA)" category = "main" optional = false @@ -220,8 +221,8 @@ python-versions = "^3.7.3" develop = true [package.dependencies] -fastapi = "^0.68.0" -httpx = {version = ">=0.18.0, <1.0.0", extras = ["http2"]} +fastapi = "^0.70.0" +httpx = {version = ">=0.20.0, <1.0.0", extras = ["http2"]} loguru = "^0.5.1" pydantic = {version = "~1.8.0", extras = ["dotenv"]} pygtrie = "^2.4.1" @@ -264,7 +265,7 @@ python-versions = "*" [[package]] name = "python-dotenv" -version = "0.19.0" +version = "0.19.1" description = "Read key-value pairs from a .env file and set them as environment variables" category = "main" optional = false @@ -275,11 +276,11 @@ cli = ["click (>=5.0)"] [[package]] name = "pyyaml" -version = "5.4.1" +version = "6.0" description = "YAML parser and emitter for Python" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.6" [[package]] name = "rfc3986" @@ -305,14 +306,18 @@ python-versions = ">=3.5" [[package]] name = "starlette" -version = "0.14.2" +version = "0.16.0" description = "The little ASGI library that shines." category = "main" optional = false python-versions = ">=3.6" +[package.dependencies] +anyio = ">=3.0.0,<4" +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} + [package.extras] -full = ["aiofiles", "graphene", "itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests"] +full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "graphene"] [[package]] name = "tomlkit" @@ -409,44 +414,44 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "247a88fc820098c6f136bce8604366d37cd1230264a6f9859bdea2ac30f1e034" +content-hash = "0cc9df471eb39cfb9b3225370913296535c45171158adc19753cebb7fe791ae3" [metadata.files] anyio = [ - {file = "anyio-3.3.2-py3-none-any.whl", hash = "sha256:c32da314c510b34a862f5afeaf8a446ffed2c2fde21583e654bd71ecfb5b744b"}, - {file = "anyio-3.3.2.tar.gz", hash = "sha256:0b993a2ef6c1dc456815c2b5ca2819f382f20af98087cc2090a4afed3a501436"}, + {file = "anyio-3.3.4-py3-none-any.whl", hash = "sha256:4fd09a25ab7fa01d34512b7249e366cd10358cdafc95022c7ff8c8f8a5026d66"}, + {file = "anyio-3.3.4.tar.gz", hash = "sha256:67da67b5b21f96b9d3d65daa6ea99f5d5282cb09f50eb4456f8fb51dffefc3ff"}, ] asgiref = [ {file = "asgiref-3.4.1-py3-none-any.whl", hash = "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"}, {file = "asgiref-3.4.1.tar.gz", hash = "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9"}, ] certifi = [ - {file = "certifi-2021.5.30-py2.py3-none-any.whl", hash = "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"}, - {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, + {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, + {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, ] charset-normalizer = [ - {file = "charset-normalizer-2.0.6.tar.gz", hash = "sha256:5ec46d183433dcbd0ab716f2d7f29d8dee50505b3fdb40c6b985c7c4f5a3591f"}, - {file = "charset_normalizer-2.0.6-py3-none-any.whl", hash = "sha256:5d209c0a931f215cee683b6445e2d77677e7e75e159f78def0db09d68fafcaa6"}, + {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"}, + {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"}, ] click = [ - {file = "click-8.0.1-py3-none-any.whl", hash = "sha256:fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6"}, - {file = "click-8.0.1.tar.gz", hash = "sha256:8c04c11192119b1ef78ea049e0a6f0463e4c48ef00a30160c704337586f3ad7a"}, + {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"}, + {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] fastapi = [ - {file = "fastapi-0.68.1-py3-none-any.whl", hash = "sha256:94d2820906c36b9b8303796fb7271337ec89c74223229e3cfcf056b5a7d59e23"}, - {file = "fastapi-0.68.1.tar.gz", hash = "sha256:644bb815bae326575c4b2842469fb83053a4b974b82fa792ff9283d17fbbd99d"}, + {file = "fastapi-0.70.0-py3-none-any.whl", hash = "sha256:a36d5f2fad931aa3575c07a3472c784e81f3e664e3bb5c8b9c88d0ec1104f59c"}, + {file = "fastapi-0.70.0.tar.gz", hash = "sha256:66da43cfe5185ea1df99552acffd201f1832c6b364e0f4136c0a99f933466ced"}, ] h11 = [ {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, ] h2 = [ - {file = "h2-4.0.0-py3-none-any.whl", hash = "sha256:ac9e293a1990b339d5d71b19c5fe630e3dd4d768c620d1730d355485323f1b25"}, - {file = "h2-4.0.0.tar.gz", hash = "sha256:bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d"}, + {file = "h2-4.1.0-py3-none-any.whl", hash = "sha256:03a46bcf682256c95b5fd9e9a99c1323584c3eec6440d379b9903d709476bc6d"}, + {file = "h2-4.1.0.tar.gz", hash = "sha256:a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb"}, ] hpack = [ {file = "hpack-4.0.0-py3-none-any.whl", hash = "sha256:84a076fad3dc9a9f8063ccb8041ef100867b1878b25ef0ee63847a5d53818a6c"}, @@ -474,16 +479,16 @@ httptools = [ {file = "httptools-0.2.0.tar.gz", hash = "sha256:94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"}, ] httpx = [ - {file = "httpx-0.19.0-py3-none-any.whl", hash = "sha256:9bd728a6c5ec0a9e243932a9983d57d3cc4a87bb4f554e1360fce407f78f9435"}, - {file = "httpx-0.19.0.tar.gz", hash = "sha256:92ecd2c00c688b529eda11cedb15161eaf02dee9116712f621c70d9a40b2cdd0"}, + {file = "httpx-0.20.0-py3-none-any.whl", hash = "sha256:33af5aad9bdc82ef1fc89219c1e36f5693bf9cd0ebe330884df563445682c0f8"}, + {file = "httpx-0.20.0.tar.gz", hash = "sha256:09606d630f070d07f9ff28104fbcea429ea0014c1e89ac90b4d8de8286c40e7b"}, ] hyperframe = [ {file = "hyperframe-6.0.1-py3-none-any.whl", hash = "sha256:0ec6bafd80d8ad2195c4f03aacba3a8265e57bc4cff261e802bf39970ed02a15"}, {file = "hyperframe-6.0.1.tar.gz", hash = "sha256:ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914"}, ] idna = [ - {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"}, - {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"}, + {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, + {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, ] importlib-metadata = [ {file = "importlib_metadata-4.8.1-py3-none-any.whl", hash = "sha256:b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15"}, @@ -522,39 +527,43 @@ pygtrie = [ {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, ] python-dotenv = [ - {file = "python-dotenv-0.19.0.tar.gz", hash = "sha256:f521bc2ac9a8e03c736f62911605c5d83970021e3fa95b37d769e2bbbe9b6172"}, - {file = "python_dotenv-0.19.0-py2.py3-none-any.whl", hash = "sha256:aae25dc1ebe97c420f50b81fb0e5c949659af713f31fdb63c749ca68748f34b1"}, + {file = "python-dotenv-0.19.1.tar.gz", hash = "sha256:14f8185cc8d494662683e6914addcb7e95374771e707601dfc70166946b4c4b8"}, + {file = "python_dotenv-0.19.1-py2.py3-none-any.whl", hash = "sha256:bbd3da593fc49c249397cbfbcc449cf36cb02e75afc8157fcc6a81df6fb7750a"}, ] pyyaml = [ - {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, - {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"}, - {file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"}, - {file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"}, - {file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"}, - {file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"}, - {file = "PyYAML-5.4.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347"}, - {file = "PyYAML-5.4.1-cp36-cp36m-manylinux2014_s390x.whl", hash = "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541"}, - {file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"}, - {file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"}, - {file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"}, - {file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"}, - {file = "PyYAML-5.4.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa"}, - {file = "PyYAML-5.4.1-cp37-cp37m-manylinux2014_s390x.whl", hash = "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0"}, - {file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"}, - {file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"}, - {file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"}, - {file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"}, - {file = "PyYAML-5.4.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247"}, - {file = "PyYAML-5.4.1-cp38-cp38-manylinux2014_s390x.whl", hash = "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc"}, - {file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"}, - {file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"}, - {file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"}, - {file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"}, - {file = "PyYAML-5.4.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122"}, - {file = "PyYAML-5.4.1-cp39-cp39-manylinux2014_s390x.whl", hash = "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6"}, - {file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"}, - {file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"}, - {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, + {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, + {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, + {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, + {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, + {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, + {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, + {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, + {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, + {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, + {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, + {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, + {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, + {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, + {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, + {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, + {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, ] rfc3986 = [ {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"}, @@ -565,8 +574,8 @@ sniffio = [ {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, ] starlette = [ - {file = "starlette-0.14.2-py3-none-any.whl", hash = "sha256:3c8e48e52736b3161e34c9f0e8153b4f32ec5d8995a3ee1d59410d92f75162ed"}, - {file = "starlette-0.14.2.tar.gz", hash = "sha256:7d49f4a27f8742262ef1470608c59ddbc66baf37c148e938c7038e6bc7a998aa"}, + {file = "starlette-0.16.0-py3-none-any.whl", hash = "sha256:38eb24bf705a2c317e15868e384c1b8a12ca396e5a3c3a003db7e667c43f939f"}, + {file = "starlette-0.16.0.tar.gz", hash = "sha256:e1904b5d0007aee24bdd3c43994be9b3b729f4f58e740200de1d623f8c3a8870"}, ] tomlkit = [ {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"}, diff --git a/packages/nonebot-adapter-mirai/pyproject.toml b/packages/nonebot-adapter-mirai/pyproject.toml index f77c877a..7340cd75 100644 --- a/packages/nonebot-adapter-mirai/pyproject.toml +++ b/packages/nonebot-adapter-mirai/pyproject.toml @@ -23,7 +23,7 @@ exclude = ["nonebot/__init__.py", "nonebot/adapters/__init__.py"] [tool.poetry.dependencies] python = "^3.7.3" -httpx = ">=0.18.0, <1.0.0" +httpx = ">=0.20.0, <1.0.0" nonebot2 = "^2.0.0-alpha.14" [tool.poetry.dev-dependencies] diff --git a/poetry.lock b/poetry.lock index 8d9a52a2..b85a4027 100644 --- a/poetry.lock +++ b/poetry.lock @@ -63,7 +63,7 @@ python-versions = "*" [[package]] name = "anyio" -version = "3.3.2" +version = "3.3.4" description = "High level compatibility layer for multiple asynchronous event loop implementations" category = "main" optional = false @@ -155,7 +155,7 @@ python-versions = "*" [[package]] name = "certifi" -version = "2021.5.30" +version = "2021.10.8" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false @@ -163,7 +163,7 @@ python-versions = "*" [[package]] name = "cffi" -version = "1.14.6" +version = "1.15.0" description = "Foreign Function Interface for Python calling C code." category = "main" optional = true @@ -182,7 +182,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "charset-normalizer" -version = "2.0.6" +version = "2.0.7" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false @@ -193,7 +193,7 @@ unicode_backport = ["unicodedata2"] [[package]] name = "click" -version = "8.0.1" +version = "8.0.3" description = "Composable command line interface toolkit" category = "main" optional = false @@ -221,21 +221,21 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "fastapi" -version = "0.68.1" +version = "0.70.0" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" category = "main" optional = false -python-versions = ">=3.6" +python-versions = ">=3.6.1" [package.dependencies] pydantic = ">=1.6.2,<1.7 || >1.7,<1.7.1 || >1.7.1,<1.7.2 || >1.7.2,<1.7.3 || >1.7.3,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0" -starlette = "0.14.2" +starlette = "0.16.0" [package.extras] -all = ["requests (>=2.24.0,<3.0.0)", "aiofiles (>=0.5.0,<0.6.0)", "jinja2 (>=2.11.2,<3.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<2.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "graphene (>=2.1.8,<3.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.14.0)", "async_exit_stack (>=1.0.1,<2.0.0)", "async_generator (>=1.10,<2.0.0)"] -dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.3.1,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.14.0)", "graphene (>=2.1.8,<3.0.0)"] -doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.2.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"] -test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<3.0.0)", "pytest-asyncio (>=0.14.0,<0.15.0)", "mypy (==0.812)", "flake8 (>=3.8.3,<4.0.0)", "black (==20.8b1)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.15.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.4.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.4.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "async_exit_stack (>=1.0.1,<2.0.0)", "async_generator (>=1.10,<2.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "aiofiles (>=0.5.0,<0.6.0)", "flask (>=1.1.2,<2.0.0)"] +all = ["requests (>=2.24.0,<3.0.0)", "jinja2 (>=2.11.2,<4.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<3.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] +dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.4.0,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] +doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"] +test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<4.0.0)", "mypy (==0.910)", "flake8 (>=3.8.3,<4.0.0)", "black (==21.9b0)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.19.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.5.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.6.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "flask (>=1.1.2,<3.0.0)", "anyio[trio] (>=3.2.1,<4.0.0)", "types-ujson (==0.1.1)", "types-orjson (==3.6.0)", "types-dataclasses (==0.1.7)"] [[package]] name = "h11" @@ -247,7 +247,7 @@ python-versions = ">=3.6" [[package]] name = "h2" -version = "4.0.0" +version = "4.1.0" description = "HTTP/2 State-Machine based protocol implementation" category = "main" optional = false @@ -302,7 +302,7 @@ test = ["Cython (==0.29.22)"] [[package]] name = "httpx" -version = "0.19.0" +version = "0.20.0" description = "The next generation HTTP client." category = "main" optional = false @@ -318,6 +318,7 @@ sniffio = "*" [package.extras] brotli = ["brotlicffi", "brotli"] +cli = ["click (>=8.0.0,<9.0.0)", "rich (>=10.0.0,<11.0.0)", "pygments (>=2.0.0,<3.0.0)"] http2 = ["h2 (>=3,<5)"] [[package]] @@ -352,7 +353,7 @@ python-versions = ">=3.6.1" [[package]] name = "idna" -version = "3.2" +version = "3.3" description = "Internationalized Domain Names in Applications (IDNA)" category = "main" optional = false @@ -393,7 +394,7 @@ python-versions = ">=3.6" [[package]] name = "jinja2" -version = "3.0.1" +version = "3.0.2" description = "A very fast and expressive template engine." category = "main" optional = false @@ -430,7 +431,7 @@ python-versions = ">=3.6" [[package]] name = "multidict" -version = "5.1.0" +version = "5.2.0" description = "multidict implementation" category = "main" optional = true @@ -540,7 +541,7 @@ python-versions = ">=3.6.1" [[package]] name = "pycares" -version = "4.0.0" +version = "4.1.2" description = "Python interface for c-ares" category = "main" optional = true @@ -562,7 +563,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "pycryptodome" -version = "3.10.4" +version = "3.11.0" description = "Cryptographic library for Python" category = "dev" optional = false @@ -586,7 +587,7 @@ email = ["email-validator (>=1.0.3)"] [[package]] name = "pydash" -version = "5.0.2" +version = "5.1.0" description = "The kitchen sink of Python utility libraries for doing \"stuff\" in a functional way. Based on the Lo-Dash Javascript library." category = "dev" optional = false @@ -621,7 +622,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "python-dotenv" -version = "0.19.0" +version = "0.19.1" description = "Read key-value pairs from a .env file and set them as environment variables" category = "main" optional = false @@ -671,11 +672,11 @@ python-versions = "*" [[package]] name = "pyyaml" -version = "5.4.1" +version = "6.0" description = "YAML parser and emitter for Python" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.6" [[package]] name = "quart" @@ -881,14 +882,18 @@ test = ["pytest"] [[package]] name = "starlette" -version = "0.14.2" +version = "0.16.0" description = "The little ASGI library that shines." category = "main" optional = false python-versions = ">=3.6" +[package.dependencies] +anyio = ">=3.0.0,<4" +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} + [package.extras] -full = ["aiofiles", "graphene", "itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests"] +full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "graphene"] [[package]] name = "toml" @@ -1001,7 +1006,7 @@ python-versions = ">=3.7" [[package]] name = "werkzeug" -version = "2.0.1" +version = "2.0.2" description = "The comprehensive WSGI web application library." category = "main" optional = true @@ -1042,7 +1047,7 @@ python-versions = "*" [[package]] name = "yarl" -version = "1.6.3" +version = "1.7.0" description = "Yet another URL library" category = "main" optional = true @@ -1073,7 +1078,7 @@ quart = ["Quart"] [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "14d2fb767ba6b7ac858ab8e691a9d76130dcf6aa7201e5c7e471f73e79c4dba5" +content-hash = "dd0809a5a36ecbd9c850ac04b39b60664c81b4cf2560f7870184dc7b3a84b0d6" [metadata.files] aiocache = [ @@ -1132,8 +1137,8 @@ alabaster = [ {file = "alabaster-0.7.12.tar.gz", hash = "sha256:a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"}, ] anyio = [ - {file = "anyio-3.3.2-py3-none-any.whl", hash = "sha256:c32da314c510b34a862f5afeaf8a446ffed2c2fde21583e654bd71ecfb5b744b"}, - {file = "anyio-3.3.2.tar.gz", hash = "sha256:0b993a2ef6c1dc456815c2b5ca2819f382f20af98087cc2090a4afed3a501436"}, + {file = "anyio-3.3.4-py3-none-any.whl", hash = "sha256:4fd09a25ab7fa01d34512b7249e366cd10358cdafc95022c7ff8c8f8a5026d66"}, + {file = "anyio-3.3.4.tar.gz", hash = "sha256:67da67b5b21f96b9d3d65daa6ea99f5d5282cb09f50eb4456f8fb51dffefc3ff"}, ] asgiref = [ {file = "asgiref-3.4.1-py3-none-any.whl", hash = "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"}, @@ -1234,67 +1239,72 @@ cchardet = [ {file = "cchardet-2.1.7.tar.gz", hash = "sha256:c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf"}, ] certifi = [ - {file = "certifi-2021.5.30-py2.py3-none-any.whl", hash = "sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8"}, - {file = "certifi-2021.5.30.tar.gz", hash = "sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee"}, + {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, + {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, ] cffi = [ - {file = "cffi-1.14.6-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:22b9c3c320171c108e903d61a3723b51e37aaa8c81255b5e7ce102775bd01e2c"}, - {file = "cffi-1.14.6-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:f0c5d1acbfca6ebdd6b1e3eded8d261affb6ddcf2186205518f1428b8569bb99"}, - {file = "cffi-1.14.6-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:99f27fefe34c37ba9875f224a8f36e31d744d8083e00f520f133cab79ad5e819"}, - {file = "cffi-1.14.6-cp27-cp27m-win32.whl", hash = "sha256:55af55e32ae468e9946f741a5d51f9896da6b9bf0bbdd326843fec05c730eb20"}, - {file = "cffi-1.14.6-cp27-cp27m-win_amd64.whl", hash = "sha256:7bcac9a2b4fdbed2c16fa5681356d7121ecabf041f18d97ed5b8e0dd38a80224"}, - {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:ed38b924ce794e505647f7c331b22a693bee1538fdf46b0222c4717b42f744e7"}, - {file = "cffi-1.14.6-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e22dcb48709fc51a7b58a927391b23ab37eb3737a98ac4338e2448bef8559b33"}, - {file = "cffi-1.14.6-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:aedb15f0a5a5949ecb129a82b72b19df97bbbca024081ed2ef88bd5c0a610534"}, - {file = "cffi-1.14.6-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:48916e459c54c4a70e52745639f1db524542140433599e13911b2f329834276a"}, - {file = "cffi-1.14.6-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f627688813d0a4140153ff532537fbe4afea5a3dffce1f9deb7f91f848a832b5"}, - {file = "cffi-1.14.6-cp35-cp35m-win32.whl", hash = "sha256:f0010c6f9d1a4011e429109fda55a225921e3206e7f62a0c22a35344bfd13cca"}, - {file = "cffi-1.14.6-cp35-cp35m-win_amd64.whl", hash = "sha256:57e555a9feb4a8460415f1aac331a2dc833b1115284f7ded7278b54afc5bd218"}, - {file = "cffi-1.14.6-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e8c6a99be100371dbb046880e7a282152aa5d6127ae01783e37662ef73850d8f"}, - {file = "cffi-1.14.6-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:19ca0dbdeda3b2615421d54bef8985f72af6e0c47082a8d26122adac81a95872"}, - {file = "cffi-1.14.6-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:d950695ae4381ecd856bcaf2b1e866720e4ab9a1498cba61c602e56630ca7195"}, - {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9dc245e3ac69c92ee4c167fbdd7428ec1956d4e754223124991ef29eb57a09d"}, - {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a8661b2ce9694ca01c529bfa204dbb144b275a31685a075ce123f12331be790b"}, - {file = "cffi-1.14.6-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b315d709717a99f4b27b59b021e6207c64620790ca3e0bde636a6c7f14618abb"}, - {file = "cffi-1.14.6-cp36-cp36m-win32.whl", hash = "sha256:80b06212075346b5546b0417b9f2bf467fea3bfe7352f781ffc05a8ab24ba14a"}, - {file = "cffi-1.14.6-cp36-cp36m-win_amd64.whl", hash = "sha256:a9da7010cec5a12193d1af9872a00888f396aba3dc79186604a09ea3ee7c029e"}, - {file = "cffi-1.14.6-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4373612d59c404baeb7cbd788a18b2b2a8331abcc84c3ba40051fcd18b17a4d5"}, - {file = "cffi-1.14.6-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:f10afb1004f102c7868ebfe91c28f4a712227fe4cb24974350ace1f90e1febbf"}, - {file = "cffi-1.14.6-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:fd4305f86f53dfd8cd3522269ed7fc34856a8ee3709a5e28b2836b2db9d4cd69"}, - {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6d6169cb3c6c2ad50db5b868db6491a790300ade1ed5d1da29289d73bbe40b56"}, - {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5d4b68e216fc65e9fe4f524c177b54964af043dde734807586cf5435af84045c"}, - {file = "cffi-1.14.6-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33791e8a2dc2953f28b8d8d300dde42dd929ac28f974c4b4c6272cb2955cb762"}, - {file = "cffi-1.14.6-cp37-cp37m-win32.whl", hash = "sha256:0c0591bee64e438883b0c92a7bed78f6290d40bf02e54c5bf0978eaf36061771"}, - {file = "cffi-1.14.6-cp37-cp37m-win_amd64.whl", hash = "sha256:8eb687582ed7cd8c4bdbff3df6c0da443eb89c3c72e6e5dcdd9c81729712791a"}, - {file = "cffi-1.14.6-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba6f2b3f452e150945d58f4badd92310449876c4c954836cfb1803bdd7b422f0"}, - {file = "cffi-1.14.6-cp38-cp38-manylinux1_i686.whl", hash = "sha256:64fda793737bc4037521d4899be780534b9aea552eb673b9833b01f945904c2e"}, - {file = "cffi-1.14.6-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:9f3e33c28cd39d1b655ed1ba7247133b6f7fc16fa16887b120c0c670e35ce346"}, - {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26bb2549b72708c833f5abe62b756176022a7b9a7f689b571e74c8478ead51dc"}, - {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eb687a11f0a7a1839719edd80f41e459cc5366857ecbed383ff376c4e3cc6afd"}, - {file = "cffi-1.14.6-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d2ad4d668a5c0645d281dcd17aff2be3212bc109b33814bbb15c4939f44181cc"}, - {file = "cffi-1.14.6-cp38-cp38-win32.whl", hash = "sha256:487d63e1454627c8e47dd230025780e91869cfba4c753a74fda196a1f6ad6548"}, - {file = "cffi-1.14.6-cp38-cp38-win_amd64.whl", hash = "sha256:c33d18eb6e6bc36f09d793c0dc58b0211fccc6ae5149b808da4a62660678b156"}, - {file = "cffi-1.14.6-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:06c54a68935738d206570b20da5ef2b6b6d92b38ef3ec45c5422c0ebaf338d4d"}, - {file = "cffi-1.14.6-cp39-cp39-manylinux1_i686.whl", hash = "sha256:f174135f5609428cc6e1b9090f9268f5c8935fddb1b25ccb8255a2d50de6789e"}, - {file = "cffi-1.14.6-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f3ebe6e73c319340830a9b2825d32eb6d8475c1dac020b4f0aa774ee3b898d1c"}, - {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c8d896becff2fa653dc4438b54a5a25a971d1f4110b32bd3068db3722c80202"}, - {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4922cd707b25e623b902c86188aca466d3620892db76c0bdd7b99a3d5e61d35f"}, - {file = "cffi-1.14.6-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c9e005e9bd57bc987764c32a1bee4364c44fdc11a3cc20a40b93b444984f2b87"}, - {file = "cffi-1.14.6-cp39-cp39-win32.whl", hash = "sha256:eb9e2a346c5238a30a746893f23a9535e700f8192a68c07c0258e7ece6ff3728"}, - {file = "cffi-1.14.6-cp39-cp39-win_amd64.whl", hash = "sha256:818014c754cd3dba7229c0f5884396264d51ffb87ec86e927ef0be140bfdb0d2"}, - {file = "cffi-1.14.6.tar.gz", hash = "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"}, + {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"}, + {file = "cffi-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0"}, + {file = "cffi-1.15.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14"}, + {file = "cffi-1.15.0-cp27-cp27m-win32.whl", hash = "sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474"}, + {file = "cffi-1.15.0-cp27-cp27m-win_amd64.whl", hash = "sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6"}, + {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27"}, + {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023"}, + {file = "cffi-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2"}, + {file = "cffi-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e"}, + {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7"}, + {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3"}, + {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c"}, + {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962"}, + {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382"}, + {file = "cffi-1.15.0-cp310-cp310-win32.whl", hash = "sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55"}, + {file = "cffi-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0"}, + {file = "cffi-1.15.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e"}, + {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39"}, + {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc"}, + {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032"}, + {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8"}, + {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605"}, + {file = "cffi-1.15.0-cp36-cp36m-win32.whl", hash = "sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e"}, + {file = "cffi-1.15.0-cp36-cp36m-win_amd64.whl", hash = "sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc"}, + {file = "cffi-1.15.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636"}, + {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4"}, + {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997"}, + {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b"}, + {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2"}, + {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7"}, + {file = "cffi-1.15.0-cp37-cp37m-win32.whl", hash = "sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66"}, + {file = "cffi-1.15.0-cp37-cp37m-win_amd64.whl", hash = "sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029"}, + {file = "cffi-1.15.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880"}, + {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20"}, + {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024"}, + {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e"}, + {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728"}, + {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6"}, + {file = "cffi-1.15.0-cp38-cp38-win32.whl", hash = "sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c"}, + {file = "cffi-1.15.0-cp38-cp38-win_amd64.whl", hash = "sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443"}, + {file = "cffi-1.15.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a"}, + {file = "cffi-1.15.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37"}, + {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a"}, + {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e"}, + {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796"}, + {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df"}, + {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8"}, + {file = "cffi-1.15.0-cp39-cp39-win32.whl", hash = "sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a"}, + {file = "cffi-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139"}, + {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, ] chardet = [ {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, ] charset-normalizer = [ - {file = "charset-normalizer-2.0.6.tar.gz", hash = "sha256:5ec46d183433dcbd0ab716f2d7f29d8dee50505b3fdb40c6b985c7c4f5a3591f"}, - {file = "charset_normalizer-2.0.6-py3-none-any.whl", hash = "sha256:5d209c0a931f215cee683b6445e2d77677e7e75e159f78def0db09d68fafcaa6"}, + {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"}, + {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"}, ] click = [ - {file = "click-8.0.1-py3-none-any.whl", hash = "sha256:fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6"}, - {file = "click-8.0.1.tar.gz", hash = "sha256:8c04c11192119b1ef78ea049e0a6f0463e4c48ef00a30160c704337586f3ad7a"}, + {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"}, + {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, @@ -1305,16 +1315,16 @@ docutils = [ {file = "docutils-0.17.1.tar.gz", hash = "sha256:686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125"}, ] fastapi = [ - {file = "fastapi-0.68.1-py3-none-any.whl", hash = "sha256:94d2820906c36b9b8303796fb7271337ec89c74223229e3cfcf056b5a7d59e23"}, - {file = "fastapi-0.68.1.tar.gz", hash = "sha256:644bb815bae326575c4b2842469fb83053a4b974b82fa792ff9283d17fbbd99d"}, + {file = "fastapi-0.70.0-py3-none-any.whl", hash = "sha256:a36d5f2fad931aa3575c07a3472c784e81f3e664e3bb5c8b9c88d0ec1104f59c"}, + {file = "fastapi-0.70.0.tar.gz", hash = "sha256:66da43cfe5185ea1df99552acffd201f1832c6b364e0f4136c0a99f933466ced"}, ] h11 = [ {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, ] h2 = [ - {file = "h2-4.0.0-py3-none-any.whl", hash = "sha256:ac9e293a1990b339d5d71b19c5fe630e3dd4d768c620d1730d355485323f1b25"}, - {file = "h2-4.0.0.tar.gz", hash = "sha256:bb7ac7099dd67a857ed52c815a6192b6b1f5ba6b516237fc24a085341340593d"}, + {file = "h2-4.1.0-py3-none-any.whl", hash = "sha256:03a46bcf682256c95b5fd9e9a99c1323584c3eec6440d379b9903d709476bc6d"}, + {file = "h2-4.1.0.tar.gz", hash = "sha256:a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb"}, ] hpack = [ {file = "hpack-4.0.0-py3-none-any.whl", hash = "sha256:84a076fad3dc9a9f8063ccb8041ef100867b1878b25ef0ee63847a5d53818a6c"}, @@ -1346,8 +1356,8 @@ httptools = [ {file = "httptools-0.2.0.tar.gz", hash = "sha256:94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"}, ] httpx = [ - {file = "httpx-0.19.0-py3-none-any.whl", hash = "sha256:9bd728a6c5ec0a9e243932a9983d57d3cc4a87bb4f554e1360fce407f78f9435"}, - {file = "httpx-0.19.0.tar.gz", hash = "sha256:92ecd2c00c688b529eda11cedb15161eaf02dee9116712f621c70d9a40b2cdd0"}, + {file = "httpx-0.20.0-py3-none-any.whl", hash = "sha256:33af5aad9bdc82ef1fc89219c1e36f5693bf9cd0ebe330884df563445682c0f8"}, + {file = "httpx-0.20.0.tar.gz", hash = "sha256:09606d630f070d07f9ff28104fbcea429ea0014c1e89ac90b4d8de8286c40e7b"}, ] hypercorn = [ {file = "Hypercorn-0.11.2-py3-none-any.whl", hash = "sha256:8007c10f81566920f8ae12c0e26e146f94ca70506da964b5a727ad610aa1d821"}, @@ -1358,8 +1368,8 @@ hyperframe = [ {file = "hyperframe-6.0.1.tar.gz", hash = "sha256:ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914"}, ] idna = [ - {file = "idna-3.2-py3-none-any.whl", hash = "sha256:14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a"}, - {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"}, + {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, + {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, ] imagesize = [ {file = "imagesize-1.2.0-py2.py3-none-any.whl", hash = "sha256:6965f19a6a2039c7d48bca7dba2473069ff854c36ae6f19d2cde309d998228a1"}, @@ -1374,8 +1384,8 @@ itsdangerous = [ {file = "itsdangerous-2.0.1.tar.gz", hash = "sha256:9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0"}, ] jinja2 = [ - {file = "Jinja2-3.0.1-py3-none-any.whl", hash = "sha256:1f06f2da51e7b56b8f238affdd6b4e2c61e39598a378cc49345bc1bd42a978a4"}, - {file = "Jinja2-3.0.1.tar.gz", hash = "sha256:703f484b47a6af502e743c9122595cc812b0271f661722403114f71a79d0f5a4"}, + {file = "Jinja2-3.0.2-py3-none-any.whl", hash = "sha256:8569982d3f0889eed11dd620c706d39b60c36d6d25843961f33f77fb6bc6b20c"}, + {file = "Jinja2-3.0.2.tar.gz", hash = "sha256:827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45"}, ] loguru = [ {file = "loguru-0.5.3-py3-none-any.whl", hash = "sha256:f8087ac396b5ee5f67c963b495d615ebbceac2796379599820e324419d53667c"}, @@ -1438,43 +1448,78 @@ markupsafe = [ {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"}, ] multidict = [ - {file = "multidict-5.1.0-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:b7993704f1a4b204e71debe6095150d43b2ee6150fa4f44d6d966ec356a8d61f"}, - {file = "multidict-5.1.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:9dd6e9b1a913d096ac95d0399bd737e00f2af1e1594a787e00f7975778c8b2bf"}, - {file = "multidict-5.1.0-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:f21756997ad8ef815d8ef3d34edd98804ab5ea337feedcd62fb52d22bf531281"}, - {file = "multidict-5.1.0-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:1ab820665e67373de5802acae069a6a05567ae234ddb129f31d290fc3d1aa56d"}, - {file = "multidict-5.1.0-cp36-cp36m-manylinux2014_ppc64le.whl", hash = "sha256:9436dc58c123f07b230383083855593550c4d301d2532045a17ccf6eca505f6d"}, - {file = "multidict-5.1.0-cp36-cp36m-manylinux2014_s390x.whl", hash = "sha256:830f57206cc96ed0ccf68304141fec9481a096c4d2e2831f311bde1c404401da"}, - {file = "multidict-5.1.0-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:2e68965192c4ea61fff1b81c14ff712fc7dc15d2bd120602e4a3494ea6584224"}, - {file = "multidict-5.1.0-cp36-cp36m-win32.whl", hash = "sha256:2f1a132f1c88724674271d636e6b7351477c27722f2ed789f719f9e3545a3d26"}, - {file = "multidict-5.1.0-cp36-cp36m-win_amd64.whl", hash = "sha256:3a4f32116f8f72ecf2a29dabfb27b23ab7cdc0ba807e8459e59a93a9be9506f6"}, - {file = "multidict-5.1.0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:46c73e09ad374a6d876c599f2328161bcd95e280f84d2060cf57991dec5cfe76"}, - {file = "multidict-5.1.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:018132dbd8688c7a69ad89c4a3f39ea2f9f33302ebe567a879da8f4ca73f0d0a"}, - {file = "multidict-5.1.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:4b186eb7d6ae7c06eb4392411189469e6a820da81447f46c0072a41c748ab73f"}, - {file = "multidict-5.1.0-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:3a041b76d13706b7fff23b9fc83117c7b8fe8d5fe9e6be45eee72b9baa75f348"}, - {file = "multidict-5.1.0-cp37-cp37m-manylinux2014_ppc64le.whl", hash = "sha256:051012ccee979b2b06be928a6150d237aec75dd6bf2d1eeeb190baf2b05abc93"}, - {file = "multidict-5.1.0-cp37-cp37m-manylinux2014_s390x.whl", hash = "sha256:6a4d5ce640e37b0efcc8441caeea8f43a06addace2335bd11151bc02d2ee31f9"}, - {file = "multidict-5.1.0-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:5cf3443199b83ed9e955f511b5b241fd3ae004e3cb81c58ec10f4fe47c7dce37"}, - {file = "multidict-5.1.0-cp37-cp37m-win32.whl", hash = "sha256:f200755768dc19c6f4e2b672421e0ebb3dd54c38d5a4f262b872d8cfcc9e93b5"}, - {file = "multidict-5.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:05c20b68e512166fddba59a918773ba002fdd77800cad9f55b59790030bab632"}, - {file = "multidict-5.1.0-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:54fd1e83a184e19c598d5e70ba508196fd0bbdd676ce159feb412a4a6664f952"}, - {file = "multidict-5.1.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:0e3c84e6c67eba89c2dbcee08504ba8644ab4284863452450520dad8f1e89b79"}, - {file = "multidict-5.1.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:dc862056f76443a0db4509116c5cd480fe1b6a2d45512a653f9a855cc0517456"}, - {file = "multidict-5.1.0-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:0e929169f9c090dae0646a011c8b058e5e5fb391466016b39d21745b48817fd7"}, - {file = "multidict-5.1.0-cp38-cp38-manylinux2014_ppc64le.whl", hash = "sha256:d81eddcb12d608cc08081fa88d046c78afb1bf8107e6feab5d43503fea74a635"}, - {file = "multidict-5.1.0-cp38-cp38-manylinux2014_s390x.whl", hash = "sha256:585fd452dd7782130d112f7ddf3473ffdd521414674c33876187e101b588738a"}, - {file = "multidict-5.1.0-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:37e5438e1c78931df5d3c0c78ae049092877e5e9c02dd1ff5abb9cf27a5914ea"}, - {file = "multidict-5.1.0-cp38-cp38-win32.whl", hash = "sha256:07b42215124aedecc6083f1ce6b7e5ec5b50047afa701f3442054373a6deb656"}, - {file = "multidict-5.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:929006d3c2d923788ba153ad0de8ed2e5ed39fdbe8e7be21e2f22ed06c6783d3"}, - {file = "multidict-5.1.0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:b797515be8743b771aa868f83563f789bbd4b236659ba52243b735d80b29ed93"}, - {file = "multidict-5.1.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:d5c65bdf4484872c4af3150aeebe101ba560dcfb34488d9a8ff8dbcd21079647"}, - {file = "multidict-5.1.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:b47a43177a5e65b771b80db71e7be76c0ba23cc8aa73eeeb089ed5219cdbe27d"}, - {file = "multidict-5.1.0-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:806068d4f86cb06af37cd65821554f98240a19ce646d3cd24e1c33587f313eb8"}, - {file = "multidict-5.1.0-cp39-cp39-manylinux2014_ppc64le.whl", hash = "sha256:46dd362c2f045095c920162e9307de5ffd0a1bfbba0a6e990b344366f55a30c1"}, - {file = "multidict-5.1.0-cp39-cp39-manylinux2014_s390x.whl", hash = "sha256:ace010325c787c378afd7f7c1ac66b26313b3344628652eacd149bdd23c68841"}, - {file = "multidict-5.1.0-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:ecc771ab628ea281517e24fd2c52e8f31c41e66652d07599ad8818abaad38cda"}, - {file = "multidict-5.1.0-cp39-cp39-win32.whl", hash = "sha256:fc13a9524bc18b6fb6e0dbec3533ba0496bbed167c56d0aabefd965584557d80"}, - {file = "multidict-5.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:7df80d07818b385f3129180369079bd6934cf70469f99daaebfac89dca288359"}, - {file = "multidict-5.1.0.tar.gz", hash = "sha256:25b4e5f22d3a37ddf3effc0710ba692cfc792c2b9edfb9c05aefe823256e84d5"}, + {file = "multidict-5.2.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3822c5894c72e3b35aae9909bef66ec83e44522faf767c0ad39e0e2de11d3b55"}, + {file = "multidict-5.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:28e6d883acd8674887d7edc896b91751dc2d8e87fbdca8359591a13872799e4e"}, + {file = "multidict-5.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:b61f85101ef08cbbc37846ac0e43f027f7844f3fade9b7f6dd087178caedeee7"}, + {file = "multidict-5.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d9b668c065968c5979fe6b6fa6760bb6ab9aeb94b75b73c0a9c1acf6393ac3bf"}, + {file = "multidict-5.2.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:517d75522b7b18a3385726b54a081afd425d4f41144a5399e5abd97ccafdf36b"}, + {file = "multidict-5.2.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1b4ac3ba7a97b35a5ccf34f41b5a8642a01d1e55454b699e5e8e7a99b5a3acf5"}, + {file = "multidict-5.2.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:df23c83398715b26ab09574217ca21e14694917a0c857e356fd39e1c64f8283f"}, + {file = "multidict-5.2.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e58a9b5cc96e014ddf93c2227cbdeca94b56a7eb77300205d6e4001805391747"}, + {file = "multidict-5.2.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:f76440e480c3b2ca7f843ff8a48dc82446b86ed4930552d736c0bac507498a52"}, + {file = "multidict-5.2.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:cfde464ca4af42a629648c0b0d79b8f295cf5b695412451716531d6916461628"}, + {file = "multidict-5.2.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:0fed465af2e0eb6357ba95795d003ac0bdb546305cc2366b1fc8f0ad67cc3fda"}, + {file = "multidict-5.2.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:b70913cbf2e14275013be98a06ef4b412329fe7b4f83d64eb70dce8269ed1e1a"}, + {file = "multidict-5.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a5635bcf1b75f0f6ef3c8a1ad07b500104a971e38d3683167b9454cb6465ac86"}, + {file = "multidict-5.2.0-cp310-cp310-win32.whl", hash = "sha256:77f0fb7200cc7dedda7a60912f2059086e29ff67cefbc58d2506638c1a9132d7"}, + {file = "multidict-5.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:9416cf11bcd73c861267e88aea71e9fcc35302b3943e45e1dbb4317f91a4b34f"}, + {file = "multidict-5.2.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:fd77c8f3cba815aa69cb97ee2b2ef385c7c12ada9c734b0f3b32e26bb88bbf1d"}, + {file = "multidict-5.2.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:98ec9aea6223adf46999f22e2c0ab6cf33f5914be604a404f658386a8f1fba37"}, + {file = "multidict-5.2.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e5283c0a00f48e8cafcecadebfa0ed1dac8b39e295c7248c44c665c16dc1138b"}, + {file = "multidict-5.2.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5f79c19c6420962eb17c7e48878a03053b7ccd7b69f389d5831c0a4a7f1ac0a1"}, + {file = "multidict-5.2.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:e4a67f1080123de76e4e97a18d10350df6a7182e243312426d508712e99988d4"}, + {file = "multidict-5.2.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:94b117e27efd8e08b4046c57461d5a114d26b40824995a2eb58372b94f9fca02"}, + {file = "multidict-5.2.0-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:2e77282fd1d677c313ffcaddfec236bf23f273c4fba7cdf198108f5940ae10f5"}, + {file = "multidict-5.2.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:116347c63ba049c1ea56e157fa8aa6edaf5e92925c9b64f3da7769bdfa012858"}, + {file = "multidict-5.2.0-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:dc3a866cf6c13d59a01878cd806f219340f3e82eed514485e094321f24900677"}, + {file = "multidict-5.2.0-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:ac42181292099d91217a82e3fa3ce0e0ddf3a74fd891b7c2b347a7f5aa0edded"}, + {file = "multidict-5.2.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:f0bb0973f42ffcb5e3537548e0767079420aefd94ba990b61cf7bb8d47f4916d"}, + {file = "multidict-5.2.0-cp36-cp36m-win32.whl", hash = "sha256:ea21d4d5104b4f840b91d9dc8cbc832aba9612121eaba503e54eaab1ad140eb9"}, + {file = "multidict-5.2.0-cp36-cp36m-win_amd64.whl", hash = "sha256:e6453f3cbeb78440747096f239d282cc57a2997a16b5197c9bc839099e1633d0"}, + {file = "multidict-5.2.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:d3def943bfd5f1c47d51fd324df1e806d8da1f8e105cc7f1c76a1daf0f7e17b0"}, + {file = "multidict-5.2.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:35591729668a303a02b06e8dba0eb8140c4a1bfd4c4b3209a436a02a5ac1de11"}, + {file = "multidict-5.2.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ce8cacda0b679ebc25624d5de66c705bc53dcc7c6f02a7fb0f3ca5e227d80422"}, + {file = "multidict-5.2.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:baf1856fab8212bf35230c019cde7c641887e3fc08cadd39d32a421a30151ea3"}, + {file = "multidict-5.2.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a43616aec0f0d53c411582c451f5d3e1123a68cc7b3475d6f7d97a626f8ff90d"}, + {file = "multidict-5.2.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:25cbd39a9029b409167aa0a20d8a17f502d43f2efebfe9e3ac019fe6796c59ac"}, + {file = "multidict-5.2.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:0a2cbcfbea6dc776782a444db819c8b78afe4db597211298dd8b2222f73e9cd0"}, + {file = "multidict-5.2.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:3d2d7d1fff8e09d99354c04c3fd5b560fb04639fd45926b34e27cfdec678a704"}, + {file = "multidict-5.2.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:a37e9a68349f6abe24130846e2f1d2e38f7ddab30b81b754e5a1fde32f782b23"}, + {file = "multidict-5.2.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:637c1896497ff19e1ee27c1c2c2ddaa9f2d134bbb5e0c52254361ea20486418d"}, + {file = "multidict-5.2.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:9815765f9dcda04921ba467957be543423e5ec6a1136135d84f2ae092c50d87b"}, + {file = "multidict-5.2.0-cp37-cp37m-win32.whl", hash = "sha256:8b911d74acdc1fe2941e59b4f1a278a330e9c34c6c8ca1ee21264c51ec9b67ef"}, + {file = "multidict-5.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:380b868f55f63d048a25931a1632818f90e4be71d2081c2338fcf656d299949a"}, + {file = "multidict-5.2.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e7d81ce5744757d2f05fc41896e3b2ae0458464b14b5a2c1e87a6a9d69aefaa8"}, + {file = "multidict-5.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2d1d55cdf706ddc62822d394d1df53573d32a7a07d4f099470d3cb9323b721b6"}, + {file = "multidict-5.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a4771d0d0ac9d9fe9e24e33bed482a13dfc1256d008d101485fe460359476065"}, + {file = "multidict-5.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da7d57ea65744d249427793c042094c4016789eb2562576fb831870f9c878d9e"}, + {file = "multidict-5.2.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cdd68778f96216596218b4e8882944d24a634d984ee1a5a049b300377878fa7c"}, + {file = "multidict-5.2.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ecc99bce8ee42dcad15848c7885197d26841cb24fa2ee6e89d23b8993c871c64"}, + {file = "multidict-5.2.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:067150fad08e6f2dd91a650c7a49ba65085303fcc3decbd64a57dc13a2733031"}, + {file = "multidict-5.2.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:78c106b2b506b4d895ddc801ff509f941119394b89c9115580014127414e6c2d"}, + {file = "multidict-5.2.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:e6c4fa1ec16e01e292315ba76eb1d012c025b99d22896bd14a66628b245e3e01"}, + {file = "multidict-5.2.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:b227345e4186809d31f22087d0265655114af7cda442ecaf72246275865bebe4"}, + {file = "multidict-5.2.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:06560fbdcf22c9387100979e65b26fba0816c162b888cb65b845d3def7a54c9b"}, + {file = "multidict-5.2.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:7878b61c867fb2df7a95e44b316f88d5a3742390c99dfba6c557a21b30180cac"}, + {file = "multidict-5.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:246145bff76cc4b19310f0ad28bd0769b940c2a49fc601b86bfd150cbd72bb22"}, + {file = "multidict-5.2.0-cp38-cp38-win32.whl", hash = "sha256:c30ac9f562106cd9e8071c23949a067b10211917fdcb75b4718cf5775356a940"}, + {file = "multidict-5.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:f19001e790013ed580abfde2a4465388950728861b52f0da73e8e8a9418533c0"}, + {file = "multidict-5.2.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c1ff762e2ee126e6f1258650ac641e2b8e1f3d927a925aafcfde943b77a36d24"}, + {file = "multidict-5.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bd6c9c50bf2ad3f0448edaa1a3b55b2e6866ef8feca5d8dbec10ec7c94371d21"}, + {file = "multidict-5.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fc66d4016f6e50ed36fb39cd287a3878ffcebfa90008535c62e0e90a7ab713ae"}, + {file = "multidict-5.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a9acb76d5f3dd9421874923da2ed1e76041cb51b9337fd7f507edde1d86535d6"}, + {file = "multidict-5.2.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:dfc924a7e946dd3c6360e50e8f750d51e3ef5395c95dc054bc9eab0f70df4f9c"}, + {file = "multidict-5.2.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:32fdba7333eb2351fee2596b756d730d62b5827d5e1ab2f84e6cbb287cc67fe0"}, + {file = "multidict-5.2.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:b9aad49466b8d828b96b9e3630006234879c8d3e2b0a9d99219b3121bc5cdb17"}, + {file = "multidict-5.2.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:93de39267c4c676c9ebb2057e98a8138bade0d806aad4d864322eee0803140a0"}, + {file = "multidict-5.2.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:f9bef5cff994ca3026fcc90680e326d1a19df9841c5e3d224076407cc21471a1"}, + {file = "multidict-5.2.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:5f841c4f14331fd1e36cbf3336ed7be2cb2a8f110ce40ea253e5573387db7621"}, + {file = "multidict-5.2.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:38ba256ee9b310da6a1a0f013ef4e422fca30a685bcbec86a969bd520504e341"}, + {file = "multidict-5.2.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:3bc3b1621b979621cee9f7b09f024ec76ec03cc365e638126a056317470bde1b"}, + {file = "multidict-5.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6ee908c070020d682e9b42c8f621e8bb10c767d04416e2ebe44e37d0f44d9ad5"}, + {file = "multidict-5.2.0-cp39-cp39-win32.whl", hash = "sha256:1c7976cd1c157fa7ba5456ae5d31ccdf1479680dc9b8d8aa28afabc370df42b8"}, + {file = "multidict-5.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:c9631c642e08b9fff1c6255487e62971d8b8e821808ddd013d8ac058087591ac"}, + {file = "multidict-5.2.0.tar.gz", hash = "sha256:0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce"}, ] nonebot-adapter-cqhttp = [] nonebot-adapter-ding = [] @@ -1493,75 +1538,73 @@ priority = [ {file = "priority-2.0.0.tar.gz", hash = "sha256:c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0"}, ] pycares = [ - {file = "pycares-4.0.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:db5a533111a3cfd481e7e4fb2bf8bef69f4fa100339803e0504dd5aecafb96a5"}, - {file = "pycares-4.0.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:fdff88393c25016f417770d82678423fc7a56995abb2df3d2a1e55725db6977d"}, - {file = "pycares-4.0.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0aa97f900a7ffb259be77d640006585e2a907b0cd4edeee0e85cf16605995d5a"}, - {file = "pycares-4.0.0-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:a34b0e3e693dceb60b8a1169668d606c75cb100ceba0a2df53c234a0eb067fbc"}, - {file = "pycares-4.0.0-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:7661d6bbd51a337e7373cb356efa8be9b4655fda484e068f9455e939aec8d54e"}, - {file = "pycares-4.0.0-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:57315b8eb8fdbc56b3ad4932bc4b17132bb7c7fd2bd590f7fb84b6b522098aa9"}, - {file = "pycares-4.0.0-cp36-cp36m-win32.whl", hash = "sha256:dca9dc58845a9d083f302732a3130c68ded845ad5d463865d464e53c75a3dd45"}, - {file = "pycares-4.0.0-cp36-cp36m-win_amd64.whl", hash = "sha256:c95c964d5dd307e104b44b193095c67bb6b10c9eda1ffe7d44ab7a9e84c476d9"}, - {file = "pycares-4.0.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:26e67e4f81c80a5955dcf6193f3d9bee3c491fc0056299b383b84d792252fba4"}, - {file = "pycares-4.0.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:cd3011ffd5e1ad55880f7256791dbab9c43ebeda260474a968f19cd0319e1aef"}, - {file = "pycares-4.0.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:1b959dd5921d207d759d421eece1b60416df33a7f862465739d5f2c363c2f523"}, - {file = "pycares-4.0.0-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:6f258c1b74c048a9501a25f732f11b401564005e5e3c18f1ca6cad0c3dc0fb19"}, - {file = "pycares-4.0.0-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:b17ef48729786e62b574c6431f675f4cb02b27691b49e7428a605a50cd59c072"}, - {file = "pycares-4.0.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:82b3259cb590ddd107a6d2dc52da2a2e9a986bf242e893d58c786af2f8191047"}, - {file = "pycares-4.0.0-cp37-cp37m-win32.whl", hash = "sha256:4876fc790ae32832ae270c4a010a1a77e12ddf8d8e6ad70ad0b0a9d506c985f7"}, - {file = "pycares-4.0.0-cp37-cp37m-win_amd64.whl", hash = "sha256:f60c04c5561b1ddf85ca4e626943cc09d7fb684e1adb22abb632095415a40fd7"}, - {file = "pycares-4.0.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:615406013cdcd1b445e5d1a551d276c6200b3abe77e534f8a7f7e1551208d14f"}, - {file = "pycares-4.0.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:6580aef5d1b29a88c3d72fe73c691eacfd454f86e74d3fdd18f4bad8e8def98b"}, - {file = "pycares-4.0.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8ebb3ba0485f66cae8eed7ce3e9ed6f2c0bfd5e7319d5d0fbbb511064f17e1d4"}, - {file = "pycares-4.0.0-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:c5362b7690ca481440f6b98395ac6df06aa50518ccb183c560464d1e5e2ab5d4"}, - {file = "pycares-4.0.0-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:eb60be66accc9a9ea1018b591a1f5800cba83491d07e9acc8c56bc6e6607ab54"}, - {file = "pycares-4.0.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:44896d6e191a6b5a914dbe3aa7c748481bf6ad19a9df33c1e76f8f2dc33fc8f0"}, - {file = "pycares-4.0.0-cp38-cp38-win32.whl", hash = "sha256:09b28fc7bc2cc05f7f69bf1636ddf46086e0a1837b62961e2092fcb40477320d"}, - {file = "pycares-4.0.0-cp38-cp38-win_amd64.whl", hash = "sha256:d4a5081e232c1d181883dcac4675807f3a6cf33911c4173fbea00c0523687ed4"}, - {file = "pycares-4.0.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:103353577a6266a53e71bfee4cf83825f1401fefa60f0fb8bdec35f13be6a5f2"}, - {file = "pycares-4.0.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:ad6caf580ee69806fc6534be93ddbb6e99bf94296d79ab351c37b2992b17abfd"}, - {file = "pycares-4.0.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:3d5e50c95849f6905d2a9dbf02ed03f82580173e3c5604a39e2ad054185631f1"}, - {file = "pycares-4.0.0-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:53bc4f181b19576499b02cea4b45391e8dcbe30abd4cd01492f66bfc15615a13"}, - {file = "pycares-4.0.0-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:d52f9c725d2a826d5ffa37681eb07ffb996bfe21788590ef257664a3898fc0b5"}, - {file = "pycares-4.0.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:3c7fb8d34ee11971c39acfaf98d0fac66725385ccef3bfe1b174c92b210e1aa4"}, - {file = "pycares-4.0.0-cp39-cp39-win32.whl", hash = "sha256:e9773e07684a55f54657df05237267611a77b294ec3bacb5f851c4ffca38a465"}, - {file = "pycares-4.0.0-cp39-cp39-win_amd64.whl", hash = "sha256:38e54037f36c149146ff15f17a4a963fbdd0f9871d4a21cd94ff9f368140f57e"}, - {file = "pycares-4.0.0.tar.gz", hash = "sha256:d0154fc5753b088758fbec9bc137e1b24bb84fc0c6a09725c8bac25a342311cd"}, + {file = "pycares-4.1.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:71b99b9e041ae3356b859822c511f286f84c8889ec9ed1fbf6ac30fb4da13e4c"}, + {file = "pycares-4.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c000942f5fc64e6e046aa61aa53b629b576ba11607d108909727c3c8f211a157"}, + {file = "pycares-4.1.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:b0e50ddc78252f2e2b6b5f2c73e5b2449dfb6bea7a5a0e21dfd1e2bcc9e17382"}, + {file = "pycares-4.1.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:6831e963a910b0a8cbdd2750ffcdf5f2bb0edb3f53ca69ff18484de2cc3807c4"}, + {file = "pycares-4.1.2-cp310-cp310-win32.whl", hash = "sha256:ad7b28e1b6bc68edd3d678373fa3af84e39d287090434f25055d21b4716b2fc6"}, + {file = "pycares-4.1.2-cp310-cp310-win_amd64.whl", hash = "sha256:27a6f09dbfb69bb79609724c0f90dfaa7c215876a7cd9f12d585574d1f922112"}, + {file = "pycares-4.1.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e5a060f5fa90ae245aa99a4a8ad13ec39c2340400de037c7e8d27b081e1a3c64"}, + {file = "pycares-4.1.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:056330275dea42b7199494047a745e1d9785d39fb8c4cd469dca043532240b80"}, + {file = "pycares-4.1.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0aa897543a786daba74ec5e19638bd38b2b432d179a0e248eac1e62de5756207"}, + {file = "pycares-4.1.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cbceaa9b2c416aa931627466d3240aecfc905c292c842252e3d77b8630072505"}, + {file = "pycares-4.1.2-cp36-cp36m-win32.whl", hash = "sha256:112e1385c451069112d6b5ea1f9c378544f3c6b89882ff964e9a64be3336d7e4"}, + {file = "pycares-4.1.2-cp36-cp36m-win_amd64.whl", hash = "sha256:c6680f7fdc0f1163e8f6c2a11d11b9a0b524a61000d2a71f9ccd410f154fb171"}, + {file = "pycares-4.1.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:58a41a2baabcd95266db776c510d349d417919407f03510fc87ac7488730d913"}, + {file = "pycares-4.1.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a810d01c9a426ee8b0f36969c2aef5fb966712be9d7e466920beb328cd9cefa3"}, + {file = "pycares-4.1.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:b266cec81dcea2c3efbbd3dda00af8d7eb0693ae9e47e8706518334b21f27d4a"}, + {file = "pycares-4.1.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:8319afe4838e09df267c421ca93da408f770b945ec6217dda72f1f6a493e37e4"}, + {file = "pycares-4.1.2-cp37-cp37m-win32.whl", hash = "sha256:4d5da840aa0d9b15fa51107f09270c563a348cb77b14ae9653d0bbdbe326fcc2"}, + {file = "pycares-4.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:5632f21d92cc0225ba5ff906e4e5dec415ef0b3df322c461d138190681cd5d89"}, + {file = "pycares-4.1.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8fd1ff17a26bb004f0f6bb902ba7dddd810059096ae0cc3b45e4f5be46315d19"}, + {file = "pycares-4.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:439799be4b7576e907139a7f9b3c8a01b90d3e38af4af9cd1fc6c1ee9a42b9e6"}, + {file = "pycares-4.1.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:40079ed58efa91747c50aac4edf8ecc7e570132ab57dc0a4030eb0d016a6cab8"}, + {file = "pycares-4.1.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4e190471a015f8225fa38069617192e06122771cce2b169ac7a60bfdbd3d4ab2"}, + {file = "pycares-4.1.2-cp38-cp38-win32.whl", hash = "sha256:2b837315ed08c7df009b67725fe1f50489e99de9089f58ec1b243dc612f172aa"}, + {file = "pycares-4.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:c7eba3c8354b730a54d23237d0b6445a2f68570fa68d0848887da23a3f3b71f3"}, + {file = "pycares-4.1.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2f5f84fe9f83eab9cd68544b165b74ba6e3412d029cc9ab20098d9c332869fc5"}, + {file = "pycares-4.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:569eef8597b5e02b1bc4644b9f272160304d8c9985357d7ecfcd054da97c0771"}, + {file = "pycares-4.1.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:e1489aa25d14dbf7176110ead937c01176ed5a0ebefd3b092bbd6b202241814c"}, + {file = "pycares-4.1.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:dc942692fca0e27081b7bb414bb971d34609c80df5e953f6d0c62ecc8019acd9"}, + {file = "pycares-4.1.2-cp39-cp39-win32.whl", hash = "sha256:ed71dc4290d9c3353945965604ef1f6a4de631733e9819a7ebc747220b27e641"}, + {file = "pycares-4.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:ec00f3594ee775665167b1a1630edceefb1b1283af9ac57480dba2fb6fd6c360"}, + {file = "pycares-4.1.2.tar.gz", hash = "sha256:03490be0e7b51a0c8073f877bec347eff31003f64f57d9518d419d9369452837"}, ] pycparser = [ {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"}, {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"}, ] pycryptodome = [ - {file = "pycryptodome-3.10.4-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:91ba4215a1f37d0f371fe43bc88c5ff49c274849f3868321c889313787de7672"}, - {file = "pycryptodome-3.10.4-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:66301e4c42dee43ee2da256625d3fe81ef98cc9924c2bd535008cc3ad8ded77b"}, - {file = "pycryptodome-3.10.4-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:8ec154ec445412df31acf0096e7f715e30e167c8f2318b8f5b1ab7c28f4c82f7"}, - {file = "pycryptodome-3.10.4-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:8e82524e7c354033508891405574d12e612cc4fdd3b55d2c238fc1a3e300b606"}, - {file = "pycryptodome-3.10.4-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:b217b4525e60e1af552d62bec01b4685095436d4de5ecde0f05d75b2f95ba6d4"}, - {file = "pycryptodome-3.10.4-cp27-cp27m-manylinux2014_aarch64.whl", hash = "sha256:3a153658d97258ca20bf18f7fe31c09cc7c558b6f8974a6ec74e19f6c634bd64"}, - {file = "pycryptodome-3.10.4-cp27-cp27m-win32.whl", hash = "sha256:c6469d1453f5864e3321a172b0aa671b938d753cbf2376b99fa2ab8841539bb8"}, - {file = "pycryptodome-3.10.4-cp27-cp27m-win_amd64.whl", hash = "sha256:6b45fcace5a5d9c57ba87cf804b161adc62aa826295ce7f7acbcbdc0df74ed37"}, - {file = "pycryptodome-3.10.4-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:b1daf251395af7336ddde6a0015ba5e632c18fe646ba930ef87402537358e3b4"}, - {file = "pycryptodome-3.10.4-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:9a2312440057bf29b9582f72f14d79692044e63bfbc4b4bbea8559355f44f3dd"}, - {file = "pycryptodome-3.10.4-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:54d4e4d45f349d8c4e2f31c2734637ff62a844af391b833f789da88e43a8f338"}, - {file = "pycryptodome-3.10.4-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:97e7df67a4da2e3f60612bbfd6c3f243a63a15d8f4797dd275e1d7b44a65cb12"}, - {file = "pycryptodome-3.10.4-cp27-cp27mu-manylinux2014_aarch64.whl", hash = "sha256:db15fa07d2a4c00beeb5e9acdfdbc1c79f9ccfbdc1a8f36c82c4aa44951b33c9"}, - {file = "pycryptodome-3.10.4-cp35-abi3-macosx_10_9_x86_64.whl", hash = "sha256:217dcc0c92503f7dd4b3d3b7d974331a4419f97f555c99a845c3b366fed7056b"}, - {file = "pycryptodome-3.10.4-cp35-abi3-manylinux1_i686.whl", hash = "sha256:a7471646d8cd1a58bb696d667dcb3853e5c9b341b68dcf3c3cc0893d0f98ca5f"}, - {file = "pycryptodome-3.10.4-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:d713dc0910e5ded07852a05e9b75f1dd9d3a31895eebee0668f612779b2a748c"}, - {file = "pycryptodome-3.10.4-cp35-abi3-manylinux2010_i686.whl", hash = "sha256:ac3012c36633564b2b5539bb7c6d9175f31d2ce74844e9abe654c428f02d0fd8"}, - {file = "pycryptodome-3.10.4-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:3f9fb499e267039262569d08658132c9cd8b136bf1d8c56b72f70ed05551e526"}, - {file = "pycryptodome-3.10.4-cp35-abi3-manylinux2014_aarch64.whl", hash = "sha256:309529d2526f3fb47102aeef376b3459110a6af7efb162e860b32e3a17a46f06"}, - {file = "pycryptodome-3.10.4-cp35-abi3-win32.whl", hash = "sha256:7efec2418e9746ec48e264eea431f8e422d931f71c57b1c96ee202b117f58fa9"}, - {file = "pycryptodome-3.10.4-cp35-abi3-win_amd64.whl", hash = "sha256:49e54f2245befb0193848c8c8031d8d1358ed4af5a1ae8d0a3ba669a5cdd3a72"}, - {file = "pycryptodome-3.10.4-pp27-pypy_73-macosx_10_9_x86_64.whl", hash = "sha256:4e8fc4c48365ce8a542fe48bf1360da05bb2851df12f64fc94d751705e7cdbe7"}, - {file = "pycryptodome-3.10.4-pp27-pypy_73-manylinux1_x86_64.whl", hash = "sha256:851e6d4930b160417235955322db44adbdb19589918670d63f4acd5d92959ac0"}, - {file = "pycryptodome-3.10.4-pp27-pypy_73-manylinux2010_x86_64.whl", hash = "sha256:04e14c732c3693d2830839feed5129286ce47ffa8bfe90e4ae042c773e51c677"}, - {file = "pycryptodome-3.10.4-pp27-pypy_73-win32.whl", hash = "sha256:cefe6b267b8e5c3c72e11adec35a9c7285b62e8ea141b63e87055e9a9e5f2f8c"}, - {file = "pycryptodome-3.10.4-pp36-pypy36_pp73-macosx_10_9_x86_64.whl", hash = "sha256:24c1b7705d19d8ae3e7255431efd2e526006855df62620118dd7b5374c6372f6"}, - {file = "pycryptodome-3.10.4-pp36-pypy36_pp73-manylinux1_x86_64.whl", hash = "sha256:c61ea053bd5d4c12a063d7e704fbe1c45abb5d2510dab55bd95d166ba661604f"}, - {file = "pycryptodome-3.10.4-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:11d3164fb49fdee000fde05baecce103c0c698168ef1a18d9c7429dd66f0f5bb"}, - {file = "pycryptodome-3.10.4-pp36-pypy36_pp73-win32.whl", hash = "sha256:3faa6ebd35c61718f3f8862569c1f38450c24f3ededb213e1a64806f02f584bc"}, - {file = "pycryptodome-3.10.4.tar.gz", hash = "sha256:40083b0d7f277452c7f2dd4841801f058cc12a74c219ee4110d65774c6a58bef"}, + {file = "pycryptodome-3.11.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:ffd0cac13ff41f2d15ed39dc6ba1d2ad88dd2905d656c33d8235852f5d6151fd"}, + {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:ead516e03dfe062aefeafe4a29445a6449b0fc43bc8cb30194b2754917a63798"}, + {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:4ce6b09547bf2c7cede3a017f79502eaed3e819c13cdb3cb357aea1b004e4cc6"}, + {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:014c758af7fa38cab85b357a496b76f4fc9dda1f731eb28358d66fef7ad4a3e1"}, + {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:a843350d08c3d22f6c09c2f17f020d8dcfa59496165d7425a3fba0045543dda7"}, + {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux2014_aarch64.whl", hash = "sha256:53989477044be41fa4a63da09d5038c2a34b2f4554cfea2e3933b17186ee9e19"}, + {file = "pycryptodome-3.11.0-cp27-cp27m-win32.whl", hash = "sha256:f9bad2220b80b4ed74f089db012ab5ab5419143a33fad6c8aedcc2a9341eac70"}, + {file = "pycryptodome-3.11.0-cp27-cp27m-win_amd64.whl", hash = "sha256:3c7ed5b07274535979c730daf5817db5e983ea80b04c22579eee8da4ca3ae4f8"}, + {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:8f3a60926be78422e662b0d0b18351b426ce27657101c8a50bad80300de6a701"}, + {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:fce7e22d96030b35345637c563246c24d4513bd3b413e1c40293114837ab8912"}, + {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:bc3c61ff92efdcc14af4a7b81da71d849c9acee51d8fd8ac9841a7620140d6c6"}, + {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:b33c9b3d1327d821e28e9cc3a6512c14f8b17570ddb4cfb9a52247ed0fcc5d8b"}, + {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux2014_aarch64.whl", hash = "sha256:75e78360d1dd6d02eb288fd8275bb4d147d6e3f5337935c096d11dba1fa84748"}, + {file = "pycryptodome-3.11.0-cp35-abi3-macosx_10_9_x86_64.whl", hash = "sha256:621a90147a5e255fdc2a0fec2d56626b76b5d72ea9e60164c9a5a8976d45b0c9"}, + {file = "pycryptodome-3.11.0-cp35-abi3-manylinux1_i686.whl", hash = "sha256:0ca7a6b4fc1f9fafe990b95c8cda89099797e2cfbf40e55607f2f2f5a3355dcb"}, + {file = "pycryptodome-3.11.0-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:b59bf823cfafde8ef1105d8984f26d1694dff165adb7198b12e3e068d7999b15"}, + {file = "pycryptodome-3.11.0-cp35-abi3-manylinux2010_i686.whl", hash = "sha256:ce81b9c6aaa0f920e2ab05eb2b9f4ccd102e3016b2f37125593b16a83a4b0cc2"}, + {file = "pycryptodome-3.11.0-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:ae29fcd56152f417bfba50a36a56a7a5f9fb74ff80bab98704cac704de6568ab"}, + {file = "pycryptodome-3.11.0-cp35-abi3-manylinux2014_aarch64.whl", hash = "sha256:ae31cb874f6f0cedbed457c6374e7e54d7ed45c1a4e11a65a9c80968da90a650"}, + {file = "pycryptodome-3.11.0-cp35-abi3-win32.whl", hash = "sha256:6db1f9fa1f52226621905f004278ce7bd90c8f5363ffd5d7ab3755363d98549a"}, + {file = "pycryptodome-3.11.0-cp35-abi3-win_amd64.whl", hash = "sha256:d7e5f6f692421e5219aa3b545eb0cffd832cd589a4b9dcd4a5eb4260e2c0d68a"}, + {file = "pycryptodome-3.11.0-pp27-pypy_73-macosx_10_9_x86_64.whl", hash = "sha256:da796e9221dda61a0019d01742337eb8a322de8598b678a4344ca0a436380315"}, + {file = "pycryptodome-3.11.0-pp27-pypy_73-manylinux1_x86_64.whl", hash = "sha256:ed45ef92d21db33685b789de2c015e9d9a18a74760a8df1fc152faee88cdf741"}, + {file = "pycryptodome-3.11.0-pp27-pypy_73-manylinux2010_x86_64.whl", hash = "sha256:4169ed515742425ff21e4bd3fabbb6994ffb64434472fb72230019bdfa36b939"}, + {file = "pycryptodome-3.11.0-pp27-pypy_73-win32.whl", hash = "sha256:f19edd42368e9057c39492947bb99570dc927123e210008f2af7cf9b505c6892"}, + {file = "pycryptodome-3.11.0-pp36-pypy36_pp73-macosx_10_9_x86_64.whl", hash = "sha256:06162fcfed2f9deee8383fd59eaeabc7b7ffc3af50d3fad4000032deb8f700b0"}, + {file = "pycryptodome-3.11.0-pp36-pypy36_pp73-manylinux1_x86_64.whl", hash = "sha256:6eda8a3157c91ba60b26a07bedd6c44ab8bda6cd79b6b5ea9744ba62c39b7b1e"}, + {file = "pycryptodome-3.11.0-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:7ff701fc283412e651eaab4319b3cd4eaa0827e94569cd37ee9075d5c05fe655"}, + {file = "pycryptodome-3.11.0-pp36-pypy36_pp73-win32.whl", hash = "sha256:2a4bcc8a9977fee0979079cd33a9e9f0d3ddba5660d35ffe874cf84f1dd399d2"}, + {file = "pycryptodome-3.11.0.tar.gz", hash = "sha256:428096bbf7a77e207f418dfd4d7c284df8ade81d2dc80f010e92753a3e406ad0"}, ] pydantic = [ {file = "pydantic-1.8.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:05ddfd37c1720c392f4e0d43c484217b7521558302e7069ce8d318438d297739"}, @@ -1588,8 +1631,8 @@ pydantic = [ {file = "pydantic-1.8.2.tar.gz", hash = "sha256:26464e57ccaafe72b7ad156fdaa4e9b9ef051f69e175dbbb463283000c05ab7b"}, ] pydash = [ - {file = "pydash-5.0.2-py3-none-any.whl", hash = "sha256:a0dfc36087b491653c7fbff4a04a52e1b58b67d3aa751d15e0dbb96fb7e09833"}, - {file = "pydash-5.0.2.tar.gz", hash = "sha256:7c02f5c27524abbd90743c4b60fd8c8c8e846ee0439642704f77a3cf21f7c371"}, + {file = "pydash-5.1.0-py3-none-any.whl", hash = "sha256:ced4fedb163eb07fbee376e474bca74029eb9fab215614449fe13164f71dd9e3"}, + {file = "pydash-5.1.0.tar.gz", hash = "sha256:1b2b050ac1bae049cd07f5920b14fabbe52638f485d9ada1eb115a9eebff6835"}, ] pygments = [ {file = "Pygments-2.10.0-py3-none-any.whl", hash = "sha256:b8e67fe6af78f492b3c4b3e2970c0624cbf08beb1e493b2c99b9fa1b67a20380"}, @@ -1603,8 +1646,8 @@ pyparsing = [ {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"}, ] python-dotenv = [ - {file = "python-dotenv-0.19.0.tar.gz", hash = "sha256:f521bc2ac9a8e03c736f62911605c5d83970021e3fa95b37d769e2bbbe9b6172"}, - {file = "python_dotenv-0.19.0-py2.py3-none-any.whl", hash = "sha256:aae25dc1ebe97c420f50b81fb0e5c949659af713f31fdb63c749ca68748f34b1"}, + {file = "python-dotenv-0.19.1.tar.gz", hash = "sha256:14f8185cc8d494662683e6914addcb7e95374771e707601dfc70166946b4c4b8"}, + {file = "python_dotenv-0.19.1-py2.py3-none-any.whl", hash = "sha256:bbd3da593fc49c249397cbfbcc449cf36cb02e75afc8157fcc6a81df6fb7750a"}, ] python-engineio = [ {file = "python-engineio-3.14.2.tar.gz", hash = "sha256:eab4553f2804c1ce97054c8b22cf0d5a9ab23128075248b97e1a5b2f29553085"}, @@ -1619,35 +1662,39 @@ pytz = [ {file = "pytz-2021.3.tar.gz", hash = "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"}, ] pyyaml = [ - {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"}, - {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"}, - {file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"}, - {file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"}, - {file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"}, - {file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"}, - {file = "PyYAML-5.4.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347"}, - {file = "PyYAML-5.4.1-cp36-cp36m-manylinux2014_s390x.whl", hash = "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541"}, - {file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"}, - {file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"}, - {file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"}, - {file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"}, - {file = "PyYAML-5.4.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa"}, - {file = "PyYAML-5.4.1-cp37-cp37m-manylinux2014_s390x.whl", hash = "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0"}, - {file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"}, - {file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"}, - {file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"}, - {file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"}, - {file = "PyYAML-5.4.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247"}, - {file = "PyYAML-5.4.1-cp38-cp38-manylinux2014_s390x.whl", hash = "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc"}, - {file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"}, - {file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"}, - {file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"}, - {file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"}, - {file = "PyYAML-5.4.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122"}, - {file = "PyYAML-5.4.1-cp39-cp39-manylinux2014_s390x.whl", hash = "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6"}, - {file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"}, - {file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"}, - {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, + {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, + {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, + {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, + {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, + {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, + {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, + {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, + {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, + {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, + {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, + {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, + {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, + {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, + {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, + {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, + {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, ] quart = [ {file = "Quart-0.15.1-py3-none-any.whl", hash = "sha256:f35134fb1d81af61624e6d89bca33cd611dcedce2dc4e291f527ab04395f4e1a"}, @@ -1703,8 +1750,8 @@ sphinxcontrib-serializinghtml = [ {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"}, ] starlette = [ - {file = "starlette-0.14.2-py3-none-any.whl", hash = "sha256:3c8e48e52736b3161e34c9f0e8153b4f32ec5d8995a3ee1d59410d92f75162ed"}, - {file = "starlette-0.14.2.tar.gz", hash = "sha256:7d49f4a27f8742262ef1470608c59ddbc66baf37c148e938c7038e6bc7a998aa"}, + {file = "starlette-0.16.0-py3-none-any.whl", hash = "sha256:38eb24bf705a2c317e15868e384c1b8a12ca396e5a3c3a003db7e667c43f939f"}, + {file = "starlette-0.16.0.tar.gz", hash = "sha256:e1904b5d0007aee24bdd3c43994be9b3b729f4f58e740200de1d623f8c3a8870"}, ] toml = [ {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, @@ -1783,8 +1830,8 @@ websockets = [ {file = "websockets-10.0.tar.gz", hash = "sha256:c4fc9a1d242317892590abe5b61a9127f1a61740477bfb121743f290b8054002"}, ] werkzeug = [ - {file = "Werkzeug-2.0.1-py3-none-any.whl", hash = "sha256:6c1ec500dcdba0baa27600f6a22f6333d8b662d22027ff9f6202e3367413caa8"}, - {file = "Werkzeug-2.0.1.tar.gz", hash = "sha256:1de1db30d010ff1af14a009224ec49ab2329ad2cde454c8a708130642d579c42"}, + {file = "Werkzeug-2.0.2-py3-none-any.whl", hash = "sha256:63d3dc1cf60e7b7e35e97fa9861f7397283b75d765afcaefd993d6046899de8f"}, + {file = "Werkzeug-2.0.2.tar.gz", hash = "sha256:aa2bb6fc8dee8d6c504c0ac1e7f5f7dc5810a9903e793b6f715a9f015bdadb9a"}, ] win32-setctime = [ {file = "win32_setctime-1.0.3-py3-none-any.whl", hash = "sha256:dc925662de0a6eb987f0b01f599c01a8236cb8c62831c22d9cada09ad958243e"}, @@ -1799,43 +1846,78 @@ yapf = [ {file = "yapf-0.31.0.tar.gz", hash = "sha256:408fb9a2b254c302f49db83c59f9aa0b4b0fd0ec25be3a5c51181327922ff63d"}, ] yarl = [ - {file = "yarl-1.6.3-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:0355a701b3998dcd832d0dc47cc5dedf3874f966ac7f870e0f3a6788d802d434"}, - {file = "yarl-1.6.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:bafb450deef6861815ed579c7a6113a879a6ef58aed4c3a4be54400ae8871478"}, - {file = "yarl-1.6.3-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:547f7665ad50fa8563150ed079f8e805e63dd85def6674c97efd78eed6c224a6"}, - {file = "yarl-1.6.3-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:63f90b20ca654b3ecc7a8d62c03ffa46999595f0167d6450fa8383bab252987e"}, - {file = "yarl-1.6.3-cp36-cp36m-manylinux2014_ppc64le.whl", hash = "sha256:97b5bdc450d63c3ba30a127d018b866ea94e65655efaf889ebeabc20f7d12406"}, - {file = "yarl-1.6.3-cp36-cp36m-manylinux2014_s390x.whl", hash = "sha256:d8d07d102f17b68966e2de0e07bfd6e139c7c02ef06d3a0f8d2f0f055e13bb76"}, - {file = "yarl-1.6.3-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:15263c3b0b47968c1d90daa89f21fcc889bb4b1aac5555580d74565de6836366"}, - {file = "yarl-1.6.3-cp36-cp36m-win32.whl", hash = "sha256:b5dfc9a40c198334f4f3f55880ecf910adebdcb2a0b9a9c23c9345faa9185721"}, - {file = "yarl-1.6.3-cp36-cp36m-win_amd64.whl", hash = "sha256:b2e9a456c121e26d13c29251f8267541bd75e6a1ccf9e859179701c36a078643"}, - {file = "yarl-1.6.3-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:ce3beb46a72d9f2190f9e1027886bfc513702d748047b548b05dab7dfb584d2e"}, - {file = "yarl-1.6.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:2ce4c621d21326a4a5500c25031e102af589edb50c09b321049e388b3934eec3"}, - {file = "yarl-1.6.3-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:d26608cf178efb8faa5ff0f2d2e77c208f471c5a3709e577a7b3fd0445703ac8"}, - {file = "yarl-1.6.3-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:4c5bcfc3ed226bf6419f7a33982fb4b8ec2e45785a0561eb99274ebbf09fdd6a"}, - {file = "yarl-1.6.3-cp37-cp37m-manylinux2014_ppc64le.whl", hash = "sha256:4736eaee5626db8d9cda9eb5282028cc834e2aeb194e0d8b50217d707e98bb5c"}, - {file = "yarl-1.6.3-cp37-cp37m-manylinux2014_s390x.whl", hash = "sha256:68dc568889b1c13f1e4745c96b931cc94fdd0defe92a72c2b8ce01091b22e35f"}, - {file = "yarl-1.6.3-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:7356644cbed76119d0b6bd32ffba704d30d747e0c217109d7979a7bc36c4d970"}, - {file = "yarl-1.6.3-cp37-cp37m-win32.whl", hash = "sha256:00d7ad91b6583602eb9c1d085a2cf281ada267e9a197e8b7cae487dadbfa293e"}, - {file = "yarl-1.6.3-cp37-cp37m-win_amd64.whl", hash = "sha256:69ee97c71fee1f63d04c945f56d5d726483c4762845400a6795a3b75d56b6c50"}, - {file = "yarl-1.6.3-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:e46fba844f4895b36f4c398c5af062a9808d1f26b2999c58909517384d5deda2"}, - {file = "yarl-1.6.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:31ede6e8c4329fb81c86706ba8f6bf661a924b53ba191b27aa5fcee5714d18ec"}, - {file = "yarl-1.6.3-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:fcbb48a93e8699eae920f8d92f7160c03567b421bc17362a9ffbbd706a816f71"}, - {file = "yarl-1.6.3-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:72a660bdd24497e3e84f5519e57a9ee9220b6f3ac4d45056961bf22838ce20cc"}, - {file = "yarl-1.6.3-cp38-cp38-manylinux2014_ppc64le.whl", hash = "sha256:324ba3d3c6fee56e2e0b0d09bf5c73824b9f08234339d2b788af65e60040c959"}, - {file = "yarl-1.6.3-cp38-cp38-manylinux2014_s390x.whl", hash = "sha256:e6b5460dc5ad42ad2b36cca524491dfcaffbfd9c8df50508bddc354e787b8dc2"}, - {file = "yarl-1.6.3-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:6d6283d8e0631b617edf0fd726353cb76630b83a089a40933043894e7f6721e2"}, - {file = "yarl-1.6.3-cp38-cp38-win32.whl", hash = "sha256:9ede61b0854e267fd565e7527e2f2eb3ef8858b301319be0604177690e1a3896"}, - {file = "yarl-1.6.3-cp38-cp38-win_amd64.whl", hash = "sha256:f0b059678fd549c66b89bed03efcabb009075bd131c248ecdf087bdb6faba24a"}, - {file = "yarl-1.6.3-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:329412812ecfc94a57cd37c9d547579510a9e83c516bc069470db5f75684629e"}, - {file = "yarl-1.6.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:c49ff66d479d38ab863c50f7bb27dee97c6627c5fe60697de15529da9c3de724"}, - {file = "yarl-1.6.3-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f040bcc6725c821a4c0665f3aa96a4d0805a7aaf2caf266d256b8ed71b9f041c"}, - {file = "yarl-1.6.3-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:d5c32c82990e4ac4d8150fd7652b972216b204de4e83a122546dce571c1bdf25"}, - {file = "yarl-1.6.3-cp39-cp39-manylinux2014_ppc64le.whl", hash = "sha256:d597767fcd2c3dc49d6eea360c458b65643d1e4dbed91361cf5e36e53c1f8c96"}, - {file = "yarl-1.6.3-cp39-cp39-manylinux2014_s390x.whl", hash = "sha256:8aa3decd5e0e852dc68335abf5478a518b41bf2ab2f330fe44916399efedfae0"}, - {file = "yarl-1.6.3-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:73494d5b71099ae8cb8754f1df131c11d433b387efab7b51849e7e1e851f07a4"}, - {file = "yarl-1.6.3-cp39-cp39-win32.whl", hash = "sha256:5b883e458058f8d6099e4420f0cc2567989032b5f34b271c0827de9f1079a424"}, - {file = "yarl-1.6.3-cp39-cp39-win_amd64.whl", hash = "sha256:4953fb0b4fdb7e08b2f3b3be80a00d28c5c8a2056bb066169de00e6501b986b6"}, - {file = "yarl-1.6.3.tar.gz", hash = "sha256:8a9066529240171b68893d60dca86a763eae2139dd42f42106b03cf4b426bf10"}, + {file = "yarl-1.7.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e35d8230e4b08d86ea65c32450533b906a8267a87b873f2954adeaecede85169"}, + {file = "yarl-1.7.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:eb4b3f277880c314e47720b4b6bb2c85114ab3c04c5442c9bc7006b3787904d8"}, + {file = "yarl-1.7.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c7015dcedb91d90a138eebdc7e432aec8966e0147ab2a55f2df27b1904fa7291"}, + {file = "yarl-1.7.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bb3e478175e15e00d659fb0354a6a8db71a7811a2a5052aed98048bc972e5d2b"}, + {file = "yarl-1.7.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8b8c409aa3a7966647e7c1c524846b362a6bcbbe120bf8a176431f940d2b9a2e"}, + {file = "yarl-1.7.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b22ea41c7e98170474a01e3eded1377d46b2dfaef45888a0005c683eaaa49285"}, + {file = "yarl-1.7.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a7dfc46add4cfe5578013dbc4127893edc69fe19132d2836ff2f6e49edc5ecd6"}, + {file = "yarl-1.7.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:82ff6f85f67500a4f74885d81659cd270eb24dfe692fe44e622b8a2fd57e7279"}, + {file = "yarl-1.7.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:f3cd2158b2ed0fb25c6811adfdcc47224efe075f2d68a750071dacc03a7a66e4"}, + {file = "yarl-1.7.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:59c0f13f9592820c51280d1cf811294d753e4a18baf90f0139d1dc93d4b6fc5f"}, + {file = "yarl-1.7.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:7f7655ad83d1a8afa48435a449bf2f3009293da1604f5dd95b5ddcf5f673bd69"}, + {file = "yarl-1.7.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:aa9f0d9b62d15182341b3e9816582f46182cab91c1a57b2d308b9a3c4e2c4f78"}, + {file = "yarl-1.7.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:fdd1b90c225a653b1bd1c0cae8edf1957892b9a09c8bf7ee6321eeb8208eac0f"}, + {file = "yarl-1.7.0-cp310-cp310-win32.whl", hash = "sha256:7c8d0bb76eabc5299db203e952ec55f8f4c53f08e0df4285aac8c92bd9e12675"}, + {file = "yarl-1.7.0-cp310-cp310-win_amd64.whl", hash = "sha256:622a36fa779efb4ff9eff5fe52730ff17521431379851a31e040958fc251670c"}, + {file = "yarl-1.7.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d461b7a8e139b9e4b41f62eb417ffa0b98d1c46d4caf14c845e6a3b349c0bb1"}, + {file = "yarl-1.7.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:81cfacdd1e40bc931b5519499342efa388d24d262c30a3d31187bfa04f4a7001"}, + {file = "yarl-1.7.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:821b978f2152be7695d4331ef0621d207aedf9bbd591ba23a63412a3efc29a01"}, + {file = "yarl-1.7.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b64bd24c8c9a487f4a12260dc26732bf41028816dbf0c458f17864fbebdb3131"}, + {file = "yarl-1.7.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:98c9ddb92b60a83c21be42c776d3d9d5ec632a762a094c41bda37b7dfbd2cd83"}, + {file = "yarl-1.7.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a532d75ca74431c053a88a802e161fb3d651b8bf5821a3440bc3616e38754583"}, + {file = "yarl-1.7.0-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:053e09817eafb892e94e172d05406c1b3a22a93bc68f6eff5198363a3d764459"}, + {file = "yarl-1.7.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:98c51f02d542945d306c8e934aa2c1e66ba5e9c1c86b5bf37f3a51c8a747067e"}, + {file = "yarl-1.7.0-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:15ec41a5a5fdb7bace6d7b16701f9440007a82734f69127c0fbf6d87e10f4a1e"}, + {file = "yarl-1.7.0-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:a7f08819dba1e1255d6991ed37448a1bf4b1352c004bcd899b9da0c47958513d"}, + {file = "yarl-1.7.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8e3ffab21db0542ffd1887f3b9575ddd58961f2cf61429cb6458afc00c4581e0"}, + {file = "yarl-1.7.0-cp36-cp36m-win32.whl", hash = "sha256:50127634f519b2956005891507e3aa4ac345f66a7ea7bbc2d7dcba7401f41898"}, + {file = "yarl-1.7.0-cp36-cp36m-win_amd64.whl", hash = "sha256:36ec44f15193f6d5288d42ebb8e751b967ebdfb72d6830983838d45ab18edb4f"}, + {file = "yarl-1.7.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:ec1b5a25a25c880c976d0bb3d107def085bb08dbb3db7f4442e0a2b980359d24"}, + {file = "yarl-1.7.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b36f5a63c891f813c6f04ef19675b382efc190fd5ce7e10ab19386d2548bca06"}, + {file = "yarl-1.7.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:38173b8c3a29945e7ecade9a3f6ff39581eee8201338ee6a2c8882db5df3e806"}, + {file = "yarl-1.7.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8ba402f32184f0b405fb281b93bd0d8ab7e3257735b57b62a6ed2e94cdf4fe50"}, + {file = "yarl-1.7.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:be52bc5208d767cdd8308a9e93059b3b36d1e048fecbea0e0346d0d24a76adc0"}, + {file = "yarl-1.7.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:08c2044a956f4ef30405f2f433ce77f1f57c2c773bf81ae43201917831044d5a"}, + {file = "yarl-1.7.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:484d61c047c45670ef5967653a1d0783e232c54bf9dd786a7737036828fa8d54"}, + {file = "yarl-1.7.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b7de92a4af85cfcaf4081f8aa6165b1d63ee5de150af3ee85f954145f93105a7"}, + {file = "yarl-1.7.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:376e41775aab79c5575534924a386c8e0f1a5d91db69fc6133fd27a489bcaf10"}, + {file = "yarl-1.7.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:8a8b10d0e7bac154f959b709fcea593cda527b234119311eb950096653816a86"}, + {file = "yarl-1.7.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:f46cd4c43e6175030e2a56def8f1d83b64e6706eeb2bb9ab0ef4756f65eab23f"}, + {file = "yarl-1.7.0-cp37-cp37m-win32.whl", hash = "sha256:b28cfb46140efe1a6092b8c5c4994a1fe70dc83c38fbcea4992401e0c6fb9cce"}, + {file = "yarl-1.7.0-cp37-cp37m-win_amd64.whl", hash = "sha256:9624154ec9c02a776802da1086eed7f5034bd1971977f5146233869c2ac80297"}, + {file = "yarl-1.7.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:69945d13e1bbf81784a9bc48824feb9cd66491e6a503d4e83f6cd7c7cc861361"}, + {file = "yarl-1.7.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:46a742ed9e363bd01be64160ce7520e92e11989bd4cb224403cfd31c101cc83d"}, + {file = "yarl-1.7.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cb4ff1ac7cb4500f43581b3f4cbd627d702143aa6be1fdc1fa3ebffaf4dc1be5"}, + {file = "yarl-1.7.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3ad51e17cd65ea3debb0e10f0120cf8dd987c741fe423ed2285087368090b33d"}, + {file = "yarl-1.7.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7e37786ea89a5d3ffbbf318ea9790926f8dfda83858544f128553c347ad143c6"}, + {file = "yarl-1.7.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c63c1e208f800daad71715786bfeb1cecdc595d87e2e9b1cd234fd6e597fd71d"}, + {file = "yarl-1.7.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:91cbe24300c11835ef186436363352b3257db7af165e0a767f4f17aa25761388"}, + {file = "yarl-1.7.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e510dbec7c59d32eaa61ffa48173d5e3d7170a67f4a03e8f5e2e9e3971aca622"}, + {file = "yarl-1.7.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:3def6e681cc02397e5d8141ee97b41d02932b2bcf0fb34532ad62855eab7c60e"}, + {file = "yarl-1.7.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:263c81b94e6431942b27f6f671fa62f430a0a5c14bb255f2ab69eeb9b2b66ff7"}, + {file = "yarl-1.7.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:e78c91faefe88d601ddd16e3882918dbde20577a2438e2320f8239c8b7507b8f"}, + {file = "yarl-1.7.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:22b2430c49713bfb2f0a0dd4a8d7aab218b28476ba86fd1c78ad8899462cbcf2"}, + {file = "yarl-1.7.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2e7ad9db939082f5d0b9269cfd92c025cb8f2fbbb1f1b9dc5a393c639db5bd92"}, + {file = "yarl-1.7.0-cp38-cp38-win32.whl", hash = "sha256:3a31e4a8dcb1beaf167b7e7af61b88cb961b220db8d3ba1c839723630e57eef7"}, + {file = "yarl-1.7.0-cp38-cp38-win_amd64.whl", hash = "sha256:d579957439933d752358c6a300c93110f84aae67b63dd0c19dde6ecbf4056f6b"}, + {file = "yarl-1.7.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:87721b549505a546eb003252185103b5ec8147de6d3ad3714d148a5a67b6fe53"}, + {file = "yarl-1.7.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:a1fa866fa24d9f4108f9e58ea8a2135655419885cdb443e36b39a346e1181532"}, + {file = "yarl-1.7.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1d3b8449dfedfe94eaff2b77954258b09b24949f6818dfa444b05dbb05ae1b7e"}, + {file = "yarl-1.7.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:db2372e350794ce8b9f810feb094c606b7e0e4aa6807141ac4fadfe5ddd75bb0"}, + {file = "yarl-1.7.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a06d9d0b9a97fa99b84fee71d9dd11e69e21ac8a27229089f07b5e5e50e8d63c"}, + {file = "yarl-1.7.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a3455c2456d6307bcfa80bc1157b8603f7d93573291f5bdc7144489ca0df4628"}, + {file = "yarl-1.7.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:d30d67e3486aea61bb2cbf7cf81385364c2e4f7ce7469a76ed72af76a5cdfe6b"}, + {file = "yarl-1.7.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c18a4b286e8d780c3a40c31d7b79836aa93b720f71d5743f20c08b7e049ca073"}, + {file = "yarl-1.7.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:d54c925396e7891666cabc0199366ca55b27d003393465acef63fd29b8b7aa92"}, + {file = "yarl-1.7.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:64773840952de17851a1c7346ad7f71688c77e74248d1f0bc230e96680f84028"}, + {file = "yarl-1.7.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:acbf1756d9dc7cd0ae943d883be72e84e04396f6c2ff93a6ddeca929d562039f"}, + {file = "yarl-1.7.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:2e48f27936aa838939c798f466c851ba4ae79e347e8dfce43b009c64b930df12"}, + {file = "yarl-1.7.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:1beef4734ca1ad40a9d8c6b20a76ab46e3a2ed09f38561f01e4aa2ea82cafcef"}, + {file = "yarl-1.7.0-cp39-cp39-win32.whl", hash = "sha256:8ee78c9a5f3c642219d4607680a4693b59239c27a3aa608b64ef79ddc9698039"}, + {file = "yarl-1.7.0-cp39-cp39-win_amd64.whl", hash = "sha256:d750503682605088a14d29a4701548c15c510da4f13c8b17409c4097d5b04c52"}, + {file = "yarl-1.7.0.tar.gz", hash = "sha256:8e7ebaf62e19c2feb097ffb7c94deb0f0c9fab52590784c8cd679d30ab009162"}, ] zipp = [ {file = "zipp-3.6.0-py3-none-any.whl", hash = "sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc"}, diff --git a/pyproject.toml b/pyproject.toml index c38a8025..07ed326a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,10 +26,10 @@ python = "^3.7.3" loguru = "^0.5.1" pygtrie = "^2.4.1" tomlkit = "^0.7.0" -fastapi = "^0.68.0" +fastapi = "^0.70.0" websockets = ">=9.1" Quart = { version = "^0.15.0", optional = true } -httpx = { version = ">=0.18.0, <1.0.0", extras = ["http2"] } +httpx = { version = ">=0.20.0, <1.0.0", extras = ["http2"] } pydantic = { version = "~1.8.0", extras = ["dotenv"] } uvicorn = { version = "^0.15.0", extras = ["standard"] } aiohttp = { version = "^3.7.4", extras = ["speedups"], optional = true } From 72f5aeea54971781087366207b346dbc9ba7a4e7 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 8 Nov 2021 01:02:35 +0800 Subject: [PATCH 009/174] :construction: refactor plugin loading --- docs_build/plugin.rst | 5 - nonebot/matcher.py | 45 +- nonebot/plugin/__init__.py | 1148 +---------------------- nonebot/plugin/export.py | 9 +- nonebot/plugin/load.py | 186 ++++ nonebot/plugin/manager.py | 43 +- nonebot/plugin/on.py | 883 +++++++++++++++++ nonebot/plugin/{__init__.pyi => on.pyi} | 61 +- nonebot/plugin/plugin.py | 85 ++ 9 files changed, 1195 insertions(+), 1270 deletions(-) create mode 100644 nonebot/plugin/load.py create mode 100644 nonebot/plugin/on.py rename nonebot/plugin/{__init__.pyi => on.pyi} (92%) create mode 100644 nonebot/plugin/plugin.py diff --git a/docs_build/plugin.rst b/docs_build/plugin.rst index 09d2a6d1..07ac137a 100644 --- a/docs_build/plugin.rst +++ b/docs_build/plugin.rst @@ -10,8 +10,3 @@ NoneBot.plugin 模块 :members: :show-inheritance: :special-members: __init__ - -.. automodule:: nonebot.plugin.export - :members: - :show-inheritance: - :special-members: __init__ diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 291d56cf..7f996323 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -24,6 +24,7 @@ from nonebot.typing import (T_State, T_Handler, T_ArgsParser, T_TypeUpdater, T_StateFactory, T_PermissionUpdater) if TYPE_CHECKING: + from nonebot.plugin import Plugin from nonebot.adapters import Bot, Event, Message, MessageSegment matchers: Dict[int, List[Type["Matcher"]]] = defaultdict(list) @@ -62,28 +63,25 @@ class MatcherMeta(type): class Matcher(metaclass=MatcherMeta): """事件响应器类""" + plugin: Optional["Plugin"] = None + """ + :类型: ``Optional[Plugin]`` + :说明: 事件响应器所在插件 + """ module: Optional[ModuleType] = None """ :类型: ``Optional[ModuleType]`` - :说明: 事件响应器所在模块 + :说明: 事件响应器所在插件模块 """ - plugin_name: Optional[str] = module and getattr(module, "__plugin_name__", - None) + plugin_name: Optional[str] = None """ :类型: ``Optional[str]`` :说明: 事件响应器所在插件名 """ - module_name: Optional[str] = module and getattr(module, "__module_name__", - None) + module_name: Optional[str] = None """ :类型: ``Optional[str]`` - :说明: 事件响应器所在模块名 - """ - module_prefix: Optional[str] = module and getattr(module, - "__module_prefix__", None) - """ - :类型: ``Optional[str]`` - :说明: 事件响应器所在模块前缀 + :说明: 事件响应器所在点分割插件模块路径 """ type: str = "" @@ -179,7 +177,7 @@ class Matcher(metaclass=MatcherMeta): priority: int = 1, block: bool = False, *, - module: Optional[ModuleType] = None, + plugin: Optional["Plugin"] = None, expire_time: Optional[datetime] = None, default_state: Optional[T_State] = None, default_state_factory: Optional[T_StateFactory] = None, @@ -201,7 +199,7 @@ class Matcher(metaclass=MatcherMeta): * ``temp: bool``: 是否为临时事件响应器，即触发一次后删除 * ``priority: int``: 响应优先级 * ``block: bool``: 是否阻止事件向更低优先级的响应器传播 - * ``module: Optional[str]``: 事件响应器所在模块名称 + * ``plugin: Optional[Plugin]``: 事件响应器所在插件 * ``default_state: Optional[T_State]``: 默认状态 ``state`` * ``default_state_factory: Optional[T_StateFactory]``: 默认状态 ``state`` 的工厂函数 * ``expire_time: Optional[datetime]``: 事件响应器最终有效时间点，过时即被删除 @@ -212,15 +210,18 @@ class Matcher(metaclass=MatcherMeta): """ NewMatcher = type( - "Matcher", (Matcher,), { + "Matcher", + (Matcher,), + { + "plugin": + plugin, "module": - module, + plugin and plugin. + module, # FIXME: matcher module may different from plugin module "plugin_name": - module and getattr(module, "__plugin_name__", None), + plugin and plugin.name, "module_name": - module and getattr(module, "__module_name__", None), - "module_prefix": - module and getattr(module, "__module_prefix__", None), + plugin and plugin.module_name, "type": type_, "rule": @@ -626,7 +627,7 @@ class Matcher(metaclass=MatcherMeta): temp=True, priority=0, block=True, - module=self.module, + plugin=self.plugin, expire_time=datetime.now() + bot.config.session_expire_timeout, default_state=self.state, default_parser=self.__class__._default_parser, @@ -662,7 +663,7 @@ class Matcher(metaclass=MatcherMeta): temp=True, priority=0, block=True, - module=self.module, + plugin=self.plugin, expire_time=datetime.now() + bot.config.session_expire_timeout, default_state=self.state, default_parser=self.__class__._default_parser, diff --git a/nonebot/plugin/__init__.py b/nonebot/plugin/__init__.py index 719fa246..fcfcbefc 100644 --- a/nonebot/plugin/__init__.py +++ b/nonebot/plugin/__init__.py @@ -4,1147 +4,15 @@ 为 NoneBot 插件开发提供便携的定义函数。 """ -import re -import json -from types import ModuleType -from dataclasses import dataclass -from collections import defaultdict -from contextvars import Context, copy_context -from typing import (TYPE_CHECKING, Any, Set, Dict, List, Type, Tuple, Union, - Optional) -import tomlkit +from typing import Optional +from contextvars import ContextVar -from nonebot.log import logger -from nonebot.handler import Handler -from nonebot.matcher import Matcher -from nonebot.utils import escape_tag -from nonebot.permission import Permission -from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_StateFactory -from nonebot.rule import (Rule, ArgumentParser, regex, command, keyword, - endswith, startswith, shell_command) +_current_plugin: ContextVar[Optional["Plugin"]] = ContextVar("_current_plugin", + default=None) -from .export import Export +from .export import Export as Export from .export import export as export -from .manager import PluginManager, _current_plugin - -if TYPE_CHECKING: - from nonebot.adapters import Bot, Event - -plugins: Dict[str, "Plugin"] = {} -""" -:类型: ``Dict[str, Plugin]`` -:说明: 已加载的插件 -""" -PLUGIN_NAMESPACE = "nonebot.loaded_plugins" - -_plugin_matchers: Dict[str, Set[Type[Matcher]]] = defaultdict(set) - - -@dataclass(eq=False) -class Plugin(object): - """存储插件信息""" - name: str - """ - - **类型**: ``str`` - - **说明**: 插件名称，使用 文件/文件夹 名称作为插件名 - """ - module: ModuleType - """ - - **类型**: ``ModuleType`` - - **说明**: 插件模块对象 - """ - - @property - def export(self) -> Export: - """ - - **类型**: ``Export`` - - **说明**: 插件内定义的导出内容 - """ - return getattr(self.module, "__export__", Export()) - - @property - def matcher(self) -> Set[Type[Matcher]]: - """ - - **类型**: ``Set[Type[Matcher]]`` - - **说明**: 插件内定义的 ``Matcher`` - """ - # return reduce( - # lambda x, y: x | _plugin_matchers[y], - # filter(lambda x: x.startswith(self.name), _plugin_matchers.keys()), - # set()) - return _plugin_matchers.get(self.name, set()) - - -def _store_matcher(matcher: Type[Matcher]): - if matcher.plugin_name: - _plugin_matchers[matcher.plugin_name].add(matcher) - - -def on(type: str = "", - rule: Optional[Union[Rule, T_RuleChecker]] = None, - permission: Optional[Permission] = None, - *, - handlers: Optional[List[Union[T_Handler, Handler]]] = None, - temp: bool = False, - priority: int = 1, - block: bool = False, - state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None) -> Type[Matcher]: - """ - :说明: - - 注册一个基础事件响应器，可自定义类型。 - - :参数: - - * ``type: str``: 事件响应器类型 - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - matcher = Matcher.new(type, - Rule() & rule, - permission or Permission(), - temp=temp, - priority=priority, - block=block, - handlers=handlers, - module=_current_plugin.get(), - default_state=state, - default_state_factory=state_factory) - _store_matcher(matcher) - return matcher - - -def on_metaevent( - rule: Optional[Union[Rule, T_RuleChecker]] = None, - *, - handlers: Optional[List[Union[T_Handler, Handler]]] = None, - temp: bool = False, - priority: int = 1, - block: bool = False, - state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None) -> Type[Matcher]: - """ - :说明: - - 注册一个元事件响应器。 - - :参数: - - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - matcher = Matcher.new("meta_event", - Rule() & rule, - Permission(), - temp=temp, - priority=priority, - block=block, - handlers=handlers, - module=_current_plugin.get(), - default_state=state, - default_state_factory=state_factory) - _store_matcher(matcher) - return matcher - - -def on_message(rule: Optional[Union[Rule, T_RuleChecker]] = None, - permission: Optional[Permission] = None, - *, - handlers: Optional[List[Union[T_Handler, Handler]]] = None, - temp: bool = False, - priority: int = 1, - block: bool = True, - state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None) -> Type[Matcher]: - """ - :说明: - - 注册一个消息事件响应器。 - - :参数: - - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - matcher = Matcher.new("message", - Rule() & rule, - permission or Permission(), - temp=temp, - priority=priority, - block=block, - handlers=handlers, - module=_current_plugin.get(), - default_state=state, - default_state_factory=state_factory) - _store_matcher(matcher) - return matcher - - -def on_notice(rule: Optional[Union[Rule, T_RuleChecker]] = None, - *, - handlers: Optional[List[Union[T_Handler, Handler]]] = None, - temp: bool = False, - priority: int = 1, - block: bool = False, - state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None) -> Type[Matcher]: - """ - :说明: - - 注册一个通知事件响应器。 - - :参数: - - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - matcher = Matcher.new("notice", - Rule() & rule, - Permission(), - temp=temp, - priority=priority, - block=block, - handlers=handlers, - module=_current_plugin.get(), - default_state=state, - default_state_factory=state_factory) - _store_matcher(matcher) - return matcher - - -def on_request(rule: Optional[Union[Rule, T_RuleChecker]] = None, - *, - handlers: Optional[List[Union[T_Handler, Handler]]] = None, - temp: bool = False, - priority: int = 1, - block: bool = False, - state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None) -> Type[Matcher]: - """ - :说明: - - 注册一个请求事件响应器。 - - :参数: - - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - matcher = Matcher.new("request", - Rule() & rule, - Permission(), - temp=temp, - priority=priority, - block=block, - handlers=handlers, - module=_current_plugin.get(), - default_state=state, - default_state_factory=state_factory) - _store_matcher(matcher) - return matcher - - -def on_startswith(msg: Union[str, Tuple[str, ...]], - rule: Optional[Optional[Union[Rule, T_RuleChecker]]] = None, - ignorecase: bool = False, - **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个消息事件响应器，并且当消息的**文本部分**以指定内容开头时响应。 - - :参数: - - * ``msg: Union[str, Tuple[str, ...]]``: 指定消息开头内容 - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``ignorecase: bool``: 是否忽略大小写 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - return on_message(startswith(msg, ignorecase) & rule, **kwargs) - - -def on_endswith(msg: Union[str, Tuple[str, ...]], - rule: Optional[Optional[Union[Rule, T_RuleChecker]]] = None, - ignorecase: bool = False, - **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个消息事件响应器，并且当消息的**文本部分**以指定内容结尾时响应。 - - :参数: - - * ``msg: Union[str, Tuple[str, ...]]``: 指定消息结尾内容 - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``ignorecase: bool``: 是否忽略大小写 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - return on_message(endswith(msg, ignorecase) & rule, **kwargs) - - -def on_keyword(keywords: Set[str], - rule: Optional[Union[Rule, T_RuleChecker]] = None, - **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个消息事件响应器，并且当消息纯文本部分包含关键词时响应。 - - :参数: - - * ``keywords: Set[str]``: 关键词列表 - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - return on_message(keyword(*keywords) & rule, **kwargs) - - -def on_command(cmd: Union[str, Tuple[str, ...]], - rule: Optional[Union[Rule, T_RuleChecker]] = None, - aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = None, - **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个消息事件响应器，并且当消息以指定命令开头时响应。 - - 命令匹配规则参考: `命令形式匹配 `_ - - :参数: - - * ``cmd: Union[str, Tuple[str, ...]]``: 指定命令内容 - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``aliases: Optional[Set[Union[str, Tuple[str, ...]]]]``: 命令别名 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - - async def _strip_cmd(bot: "Bot", event: "Event", state: T_State): - message = event.get_message() - if len(message) < 1: - return - segment = message.pop(0) - segment_text = str(segment).lstrip() - if not segment_text.startswith(state["_prefix"]["raw_command"]): - return - new_message = message.__class__( - segment_text[len(state["_prefix"]["raw_command"]):].lstrip()) - for new_segment in reversed(new_message): - message.insert(0, new_segment) - - handlers = kwargs.pop("handlers", []) - handlers.insert(0, _strip_cmd) - - commands = set([cmd]) | (aliases or set()) - return on_message(command(*commands) & rule, handlers=handlers, **kwargs) - - -def on_shell_command(cmd: Union[str, Tuple[str, ...]], - rule: Optional[Union[Rule, T_RuleChecker]] = None, - aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = None, - parser: Optional[ArgumentParser] = None, - **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个支持 ``shell_like`` 解析参数的命令消息事件响应器。 - - 与普通的 ``on_command`` 不同的是，在添加 ``parser`` 参数时, 响应器会自动处理消息。 - - 并将用户输入的原始参数列表保存在 ``state["argv"]``, ``parser`` 处理的参数保存在 ``state["args"]`` 中 - - :参数: - - * ``cmd: Union[str, Tuple[str, ...]]``: 指定命令内容 - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``aliases: Optional[Set[Union[str, Tuple[str, ...]]]]``: 命令别名 - * ``parser: Optional[ArgumentParser]``: ``nonebot.rule.ArgumentParser`` 对象 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - - async def _strip_cmd(bot: "Bot", event: "Event", state: T_State): - message = event.get_message() - segment = message.pop(0) - new_message = message.__class__( - str(segment) - [len(state["_prefix"]["raw_command"]):].strip()) # type: ignore - for new_segment in reversed(new_message): - message.insert(0, new_segment) - - handlers = kwargs.pop("handlers", []) - handlers.insert(0, _strip_cmd) - - commands = set([cmd]) | (aliases or set()) - return on_message(shell_command(*commands, parser=parser) & rule, - handlers=handlers, - **kwargs) - - -def on_regex(pattern: str, - flags: Union[int, re.RegexFlag] = 0, - rule: Optional[Union[Rule, T_RuleChecker]] = None, - **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个消息事件响应器，并且当消息匹配正则表达式时响应。 - - 命令匹配规则参考: `正则匹配 `_ - - :参数: - - * ``pattern: str``: 正则表达式 - * ``flags: Union[int, re.RegexFlag]``: 正则匹配标志 - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - return on_message(regex(pattern, flags) & rule, **kwargs) - - -class CommandGroup: - """命令组，用于声明一组有相同名称前缀的命令。""" - - def __init__(self, cmd: Union[str, Tuple[str, ...]], **kwargs): - """ - :参数: - - * ``cmd: Union[str, Tuple[str, ...]]``: 命令前缀 - * ``**kwargs``: 其他传递给 ``on_command`` 的参数默认值，参考 `on_command <#on-command-cmd-rule-none-aliases-none-kwargs>`_ - """ - self.basecmd: Tuple[str, ...] = (cmd,) if isinstance(cmd, str) else cmd - """ - - **类型**: ``Tuple[str, ...]`` - - **说明**: 命令前缀 - """ - if "aliases" in kwargs: - del kwargs["aliases"] - self.base_kwargs: Dict[str, Any] = kwargs - """ - - **类型**: ``Dict[str, Any]`` - - **说明**: 其他传递给 ``on_command`` 的参数默认值 - """ - - def command(self, cmd: Union[str, Tuple[str, ...]], - **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个新的命令。 - - :参数: - - * ``cmd: Union[str, Tuple[str, ...]]``: 命令前缀 - * ``**kwargs``: 其他传递给 ``on_command`` 的参数，将会覆盖命令组默认值 - - :返回: - - - ``Type[Matcher]`` - """ - sub_cmd = (cmd,) if isinstance(cmd, str) else cmd - cmd = self.basecmd + sub_cmd - - final_kwargs = self.base_kwargs.copy() - final_kwargs.update(kwargs) - return on_command(cmd, **final_kwargs) - - def shell_command(self, cmd: Union[str, Tuple[str, ...]], - **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个新的命令。 - - :参数: - - * ``cmd: Union[str, Tuple[str, ...]]``: 命令前缀 - * ``**kwargs``: 其他传递给 ``on_shell_command`` 的参数，将会覆盖命令组默认值 - - :返回: - - - ``Type[Matcher]`` - """ - sub_cmd = (cmd,) if isinstance(cmd, str) else cmd - cmd = self.basecmd + sub_cmd - - final_kwargs = self.base_kwargs.copy() - final_kwargs.update(kwargs) - return on_shell_command(cmd, **final_kwargs) - - -class MatcherGroup: - """事件响应器组合，统一管理。为 ``Matcher`` 创建提供默认属性。""" - - def __init__(self, **kwargs): - """ - :说明: - - 创建一个事件响应器组合，参数为默认值，与 ``on`` 一致 - """ - self.matchers: List[Type[Matcher]] = [] - """ - :类型: ``List[Type[Matcher]]`` - :说明: 组内事件响应器列表 - """ - self.base_kwargs: Dict[str, Any] = kwargs - """ - - **类型**: ``Dict[str, Any]`` - - **说明**: 其他传递给 ``on`` 的参数默认值 - """ - - def on(self, **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个基础事件响应器，可自定义类型。 - - :参数: - - * ``type: str``: 事件响应器类型 - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - final_kwargs = self.base_kwargs.copy() - final_kwargs.update(kwargs) - matcher = on(**final_kwargs) - self.matchers.append(matcher) - return matcher - - def on_metaevent(self, **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个元事件响应器。 - - :参数: - - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - final_kwargs = self.base_kwargs.copy() - final_kwargs.update(kwargs) - final_kwargs.pop("type", None) - final_kwargs.pop("permission", None) - matcher = on_metaevent(**final_kwargs) - self.matchers.append(matcher) - return matcher - - def on_message(self, **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个消息事件响应器。 - - :参数: - - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - final_kwargs = self.base_kwargs.copy() - final_kwargs.update(kwargs) - final_kwargs.pop("type", None) - matcher = on_message(**final_kwargs) - self.matchers.append(matcher) - return matcher - - def on_notice(self, **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个通知事件响应器。 - - :参数: - - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - final_kwargs = self.base_kwargs.copy() - final_kwargs.update(kwargs) - final_kwargs.pop("type", None) - matcher = on_notice(**final_kwargs) - self.matchers.append(matcher) - return matcher - - def on_request(self, **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个请求事件响应器。 - - :参数: - - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - final_kwargs = self.base_kwargs.copy() - final_kwargs.update(kwargs) - final_kwargs.pop("type", None) - matcher = on_request(**final_kwargs) - self.matchers.append(matcher) - return matcher - - def on_startswith(self, msg: Union[str, Tuple[str, ...]], - **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个消息事件响应器，并且当消息的**文本部分**以指定内容开头时响应。 - - :参数: - - * ``msg: Union[str, Tuple[str, ...]]``: 指定消息开头内容 - * ``ignorecase: bool``: 是否忽略大小写 - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - final_kwargs = self.base_kwargs.copy() - final_kwargs.update(kwargs) - final_kwargs.pop("type", None) - matcher = on_startswith(msg, **final_kwargs) - self.matchers.append(matcher) - return matcher - - def on_endswith(self, msg: Union[str, Tuple[str, ...]], - **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个消息事件响应器，并且当消息的**文本部分**以指定内容结尾时响应。 - - :参数: - - * ``msg: Union[str, Tuple[str, ...]]``: 指定消息结尾内容 - * ``ignorecase: bool``: 是否忽略大小写 - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - final_kwargs = self.base_kwargs.copy() - final_kwargs.update(kwargs) - final_kwargs.pop("type", None) - matcher = on_endswith(msg, **final_kwargs) - self.matchers.append(matcher) - return matcher - - def on_keyword(self, keywords: Set[str], **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个消息事件响应器，并且当消息纯文本部分包含关键词时响应。 - - :参数: - - * ``keywords: Set[str]``: 关键词列表 - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - final_kwargs = self.base_kwargs.copy() - final_kwargs.update(kwargs) - final_kwargs.pop("type", None) - matcher = on_keyword(keywords, **final_kwargs) - self.matchers.append(matcher) - return matcher - - def on_command(self, - cmd: Union[str, Tuple[str, ...]], - aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = None, - **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个消息事件响应器，并且当消息以指定命令开头时响应。 - - 命令匹配规则参考: `命令形式匹配 `_ - - :参数: - - * ``cmd: Union[str, Tuple[str, ...]]``: 指定命令内容 - * ``aliases: Optional[Set[Union[str, Tuple[str, ...]]]]``: 命令别名 - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - final_kwargs = self.base_kwargs.copy() - final_kwargs.update(kwargs) - final_kwargs.pop("type", None) - matcher = on_command(cmd, aliases=aliases, **final_kwargs) - self.matchers.append(matcher) - return matcher - - def on_shell_command(self, - cmd: Union[str, Tuple[str, ...]], - aliases: Optional[Set[Union[str, Tuple[str, - ...]]]] = None, - parser: Optional[ArgumentParser] = None, - **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个支持 ``shell_like`` 解析参数的命令消息事件响应器。 - - 与普通的 ``on_command`` 不同的是，在添加 ``parser`` 参数时, 响应器会自动处理消息。 - - 并将用户输入的原始参数列表保存在 ``state["argv"]``, ``parser`` 处理的参数保存在 ``state["args"]`` 中 - - :参数: - - * ``cmd: Union[str, Tuple[str, ...]]``: 指定命令内容 - * ``aliases: Optional[Set[Union[str, Tuple[str, ...]]]]``: 命令别名 - * ``parser: Optional[ArgumentParser]``: ``nonebot.rule.ArgumentParser`` 对象 - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - final_kwargs = self.base_kwargs.copy() - final_kwargs.update(kwargs) - final_kwargs.pop("type", None) - matcher = on_shell_command(cmd, - aliases=aliases, - parser=parser, - **final_kwargs) - self.matchers.append(matcher) - return matcher - - def on_regex(self, - pattern: str, - flags: Union[int, re.RegexFlag] = 0, - **kwargs) -> Type[Matcher]: - """ - :说明: - - 注册一个消息事件响应器，并且当消息匹配正则表达式时响应。 - - 命令匹配规则参考: `正则匹配 `_ - - :参数: - - * ``pattern: str``: 正则表达式 - * ``flags: Union[int, re.RegexFlag]``: 正则匹配标志 - * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 - * ``temp: bool``: 是否为临时事件响应器（仅执行一次） - * ``priority: int``: 事件响应器优先级 - * ``block: bool``: 是否阻止事件向更低优先级传递 - * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 - - :返回: - - - ``Type[Matcher]`` - """ - final_kwargs = self.base_kwargs.copy() - final_kwargs.update(kwargs) - final_kwargs.pop("type", None) - matcher = on_regex(pattern, flags=flags, **final_kwargs) - self.matchers.append(matcher) - return matcher - - -def _load_plugin(manager: PluginManager, plugin_name: str) -> Optional[Plugin]: - if plugin_name.startswith("_"): - return None - - if plugin_name in plugins: - return None - - try: - module = manager.load_plugin(plugin_name) - - plugin = Plugin(plugin_name, module) - plugins[plugin_name] = plugin - logger.opt(colors=True).success( - f'Succeeded to import "{escape_tag(plugin_name)}"') - return plugin - except Exception as e: - logger.opt(colors=True, exception=e).error( - f'Failed to import "{escape_tag(plugin_name)}"' - ) - return None - - -def load_plugin(module_path: str) -> Optional[Plugin]: - """ - :说明: - - 使用 ``PluginManager`` 加载单个插件，可以是本地插件或是通过 ``pip`` 安装的插件。 - - :参数: - - * ``module_path: str``: 插件名称 ``path.to.your.plugin`` - - :返回: - - - ``Optional[Plugin]`` - """ - - context: Context = copy_context() - manager = PluginManager(PLUGIN_NAMESPACE, plugins=[module_path]) - return context.run(_load_plugin, manager, module_path) - - -def load_plugins(*plugin_dir: str) -> Set[Plugin]: - """ - :说明: - - 导入目录下多个插件，以 ``_`` 开头的插件不会被导入！ - - :参数: - - - ``*plugin_dir: str``: 插件路径 - - :返回: - - - ``Set[Plugin]`` - """ - loaded_plugins = set() - manager = PluginManager(PLUGIN_NAMESPACE, search_path=plugin_dir) - for plugin_name in manager.list_plugins(): - context: Context = copy_context() - result = context.run(_load_plugin, manager, plugin_name) - if result: - loaded_plugins.add(result) - return loaded_plugins - - -def load_all_plugins(module_path: Set[str], - plugin_dir: Set[str]) -> Set[Plugin]: - """ - :说明: - - 导入指定列表中的插件以及指定目录下多个插件，以 ``_`` 开头的插件不会被导入！ - - :参数: - - - ``module_path: Set[str]``: 指定插件集合 - - ``plugin_dir: Set[str]``: 指定插件路径集合 - - :返回: - - - ``Set[Plugin]`` - """ - loaded_plugins = set() - manager = PluginManager(PLUGIN_NAMESPACE, module_path, plugin_dir) - for plugin_name in manager.list_plugins(): - context: Context = copy_context() - result = context.run(_load_plugin, manager, plugin_name) - if result: - loaded_plugins.add(result) - return loaded_plugins - - -def load_from_json(file_path: str, encoding: str = "utf-8") -> Set[Plugin]: - """ - :说明: - - 导入指定 json 文件中的 ``plugins`` 以及 ``plugin_dirs`` 下多个插件，以 ``_`` 开头的插件不会被导入！ - - :参数: - - - ``file_path: str``: 指定 json 文件路径 - - ``encoding: str``: 指定 json 文件编码 - - :返回: - - - ``Set[Plugin]`` - """ - with open(file_path, "r", encoding=encoding) as f: - data = json.load(f) - plugins = data.get("plugins") - plugin_dirs = data.get("plugin_dirs") - assert isinstance(plugins, list), "plugins must be a list of plugin name" - assert isinstance(plugin_dirs, - list), "plugin_dirs must be a list of directories" - return load_all_plugins(set(plugins), set(plugin_dirs)) - - -def load_from_toml(file_path: str, encoding: str = "utf-8") -> Set[Plugin]: - """ - :说明: - - 导入指定 toml 文件 ``[nonebot.plugins]`` 中的 ``plugins`` 以及 ``plugin_dirs`` 下多个插件， - 以 ``_`` 开头的插件不会被导入！ - - :参数: - - - ``file_path: str``: 指定 toml 文件路径 - - ``encoding: str``: 指定 toml 文件编码 - - :返回: - - - ``Set[Plugin]`` - """ - with open(file_path, "r", encoding=encoding) as f: - data = tomlkit.parse(f.read()) # type: ignore - - nonebot_data = data.get("nonebot", {}).get("plugins") - if not nonebot_data: - raise ValueError("Cannot find '[nonebot.plugins]' in given toml file!") - plugins = nonebot_data.get("plugins", []) - plugin_dirs = nonebot_data.get("plugin_dirs", []) - assert isinstance(plugins, list), "plugins must be a list of plugin name" - assert isinstance(plugin_dirs, - list), "plugin_dirs must be a list of directories" - return load_all_plugins(set(plugins), set(plugin_dirs)) - - -def load_builtin_plugins(name: str = "echo") -> Optional[Plugin]: - """ - :说明: - - 导入 NoneBot 内置插件 - - :返回: - - - ``Plugin`` - """ - return load_plugin(f"nonebot.plugins.{name}") - - -def get_plugin(name: str) -> Optional[Plugin]: - """ - :说明: - - 获取当前导入的某个插件。 - - :参数: - - * ``name: str``: 插件名，与 ``load_plugin`` 参数一致。如果为 ``load_plugins`` 导入的插件，则为文件(夹)名。 - - :返回: - - - ``Optional[Plugin]`` - """ - return plugins.get(name) - - -def get_loaded_plugins() -> Set[Plugin]: - """ - :说明: - - 获取当前已导入的所有插件。 - - :返回: - - - ``Set[Plugin]`` - """ - return set(plugins.values()) - - -def require(name: str) -> Optional[Export]: - """ - :说明: - - 获取一个插件的导出内容 - - :参数: - - * ``name: str``: 插件名，与 ``load_plugin`` 参数一致。如果为 ``load_plugins`` 导入的插件，则为文件(夹)名。 - - :返回: - - - ``Optional[Export]`` - """ - plugin = get_plugin(name) or load_plugin(name) - return plugin.export if plugin else None +from .plugin import Plugin as Plugin +from .plugin import get_plugin as get_plugin +from .plugin import get_loaded_plugins as get_loaded_plugins diff --git a/nonebot/plugin/export.py b/nonebot/plugin/export.py index 20ad4d72..9c7c3f57 100644 --- a/nonebot/plugin/export.py +++ b/nonebot/plugin/export.py @@ -1,6 +1,4 @@ -from contextvars import ContextVar - -_export: ContextVar["Export"] = ContextVar("_export") +from . import _current_plugin class Export(dict): @@ -57,4 +55,7 @@ def export() -> Export: - ``Export`` """ - return _export.get() + plugin = _current_plugin.get() + if not plugin: + raise RuntimeError("Export outside of the plugin!") + return plugin.export diff --git a/nonebot/plugin/load.py b/nonebot/plugin/load.py new file mode 100644 index 00000000..cbac46c3 --- /dev/null +++ b/nonebot/plugin/load.py @@ -0,0 +1,186 @@ +from typing import Set, Optional + +from .export import Export +from .manager import PluginManager +from .plugin import Plugin, get_plugin + + +# TODO +def _load_plugin(manager: PluginManager, plugin_name: str) -> Optional[Plugin]: + if plugin_name.startswith("_"): + return None + + if plugin_name in plugins: + return None + + try: + module = manager.load_plugin(plugin_name) + + plugin = Plugin(plugin_name, module) + plugins[plugin_name] = plugin + logger.opt(colors=True).success( + f'Succeeded to import "{escape_tag(plugin_name)}"') + return plugin + except Exception as e: + logger.opt(colors=True, exception=e).error( + f'Failed to import "{escape_tag(plugin_name)}"' + ) + return None + + +def load_plugin(module_path: str) -> Optional[Plugin]: + """ + :说明: + + 使用 ``PluginManager`` 加载单个插件，可以是本地插件或是通过 ``pip`` 安装的插件。 + + :参数: + + * ``module_path: str``: 插件名称 ``path.to.your.plugin`` + + :返回: + + - ``Optional[Plugin]`` + """ + + context: Context = copy_context() + manager = PluginManager(PLUGIN_NAMESPACE, plugins=[module_path]) + return context.run(_load_plugin, manager, module_path) + + +def load_plugins(*plugin_dir: str) -> Set[Plugin]: + """ + :说明: + + 导入目录下多个插件，以 ``_`` 开头的插件不会被导入！ + + :参数: + + - ``*plugin_dir: str``: 插件路径 + + :返回: + + - ``Set[Plugin]`` + """ + loaded_plugins = set() + manager = PluginManager(PLUGIN_NAMESPACE, search_path=plugin_dir) + for plugin_name in manager.list_plugins(): + context: Context = copy_context() + result = context.run(_load_plugin, manager, plugin_name) + if result: + loaded_plugins.add(result) + return loaded_plugins + + +def load_all_plugins(module_path: Set[str], + plugin_dir: Set[str]) -> Set[Plugin]: + """ + :说明: + + 导入指定列表中的插件以及指定目录下多个插件，以 ``_`` 开头的插件不会被导入！ + + :参数: + + - ``module_path: Set[str]``: 指定插件集合 + - ``plugin_dir: Set[str]``: 指定插件路径集合 + + :返回: + + - ``Set[Plugin]`` + """ + loaded_plugins = set() + manager = PluginManager(PLUGIN_NAMESPACE, module_path, plugin_dir) + for plugin_name in manager.list_plugins(): + context: Context = copy_context() + result = context.run(_load_plugin, manager, plugin_name) + if result: + loaded_plugins.add(result) + return loaded_plugins + + +def load_from_json(file_path: str, encoding: str = "utf-8") -> Set[Plugin]: + """ + :说明: + + 导入指定 json 文件中的 ``plugins`` 以及 ``plugin_dirs`` 下多个插件，以 ``_`` 开头的插件不会被导入！ + + :参数: + + - ``file_path: str``: 指定 json 文件路径 + - ``encoding: str``: 指定 json 文件编码 + + :返回: + + - ``Set[Plugin]`` + """ + with open(file_path, "r", encoding=encoding) as f: + data = json.load(f) + plugins = data.get("plugins") + plugin_dirs = data.get("plugin_dirs") + assert isinstance(plugins, list), "plugins must be a list of plugin name" + assert isinstance(plugin_dirs, + list), "plugin_dirs must be a list of directories" + return load_all_plugins(set(plugins), set(plugin_dirs)) + + +def load_from_toml(file_path: str, encoding: str = "utf-8") -> Set[Plugin]: + """ + :说明: + + 导入指定 toml 文件 ``[nonebot.plugins]`` 中的 ``plugins`` 以及 ``plugin_dirs`` 下多个插件， + 以 ``_`` 开头的插件不会被导入！ + + :参数: + + - ``file_path: str``: 指定 toml 文件路径 + - ``encoding: str``: 指定 toml 文件编码 + + :返回: + + - ``Set[Plugin]`` + """ + with open(file_path, "r", encoding=encoding) as f: + data = tomlkit.parse(f.read()) # type: ignore + + nonebot_data = data.get("nonebot", {}).get("plugins") + if not nonebot_data: + raise ValueError("Cannot find '[nonebot.plugins]' in given toml file!") + plugins = nonebot_data.get("plugins", []) + plugin_dirs = nonebot_data.get("plugin_dirs", []) + assert isinstance(plugins, list), "plugins must be a list of plugin name" + assert isinstance(plugin_dirs, + list), "plugin_dirs must be a list of directories" + return load_all_plugins(set(plugins), set(plugin_dirs)) + + +def load_builtin_plugins(name: str = "echo") -> Optional[Plugin]: + """ + :说明: + + 导入 NoneBot 内置插件 + + :返回: + + - ``Plugin`` + """ + return load_plugin(f"nonebot.plugins.{name}") + + +def require(name: str) -> Optional[Export]: + """ + :说明: + + 获取一个插件的导出内容 + + :参数: + + * ``name: str``: 插件名，与 ``load_plugin`` 参数一致。如果为 ``load_plugins`` 导入的插件，则为文件(夹)名。 + + :返回: + + - ``Optional[Export]`` + """ + plugin = get_plugin(name) or load_plugin(name) + if not plugin: + raise RuntimeError(f"Cannot load plugin \"{name}\"!") + return plugin.export diff --git a/nonebot/plugin/manager.py b/nonebot/plugin/manager.py index d7485c72..825e3844 100644 --- a/nonebot/plugin/manager.py +++ b/nonebot/plugin/manager.py @@ -6,51 +6,16 @@ from hashlib import md5 from pathlib import Path from types import ModuleType from collections import Counter -from contextvars import ContextVar from importlib.abc import MetaPathFinder from importlib.machinery import PathFinder, SourceFileLoader from typing import Set, List, Union, Iterable, Optional, Sequence -from .export import Export, _export - -_current_plugin: ContextVar[Optional[ModuleType]] = ContextVar( - "_current_plugin", default=None) - -_internal_space = ModuleType(__name__ + "._internal") -_internal_space.__path__ = [] # type: ignore -sys.modules[_internal_space.__name__] = _internal_space - -_manager_stack: List["PluginManager"] = [] - - -class _NamespaceModule(ModuleType): - """Simple namespace module to store plugins.""" - - @property - def __path__(self): - return [] - - def __getattr__(self, name: str): - try: - return super().__getattr__(name) # type: ignore - except AttributeError: - if name.startswith("__"): - raise - raise RuntimeError("Plugin manager not activated!") - - -class _InternalModule(ModuleType): - """Internal module for each plugin manager.""" - - def __init__(self, prefix: str, plugin_manager: "PluginManager"): - super().__init__(f"{prefix}.{plugin_manager.internal_id}") - self.__plugin_manager__ = plugin_manager - - @property - def __path__(self) -> List[str]: - return list(self.__plugin_manager__.search_path) +from .export import Export +from . import _current_plugin +from .plugin import Plugin, _new_plugin +# TODO class PluginManager: def __init__(self, diff --git a/nonebot/plugin/on.py b/nonebot/plugin/on.py new file mode 100644 index 00000000..aa648b7a --- /dev/null +++ b/nonebot/plugin/on.py @@ -0,0 +1,883 @@ +import re +from typing import (TYPE_CHECKING, Any, Set, Dict, List, Type, Tuple, Union, + Optional) + +from nonebot.handler import Handler +from nonebot.matcher import Matcher +from nonebot.permission import Permission +from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_StateFactory +from nonebot.rule import (Rule, ArgumentParser, regex, command, keyword, + endswith, startswith, shell_command) + +from .manager import _current_plugin + +if TYPE_CHECKING: + from nonebot.adapters import Bot, Event + + +def _store_matcher(matcher: Type[Matcher]) -> None: + plugin = _current_plugin.get() + # only store the matcher defined in the plugin + if plugin: + plugin.matcher.add(matcher) + + +def on(type: str = "", + rule: Optional[Union[Rule, T_RuleChecker]] = None, + permission: Optional[Permission] = None, + *, + handlers: Optional[List[Union[T_Handler, Handler]]] = None, + temp: bool = False, + priority: int = 1, + block: bool = False, + state: Optional[T_State] = None, + state_factory: Optional[T_StateFactory] = None) -> Type[Matcher]: + """ + :说明: + + 注册一个基础事件响应器，可自定义类型。 + + :参数: + + * ``type: str``: 事件响应器类型 + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``permission: Optional[Permission]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + matcher = Matcher.new(type, + Rule() & rule, + permission or Permission(), + temp=temp, + priority=priority, + block=block, + handlers=handlers, + plugin=_current_plugin.get(), + default_state=state, + default_state_factory=state_factory) + _store_matcher(matcher) + return matcher + + +def on_metaevent( + rule: Optional[Union[Rule, T_RuleChecker]] = None, + *, + handlers: Optional[List[Union[T_Handler, Handler]]] = None, + temp: bool = False, + priority: int = 1, + block: bool = False, + state: Optional[T_State] = None, + state_factory: Optional[T_StateFactory] = None) -> Type[Matcher]: + """ + :说明: + + 注册一个元事件响应器。 + + :参数: + + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + matcher = Matcher.new("meta_event", + Rule() & rule, + Permission(), + temp=temp, + priority=priority, + block=block, + handlers=handlers, + plugin=_current_plugin.get(), + default_state=state, + default_state_factory=state_factory) + _store_matcher(matcher) + return matcher + + +def on_message(rule: Optional[Union[Rule, T_RuleChecker]] = None, + permission: Optional[Permission] = None, + *, + handlers: Optional[List[Union[T_Handler, Handler]]] = None, + temp: bool = False, + priority: int = 1, + block: bool = True, + state: Optional[T_State] = None, + state_factory: Optional[T_StateFactory] = None) -> Type[Matcher]: + """ + :说明: + + 注册一个消息事件响应器。 + + :参数: + + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``permission: Optional[Permission]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + matcher = Matcher.new("message", + Rule() & rule, + permission or Permission(), + temp=temp, + priority=priority, + block=block, + handlers=handlers, + plugin=_current_plugin.get(), + default_state=state, + default_state_factory=state_factory) + _store_matcher(matcher) + return matcher + + +def on_notice(rule: Optional[Union[Rule, T_RuleChecker]] = None, + *, + handlers: Optional[List[Union[T_Handler, Handler]]] = None, + temp: bool = False, + priority: int = 1, + block: bool = False, + state: Optional[T_State] = None, + state_factory: Optional[T_StateFactory] = None) -> Type[Matcher]: + """ + :说明: + + 注册一个通知事件响应器。 + + :参数: + + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + matcher = Matcher.new("notice", + Rule() & rule, + Permission(), + temp=temp, + priority=priority, + block=block, + handlers=handlers, + plugin=_current_plugin.get(), + default_state=state, + default_state_factory=state_factory) + _store_matcher(matcher) + return matcher + + +def on_request(rule: Optional[Union[Rule, T_RuleChecker]] = None, + *, + handlers: Optional[List[Union[T_Handler, Handler]]] = None, + temp: bool = False, + priority: int = 1, + block: bool = False, + state: Optional[T_State] = None, + state_factory: Optional[T_StateFactory] = None) -> Type[Matcher]: + """ + :说明: + + 注册一个请求事件响应器。 + + :参数: + + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + matcher = Matcher.new("request", + Rule() & rule, + Permission(), + temp=temp, + priority=priority, + block=block, + handlers=handlers, + plugin=_current_plugin.get(), + default_state=state, + default_state_factory=state_factory) + _store_matcher(matcher) + return matcher + + +def on_startswith(msg: Union[str, Tuple[str, ...]], + rule: Optional[Optional[Union[Rule, T_RuleChecker]]] = None, + ignorecase: bool = False, + **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个消息事件响应器，并且当消息的**文本部分**以指定内容开头时响应。 + + :参数: + + * ``msg: Union[str, Tuple[str, ...]]``: 指定消息开头内容 + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``ignorecase: bool``: 是否忽略大小写 + * ``permission: Optional[Permission]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + return on_message(startswith(msg, ignorecase) & rule, **kwargs) + + +def on_endswith(msg: Union[str, Tuple[str, ...]], + rule: Optional[Optional[Union[Rule, T_RuleChecker]]] = None, + ignorecase: bool = False, + **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个消息事件响应器，并且当消息的**文本部分**以指定内容结尾时响应。 + + :参数: + + * ``msg: Union[str, Tuple[str, ...]]``: 指定消息结尾内容 + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``ignorecase: bool``: 是否忽略大小写 + * ``permission: Optional[Permission]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + return on_message(endswith(msg, ignorecase) & rule, **kwargs) + + +def on_keyword(keywords: Set[str], + rule: Optional[Union[Rule, T_RuleChecker]] = None, + **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个消息事件响应器，并且当消息纯文本部分包含关键词时响应。 + + :参数: + + * ``keywords: Set[str]``: 关键词列表 + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``permission: Optional[Permission]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + return on_message(keyword(*keywords) & rule, **kwargs) + + +def on_command(cmd: Union[str, Tuple[str, ...]], + rule: Optional[Union[Rule, T_RuleChecker]] = None, + aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = None, + **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个消息事件响应器，并且当消息以指定命令开头时响应。 + + 命令匹配规则参考: `命令形式匹配 `_ + + :参数: + + * ``cmd: Union[str, Tuple[str, ...]]``: 指定命令内容 + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``aliases: Optional[Set[Union[str, Tuple[str, ...]]]]``: 命令别名 + * ``permission: Optional[Permission]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + + async def _strip_cmd(bot: "Bot", event: "Event", state: T_State): + message = event.get_message() + if len(message) < 1: + return + segment = message.pop(0) + segment_text = str(segment).lstrip() + if not segment_text.startswith(state["_prefix"]["raw_command"]): + return + new_message = message.__class__( + segment_text[len(state["_prefix"]["raw_command"]):].lstrip()) + for new_segment in reversed(new_message): + message.insert(0, new_segment) + + handlers = kwargs.pop("handlers", []) + handlers.insert(0, _strip_cmd) + + commands = set([cmd]) | (aliases or set()) + return on_message(command(*commands) & rule, handlers=handlers, **kwargs) + + +def on_shell_command(cmd: Union[str, Tuple[str, ...]], + rule: Optional[Union[Rule, T_RuleChecker]] = None, + aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = None, + parser: Optional[ArgumentParser] = None, + **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个支持 ``shell_like`` 解析参数的命令消息事件响应器。 + + 与普通的 ``on_command`` 不同的是，在添加 ``parser`` 参数时, 响应器会自动处理消息。 + + 并将用户输入的原始参数列表保存在 ``state["argv"]``, ``parser`` 处理的参数保存在 ``state["args"]`` 中 + + :参数: + + * ``cmd: Union[str, Tuple[str, ...]]``: 指定命令内容 + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``aliases: Optional[Set[Union[str, Tuple[str, ...]]]]``: 命令别名 + * ``parser: Optional[ArgumentParser]``: ``nonebot.rule.ArgumentParser`` 对象 + * ``permission: Optional[Permission]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + + async def _strip_cmd(bot: "Bot", event: "Event", state: T_State): + message = event.get_message() + segment = message.pop(0) + new_message = message.__class__( + str(segment) + [len(state["_prefix"]["raw_command"]):].strip()) # type: ignore + for new_segment in reversed(new_message): + message.insert(0, new_segment) + + handlers = kwargs.pop("handlers", []) + handlers.insert(0, _strip_cmd) + + commands = set([cmd]) | (aliases or set()) + return on_message(shell_command(*commands, parser=parser) & rule, + handlers=handlers, + **kwargs) + + +def on_regex(pattern: str, + flags: Union[int, re.RegexFlag] = 0, + rule: Optional[Union[Rule, T_RuleChecker]] = None, + **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个消息事件响应器，并且当消息匹配正则表达式时响应。 + + 命令匹配规则参考: `正则匹配 `_ + + :参数: + + * ``pattern: str``: 正则表达式 + * ``flags: Union[int, re.RegexFlag]``: 正则匹配标志 + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``permission: Optional[Permission]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + return on_message(regex(pattern, flags) & rule, **kwargs) + + +class CommandGroup: + """命令组，用于声明一组有相同名称前缀的命令。""" + + def __init__(self, cmd: Union[str, Tuple[str, ...]], **kwargs): + """ + :参数: + + * ``cmd: Union[str, Tuple[str, ...]]``: 命令前缀 + * ``**kwargs``: 其他传递给 ``on_command`` 的参数默认值，参考 `on_command <#on-command-cmd-rule-none-aliases-none-kwargs>`_ + """ + self.basecmd: Tuple[str, ...] = (cmd,) if isinstance(cmd, str) else cmd + """ + - **类型**: ``Tuple[str, ...]`` + - **说明**: 命令前缀 + """ + if "aliases" in kwargs: + del kwargs["aliases"] + self.base_kwargs: Dict[str, Any] = kwargs + """ + - **类型**: ``Dict[str, Any]`` + - **说明**: 其他传递给 ``on_command`` 的参数默认值 + """ + + def command(self, cmd: Union[str, Tuple[str, ...]], + **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个新的命令。 + + :参数: + + * ``cmd: Union[str, Tuple[str, ...]]``: 命令前缀 + * ``**kwargs``: 其他传递给 ``on_command`` 的参数，将会覆盖命令组默认值 + + :返回: + + - ``Type[Matcher]`` + """ + sub_cmd = (cmd,) if isinstance(cmd, str) else cmd + cmd = self.basecmd + sub_cmd + + final_kwargs = self.base_kwargs.copy() + final_kwargs.update(kwargs) + return on_command(cmd, **final_kwargs) + + def shell_command(self, cmd: Union[str, Tuple[str, ...]], + **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个新的命令。 + + :参数: + + * ``cmd: Union[str, Tuple[str, ...]]``: 命令前缀 + * ``**kwargs``: 其他传递给 ``on_shell_command`` 的参数，将会覆盖命令组默认值 + + :返回: + + - ``Type[Matcher]`` + """ + sub_cmd = (cmd,) if isinstance(cmd, str) else cmd + cmd = self.basecmd + sub_cmd + + final_kwargs = self.base_kwargs.copy() + final_kwargs.update(kwargs) + return on_shell_command(cmd, **final_kwargs) + + +class MatcherGroup: + """事件响应器组合，统一管理。为 ``Matcher`` 创建提供默认属性。""" + + def __init__(self, **kwargs): + """ + :说明: + + 创建一个事件响应器组合，参数为默认值，与 ``on`` 一致 + """ + self.matchers: List[Type[Matcher]] = [] + """ + :类型: ``List[Type[Matcher]]`` + :说明: 组内事件响应器列表 + """ + self.base_kwargs: Dict[str, Any] = kwargs + """ + - **类型**: ``Dict[str, Any]`` + - **说明**: 其他传递给 ``on`` 的参数默认值 + """ + + def on(self, **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个基础事件响应器，可自定义类型。 + + :参数: + + * ``type: str``: 事件响应器类型 + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``permission: Optional[Permission]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + final_kwargs = self.base_kwargs.copy() + final_kwargs.update(kwargs) + matcher = on(**final_kwargs) + self.matchers.append(matcher) + return matcher + + def on_metaevent(self, **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个元事件响应器。 + + :参数: + + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + final_kwargs = self.base_kwargs.copy() + final_kwargs.update(kwargs) + final_kwargs.pop("type", None) + final_kwargs.pop("permission", None) + matcher = on_metaevent(**final_kwargs) + self.matchers.append(matcher) + return matcher + + def on_message(self, **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个消息事件响应器。 + + :参数: + + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``permission: Optional[Permission]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + final_kwargs = self.base_kwargs.copy() + final_kwargs.update(kwargs) + final_kwargs.pop("type", None) + matcher = on_message(**final_kwargs) + self.matchers.append(matcher) + return matcher + + def on_notice(self, **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个通知事件响应器。 + + :参数: + + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + final_kwargs = self.base_kwargs.copy() + final_kwargs.update(kwargs) + final_kwargs.pop("type", None) + matcher = on_notice(**final_kwargs) + self.matchers.append(matcher) + return matcher + + def on_request(self, **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个请求事件响应器。 + + :参数: + + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + final_kwargs = self.base_kwargs.copy() + final_kwargs.update(kwargs) + final_kwargs.pop("type", None) + matcher = on_request(**final_kwargs) + self.matchers.append(matcher) + return matcher + + def on_startswith(self, msg: Union[str, Tuple[str, ...]], + **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个消息事件响应器，并且当消息的**文本部分**以指定内容开头时响应。 + + :参数: + + * ``msg: Union[str, Tuple[str, ...]]``: 指定消息开头内容 + * ``ignorecase: bool``: 是否忽略大小写 + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``permission: Optional[Permission]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + final_kwargs = self.base_kwargs.copy() + final_kwargs.update(kwargs) + final_kwargs.pop("type", None) + matcher = on_startswith(msg, **final_kwargs) + self.matchers.append(matcher) + return matcher + + def on_endswith(self, msg: Union[str, Tuple[str, ...]], + **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个消息事件响应器，并且当消息的**文本部分**以指定内容结尾时响应。 + + :参数: + + * ``msg: Union[str, Tuple[str, ...]]``: 指定消息结尾内容 + * ``ignorecase: bool``: 是否忽略大小写 + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``permission: Optional[Permission]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + final_kwargs = self.base_kwargs.copy() + final_kwargs.update(kwargs) + final_kwargs.pop("type", None) + matcher = on_endswith(msg, **final_kwargs) + self.matchers.append(matcher) + return matcher + + def on_keyword(self, keywords: Set[str], **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个消息事件响应器，并且当消息纯文本部分包含关键词时响应。 + + :参数: + + * ``keywords: Set[str]``: 关键词列表 + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``permission: Optional[Permission]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + final_kwargs = self.base_kwargs.copy() + final_kwargs.update(kwargs) + final_kwargs.pop("type", None) + matcher = on_keyword(keywords, **final_kwargs) + self.matchers.append(matcher) + return matcher + + def on_command(self, + cmd: Union[str, Tuple[str, ...]], + aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = None, + **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个消息事件响应器，并且当消息以指定命令开头时响应。 + + 命令匹配规则参考: `命令形式匹配 `_ + + :参数: + + * ``cmd: Union[str, Tuple[str, ...]]``: 指定命令内容 + * ``aliases: Optional[Set[Union[str, Tuple[str, ...]]]]``: 命令别名 + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``permission: Optional[Permission]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + final_kwargs = self.base_kwargs.copy() + final_kwargs.update(kwargs) + final_kwargs.pop("type", None) + matcher = on_command(cmd, aliases=aliases, **final_kwargs) + self.matchers.append(matcher) + return matcher + + def on_shell_command(self, + cmd: Union[str, Tuple[str, ...]], + aliases: Optional[Set[Union[str, Tuple[str, + ...]]]] = None, + parser: Optional[ArgumentParser] = None, + **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个支持 ``shell_like`` 解析参数的命令消息事件响应器。 + + 与普通的 ``on_command`` 不同的是，在添加 ``parser`` 参数时, 响应器会自动处理消息。 + + 并将用户输入的原始参数列表保存在 ``state["argv"]``, ``parser`` 处理的参数保存在 ``state["args"]`` 中 + + :参数: + + * ``cmd: Union[str, Tuple[str, ...]]``: 指定命令内容 + * ``aliases: Optional[Set[Union[str, Tuple[str, ...]]]]``: 命令别名 + * ``parser: Optional[ArgumentParser]``: ``nonebot.rule.ArgumentParser`` 对象 + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``permission: Optional[Permission]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + final_kwargs = self.base_kwargs.copy() + final_kwargs.update(kwargs) + final_kwargs.pop("type", None) + matcher = on_shell_command(cmd, + aliases=aliases, + parser=parser, + **final_kwargs) + self.matchers.append(matcher) + return matcher + + def on_regex(self, + pattern: str, + flags: Union[int, re.RegexFlag] = 0, + **kwargs) -> Type[Matcher]: + """ + :说明: + + 注册一个消息事件响应器，并且当消息匹配正则表达式时响应。 + + 命令匹配规则参考: `正则匹配 `_ + + :参数: + + * ``pattern: str``: 正则表达式 + * ``flags: Union[int, re.RegexFlag]``: 正则匹配标志 + * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 + * ``permission: Optional[Permission]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``temp: bool``: 是否为临时事件响应器（仅执行一次） + * ``priority: int``: 事件响应器优先级 + * ``block: bool``: 是否阻止事件向更低优先级传递 + * ``state: Optional[T_State]``: 默认 state + * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 + + :返回: + + - ``Type[Matcher]`` + """ + final_kwargs = self.base_kwargs.copy() + final_kwargs.update(kwargs) + final_kwargs.pop("type", None) + matcher = on_regex(pattern, flags=flags, **final_kwargs) + self.matchers.append(matcher) + return matcher diff --git a/nonebot/plugin/__init__.pyi b/nonebot/plugin/on.pyi similarity index 92% rename from nonebot/plugin/__init__.pyi rename to nonebot/plugin/on.pyi index bf8b071f..68e8ad62 100644 --- a/nonebot/plugin/__init__.pyi +++ b/nonebot/plugin/on.pyi @@ -1,7 +1,5 @@ import re -from types import ModuleType -from dataclasses import dataclass -from typing import Set, Dict, List, Type, Tuple, Union, Optional +from typing import Set, List, Type, Tuple, Union, Optional from nonebot.handler import Handler from nonebot.matcher import Matcher @@ -9,26 +7,6 @@ from nonebot.permission import Permission from nonebot.rule import Rule, ArgumentParser from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_StateFactory -from .export import Export -from .export import export as export - -plugins: Dict[str, "Plugin"] = ... -PLUGIN_NAMESPACE: str = ... - - -@dataclass(eq=False) -class Plugin(object): - name: str - module: ModuleType - - @property - def export(self) -> Export: - ... - - @property - def matcher(self) -> Set[Type[Matcher]]: - ... - def on(type: str = "", rule: Optional[Union[Rule, T_RuleChecker]] = ..., @@ -387,40 +365,3 @@ class MatcherGroup: state: Optional[T_State] = ..., state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: ... - - -def load_plugin(module_path: str) -> Optional[Plugin]: - ... - - -def load_plugins(*plugin_dir: str) -> Set[Plugin]: - ... - - -def load_all_plugins(module_path: Set[str], - plugin_dir: Set[str]) -> Set[Plugin]: - ... - - -def load_from_json(file_path: str, encoding: str = ...) -> Set[Plugin]: - ... - - -def load_from_toml(file_path: str, encoding: str = ...) -> Set[Plugin]: - ... - - -def load_builtin_plugins(name: str = ...) -> Optional[Plugin]: - ... - - -def get_plugin(name: str) -> Optional[Plugin]: - ... - - -def get_loaded_plugins() -> Set[Plugin]: - ... - - -def require(name: str) -> Optional[Export]: - ... diff --git a/nonebot/plugin/plugin.py b/nonebot/plugin/plugin.py new file mode 100644 index 00000000..ec248d10 --- /dev/null +++ b/nonebot/plugin/plugin.py @@ -0,0 +1,85 @@ +from types import ModuleType +from dataclasses import field, dataclass +from typing import Set, Dict, Type, Optional + +from nonebot.matcher import Matcher + +from .export import Export + +plugins: Dict[str, "Plugin"] = {} +""" +:类型: ``Dict[str, Plugin]`` +:说明: 已加载的插件 +""" + + +@dataclass(eq=False) +class Plugin(object): + """存储插件信息""" + name: str + """ + - **类型**: ``str`` + - **说明**: 插件名称，使用 文件/文件夹 名称作为插件名 + """ + module: ModuleType + """ + - **类型**: ``ModuleType`` + - **说明**: 插件模块对象 + """ + module_name: str + """ + - **类型**: ``str`` + - **说明**: 点分割模块路径 + """ + export: Export = field(default_factory=Export) + """ + - **类型**: ``Export`` + - **说明**: 插件内定义的导出内容 + """ + matcher: Set[Type[Matcher]] = field(default_factory=set) + """ + - **类型**: ``Set[Type[Matcher]]`` + - **说明**: 插件内定义的 ``Matcher`` + """ + # TODO + parent_plugin: Optional["Plugin"] = None + sub_plugins: Set["Plugin"] = field(default_factory=set) + + +def get_plugin(name: str) -> Optional[Plugin]: + """ + :说明: + + 获取当前导入的某个插件。 + + :参数: + + * ``name: str``: 插件名，与 ``load_plugin`` 参数一致。如果为 ``load_plugins`` 导入的插件，则为文件(夹)名。 + + :返回: + + - ``Optional[Plugin]`` + """ + return plugins.get(name) + + +def get_loaded_plugins() -> Set[Plugin]: + """ + :说明: + + 获取当前已导入的所有插件。 + + :返回: + + - ``Set[Plugin]`` + """ + return set(plugins.values()) + + +def _new_plugin(fullname: str, module: ModuleType) -> Plugin: + _, name = fullname.rsplit(".", 1) + if name in plugins: + raise RuntimeError("Plugin already exists! Check your plugin name.") + plugin = Plugin(name, module, fullname) + plugins[name] = plugin + return plugin From 08f56db385dd03c3716997091831dca72251bf56 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 9 Nov 2021 00:57:59 +0800 Subject: [PATCH 010/174] :construction: process matcher module --- nonebot/matcher.py | 11 +++--- nonebot/plugin/manager.py | 77 +++++---------------------------------- nonebot/plugin/on.py | 17 +++++++++ 3 files changed, 31 insertions(+), 74 deletions(-) diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 7f996323..8a5f60d6 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -178,6 +178,7 @@ class Matcher(metaclass=MatcherMeta): block: bool = False, *, plugin: Optional["Plugin"] = None, + module: Optional[ModuleType] = None, expire_time: Optional[datetime] = None, default_state: Optional[T_State] = None, default_state_factory: Optional[T_StateFactory] = None, @@ -200,6 +201,7 @@ class Matcher(metaclass=MatcherMeta): * ``priority: int``: 响应优先级 * ``block: bool``: 是否阻止事件向更低优先级的响应器传播 * ``plugin: Optional[Plugin]``: 事件响应器所在插件 + * ``module: Optional[ModuleType]``: 事件响应器所在模块 * ``default_state: Optional[T_State]``: 默认状态 ``state`` * ``default_state_factory: Optional[T_StateFactory]``: 默认状态 ``state`` 的工厂函数 * ``expire_time: Optional[datetime]``: 事件响应器最终有效时间点，过时即被删除 @@ -210,18 +212,15 @@ class Matcher(metaclass=MatcherMeta): """ NewMatcher = type( - "Matcher", - (Matcher,), - { + "Matcher", (Matcher,), { "plugin": plugin, "module": - plugin and plugin. - module, # FIXME: matcher module may different from plugin module + module, "plugin_name": plugin and plugin.name, "module_name": - plugin and plugin.module_name, + module and module.__name__, "type": type_, "rule": diff --git a/nonebot/plugin/manager.py b/nonebot/plugin/manager.py index 825e3844..d0243c91 100644 --- a/nonebot/plugin/manager.py +++ b/nonebot/plugin/manager.py @@ -1,8 +1,6 @@ import sys -import uuid import pkgutil import importlib -from hashlib import md5 from pathlib import Path from types import ModuleType from collections import Counter @@ -14,23 +12,17 @@ from .export import Export from . import _current_plugin from .plugin import Plugin, _new_plugin +_manager_stack: List["PluginManager"] = [] + # TODO class PluginManager: - def __init__(self, - namespace: str, - plugins: Optional[Iterable[str]] = None, - search_path: Optional[Iterable[str]] = None, - *, - id: Optional[str] = None): - self.namespace: str = namespace - self.namespace_module: ModuleType = self._setup_namespace(namespace) - - self.id: str = id or str(uuid.uuid4()) - self.internal_id: str = md5( - ((self.namespace or "") + self.id).encode()).hexdigest() - self.internal_module = self._setup_internal_module(self.internal_id) + def __init__( + self, + plugins: Optional[Iterable[str]] = None, + search_path: Optional[Iterable[str]] = None, + ): # simple plugin not in search path self.plugins: Set[str] = set(plugins or []) @@ -38,55 +30,6 @@ class PluginManager: # ensure can be loaded self.list_plugins() - def _setup_namespace(self, namespace: str) -> ModuleType: - try: - module = importlib.import_module(namespace) - except ImportError: - module = _NamespaceModule(namespace) - if "." in namespace: - parent = importlib.import_module(namespace.rsplit(".", 1)[0]) - setattr(parent, namespace.rsplit(".", 1)[1], module) - - sys.modules[namespace] = module - return module - - def _setup_internal_module(self, internal_id: str) -> ModuleType: - if hasattr(_internal_space, internal_id): - raise RuntimeError("Plugin manager already exists!") - - index = 2 - prefix: str = _internal_space.__name__ - while True: - try: - frame = sys._getframe(index) - except ValueError: - break - # check if is called in plugin - if "__plugin_name__" not in frame.f_globals: - index += 1 - continue - prefix = frame.f_globals.get("__name__", _internal_space.__name__) - break - - if not prefix.startswith(_internal_space.__name__): - prefix = _internal_space.__name__ - module = _InternalModule(prefix, self) - sys.modules[module.__name__] = module # type: ignore - setattr(_internal_space, internal_id, module) - return module - - def __enter__(self): - if self in _manager_stack: - raise RuntimeError("Plugin manager already activated!") - _manager_stack.append(self) - return self - - def __exit__(self, exc_type, exc_value, traceback): - try: - _manager_stack.pop() - except IndexError: - pass - def search_plugins(self) -> List[str]: return [ module_info.name @@ -116,14 +59,12 @@ class PluginManager: def load_plugin(self, name) -> ModuleType: if name in self.plugins: - with self: - return importlib.import_module(name) + return importlib.import_module(name) if "." in name: raise ValueError("Plugin name cannot contain '.'") - with self: - return importlib.import_module(f"{self.namespace}.{name}") + return importlib.import_module(f"{self.namespace}.{name}") def load_all_plugins(self) -> List[ModuleType]: return [self.load_plugin(name) for name in self.list_plugins()] diff --git a/nonebot/plugin/on.py b/nonebot/plugin/on.py index aa648b7a..f8d22167 100644 --- a/nonebot/plugin/on.py +++ b/nonebot/plugin/on.py @@ -1,4 +1,7 @@ import re +import sys +import inspect +from types import ModuleType from typing import (TYPE_CHECKING, Any, Set, Dict, List, Type, Tuple, Union, Optional) @@ -22,6 +25,15 @@ def _store_matcher(matcher: Type[Matcher]) -> None: plugin.matcher.add(matcher) +def _get_matcher_module(depth: int = 1) -> Optional[ModuleType]: + current_frame = inspect.currentframe() + if current_frame is None: + return None + frame = inspect.getouterframes(current_frame)[depth + 1].frame + module_name = frame.f_globals["__name__"] + return sys.modules.get(module_name) + + def on(type: str = "", rule: Optional[Union[Rule, T_RuleChecker]] = None, permission: Optional[Permission] = None, @@ -61,6 +73,7 @@ def on(type: str = "", block=block, handlers=handlers, plugin=_current_plugin.get(), + module=_get_matcher_module(), default_state=state, default_state_factory=state_factory) _store_matcher(matcher) @@ -103,6 +116,7 @@ def on_metaevent( block=block, handlers=handlers, plugin=_current_plugin.get(), + module=_get_matcher_module(), default_state=state, default_state_factory=state_factory) _store_matcher(matcher) @@ -146,6 +160,7 @@ def on_message(rule: Optional[Union[Rule, T_RuleChecker]] = None, block=block, handlers=handlers, plugin=_current_plugin.get(), + module=_get_matcher_module(), default_state=state, default_state_factory=state_factory) _store_matcher(matcher) @@ -187,6 +202,7 @@ def on_notice(rule: Optional[Union[Rule, T_RuleChecker]] = None, block=block, handlers=handlers, plugin=_current_plugin.get(), + module=_get_matcher_module(), default_state=state, default_state_factory=state_factory) _store_matcher(matcher) @@ -228,6 +244,7 @@ def on_request(rule: Optional[Union[Rule, T_RuleChecker]] = None, block=block, handlers=handlers, plugin=_current_plugin.get(), + module=_get_matcher_module(), default_state=state, default_state_factory=state_factory) _store_matcher(matcher) From 2ccbc93e48ca591b87d523ecdd642d853cc59e88 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 11 Nov 2021 17:33:30 +0800 Subject: [PATCH 011/174] :recycle: remove plugin namespace --- nonebot/__init__.py | 2 +- nonebot/plugin/__init__.py | 24 ++++- nonebot/plugin/load.py | 83 ++++++---------- nonebot/plugin/manager.py | 199 ++++++++++++++++++------------------- nonebot/plugin/on.py | 96 ++++++++++-------- nonebot/plugin/plugin.py | 5 +- pages/changelog.md | 2 + pyproject.toml | 1 + tests/plugins.toml | 2 +- 9 files changed, 210 insertions(+), 204 deletions(-) diff --git a/nonebot/__init__.py b/nonebot/__init__.py index e5af0caf..a9c6d350 100644 --- a/nonebot/__init__.py +++ b/nonebot/__init__.py @@ -37,7 +37,7 @@ from nonebot.adapters import Bot from nonebot.utils import escape_tag from nonebot.config import Env, Config from nonebot.log import logger, default_filter -from nonebot.drivers import Driver, ForwardDriver, ReverseDriver +from nonebot.drivers import Driver, ReverseDriver try: _dist: pkg_resources.Distribution = pkg_resources.get_distribution( diff --git a/nonebot/plugin/__init__.py b/nonebot/plugin/__init__.py index fcfcbefc..69a34e63 100644 --- a/nonebot/plugin/__init__.py +++ b/nonebot/plugin/__init__.py @@ -5,14 +5,36 @@ 为 NoneBot 插件开发提供便携的定义函数。 """ -from typing import Optional +from typing import List, Optional from contextvars import ContextVar +_managers: List["PluginManager"] = [] _current_plugin: ContextVar[Optional["Plugin"]] = ContextVar("_current_plugin", default=None) +from .on import on as on +from .manager import PluginManager from .export import Export as Export from .export import export as export +from .load import require as require +from .on import on_regex as on_regex from .plugin import Plugin as Plugin +from .on import on_notice as on_notice +from .on import on_command as on_command +from .on import on_keyword as on_keyword +from .on import on_message as on_message +from .on import on_request as on_request +from .on import on_endswith as on_endswith +from .load import load_plugin as load_plugin +from .on import CommandGroup as CommandGroup +from .on import MatcherGroup as MatcherGroup +from .on import on_metaevent as on_metaevent from .plugin import get_plugin as get_plugin +from .load import load_plugins as load_plugins +from .on import on_startswith as on_startswith +from .load import load_from_json as load_from_json +from .load import load_from_toml as load_from_toml +from .on import on_shell_command as on_shell_command +from .load import load_all_plugins as load_all_plugins from .plugin import get_loaded_plugins as get_loaded_plugins +from .load import load_builtin_plugins as load_builtin_plugins diff --git a/nonebot/plugin/load.py b/nonebot/plugin/load.py index cbac46c3..5e1002dc 100644 --- a/nonebot/plugin/load.py +++ b/nonebot/plugin/load.py @@ -1,33 +1,14 @@ -from typing import Set, Optional +import json +from typing import Set, Iterable, Optional +import tomlkit + +from . import _managers from .export import Export from .manager import PluginManager from .plugin import Plugin, get_plugin -# TODO -def _load_plugin(manager: PluginManager, plugin_name: str) -> Optional[Plugin]: - if plugin_name.startswith("_"): - return None - - if plugin_name in plugins: - return None - - try: - module = manager.load_plugin(plugin_name) - - plugin = Plugin(plugin_name, module) - plugins[plugin_name] = plugin - logger.opt(colors=True).success( - f'Succeeded to import "{escape_tag(plugin_name)}"') - return plugin - except Exception as e: - logger.opt(colors=True, exception=e).error( - f'Failed to import "{escape_tag(plugin_name)}"' - ) - return None - - def load_plugin(module_path: str) -> Optional[Plugin]: """ :说明: @@ -43,9 +24,9 @@ def load_plugin(module_path: str) -> Optional[Plugin]: - ``Optional[Plugin]`` """ - context: Context = copy_context() - manager = PluginManager(PLUGIN_NAMESPACE, plugins=[module_path]) - return context.run(_load_plugin, manager, module_path) + manager = PluginManager([module_path]) + _managers.append(manager) + return manager.load_plugin(module_path) def load_plugins(*plugin_dir: str) -> Set[Plugin]: @@ -62,18 +43,13 @@ def load_plugins(*plugin_dir: str) -> Set[Plugin]: - ``Set[Plugin]`` """ - loaded_plugins = set() - manager = PluginManager(PLUGIN_NAMESPACE, search_path=plugin_dir) - for plugin_name in manager.list_plugins(): - context: Context = copy_context() - result = context.run(_load_plugin, manager, plugin_name) - if result: - loaded_plugins.add(result) - return loaded_plugins + manager = PluginManager(search_path=plugin_dir) + _managers.append(manager) + return manager.load_all_plugins() -def load_all_plugins(module_path: Set[str], - plugin_dir: Set[str]) -> Set[Plugin]: +def load_all_plugins(module_path: Iterable[str], + plugin_dir: Iterable[str]) -> Set[Plugin]: """ :说明: @@ -81,21 +57,16 @@ def load_all_plugins(module_path: Set[str], :参数: - - ``module_path: Set[str]``: 指定插件集合 - - ``plugin_dir: Set[str]``: 指定插件路径集合 + - ``module_path: Iterable[str]``: 指定插件集合 + - ``plugin_dir: Iterable[str]``: 指定插件路径集合 :返回: - ``Set[Plugin]`` """ - loaded_plugins = set() - manager = PluginManager(PLUGIN_NAMESPACE, module_path, plugin_dir) - for plugin_name in manager.list_plugins(): - context: Context = copy_context() - result = context.run(_load_plugin, manager, plugin_name) - if result: - loaded_plugins.add(result) - return loaded_plugins + manager = PluginManager(module_path, plugin_dir) + _managers.append(manager) + return manager.load_all_plugins() def load_from_json(file_path: str, encoding: str = "utf-8") -> Set[Plugin]: @@ -127,7 +98,7 @@ def load_from_toml(file_path: str, encoding: str = "utf-8") -> Set[Plugin]: """ :说明: - 导入指定 toml 文件 ``[nonebot.plugins]`` 中的 ``plugins`` 以及 ``plugin_dirs`` 下多个插件， + 导入指定 toml 文件 ``[tool.nonebot]`` 中的 ``plugins`` 以及 ``plugin_dirs`` 下多个插件， 以 ``_`` 开头的插件不会被导入！ :参数: @@ -142,22 +113,23 @@ def load_from_toml(file_path: str, encoding: str = "utf-8") -> Set[Plugin]: with open(file_path, "r", encoding=encoding) as f: data = tomlkit.parse(f.read()) # type: ignore - nonebot_data = data.get("nonebot", {}).get("plugins") + nonebot_data = data.get("tool", {}).get("nonebot") or data.get( + "nonebot", {}).get("plugins") if not nonebot_data: - raise ValueError("Cannot find '[nonebot.plugins]' in given toml file!") + raise ValueError("Cannot find '[tool.nonebot]' in given toml file!") plugins = nonebot_data.get("plugins", []) plugin_dirs = nonebot_data.get("plugin_dirs", []) assert isinstance(plugins, list), "plugins must be a list of plugin name" assert isinstance(plugin_dirs, list), "plugin_dirs must be a list of directories" - return load_all_plugins(set(plugins), set(plugin_dirs)) + return load_all_plugins(plugins, plugin_dirs) def load_builtin_plugins(name: str = "echo") -> Optional[Plugin]: """ :说明: - 导入 NoneBot 内置插件 + 导入 NoneBot 内置插件, 默认导入 ``echo`` 插件 :返回: @@ -166,7 +138,7 @@ def load_builtin_plugins(name: str = "echo") -> Optional[Plugin]: return load_plugin(f"nonebot.plugins.{name}") -def require(name: str) -> Optional[Export]: +def require(name: str) -> Export: """ :说明: @@ -178,7 +150,10 @@ def require(name: str) -> Optional[Export]: :返回: - - ``Optional[Export]`` + - ``Export`` + + :异常: + - ``RuntimeError``: 插件无法加载 """ plugin = get_plugin(name) or load_plugin(name) if not plugin: diff --git a/nonebot/plugin/manager.py b/nonebot/plugin/manager.py index d0243c91..e98495d0 100644 --- a/nonebot/plugin/manager.py +++ b/nonebot/plugin/manager.py @@ -2,20 +2,18 @@ import sys import pkgutil import importlib from pathlib import Path +from itertools import chain from types import ModuleType -from collections import Counter from importlib.abc import MetaPathFinder from importlib.machinery import PathFinder, SourceFileLoader -from typing import Set, List, Union, Iterable, Optional, Sequence +from typing import Set, Dict, List, Union, Iterable, Optional, Sequence -from .export import Export -from . import _current_plugin +from nonebot.log import logger +from nonebot.utils import escape_tag from .plugin import Plugin, _new_plugin - -_manager_stack: List["PluginManager"] = [] +from . import _managers, _current_plugin -# TODO class PluginManager: def __init__( @@ -27,81 +25,79 @@ class PluginManager: # simple plugin not in search path self.plugins: Set[str] = set(plugins or []) self.search_path: Set[str] = set(search_path or []) - # ensure can be loaded + # cache plugins + self.searched_plugins: Dict[str, Path] = {} self.list_plugins() - def search_plugins(self) -> List[str]: + def _path_to_module_name(self, path: Path) -> str: + rel_path = path.resolve().relative_to(Path(".").resolve()) + if rel_path.stem == "__init__": + return ".".join(rel_path.parts[:-1]) + else: + return ".".join(rel_path.parts[:-1] + (rel_path.stem,)) + + def _previous_plugins(self) -> List[str]: + _pre_managers: List[PluginManager] + if self in _managers: + _pre_managers = _managers[:_managers.index(self)] + else: + _pre_managers = _managers[:] + return [ - module_info.name - for module_info in pkgutil.iter_modules(self.search_path) + *chain.from_iterable( + [*manager.plugins, *manager.searched_plugins.keys()] + for manager in _pre_managers) ] def list_plugins(self) -> Set[str]: - _pre_managers: List[PluginManager] - if self in _manager_stack: - _pre_managers = _manager_stack[:_manager_stack.index(self)] - else: - _pre_managers = _manager_stack[:] + # get all previous ready to load plugins + previous_plugins = self._previous_plugins() + searched_plugins: Dict[str, Path] = {} - _search_path: Set[str] = set() - for manager in _pre_managers: - _search_path |= manager.search_path - if _search_path & self.search_path: - raise RuntimeError("Duplicate plugin search path!") - - _search_plugins = self.search_plugins() - c = Counter([*_search_plugins, *self.plugins]) - conflict = [name for name, num in c.items() if num > 1] - if conflict: - raise RuntimeError( - f"More than one plugin named {' / '.join(conflict)}!") - return set(_search_plugins) | self.plugins - - def load_plugin(self, name) -> ModuleType: - if name in self.plugins: - return importlib.import_module(name) - - if "." in name: - raise ValueError("Plugin name cannot contain '.'") - - return importlib.import_module(f"{self.namespace}.{name}") - - def load_all_plugins(self) -> List[ModuleType]: - return [self.load_plugin(name) for name in self.list_plugins()] - - def _rewrite_module_name(self, module_name: str) -> Optional[str]: - prefix = f"{self.internal_module.__name__}." - raw_name = module_name[len(self.namespace) + - 1:] if module_name.startswith(self.namespace + - ".") else None - # dir plugins - if raw_name and raw_name.split(".")[0] in self.search_plugins(): - return f"{prefix}{raw_name}" - # third party plugin or renamed dir plugins - elif module_name in self.plugins or module_name.startswith(prefix): - return module_name - # dir plugins - elif module_name in self.search_plugins(): - return f"{prefix}{module_name}" - return None - - def _check_absolute_import(self, origin_path: str) -> Optional[str]: - if not self.search_path: - return - paths = set([ - *self.search_path, - *(str(Path(path).resolve()) for path in self.search_path) - ]) - for path in paths: - try: - rel_path = Path(origin_path).relative_to(path) - if rel_path.stem == "__init__": - return f"{self.internal_module.__name__}." + ".".join( - rel_path.parts[:-1]) - return f"{self.internal_module.__name__}." + ".".join( - rel_path.parts[:-1] + (rel_path.stem,)) - except ValueError: + for module_info in pkgutil.iter_modules(self.search_path): + if module_info.name.startswith("_"): continue + if module_info.name in searched_plugins.keys( + ) or module_info.name in previous_plugins: + raise RuntimeError( + f"Plugin already exists: {module_info.name}! Check your plugin name" + ) + module_spec = module_info.module_finder.find_spec( + module_info.name, None) + if not module_spec: + continue + module_path = module_spec.origin + if not module_path: + continue + searched_plugins[module_info.name] = Path(module_path).resolve() + + self.searched_plugins = searched_plugins + + return self.plugins | set(self.searched_plugins.keys()) + + def load_plugin(self, name) -> Optional[Plugin]: + try: + if name in self.plugins: + module = importlib.import_module(name) + elif name not in self.searched_plugins: + raise RuntimeError( + f"Plugin not found: {name}! Check your plugin name") + else: + module = importlib.import_module( + self._path_to_module_name(self.searched_plugins[name])) + + logger.opt(colors=True).success( + f'Succeeded to import "{escape_tag(name)}"') + return getattr(module, "__plugin__", None) + except Exception as e: + logger.opt(colors=True, exception=e).error( + f'Failed to import "{escape_tag(name)}"' + ) + + def load_all_plugins(self) -> Set[Plugin]: + return set( + filter(None, + (self.load_plugin(name) for name in self.list_plugins()))) class PluginFinder(MetaPathFinder): @@ -110,28 +106,27 @@ class PluginFinder(MetaPathFinder): fullname: str, path: Optional[Sequence[Union[bytes, str]]], target: Optional[ModuleType] = None): - if _manager_stack: + if _managers: index = -1 - origin_spec = PathFinder.find_spec(fullname, path, target) - while -index <= len(_manager_stack): - manager = _manager_stack[index] + module_spec = PathFinder.find_spec(fullname, path, target) + if not module_spec: + return + module_origin = module_spec.origin + if not module_origin: + return + module_path = Path(module_origin).resolve() - rel_name = None - if origin_spec and origin_spec.origin: - rel_name = manager._check_absolute_import( - origin_spec.origin) + while -index <= len(_managers): + manager = _managers[index] + + if fullname in manager.plugins or module_path in manager.searched_plugins.values( + ): + module_spec.loader = PluginLoader(manager, fullname, + module_origin) + return module_spec - newname = manager._rewrite_module_name(rel_name or fullname) - if newname: - spec = PathFinder.find_spec( - newname, path or [*manager.search_path, *sys.path], - target) - if spec: - spec.loader = PluginLoader( # type: ignore - manager, newname, spec.origin) - return spec index -= 1 - return None + return class PluginLoader(SourceFileLoader): @@ -152,20 +147,15 @@ class PluginLoader(SourceFileLoader): if self.loaded: return - export = Export() - _export_token = _export.set(export) + plugin = _new_plugin(self.name, module) + parent_plugin = _current_plugin.get() + if parent_plugin: + plugin.parent_plugin = parent_plugin + parent_plugin.sub_plugins.add(plugin) - prefix = self.manager.internal_module.__name__ - is_dir_plugin = self.name.startswith(prefix + ".") - module_name = self.name[len(prefix) + - 1:] if is_dir_plugin else self.name - _plugin_token = _current_plugin.set(module) + _plugin_token = _current_plugin.set(plugin) - setattr(module, "__export__", export) - setattr(module, "__plugin_name__", - module_name.split(".")[0] if is_dir_plugin else module_name) - setattr(module, "__module_name__", module_name) - setattr(module, "__module_prefix__", prefix if is_dir_plugin else "") + setattr(module, "__plugin__", plugin) # try: # super().exec_module(module) @@ -176,7 +166,6 @@ class PluginLoader(SourceFileLoader): super().exec_module(module) _current_plugin.reset(_plugin_token) - _export.reset(_export_token) return diff --git a/nonebot/plugin/on.py b/nonebot/plugin/on.py index f8d22167..e4da8345 100644 --- a/nonebot/plugin/on.py +++ b/nonebot/plugin/on.py @@ -7,13 +7,12 @@ from typing import (TYPE_CHECKING, Any, Set, Dict, List, Type, Tuple, Union, from nonebot.handler import Handler from nonebot.matcher import Matcher +from .manager import _current_plugin from nonebot.permission import Permission from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_StateFactory from nonebot.rule import (Rule, ArgumentParser, regex, command, keyword, endswith, startswith, shell_command) -from .manager import _current_plugin - if TYPE_CHECKING: from nonebot.adapters import Bot, Event @@ -43,7 +42,8 @@ def on(type: str = "", priority: int = 1, block: bool = False, state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None) -> Type[Matcher]: + state_factory: Optional[T_StateFactory] = None, + _depth: int = 0) -> Type[Matcher]: """ :说明: @@ -73,22 +73,22 @@ def on(type: str = "", block=block, handlers=handlers, plugin=_current_plugin.get(), - module=_get_matcher_module(), + module=_get_matcher_module(_depth + 1), default_state=state, default_state_factory=state_factory) _store_matcher(matcher) return matcher -def on_metaevent( - rule: Optional[Union[Rule, T_RuleChecker]] = None, - *, - handlers: Optional[List[Union[T_Handler, Handler]]] = None, - temp: bool = False, - priority: int = 1, - block: bool = False, - state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None) -> Type[Matcher]: +def on_metaevent(rule: Optional[Union[Rule, T_RuleChecker]] = None, + *, + handlers: Optional[List[Union[T_Handler, Handler]]] = None, + temp: bool = False, + priority: int = 1, + block: bool = False, + state: Optional[T_State] = None, + state_factory: Optional[T_StateFactory] = None, + _depth: int = 0) -> Type[Matcher]: """ :说明: @@ -116,7 +116,7 @@ def on_metaevent( block=block, handlers=handlers, plugin=_current_plugin.get(), - module=_get_matcher_module(), + module=_get_matcher_module(_depth + 1), default_state=state, default_state_factory=state_factory) _store_matcher(matcher) @@ -131,7 +131,8 @@ def on_message(rule: Optional[Union[Rule, T_RuleChecker]] = None, priority: int = 1, block: bool = True, state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None) -> Type[Matcher]: + state_factory: Optional[T_StateFactory] = None, + _depth: int = 0) -> Type[Matcher]: """ :说明: @@ -160,7 +161,7 @@ def on_message(rule: Optional[Union[Rule, T_RuleChecker]] = None, block=block, handlers=handlers, plugin=_current_plugin.get(), - module=_get_matcher_module(), + module=_get_matcher_module(_depth + 1), default_state=state, default_state_factory=state_factory) _store_matcher(matcher) @@ -174,7 +175,8 @@ def on_notice(rule: Optional[Union[Rule, T_RuleChecker]] = None, priority: int = 1, block: bool = False, state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None) -> Type[Matcher]: + state_factory: Optional[T_StateFactory] = None, + _depth: int = 0) -> Type[Matcher]: """ :说明: @@ -202,7 +204,7 @@ def on_notice(rule: Optional[Union[Rule, T_RuleChecker]] = None, block=block, handlers=handlers, plugin=_current_plugin.get(), - module=_get_matcher_module(), + module=_get_matcher_module(_depth + 1), default_state=state, default_state_factory=state_factory) _store_matcher(matcher) @@ -216,7 +218,8 @@ def on_request(rule: Optional[Union[Rule, T_RuleChecker]] = None, priority: int = 1, block: bool = False, state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None) -> Type[Matcher]: + state_factory: Optional[T_StateFactory] = None, + _depth: int = 0) -> Type[Matcher]: """ :说明: @@ -244,7 +247,7 @@ def on_request(rule: Optional[Union[Rule, T_RuleChecker]] = None, block=block, handlers=handlers, plugin=_current_plugin.get(), - module=_get_matcher_module(), + module=_get_matcher_module(_depth + 1), default_state=state, default_state_factory=state_factory) _store_matcher(matcher) @@ -254,6 +257,7 @@ def on_request(rule: Optional[Union[Rule, T_RuleChecker]] = None, def on_startswith(msg: Union[str, Tuple[str, ...]], rule: Optional[Optional[Union[Rule, T_RuleChecker]]] = None, ignorecase: bool = False, + _depth: int = 0, **kwargs) -> Type[Matcher]: """ :说明: @@ -277,12 +281,15 @@ def on_startswith(msg: Union[str, Tuple[str, ...]], - ``Type[Matcher]`` """ - return on_message(startswith(msg, ignorecase) & rule, **kwargs) + return on_message(startswith(msg, ignorecase) & rule, + **kwargs, + _depth=_depth + 1) def on_endswith(msg: Union[str, Tuple[str, ...]], rule: Optional[Optional[Union[Rule, T_RuleChecker]]] = None, ignorecase: bool = False, + _depth: int = 0, **kwargs) -> Type[Matcher]: """ :说明: @@ -306,11 +313,14 @@ def on_endswith(msg: Union[str, Tuple[str, ...]], - ``Type[Matcher]`` """ - return on_message(endswith(msg, ignorecase) & rule, **kwargs) + return on_message(endswith(msg, ignorecase) & rule, + **kwargs, + _depth=_depth + 1) def on_keyword(keywords: Set[str], rule: Optional[Union[Rule, T_RuleChecker]] = None, + _depth: int = 0, **kwargs) -> Type[Matcher]: """ :说明: @@ -333,12 +343,13 @@ def on_keyword(keywords: Set[str], - ``Type[Matcher]`` """ - return on_message(keyword(*keywords) & rule, **kwargs) + return on_message(keyword(*keywords) & rule, **kwargs, _depth=_depth + 1) def on_command(cmd: Union[str, Tuple[str, ...]], rule: Optional[Union[Rule, T_RuleChecker]] = None, aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = None, + _depth: int = 0, **kwargs) -> Type[Matcher]: """ :说明: @@ -382,13 +393,17 @@ def on_command(cmd: Union[str, Tuple[str, ...]], handlers.insert(0, _strip_cmd) commands = set([cmd]) | (aliases or set()) - return on_message(command(*commands) & rule, handlers=handlers, **kwargs) + return on_message(command(*commands) & rule, + handlers=handlers, + **kwargs, + _depth=_depth + 1) def on_shell_command(cmd: Union[str, Tuple[str, ...]], rule: Optional[Union[Rule, T_RuleChecker]] = None, aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = None, parser: Optional[ArgumentParser] = None, + _depth: int = 0, **kwargs) -> Type[Matcher]: """ :说明: @@ -433,12 +448,14 @@ def on_shell_command(cmd: Union[str, Tuple[str, ...]], commands = set([cmd]) | (aliases or set()) return on_message(shell_command(*commands, parser=parser) & rule, handlers=handlers, - **kwargs) + **kwargs, + _depth=_depth + 1) def on_regex(pattern: str, flags: Union[int, re.RegexFlag] = 0, rule: Optional[Union[Rule, T_RuleChecker]] = None, + _depth: int = 0, **kwargs) -> Type[Matcher]: """ :说明: @@ -464,7 +481,7 @@ def on_regex(pattern: str, - ``Type[Matcher]`` """ - return on_message(regex(pattern, flags) & rule, **kwargs) + return on_message(regex(pattern, flags) & rule, **kwargs, _depth=_depth + 1) class CommandGroup: @@ -511,7 +528,7 @@ class CommandGroup: final_kwargs = self.base_kwargs.copy() final_kwargs.update(kwargs) - return on_command(cmd, **final_kwargs) + return on_command(cmd, **final_kwargs, _depth=1) def shell_command(self, cmd: Union[str, Tuple[str, ...]], **kwargs) -> Type[Matcher]: @@ -534,7 +551,7 @@ class CommandGroup: final_kwargs = self.base_kwargs.copy() final_kwargs.update(kwargs) - return on_shell_command(cmd, **final_kwargs) + return on_shell_command(cmd, **final_kwargs, _depth=1) class MatcherGroup: @@ -581,7 +598,7 @@ class MatcherGroup: """ final_kwargs = self.base_kwargs.copy() final_kwargs.update(kwargs) - matcher = on(**final_kwargs) + matcher = on(**final_kwargs, _depth=1) self.matchers.append(matcher) return matcher @@ -609,7 +626,7 @@ class MatcherGroup: final_kwargs.update(kwargs) final_kwargs.pop("type", None) final_kwargs.pop("permission", None) - matcher = on_metaevent(**final_kwargs) + matcher = on_metaevent(**final_kwargs, _depth=1) self.matchers.append(matcher) return matcher @@ -637,7 +654,7 @@ class MatcherGroup: final_kwargs = self.base_kwargs.copy() final_kwargs.update(kwargs) final_kwargs.pop("type", None) - matcher = on_message(**final_kwargs) + matcher = on_message(**final_kwargs, _depth=1) self.matchers.append(matcher) return matcher @@ -664,7 +681,7 @@ class MatcherGroup: final_kwargs = self.base_kwargs.copy() final_kwargs.update(kwargs) final_kwargs.pop("type", None) - matcher = on_notice(**final_kwargs) + matcher = on_notice(**final_kwargs, _depth=1) self.matchers.append(matcher) return matcher @@ -691,7 +708,7 @@ class MatcherGroup: final_kwargs = self.base_kwargs.copy() final_kwargs.update(kwargs) final_kwargs.pop("type", None) - matcher = on_request(**final_kwargs) + matcher = on_request(**final_kwargs, _depth=1) self.matchers.append(matcher) return matcher @@ -722,7 +739,7 @@ class MatcherGroup: final_kwargs = self.base_kwargs.copy() final_kwargs.update(kwargs) final_kwargs.pop("type", None) - matcher = on_startswith(msg, **final_kwargs) + matcher = on_startswith(msg, **final_kwargs, _depth=1) self.matchers.append(matcher) return matcher @@ -753,7 +770,7 @@ class MatcherGroup: final_kwargs = self.base_kwargs.copy() final_kwargs.update(kwargs) final_kwargs.pop("type", None) - matcher = on_endswith(msg, **final_kwargs) + matcher = on_endswith(msg, **final_kwargs, _depth=1) self.matchers.append(matcher) return matcher @@ -782,7 +799,7 @@ class MatcherGroup: final_kwargs = self.base_kwargs.copy() final_kwargs.update(kwargs) final_kwargs.pop("type", None) - matcher = on_keyword(keywords, **final_kwargs) + matcher = on_keyword(keywords, **final_kwargs, _depth=1) self.matchers.append(matcher) return matcher @@ -817,7 +834,7 @@ class MatcherGroup: final_kwargs = self.base_kwargs.copy() final_kwargs.update(kwargs) final_kwargs.pop("type", None) - matcher = on_command(cmd, aliases=aliases, **final_kwargs) + matcher = on_command(cmd, aliases=aliases, **final_kwargs, _depth=1) self.matchers.append(matcher) return matcher @@ -860,7 +877,8 @@ class MatcherGroup: matcher = on_shell_command(cmd, aliases=aliases, parser=parser, - **final_kwargs) + **final_kwargs, + _depth=1) self.matchers.append(matcher) return matcher @@ -895,6 +913,6 @@ class MatcherGroup: final_kwargs = self.base_kwargs.copy() final_kwargs.update(kwargs) final_kwargs.pop("type", None) - matcher = on_regex(pattern, flags=flags, **final_kwargs) + matcher = on_regex(pattern, flags=flags, **final_kwargs, _depth=1) self.matchers.append(matcher) return matcher diff --git a/nonebot/plugin/plugin.py b/nonebot/plugin/plugin.py index ec248d10..ea06b446 100644 --- a/nonebot/plugin/plugin.py +++ b/nonebot/plugin/plugin.py @@ -2,9 +2,8 @@ from types import ModuleType from dataclasses import field, dataclass from typing import Set, Dict, Type, Optional -from nonebot.matcher import Matcher - from .export import Export +from nonebot.matcher import Matcher plugins: Dict[str, "Plugin"] = {} """ @@ -77,7 +76,7 @@ def get_loaded_plugins() -> Set[Plugin]: def _new_plugin(fullname: str, module: ModuleType) -> Plugin: - _, name = fullname.rsplit(".", 1) + name = fullname.rsplit(".", 1)[-1] if "." in fullname else fullname if name in plugins: raise RuntimeError("Plugin already exists! Check your plugin name.") plugin = Plugin(name, module, fullname) diff --git a/pages/changelog.md b/pages/changelog.md index b5012389..76c9f1c5 100644 --- a/pages/changelog.md +++ b/pages/changelog.md @@ -7,6 +7,8 @@ sidebar: auto ## v2.0.0a17 - 新增 `MessageTemplate` 对于 `str` 普通模板的支持 +- 移除插件加载的 `NameSpace` 模式 +- 修改 toml 加载插件时的键名为 `tool.nonebot` 以符合规范 ## v2.0.0a16 diff --git a/pyproject.toml b/pyproject.toml index 07ed326a..6d9a8330 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,6 +59,7 @@ line_length = 80 length_sort = true skip_gitignore = true force_sort_within_sections = true +known_local_folder = "nonebot" extra_standard_library = "typing_extensions" [build-system] diff --git a/tests/plugins.toml b/tests/plugins.toml index 85eefe30..a905f3dc 100644 --- a/tests/plugins.toml +++ b/tests/plugins.toml @@ -1,3 +1,3 @@ -[nonebot.plugins] +[tool.nonebot] plugins = ["nonebot_plugin_test"] plugin_dirs = ["test_plugins"] From 8be2de4cfc3a3ee239f795517bcd146e23ccb430 Mon Sep 17 00:00:00 2001 From: nonebot Date: Thu, 11 Nov 2021 09:52:50 +0000 Subject: [PATCH 012/174] :memo: update api docs --- docs/api/matcher.md | 41 +- docs/api/plugin.md | 1482 ------------------------------------------- 2 files changed, 22 insertions(+), 1501 deletions(-) diff --git a/docs/api/matcher.md b/docs/api/matcher.md index 5ebb8d3f..5cd6b03f 100644 --- a/docs/api/matcher.md +++ b/docs/api/matcher.md @@ -32,6 +32,21 @@ sidebarDepth: 0 事件响应器类 +### `plugin` + + +* **类型** + + `Optional[Plugin]` + + + +* **说明** + + 事件响应器所在插件 + + + ### `module` @@ -43,7 +58,7 @@ sidebarDepth: 0 * **说明** - 事件响应器所在模块 + 事件响应器所在插件模块 @@ -73,22 +88,7 @@ sidebarDepth: 0 * **说明** - 事件响应器所在模块名 - - - -### `module_prefix` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - 事件响应器所在模块前缀 + 事件响应器所在点分割插件模块路径 @@ -292,7 +292,7 @@ sidebarDepth: 0 -### _classmethod_ `new(type_='', rule=None, permission=None, handlers=None, temp=False, priority=1, block=False, *, module=None, expire_time=None, default_state=None, default_state_factory=None, default_parser=None, default_type_updater=None, default_permission_updater=None)` +### _classmethod_ `new(type_='', rule=None, permission=None, handlers=None, temp=False, priority=1, block=False, *, plugin=None, module=None, expire_time=None, default_state=None, default_state_factory=None, default_parser=None, default_type_updater=None, default_permission_updater=None)` * **说明** @@ -325,7 +325,10 @@ sidebarDepth: 0 * `block: bool`: 是否阻止事件向更低优先级的响应器传播 - * `module: Optional[str]`: 事件响应器所在模块名称 + * `plugin: Optional[Plugin]`: 事件响应器所在插件 + + + * `module: Optional[ModuleType]`: 事件响应器所在模块 * `default_state: Optional[T_State]`: 默认状态 `state` diff --git a/docs/api/plugin.md b/docs/api/plugin.md index c51c93b2..414328a9 100644 --- a/docs/api/plugin.md +++ b/docs/api/plugin.md @@ -8,1485 +8,3 @@ sidebarDepth: 0 ## 插件 为 NoneBot 插件开发提供便携的定义函数。 - - -## `plugins` - - -* **类型** - - `Dict[str, Plugin]` - - - -* **说明** - - 已加载的插件 - - - -## _class_ `Plugin` - -基类：`object` - -存储插件信息 - - -### `name` - - -* **类型**: `str` - - -* **说明**: 插件名称，使用 文件/文件夹 名称作为插件名 - - -### `module` - - -* **类型**: `ModuleType` - - -* **说明**: 插件模块对象 - - -### _property_ `export` - - -* **类型**: `Export` - - -* **说明**: 插件内定义的导出内容 - - -### _property_ `matcher` - - -* **类型**: `Set[Type[Matcher]]` - - -* **说明**: 插件内定义的 `Matcher` - - -## `on(type='', rule=None, permission=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` - - -* **说明** - - 注册一个基础事件响应器，可自定义类型。 - - - -* **参数** - - - * `type: str`: 事件响应器类型 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_metaevent(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` - - -* **说明** - - 注册一个元事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_message(rule=None, permission=None, *, handlers=None, temp=False, priority=1, block=True, state=None, state_factory=None)` - - -* **说明** - - 注册一个消息事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_notice(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` - - -* **说明** - - 注册一个通知事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_request(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` - - -* **说明** - - 注册一个请求事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_startswith(msg, rule=None, ignorecase=False, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容开头时响应。 - - - -* **参数** - - - * `msg: Union[str, Tuple[str, ...]]`: 指定消息开头内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `ignorecase: bool`: 是否忽略大小写 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_endswith(msg, rule=None, ignorecase=False, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容结尾时响应。 - - - -* **参数** - - - * `msg: Union[str, Tuple[str, ...]]`: 指定消息结尾内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `ignorecase: bool`: 是否忽略大小写 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_keyword(keywords, rule=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息纯文本部分包含关键词时响应。 - - - -* **参数** - - - * `keywords: Set[str]`: 关键词列表 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_command(cmd, rule=None, aliases=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息以指定命令开头时响应。 - - 命令匹配规则参考: [命令形式匹配](rule.html#command-command) - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_shell_command(cmd, rule=None, aliases=None, parser=None, **kwargs)` - - -* **说明** - - 注册一个支持 `shell_like` 解析参数的命令消息事件响应器。 - - 与普通的 `on_command` 不同的是，在添加 `parser` 参数时, 响应器会自动处理消息。 - - 并将用户输入的原始参数列表保存在 `state["argv"]`, `parser` 处理的参数保存在 `state["args"]` 中 - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 - - - * `parser: Optional[ArgumentParser]`: `nonebot.rule.ArgumentParser` 对象 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_regex(pattern, flags=0, rule=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息匹配正则表达式时响应。 - - 命令匹配规则参考: [正则匹配](rule.html#regex-regex-flags-0) - - - -* **参数** - - - * `pattern: str`: 正则表达式 - - - * `flags: Union[int, re.RegexFlag]`: 正则匹配标志 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## _class_ `CommandGroup` - -基类：`object` - -命令组，用于声明一组有相同名称前缀的命令。 - - -### `__init__(cmd, **kwargs)` - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 - - - * `**kwargs`: 其他传递给 `on_command` 的参数默认值，参考 [on_command](#on-command-cmd-rule-none-aliases-none-kwargs) - - - -### `basecmd` - - -* **类型**: `Tuple[str, ...]` - - -* **说明**: 命令前缀 - - -### `base_kwargs` - - -* **类型**: `Dict[str, Any]` - - -* **说明**: 其他传递给 `on_command` 的参数默认值 - - -### `command(cmd, **kwargs)` - - -* **说明** - - 注册一个新的命令。 - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 - - - * `**kwargs`: 其他传递给 `on_command` 的参数，将会覆盖命令组默认值 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `shell_command(cmd, **kwargs)` - - -* **说明** - - 注册一个新的命令。 - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 - - - * `**kwargs`: 其他传递给 `on_shell_command` 的参数，将会覆盖命令组默认值 - - - -* **返回** - - - * `Type[Matcher]` - - - -## _class_ `MatcherGroup` - -基类：`object` - -事件响应器组合，统一管理。为 `Matcher` 创建提供默认属性。 - - -### `__init__(**kwargs)` - - -* **说明** - - 创建一个事件响应器组合，参数为默认值，与 `on` 一致 - - - -### `matchers` - - -* **类型** - - `List[Type[Matcher]]` - - - -* **说明** - - 组内事件响应器列表 - - - -### `base_kwargs` - - -* **类型**: `Dict[str, Any]` - - -* **说明**: 其他传递给 `on` 的参数默认值 - - -### `on(**kwargs)` - - -* **说明** - - 注册一个基础事件响应器，可自定义类型。 - - - -* **参数** - - - * `type: str`: 事件响应器类型 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_metaevent(**kwargs)` - - -* **说明** - - 注册一个元事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_message(**kwargs)` - - -* **说明** - - 注册一个消息事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_notice(**kwargs)` - - -* **说明** - - 注册一个通知事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_request(**kwargs)` - - -* **说明** - - 注册一个请求事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_startswith(msg, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容开头时响应。 - - - -* **参数** - - - * `msg: Union[str, Tuple[str, ...]]`: 指定消息开头内容 - - - * `ignorecase: bool`: 是否忽略大小写 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_endswith(msg, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容结尾时响应。 - - - -* **参数** - - - * `msg: Union[str, Tuple[str, ...]]`: 指定消息结尾内容 - - - * `ignorecase: bool`: 是否忽略大小写 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_keyword(keywords, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息纯文本部分包含关键词时响应。 - - - -* **参数** - - - * `keywords: Set[str]`: 关键词列表 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_command(cmd, aliases=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息以指定命令开头时响应。 - - 命令匹配规则参考: [命令形式匹配](rule.html#command-command) - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 - - - * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_shell_command(cmd, aliases=None, parser=None, **kwargs)` - - -* **说明** - - 注册一个支持 `shell_like` 解析参数的命令消息事件响应器。 - - 与普通的 `on_command` 不同的是，在添加 `parser` 参数时, 响应器会自动处理消息。 - - 并将用户输入的原始参数列表保存在 `state["argv"]`, `parser` 处理的参数保存在 `state["args"]` 中 - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 - - - * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 - - - * `parser: Optional[ArgumentParser]`: `nonebot.rule.ArgumentParser` 对象 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_regex(pattern, flags=0, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息匹配正则表达式时响应。 - - 命令匹配规则参考: [正则匹配](rule.html#regex-regex-flags-0) - - - -* **参数** - - - * `pattern: str`: 正则表达式 - - - * `flags: Union[int, re.RegexFlag]`: 正则匹配标志 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `load_plugin(module_path)` - - -* **说明** - - 使用 `PluginManager` 加载单个插件，可以是本地插件或是通过 `pip` 安装的插件。 - - - -* **参数** - - - * `module_path: str`: 插件名称 `path.to.your.plugin` - - - -* **返回** - - - * `Optional[Plugin]` - - - -## `load_plugins(*plugin_dir)` - - -* **说明** - - 导入目录下多个插件，以 `_` 开头的插件不会被导入！ - - - -* **参数** - - - * `*plugin_dir: str`: 插件路径 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `load_all_plugins(module_path, plugin_dir)` - - -* **说明** - - 导入指定列表中的插件以及指定目录下多个插件，以 `_` 开头的插件不会被导入！ - - - -* **参数** - - - * `module_path: Set[str]`: 指定插件集合 - - - * `plugin_dir: Set[str]`: 指定插件路径集合 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `load_from_json(file_path, encoding='utf-8')` - - -* **说明** - - 导入指定 json 文件中的 `plugins` 以及 `plugin_dirs` 下多个插件，以 `_` 开头的插件不会被导入！ - - - -* **参数** - - - * `file_path: str`: 指定 json 文件路径 - - - * `encoding: str`: 指定 json 文件编码 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `load_from_toml(file_path, encoding='utf-8')` - - -* **说明** - - 导入指定 toml 文件 `[nonebot.plugins]` 中的 `plugins` 以及 `plugin_dirs` 下多个插件， - 以 `_` 开头的插件不会被导入！ - - - -* **参数** - - - * `file_path: str`: 指定 toml 文件路径 - - - * `encoding: str`: 指定 toml 文件编码 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `load_builtin_plugins(name='echo')` - - -* **说明** - - 导入 NoneBot 内置插件 - - - -* **返回** - - - * `Plugin` - - - -## `get_plugin(name)` - - -* **说明** - - 获取当前导入的某个插件。 - - - -* **参数** - - - * `name: str`: 插件名，与 `load_plugin` 参数一致。如果为 `load_plugins` 导入的插件，则为文件(夹)名。 - - - -* **返回** - - - * `Optional[Plugin]` - - - -## `get_loaded_plugins()` - - -* **说明** - - 获取当前已导入的所有插件。 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `require(name)` - - -* **说明** - - 获取一个插件的导出内容 - - - -* **参数** - - - * `name: str`: 插件名，与 `load_plugin` 参数一致。如果为 `load_plugins` 导入的插件，则为文件(夹)名。 - - - -* **返回** - - - * `Optional[Export]` - - - -## _class_ `Export` - -基类：`dict` - - -* **说明** - - 插件导出内容以使得其他插件可以获得。 - - - -* **示例** - - -```python -nonebot.export().default = "bar" - -@nonebot.export() -def some_function(): - pass - -# this doesn't work before python 3.9 -# use -# export = nonebot.export(); @export.sub -# instead -# See also PEP-614: https://www.python.org/dev/peps/pep-0614/ -@nonebot.export().sub -def something_else(): - pass -``` - - -## `export()` - - -* **说明** - - 获取插件的导出内容对象 - - - -* **返回** - - - * `Export` From 554ad156c04af5482af8609c8f0d3d508f80a7c0 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 11 Nov 2021 18:03:26 +0800 Subject: [PATCH 013/174] :memo: update plugin doc build --- docs_build/plugin.rst | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs_build/plugin.rst b/docs_build/plugin.rst index 07ac137a..1456f15f 100644 --- a/docs_build/plugin.rst +++ b/docs_build/plugin.rst @@ -10,3 +10,23 @@ NoneBot.plugin 模块 :members: :show-inheritance: :special-members: __init__ + +.. automodule:: nonebot.plugin.plugin + :members: + :show-inheritance: + :special-members: __init__ + +.. automodule:: nonebot.plugin.on + :members: + :show-inheritance: + :special-members: __init__ + +.. automodule:: nonebot.plugin.load + :members: + :show-inheritance: + :special-members: __init__ + +.. automodule:: nonebot.plugin.export + :members: + :show-inheritance: + :special-members: __init__ From 7c27fbe1d5947b309af0a9a868cf1928fc9c6445 Mon Sep 17 00:00:00 2001 From: nonebot Date: Thu, 11 Nov 2021 10:04:37 +0000 Subject: [PATCH 014/174] :memo: update api docs --- docs/api/plugin.md | 1498 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1498 insertions(+) diff --git a/docs/api/plugin.md b/docs/api/plugin.md index 414328a9..68938af3 100644 --- a/docs/api/plugin.md +++ b/docs/api/plugin.md @@ -8,3 +8,1501 @@ sidebarDepth: 0 ## 插件 为 NoneBot 插件开发提供便携的定义函数。 + + +## `plugins` + + +* **类型** + + `Dict[str, Plugin]` + + + +* **说明** + + 已加载的插件 + + + +## _class_ `Plugin` + +基类：`object` + +存储插件信息 + + +### `name` + + +* **类型**: `str` + + +* **说明**: 插件名称，使用 文件/文件夹 名称作为插件名 + + +### `module` + + +* **类型**: `ModuleType` + + +* **说明**: 插件模块对象 + + +### `module_name` + + +* **类型**: `str` + + +* **说明**: 点分割模块路径 + + +### `export` + + +* **类型**: `Export` + + +* **说明**: 插件内定义的导出内容 + + +### `matcher` + + +* **类型**: `Set[Type[Matcher]]` + + +* **说明**: 插件内定义的 `Matcher` + + +## `get_plugin(name)` + + +* **说明** + + 获取当前导入的某个插件。 + + + +* **参数** + + + * `name: str`: 插件名，与 `load_plugin` 参数一致。如果为 `load_plugins` 导入的插件，则为文件(夹)名。 + + + +* **返回** + + + * `Optional[Plugin]` + + + +## `get_loaded_plugins()` + + +* **说明** + + 获取当前已导入的所有插件。 + + + +* **返回** + + + * `Set[Plugin]` + + + +## `on(type='', rule=None, permission=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None, _depth=0)` + + +* **说明** + + 注册一个基础事件响应器，可自定义类型。 + + + +* **参数** + + + * `type: str`: 事件响应器类型 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_metaevent(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None, _depth=0)` + + +* **说明** + + 注册一个元事件响应器。 + + + +* **参数** + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_message(rule=None, permission=None, *, handlers=None, temp=False, priority=1, block=True, state=None, state_factory=None, _depth=0)` + + +* **说明** + + 注册一个消息事件响应器。 + + + +* **参数** + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_notice(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None, _depth=0)` + + +* **说明** + + 注册一个通知事件响应器。 + + + +* **参数** + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_request(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None, _depth=0)` + + +* **说明** + + 注册一个请求事件响应器。 + + + +* **参数** + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_startswith(msg, rule=None, ignorecase=False, _depth=0, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容开头时响应。 + + + +* **参数** + + + * `msg: Union[str, Tuple[str, ...]]`: 指定消息开头内容 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `ignorecase: bool`: 是否忽略大小写 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_endswith(msg, rule=None, ignorecase=False, _depth=0, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容结尾时响应。 + + + +* **参数** + + + * `msg: Union[str, Tuple[str, ...]]`: 指定消息结尾内容 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `ignorecase: bool`: 是否忽略大小写 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_keyword(keywords, rule=None, _depth=0, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息纯文本部分包含关键词时响应。 + + + +* **参数** + + + * `keywords: Set[str]`: 关键词列表 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_command(cmd, rule=None, aliases=None, _depth=0, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息以指定命令开头时响应。 + + 命令匹配规则参考: [命令形式匹配](rule.html#command-command) + + + +* **参数** + + + * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_shell_command(cmd, rule=None, aliases=None, parser=None, _depth=0, **kwargs)` + + +* **说明** + + 注册一个支持 `shell_like` 解析参数的命令消息事件响应器。 + + 与普通的 `on_command` 不同的是，在添加 `parser` 参数时, 响应器会自动处理消息。 + + 并将用户输入的原始参数列表保存在 `state["argv"]`, `parser` 处理的参数保存在 `state["args"]` 中 + + + +* **参数** + + + * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 + + + * `parser: Optional[ArgumentParser]`: `nonebot.rule.ArgumentParser` 对象 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `on_regex(pattern, flags=0, rule=None, _depth=0, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息匹配正则表达式时响应。 + + 命令匹配规则参考: [正则匹配](rule.html#regex-regex-flags-0) + + + +* **参数** + + + * `pattern: str`: 正则表达式 + + + * `flags: Union[int, re.RegexFlag]`: 正则匹配标志 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## _class_ `CommandGroup` + +基类：`object` + +命令组，用于声明一组有相同名称前缀的命令。 + + +### `__init__(cmd, **kwargs)` + + +* **参数** + + + * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 + + + * `**kwargs`: 其他传递给 `on_command` 的参数默认值，参考 [on_command](#on-command-cmd-rule-none-aliases-none-kwargs) + + + +### `basecmd` + + +* **类型**: `Tuple[str, ...]` + + +* **说明**: 命令前缀 + + +### `base_kwargs` + + +* **类型**: `Dict[str, Any]` + + +* **说明**: 其他传递给 `on_command` 的参数默认值 + + +### `command(cmd, **kwargs)` + + +* **说明** + + 注册一个新的命令。 + + + +* **参数** + + + * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 + + + * `**kwargs`: 其他传递给 `on_command` 的参数，将会覆盖命令组默认值 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `shell_command(cmd, **kwargs)` + + +* **说明** + + 注册一个新的命令。 + + + +* **参数** + + + * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 + + + * `**kwargs`: 其他传递给 `on_shell_command` 的参数，将会覆盖命令组默认值 + + + +* **返回** + + + * `Type[Matcher]` + + + +## _class_ `MatcherGroup` + +基类：`object` + +事件响应器组合，统一管理。为 `Matcher` 创建提供默认属性。 + + +### `__init__(**kwargs)` + + +* **说明** + + 创建一个事件响应器组合，参数为默认值，与 `on` 一致 + + + +### `matchers` + + +* **类型** + + `List[Type[Matcher]]` + + + +* **说明** + + 组内事件响应器列表 + + + +### `base_kwargs` + + +* **类型**: `Dict[str, Any]` + + +* **说明**: 其他传递给 `on` 的参数默认值 + + +### `on(**kwargs)` + + +* **说明** + + 注册一个基础事件响应器，可自定义类型。 + + + +* **参数** + + + * `type: str`: 事件响应器类型 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_metaevent(**kwargs)` + + +* **说明** + + 注册一个元事件响应器。 + + + +* **参数** + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_message(**kwargs)` + + +* **说明** + + 注册一个消息事件响应器。 + + + +* **参数** + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_notice(**kwargs)` + + +* **说明** + + 注册一个通知事件响应器。 + + + +* **参数** + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_request(**kwargs)` + + +* **说明** + + 注册一个请求事件响应器。 + + + +* **参数** + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_startswith(msg, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容开头时响应。 + + + +* **参数** + + + * `msg: Union[str, Tuple[str, ...]]`: 指定消息开头内容 + + + * `ignorecase: bool`: 是否忽略大小写 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_endswith(msg, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容结尾时响应。 + + + +* **参数** + + + * `msg: Union[str, Tuple[str, ...]]`: 指定消息结尾内容 + + + * `ignorecase: bool`: 是否忽略大小写 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_keyword(keywords, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息纯文本部分包含关键词时响应。 + + + +* **参数** + + + * `keywords: Set[str]`: 关键词列表 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_command(cmd, aliases=None, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息以指定命令开头时响应。 + + 命令匹配规则参考: [命令形式匹配](rule.html#command-command) + + + +* **参数** + + + * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 + + + * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_shell_command(cmd, aliases=None, parser=None, **kwargs)` + + +* **说明** + + 注册一个支持 `shell_like` 解析参数的命令消息事件响应器。 + + 与普通的 `on_command` 不同的是，在添加 `parser` 参数时, 响应器会自动处理消息。 + + 并将用户输入的原始参数列表保存在 `state["argv"]`, `parser` 处理的参数保存在 `state["args"]` 中 + + + +* **参数** + + + * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 + + + * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 + + + * `parser: Optional[ArgumentParser]`: `nonebot.rule.ArgumentParser` 对象 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +### `on_regex(pattern, flags=0, **kwargs)` + + +* **说明** + + 注册一个消息事件响应器，并且当消息匹配正则表达式时响应。 + + 命令匹配规则参考: [正则匹配](rule.html#regex-regex-flags-0) + + + +* **参数** + + + * `pattern: str`: 正则表达式 + + + * `flags: Union[int, re.RegexFlag]`: 正则匹配标志 + + + * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 + + + * `permission: Optional[Permission]`: 事件响应权限 + + + * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 + + + * `temp: bool`: 是否为临时事件响应器（仅执行一次） + + + * `priority: int`: 事件响应器优先级 + + + * `block: bool`: 是否阻止事件向更低优先级传递 + + + * `state: Optional[T_State]`: 默认 state + + + * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 + + + +* **返回** + + + * `Type[Matcher]` + + + +## `load_plugin(module_path)` + + +* **说明** + + 使用 `PluginManager` 加载单个插件，可以是本地插件或是通过 `pip` 安装的插件。 + + + +* **参数** + + + * `module_path: str`: 插件名称 `path.to.your.plugin` + + + +* **返回** + + + * `Optional[Plugin]` + + + +## `load_plugins(*plugin_dir)` + + +* **说明** + + 导入目录下多个插件，以 `_` 开头的插件不会被导入！ + + + +* **参数** + + + * `*plugin_dir: str`: 插件路径 + + + +* **返回** + + + * `Set[Plugin]` + + + +## `load_all_plugins(module_path, plugin_dir)` + + +* **说明** + + 导入指定列表中的插件以及指定目录下多个插件，以 `_` 开头的插件不会被导入！ + + + +* **参数** + + + * `module_path: Iterable[str]`: 指定插件集合 + + + * `plugin_dir: Iterable[str]`: 指定插件路径集合 + + + +* **返回** + + + * `Set[Plugin]` + + + +## `load_from_json(file_path, encoding='utf-8')` + + +* **说明** + + 导入指定 json 文件中的 `plugins` 以及 `plugin_dirs` 下多个插件，以 `_` 开头的插件不会被导入！ + + + +* **参数** + + + * `file_path: str`: 指定 json 文件路径 + + + * `encoding: str`: 指定 json 文件编码 + + + +* **返回** + + + * `Set[Plugin]` + + + +## `load_from_toml(file_path, encoding='utf-8')` + + +* **说明** + + 导入指定 toml 文件 `[tool.nonebot]` 中的 `plugins` 以及 `plugin_dirs` 下多个插件， + 以 `_` 开头的插件不会被导入！ + + + +* **参数** + + + * `file_path: str`: 指定 toml 文件路径 + + + * `encoding: str`: 指定 toml 文件编码 + + + +* **返回** + + + * `Set[Plugin]` + + + +## `load_builtin_plugins(name='echo')` + + +* **说明** + + 导入 NoneBot 内置插件, 默认导入 `echo` 插件 + + + +* **返回** + + + * `Plugin` + + + +## `require(name)` + + +* **说明** + + 获取一个插件的导出内容 + + + +* **参数** + + + * `name: str`: 插件名，与 `load_plugin` 参数一致。如果为 `load_plugins` 导入的插件，则为文件(夹)名。 + + + +* **返回** + + + * `Export` + + + +* **异常** + + + * `RuntimeError`: 插件无法加载 + + + +## _class_ `Export` + +基类：`dict` + + +* **说明** + + 插件导出内容以使得其他插件可以获得。 + + + +* **示例** + + +```python +nonebot.export().default = "bar" + +@nonebot.export() +def some_function(): + pass + +# this doesn't work before python 3.9 +# use +# export = nonebot.export(); @export.sub +# instead +# See also PEP-614: https://www.python.org/dev/peps/pep-0614/ +@nonebot.export().sub +def something_else(): + pass +``` + + +## `export()` + + +* **说明** + + 获取插件的导出内容对象 + + + +* **返回** + + + * `Export` From fdffaf4e850f51130ad6d28d5afdead1b3e0159c Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 11 Nov 2021 18:10:39 +0800 Subject: [PATCH 015/174] :bulb: add docstring --- nonebot/matcher.py | 2 ++ nonebot/plugin/plugin.py | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 8a5f60d6..b8a874f2 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -627,6 +627,7 @@ class Matcher(metaclass=MatcherMeta): priority=0, block=True, plugin=self.plugin, + module=self.module, expire_time=datetime.now() + bot.config.session_expire_timeout, default_state=self.state, default_parser=self.__class__._default_parser, @@ -663,6 +664,7 @@ class Matcher(metaclass=MatcherMeta): priority=0, block=True, plugin=self.plugin, + module=self.module, expire_time=datetime.now() + bot.config.session_expire_timeout, default_state=self.state, default_parser=self.__class__._default_parser, diff --git a/nonebot/plugin/plugin.py b/nonebot/plugin/plugin.py index ea06b446..ee5a7c51 100644 --- a/nonebot/plugin/plugin.py +++ b/nonebot/plugin/plugin.py @@ -40,9 +40,16 @@ class Plugin(object): - **类型**: ``Set[Type[Matcher]]`` - **说明**: 插件内定义的 ``Matcher`` """ - # TODO parent_plugin: Optional["Plugin"] = None + """ + - **类型**: ``Optional[Plugin]`` + - **说明**: 父插件 + """ sub_plugins: Set["Plugin"] = field(default_factory=set) + """ + - **类型**: ``Set[Plugin]`` + - **说明**: 子插件集合 + """ def get_plugin(name: str) -> Optional[Plugin]: From 618753bd3a1a678574bff1917d37dbb11c820284 Mon Sep 17 00:00:00 2001 From: nonebot Date: Thu, 11 Nov 2021 10:11:50 +0000 Subject: [PATCH 016/174] :memo: update api docs --- docs/api/plugin.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/api/plugin.md b/docs/api/plugin.md index 68938af3..7575692e 100644 --- a/docs/api/plugin.md +++ b/docs/api/plugin.md @@ -77,6 +77,24 @@ sidebarDepth: 0 * **说明**: 插件内定义的 `Matcher` +### `parent_plugin` + + +* **类型**: `Optional[Plugin]` + + +* **说明**: 父插件 + + +### `sub_plugins` + + +* **类型**: `Set[Plugin]` + + +* **说明**: 子插件集合 + + ## `get_plugin(name)` From ecb9d6bc282222ecdbe090b604e247a47b7ed09d Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 12 Nov 2021 11:53:42 +0800 Subject: [PATCH 017/174] :rotating_light: remove linter warning --- .../nonebot/adapters/cqhttp/message.py | 9 +++++---- .../nonebot/adapters/ding/message.py | 6 ++++-- .../nonebot/adapters/feishu/bot.py | 8 ++++---- .../nonebot/adapters/feishu/message.py | 9 +++++---- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py index 19803cf3..37db4e88 100644 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py +++ b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py @@ -2,12 +2,12 @@ import re from io import BytesIO from pathlib import Path from base64 import b64encode -from typing import Type, Union, Tuple, Mapping, Iterable, Optional +from typing import Any, Type, Tuple, Union, Mapping, Iterable, Optional, cast from nonebot.typing import overrides -from nonebot.adapters import Message as BaseMessage, MessageSegment as BaseMessageSegment - -from .utils import log, escape, unescape, _b2s +from .utils import log, _b2s, escape, unescape +from nonebot.adapters import Message as BaseMessage +from nonebot.adapters import MessageSegment as BaseMessageSegment class MessageSegment(BaseMessageSegment["Message"]): @@ -258,6 +258,7 @@ class Message(BaseMessage[MessageSegment]): msg: Union[str, Mapping, Iterable[Mapping]]) -> Iterable[MessageSegment]: if isinstance(msg, Mapping): + msg = cast(Mapping[str, Any], msg) yield MessageSegment(msg["type"], msg.get("data") or {}) return elif isinstance(msg, Iterable) and not isinstance(msg, str): diff --git a/packages/nonebot-adapter-ding/nonebot/adapters/ding/message.py b/packages/nonebot-adapter-ding/nonebot/adapters/ding/message.py index 42012f9e..98d13f7d 100644 --- a/packages/nonebot-adapter-ding/nonebot/adapters/ding/message.py +++ b/packages/nonebot-adapter-ding/nonebot/adapters/ding/message.py @@ -1,8 +1,9 @@ from copy import copy -from typing import Any, Dict, Type, Union, Mapping, Iterable +from typing import Any, Dict, Type, Union, Mapping, Iterable, cast from nonebot.typing import overrides -from nonebot.adapters import Message as BaseMessage, MessageSegment as BaseMessageSegment +from nonebot.adapters import Message as BaseMessage +from nonebot.adapters import MessageSegment as BaseMessageSegment class MessageSegment(BaseMessageSegment["Message"]): @@ -173,6 +174,7 @@ class Message(BaseMessage[MessageSegment]): msg: Union[str, Mapping, Iterable[Mapping]]) -> Iterable[MessageSegment]: if isinstance(msg, Mapping): + msg = cast(Mapping[str, Any], msg) yield MessageSegment(msg["type"], msg.get("data") or {}) elif isinstance(msg, str): yield MessageSegment.text(msg) diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py index f5a60cc8..c3ab6cc8 100644 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py +++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py @@ -1,21 +1,20 @@ import re import json from typing import (TYPE_CHECKING, Any, Dict, Tuple, Union, Iterable, Optional, - AsyncIterable) + AsyncIterable, cast) import httpx from aiocache import Cache, cached from aiocache.serializers import PickleSerializer from nonebot.log import logger +from .utils import AESCipher, log from nonebot.typing import overrides from nonebot.utils import escape_tag from nonebot.message import handle_event +from .config import Config as FeishuConfig from nonebot.adapters import Bot as BaseBot from nonebot.drivers import Driver, HTTPRequest, HTTPResponse - -from .utils import AESCipher, log -from .config import Config as FeishuConfig from .message import Message, MessageSegment, MessageSerializer from .exception import ActionFailed, NetworkError, ApiNotAvailable from .event import (Event, MessageEvent, GroupMessageEvent, PrivateMessageEvent, @@ -124,6 +123,7 @@ def _handle_api_result( - ``ActionFailed``: API 调用失败 """ if isinstance(result, dict): + result = cast(Dict[str, Any], result) if result.get("code") != 0: raise ActionFailed(**result) return result.get("data") diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/message.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/message.py index 03f5a858..d9a7e2a1 100644 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/message.py +++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/message.py @@ -1,12 +1,12 @@ -import itertools import json +import itertools from dataclasses import dataclass -from typing import (Any, Dict, Iterable, List, Mapping, Optional, Tuple, Type, - Union) +from typing import (Any, Dict, List, Type, Tuple, Union, Mapping, Iterable, + Optional, cast) +from nonebot.typing import overrides from nonebot.adapters import Message as BaseMessage from nonebot.adapters import MessageSegment as BaseMessageSegment -from nonebot.typing import overrides class MessageSegment(BaseMessageSegment["Message"]): @@ -150,6 +150,7 @@ class Message(BaseMessage[MessageSegment]): msg: Union[str, Mapping, Iterable[Mapping]]) -> Iterable[MessageSegment]: if isinstance(msg, Mapping): + msg = cast(Mapping[str, Any], msg) yield MessageSegment(msg["type"], msg.get("data") or {}) return elif isinstance(msg, str): From 57e826a835c68892407ba4e476ed035cc3076725 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 12 Nov 2021 12:12:41 +0800 Subject: [PATCH 018/174] :arrow_up: update lock file --- poetry.lock | 588 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 369 insertions(+), 219 deletions(-) diff --git a/poetry.lock b/poetry.lock index b85a4027..13e3204d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -33,7 +33,7 @@ python-versions = ">=3.6,<4.0" [[package]] name = "aiohttp" -version = "3.7.4.post0" +version = "3.8.0" description = "Async http client/server framework (asyncio)" category = "main" optional = true @@ -41,17 +41,31 @@ python-versions = ">=3.6" [package.dependencies] aiodns = {version = "*", optional = true, markers = "extra == \"speedups\""} -async-timeout = ">=3.0,<4.0" +aiosignal = ">=1.1.2" +async-timeout = ">=4.0.0a3,<5.0" +asynctest = {version = "0.13.0", markers = "python_version < \"3.8\""} attrs = ">=17.3.0" -brotlipy = {version = "*", optional = true, markers = "extra == \"speedups\""} +Brotli = {version = "*", optional = true, markers = "extra == \"speedups\""} cchardet = {version = "*", optional = true, markers = "extra == \"speedups\""} -chardet = ">=2.0,<5.0" +charset-normalizer = ">=2.0,<3.0" +frozenlist = ">=1.1.1" multidict = ">=4.5,<7.0" -typing-extensions = ">=3.6.5" +typing-extensions = {version = ">=3.7.4", markers = "python_version < \"3.8\""} yarl = ">=1.0,<2.0" [package.extras] -speedups = ["aiodns", "brotlipy", "cchardet"] +speedups = ["aiodns", "brotli", "cchardet"] + +[[package]] +name = "aiosignal" +version = "1.2.0" +description = "aiosignal: a list of registered asynchronous callbacks" +category = "main" +optional = true +python-versions = ">=3.6" + +[package.dependencies] +frozenlist = ">=1.1.0" [[package]] name = "alabaster" @@ -95,11 +109,22 @@ tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] [[package]] name = "async-timeout" -version = "3.0.1" +version = "4.0.1" description = "Timeout context manager for asyncio programs" category = "main" optional = true -python-versions = ">=3.5.3" +python-versions = ">=3.6" + +[package.dependencies] +typing-extensions = ">=3.6.5" + +[[package]] +name = "asynctest" +version = "0.13.0" +description = "Enhance the standard unittest package with features for testing asyncio libraries" +category = "main" +optional = true +python-versions = ">=3.5" [[package]] name = "attrs" @@ -135,16 +160,13 @@ optional = true python-versions = "*" [[package]] -name = "brotlipy" -version = "0.7.0" -description = "Python binding to the Brotli library" +name = "brotli" +version = "1.0.9" +description = "Python bindings for the Brotli compression library" category = "main" optional = true python-versions = "*" -[package.dependencies] -cffi = ">=1.0.0" - [[package]] name = "cchardet" version = "2.1.7" @@ -172,14 +194,6 @@ python-versions = "*" [package.dependencies] pycparser = "*" -[[package]] -name = "chardet" -version = "4.0.0" -description = "Universal encoding detector for Python 2 and 3" -category = "main" -optional = true -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - [[package]] name = "charset-normalizer" version = "2.0.7" @@ -237,6 +251,14 @@ dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,< doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"] test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<4.0.0)", "mypy (==0.910)", "flake8 (>=3.8.3,<4.0.0)", "black (==21.9b0)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.19.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.5.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.6.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "flask (>=1.1.2,<3.0.0)", "anyio[trio] (>=3.2.1,<4.0.0)", "types-ujson (==0.1.1)", "types-orjson (==3.6.0)", "types-dataclasses (==0.1.7)"] +[[package]] +name = "frozenlist" +version = "1.2.0" +description = "A list-like structure which implements collections.abc.MutableSequence" +category = "main" +optional = true +python-versions = ">=3.6" + [[package]] name = "h11" version = "0.12.0" @@ -323,8 +345,8 @@ http2 = ["h2 (>=3,<5)"] [[package]] name = "hypercorn" -version = "0.11.2" -description = "A ASGI Server based on Hyper libraries and inspired by Gunicorn." +version = "0.12.0" +description = "A ASGI Server based on Hyper libraries and inspired by Gunicorn" category = "main" optional = true python-versions = ">=3.7" @@ -334,12 +356,11 @@ h11 = "*" h2 = ">=3.1.0" priority = "*" toml = "*" -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} +typing_extensions = {version = ">=3.7.4", markers = "python_version < \"3.8\""} wsproto = ">=0.14.0" [package.extras] h3 = ["aioquic (>=0.9.0,<1.0)"] -tests = ["hypothesis", "mock", "pytest", "pytest-asyncio", "pytest-cov", "pytest-trio", "trio"] trio = ["trio (>=0.11.0)"] uvloop = ["uvloop"] @@ -361,7 +382,7 @@ python-versions = ">=3.5" [[package]] name = "imagesize" -version = "1.2.0" +version = "1.3.0" description = "Getting image size from png/jpeg/jpeg2000/gif file" category = "dev" optional = false @@ -369,7 +390,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "importlib-metadata" -version = "4.8.1" +version = "4.8.2" description = "Read metadata from Python packages" category = "main" optional = false @@ -382,7 +403,7 @@ zipp = ">=0.5" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] perf = ["ipython"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"] +testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"] [[package]] name = "itsdangerous" @@ -394,7 +415,7 @@ python-versions = ">=3.6" [[package]] name = "jinja2" -version = "3.0.2" +version = "3.0.3" description = "A very fast and expressive template engine." category = "main" optional = false @@ -447,7 +468,7 @@ python-versions = "^3.7.3" develop = true [package.dependencies] -httpx = ">=0.18.0, <1.0.0" +httpx = ">=0.20.0, <1.0.0" nonebot2 = "^2.0.0-alpha.14" [package.source] @@ -464,7 +485,7 @@ python-versions = "^3.7.3" develop = true [package.dependencies] -httpx = ">=0.18.0, <1.0.0" +httpx = ">=0.20.0, <1.0.0" nonebot2 = "^2.0.0-alpha.14" [package.source] @@ -482,7 +503,7 @@ develop = true [package.dependencies] aiocache = "^0.11.1" -httpx = ">=0.18.0, <1.0.0" +httpx = ">=0.20.0, <1.0.0" nonebot2 = "^2.0.0-alpha.14" pycryptodome = "^3.10.1" @@ -500,7 +521,7 @@ python-versions = "^3.7.3" develop = true [package.dependencies] -httpx = ">=0.18.0, <1.0.0" +httpx = ">=0.20.0, <1.0.0" nonebot2 = "^2.0.0-alpha.14" [package.source] @@ -522,14 +543,14 @@ python-socketio = ">=4.6.1,<5.0.0" [[package]] name = "packaging" -version = "21.0" +version = "21.2" description = "Core utilities for Python packages" category = "dev" optional = false python-versions = ">=3.6" [package.dependencies] -pyparsing = ">=2.0.2" +pyparsing = ">=2.0.2,<3" [[package]] name = "priority" @@ -555,7 +576,7 @@ idna = ["idna (>=2.1)"] [[package]] name = "pycparser" -version = "2.20" +version = "2.21" description = "C parser in Python" category = "main" optional = true @@ -622,7 +643,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "python-dotenv" -version = "0.19.1" +version = "0.19.2" description = "Read key-value pairs from a .env file and set them as environment variables" category = "main" optional = false @@ -758,7 +779,7 @@ python-versions = "*" [[package]] name = "sphinx" -version = "4.2.0" +version = "4.3.0" description = "Python documentation generator" category = "dev" optional = false @@ -1047,7 +1068,7 @@ python-versions = "*" [[package]] name = "yarl" -version = "1.7.0" +version = "1.7.2" description = "Yet another URL library" category = "main" optional = true @@ -1078,7 +1099,7 @@ quart = ["Quart"] [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "dd0809a5a36ecbd9c850ac04b39b60664c81b4cf2560f7870184dc7b3a84b0d6" +content-hash = "51f4f0ce5ced234a65cae790c4f57486e42d7120972657a3f51e733cb4e7c639" [metadata.files] aiocache = [ @@ -1094,43 +1115,82 @@ aiofiles = [ {file = "aiofiles-0.7.0.tar.gz", hash = "sha256:a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4"}, ] aiohttp = [ - {file = "aiohttp-3.7.4.post0-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:3cf75f7cdc2397ed4442594b935a11ed5569961333d49b7539ea741be2cc79d5"}, - {file = "aiohttp-3.7.4.post0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:4b302b45040890cea949ad092479e01ba25911a15e648429c7c5aae9650c67a8"}, - {file = "aiohttp-3.7.4.post0-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:fe60131d21b31fd1a14bd43e6bb88256f69dfc3188b3a89d736d6c71ed43ec95"}, - {file = "aiohttp-3.7.4.post0-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:393f389841e8f2dfc86f774ad22f00923fdee66d238af89b70ea314c4aefd290"}, - {file = "aiohttp-3.7.4.post0-cp36-cp36m-manylinux2014_ppc64le.whl", hash = "sha256:c6e9dcb4cb338d91a73f178d866d051efe7c62a7166653a91e7d9fb18274058f"}, - {file = "aiohttp-3.7.4.post0-cp36-cp36m-manylinux2014_s390x.whl", hash = "sha256:5df68496d19f849921f05f14f31bd6ef53ad4b00245da3195048c69934521809"}, - {file = "aiohttp-3.7.4.post0-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:0563c1b3826945eecd62186f3f5c7d31abb7391fedc893b7e2b26303b5a9f3fe"}, - {file = "aiohttp-3.7.4.post0-cp36-cp36m-win32.whl", hash = "sha256:3d78619672183be860b96ed96f533046ec97ca067fd46ac1f6a09cd9b7484287"}, - {file = "aiohttp-3.7.4.post0-cp36-cp36m-win_amd64.whl", hash = "sha256:f705e12750171c0ab4ef2a3c76b9a4024a62c4103e3a55dd6f99265b9bc6fcfc"}, - {file = "aiohttp-3.7.4.post0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:230a8f7e24298dea47659251abc0fd8b3c4e38a664c59d4b89cca7f6c09c9e87"}, - {file = "aiohttp-3.7.4.post0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:2e19413bf84934d651344783c9f5e22dee452e251cfd220ebadbed2d9931dbf0"}, - {file = "aiohttp-3.7.4.post0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:e4b2b334e68b18ac9817d828ba44d8fcb391f6acb398bcc5062b14b2cbeac970"}, - {file = "aiohttp-3.7.4.post0-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:d012ad7911653a906425d8473a1465caa9f8dea7fcf07b6d870397b774ea7c0f"}, - {file = "aiohttp-3.7.4.post0-cp37-cp37m-manylinux2014_ppc64le.whl", hash = "sha256:40eced07f07a9e60e825554a31f923e8d3997cfc7fb31dbc1328c70826e04cde"}, - {file = "aiohttp-3.7.4.post0-cp37-cp37m-manylinux2014_s390x.whl", hash = "sha256:209b4a8ee987eccc91e2bd3ac36adee0e53a5970b8ac52c273f7f8fd4872c94c"}, - {file = "aiohttp-3.7.4.post0-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:14762875b22d0055f05d12abc7f7d61d5fd4fe4642ce1a249abdf8c700bf1fd8"}, - {file = "aiohttp-3.7.4.post0-cp37-cp37m-win32.whl", hash = "sha256:7615dab56bb07bff74bc865307aeb89a8bfd9941d2ef9d817b9436da3a0ea54f"}, - {file = "aiohttp-3.7.4.post0-cp37-cp37m-win_amd64.whl", hash = "sha256:d9e13b33afd39ddeb377eff2c1c4f00544e191e1d1dee5b6c51ddee8ea6f0cf5"}, - {file = "aiohttp-3.7.4.post0-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:547da6cacac20666422d4882cfcd51298d45f7ccb60a04ec27424d2f36ba3eaf"}, - {file = "aiohttp-3.7.4.post0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:af9aa9ef5ba1fd5b8c948bb11f44891968ab30356d65fd0cc6707d989cd521df"}, - {file = "aiohttp-3.7.4.post0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:64322071e046020e8797117b3658b9c2f80e3267daec409b350b6a7a05041213"}, - {file = "aiohttp-3.7.4.post0-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:bb437315738aa441251214dad17428cafda9cdc9729499f1d6001748e1d432f4"}, - {file = "aiohttp-3.7.4.post0-cp38-cp38-manylinux2014_ppc64le.whl", hash = "sha256:e54962802d4b8b18b6207d4a927032826af39395a3bd9196a5af43fc4e60b009"}, - {file = "aiohttp-3.7.4.post0-cp38-cp38-manylinux2014_s390x.whl", hash = "sha256:a00bb73540af068ca7390e636c01cbc4f644961896fa9363154ff43fd37af2f5"}, - {file = "aiohttp-3.7.4.post0-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:79ebfc238612123a713a457d92afb4096e2148be17df6c50fb9bf7a81c2f8013"}, - {file = "aiohttp-3.7.4.post0-cp38-cp38-win32.whl", hash = "sha256:515dfef7f869a0feb2afee66b957cc7bbe9ad0cdee45aec7fdc623f4ecd4fb16"}, - {file = "aiohttp-3.7.4.post0-cp38-cp38-win_amd64.whl", hash = "sha256:114b281e4d68302a324dd33abb04778e8557d88947875cbf4e842c2c01a030c5"}, - {file = "aiohttp-3.7.4.post0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:7b18b97cf8ee5452fa5f4e3af95d01d84d86d32c5e2bfa260cf041749d66360b"}, - {file = "aiohttp-3.7.4.post0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:15492a6368d985b76a2a5fdd2166cddfea5d24e69eefed4630cbaae5c81d89bd"}, - {file = "aiohttp-3.7.4.post0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:bdb230b4943891321e06fc7def63c7aace16095be7d9cf3b1e01be2f10fba439"}, - {file = "aiohttp-3.7.4.post0-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:cffe3ab27871bc3ea47df5d8f7013945712c46a3cc5a95b6bee15887f1675c22"}, - {file = "aiohttp-3.7.4.post0-cp39-cp39-manylinux2014_ppc64le.whl", hash = "sha256:f881853d2643a29e643609da57b96d5f9c9b93f62429dcc1cbb413c7d07f0e1a"}, - {file = "aiohttp-3.7.4.post0-cp39-cp39-manylinux2014_s390x.whl", hash = "sha256:a5ca29ee66f8343ed336816c553e82d6cade48a3ad702b9ffa6125d187e2dedb"}, - {file = "aiohttp-3.7.4.post0-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:17c073de315745a1510393a96e680d20af8e67e324f70b42accbd4cb3315c9fb"}, - {file = "aiohttp-3.7.4.post0-cp39-cp39-win32.whl", hash = "sha256:932bb1ea39a54e9ea27fc9232163059a0b8855256f4052e776357ad9add6f1c9"}, - {file = "aiohttp-3.7.4.post0-cp39-cp39-win_amd64.whl", hash = "sha256:02f46fc0e3c5ac58b80d4d56eb0a7c7d97fcef69ace9326289fb9f1955e65cfe"}, - {file = "aiohttp-3.7.4.post0.tar.gz", hash = "sha256:493d3299ebe5f5a7c66b9819eacdcfbbaaf1a8e84911ddffcdc48888497afecf"}, + {file = "aiohttp-3.8.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:48f218a5257b6bc16bcf26a91d97ecea0c7d29c811a90d965f3dd97c20f016d6"}, + {file = "aiohttp-3.8.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a2fee4d656a7cc9ab47771b2a9e8fad8a9a33331c1b59c3057ecf0ac858f5bfe"}, + {file = "aiohttp-3.8.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:688a1eb8c1a5f7e795c7cb67e0fe600194e6723ba35f138dfae0db20c0cb8f94"}, + {file = "aiohttp-3.8.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7ba09bb3dcb0b7ec936a485db2b64be44fe14cdce0a5eac56f50e55da3627385"}, + {file = "aiohttp-3.8.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d7715daf84f10bcebc083ad137e3eced3e1c8e7fa1f096ade9a8d02b08f0d91c"}, + {file = "aiohttp-3.8.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5e3f81fbbc170418e22918a9585fd7281bbc11d027064d62aa4b507552c92671"}, + {file = "aiohttp-3.8.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1fa9f50aa1f114249b7963c98e20dc35c51be64096a85bc92433185f331de9cc"}, + {file = "aiohttp-3.8.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:8a50150419b741ee048b53146c39c47053f060cb9d98e78be08fdbe942eaa3c4"}, + {file = "aiohttp-3.8.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a84c335337b676d832c1e2bc47c3a97531b46b82de9f959dafb315cbcbe0dfcd"}, + {file = "aiohttp-3.8.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:88d4917c30fcd7f6404fb1dc713fa21de59d3063dcc048f4a8a1a90e6bbbd739"}, + {file = "aiohttp-3.8.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:b76669b7c058b8020b11008283c3b8e9c61bfd978807c45862956119b77ece45"}, + {file = "aiohttp-3.8.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:84fe1732648c1bc303a70faa67cbc2f7f2e810c8a5bca94f6db7818e722e4c0a"}, + {file = "aiohttp-3.8.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:730b7c2b7382194d9985ffdc32ab317e893bca21e0665cb1186bdfbb4089d990"}, + {file = "aiohttp-3.8.0-cp310-cp310-win32.whl", hash = "sha256:0a96473a1f61d7920a9099bc8e729dc8282539d25f79c12573ee0fdb9c8b66a8"}, + {file = "aiohttp-3.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:764c7c6aa1f78bd77bd9674fc07d1ec44654da1818d0eef9fb48aa8371a3c847"}, + {file = "aiohttp-3.8.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:9951c2696c4357703001e1fe6edc6ae8e97553ac630492ea1bf64b429cb712a3"}, + {file = "aiohttp-3.8.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0af379221975054162959e00daf21159ff69a712fc42ed0052caddbd70d52ff4"}, + {file = "aiohttp-3.8.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9689af0f0a89e5032426c143fa3683b0451f06c83bf3b1e27902bd33acfae769"}, + {file = "aiohttp-3.8.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:fe4a327da0c6b6e59f2e474ae79d6ee7745ac3279fd15f200044602fa31e3d79"}, + {file = "aiohttp-3.8.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ecb314e59bedb77188017f26e6b684b1f6d0465e724c3122a726359fa62ca1ba"}, + {file = "aiohttp-3.8.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a5399a44a529083951b55521cf4ecbf6ad79fd54b9df57dbf01699ffa0549fc9"}, + {file = "aiohttp-3.8.0-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:09754a0d5eaab66c37591f2f8fac8f9781a5f61d51aa852a3261c4805ca6b984"}, + {file = "aiohttp-3.8.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:adf0cb251b1b842c9dee5cfcdf880ba0aae32e841b8d0e6b6feeaef002a267c5"}, + {file = "aiohttp-3.8.0-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:a4759e85a191de58e0ea468ab6fd9c03941986eee436e0518d7a9291fab122c8"}, + {file = "aiohttp-3.8.0-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:28369fe331a59d80393ec82df3d43307c7461bfaf9217999e33e2acc7984ff7c"}, + {file = "aiohttp-3.8.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:2f44d1b1c740a9e2275160d77c73a11f61e8a916191c572876baa7b282bcc934"}, + {file = "aiohttp-3.8.0-cp36-cp36m-win32.whl", hash = "sha256:e27cde1e8d17b09730801ce97b6e0c444ba2a1f06348b169fd931b51d3402f0d"}, + {file = "aiohttp-3.8.0-cp36-cp36m-win_amd64.whl", hash = "sha256:15a660d06092b7c92ed17c1dbe6c1eab0a02963992d60e3e8b9d5fa7fa81f01e"}, + {file = "aiohttp-3.8.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:257f4fad1714d26d562572095c8c5cd271d5a333252795cb7a002dca41fdbad7"}, + {file = "aiohttp-3.8.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a6074a3b2fa2d0c9bf0963f8dfc85e1e54a26114cc8594126bc52d3fa061c40e"}, + {file = "aiohttp-3.8.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7a315ceb813208ef32bdd6ec3a85cbe3cb3be9bbda5fd030c234592fa9116993"}, + {file = "aiohttp-3.8.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9a52b141ff3b923a9166595de6e3768a027546e75052ffba267d95b54267f4ab"}, + {file = "aiohttp-3.8.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6a038cb1e6e55b26bb5520ccffab7f539b3786f5553af2ee47eb2ec5cbd7084e"}, + {file = "aiohttp-3.8.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98b1ea2763b33559dd9ec621d67fc17b583484cb90735bfb0ec3614c17b210e4"}, + {file = "aiohttp-3.8.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:9e8723c3256641e141cd18f6ce478d54a004138b9f1a36e41083b36d9ecc5fc5"}, + {file = "aiohttp-3.8.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:14a6f026eca80dfa3d52e86be89feb5cd878f6f4a6adb34457e2c689fd85229b"}, + {file = "aiohttp-3.8.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:c62d4791a8212c885b97a63ef5f3974b2cd41930f0cd224ada9c6ee6654f8150"}, + {file = "aiohttp-3.8.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:90a97c2ed2830e7974cbe45f0838de0aefc1c123313f7c402e21c29ec063fbb4"}, + {file = "aiohttp-3.8.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:dcc4d5dd5fba3affaf4fd08f00ef156407573de8c63338787614ccc64f96b321"}, + {file = "aiohttp-3.8.0-cp37-cp37m-win32.whl", hash = "sha256:de42f513ed7a997bc821bddab356b72e55e8396b1b7ba1bf39926d538a76a90f"}, + {file = "aiohttp-3.8.0-cp37-cp37m-win_amd64.whl", hash = "sha256:7d76e8a83396e06abe3df569b25bd3fc88bf78b7baa2c8e4cf4aaf5983af66a3"}, + {file = "aiohttp-3.8.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5d79174d96446a02664e2bffc95e7b6fa93b9e6d8314536c5840dff130d0878b"}, + {file = "aiohttp-3.8.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4a6551057a846bf72c7a04f73de3fcaca269c0bd85afe475ceb59d261c6a938c"}, + {file = "aiohttp-3.8.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:871d4fdc56288caa58b1094c20f2364215f7400411f76783ea19ad13be7c8e19"}, + {file = "aiohttp-3.8.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3ba08a71caa42eef64357257878fb17f3fba3fba6e81a51d170e32321569e079"}, + {file = "aiohttp-3.8.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:51f90dabd9933b1621260b32c2f0d05d36923c7a5a909eb823e429dba0fd2f3e"}, + {file = "aiohttp-3.8.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f348ebd20554e8bc26e8ef3ed8a134110c0f4bf015b3b4da6a4ddf34e0515b19"}, + {file = "aiohttp-3.8.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:d5f8c04574efa814a24510122810e3a3c77c0552f9f6ff65c9862f1f046be2c3"}, + {file = "aiohttp-3.8.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5ecffdc748d3b40dd3618ede0170e4f5e1d3c9647cfb410d235d19e62cb54ee0"}, + {file = "aiohttp-3.8.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:577cc2c7b807b174814dac2d02e673728f2e46c7f90ceda3a70ea4bb6d90b769"}, + {file = "aiohttp-3.8.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:6b79f6c31e68b6dafc0317ec453c83c86dd8db1f8f0c6f28e97186563fca87a0"}, + {file = "aiohttp-3.8.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:2bdd655732e38b40f8a8344d330cfae3c727fb257585df923316aabbd489ccb8"}, + {file = "aiohttp-3.8.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:63fa57a0708573d3c059f7b5527617bd0c291e4559298473df238d502e4ab98c"}, + {file = "aiohttp-3.8.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d3f90ee275b1d7c942e65b5c44c8fb52d55502a0b9a679837d71be2bd8927661"}, + {file = "aiohttp-3.8.0-cp38-cp38-win32.whl", hash = "sha256:fa818609357dde5c4a94a64c097c6404ad996b1d38ca977a72834b682830a722"}, + {file = "aiohttp-3.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:097ecf52f6b9859b025c1e36401f8aa4573552e887d1b91b4b999d68d0b5a3b3"}, + {file = "aiohttp-3.8.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:be03a7483ad9ea60388f930160bb3728467dd0af538aa5edc60962ee700a0bdc"}, + {file = "aiohttp-3.8.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:78d51e35ed163783d721b6f2ce8ce3f82fccfe471e8e50a10fba13a766d31f5a"}, + {file = "aiohttp-3.8.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:bda75d73e7400e81077b0910c9a60bf9771f715420d7e35fa7739ae95555f195"}, + {file = "aiohttp-3.8.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:707adc30ea6918fba725c3cb3fe782d271ba352b22d7ae54a7f9f2e8a8488c41"}, + {file = "aiohttp-3.8.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f58aa995b905ab82fe228acd38538e7dc1509e01508dcf307dad5046399130f"}, + {file = "aiohttp-3.8.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c996eb91bfbdab1e01e2c02e7ff678c51e2b28e3a04e26e41691991cc55795"}, + {file = "aiohttp-3.8.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:d6a1a66bb8bac9bc2892c2674ea363486bfb748b86504966a390345a11b1680e"}, + {file = "aiohttp-3.8.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:dafc01a32b4a1d7d3ef8bfd3699406bb44f7b2e0d3eb8906d574846e1019b12f"}, + {file = "aiohttp-3.8.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:949a605ef3907254b122f845baa0920407080cdb1f73aa64f8d47df4a7f4c4f9"}, + {file = "aiohttp-3.8.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:0d7b056fd3972d353cb4bc305c03f9381583766b7f8c7f1c44478dba69099e33"}, + {file = "aiohttp-3.8.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:6f1d39a744101bf4043fa0926b3ead616607578192d0a169974fb5265ab1e9d2"}, + {file = "aiohttp-3.8.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:67ca7032dfac8d001023fadafc812d9f48bf8a8c3bb15412d9cdcf92267593f4"}, + {file = "aiohttp-3.8.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:cb751ef712570d3bda9a73fd765ff3e1aba943ec5d52a54a0c2e89c7eef9da1e"}, + {file = "aiohttp-3.8.0-cp39-cp39-win32.whl", hash = "sha256:6d3e027fe291b77f6be9630114a0200b2c52004ef20b94dc50ca59849cd623b3"}, + {file = "aiohttp-3.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:3c5e9981e449d54308c6824f172ec8ab63eb9c5f922920970249efee83f7e919"}, + {file = "aiohttp-3.8.0.tar.gz", hash = "sha256:d3b19d8d183bcfd68b25beebab8dc3308282fe2ca3d6ea3cb4cd101b3c279f8d"}, +] +aiosignal = [ + {file = "aiosignal-1.2.0-py3-none-any.whl", hash = "sha256:26e62109036cd181df6e6ad646f91f0dcfd05fe16d0cb924138ff2ab75d64e3a"}, + {file = "aiosignal-1.2.0.tar.gz", hash = "sha256:78ed67db6c7b7ced4f98e495e572106d5c432a93e1ddd1bf475e1dc05f5b7df2"}, ] alabaster = [ {file = "alabaster-0.7.12-py2.py3-none-any.whl", hash = "sha256:446438bdcca0e05bd45ea2de1668c1d9b032e1a9154c2c259092d77031ddd359"}, @@ -1145,8 +1205,12 @@ asgiref = [ {file = "asgiref-3.4.1.tar.gz", hash = "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9"}, ] async-timeout = [ - {file = "async-timeout-3.0.1.tar.gz", hash = "sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f"}, - {file = "async_timeout-3.0.1-py3-none-any.whl", hash = "sha256:4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3"}, + {file = "async-timeout-4.0.1.tar.gz", hash = "sha256:b930cb161a39042f9222f6efb7301399c87eeab394727ec5437924a36d6eef51"}, + {file = "async_timeout-4.0.1-py3-none-any.whl", hash = "sha256:a22c0b311af23337eb05fcf05a8b51c3ea53729d46fb5460af62bee033cec690"}, +] +asynctest = [ + {file = "asynctest-0.13.0-py3-none-any.whl", hash = "sha256:5da6118a7e6d6b54d83a8f7197769d046922a44d2a99c21382f0a6e4fadae676"}, + {file = "asynctest-0.13.0.tar.gz", hash = "sha256:c27862842d15d83e6a34eb0b2866c323880eb3a75e4485b079ea11748fd77fac"}, ] attrs = [ {file = "attrs-21.2.0-py2.py3-none-any.whl", hash = "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1"}, @@ -1159,53 +1223,54 @@ babel = [ blinker = [ {file = "blinker-1.4.tar.gz", hash = "sha256:471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6"}, ] -brotlipy = [ - {file = "brotlipy-0.7.0-cp27-cp27m-macosx_10_6_intel.whl", hash = "sha256:af65d2699cb9f13b26ec3ba09e75e80d31ff422c03675fcb36ee4dabe588fdc2"}, - {file = "brotlipy-0.7.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:50ca336374131cfad20612f26cc43c637ac0bfd2be3361495e99270883b52962"}, - {file = "brotlipy-0.7.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:fd1d1c64214af5d90014d82cee5d8141b13d44c92ada7a0c0ec0679c6f15a471"}, - {file = "brotlipy-0.7.0-cp27-cp27m-win32.whl", hash = "sha256:5de6f7d010b7558f72f4b061a07395c5c3fd57f0285c5af7f126a677b976a868"}, - {file = "brotlipy-0.7.0-cp27-cp27m-win_amd64.whl", hash = "sha256:637847560d671657f993313ecc6c6c6666a936b7a925779fd044065c7bc035b9"}, - {file = "brotlipy-0.7.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:b4c98b0d2c9c7020a524ca5bbff42027db1004c6571f8bc7b747f2b843128e7a"}, - {file = "brotlipy-0.7.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:8b39abc3256c978f575df5cd7893153277216474f303e26f0e43ba3d3969ef96"}, - {file = "brotlipy-0.7.0-cp33-cp33m-macosx_10_6_intel.whl", hash = "sha256:96bc59ff9b5b5552843dc67999486a220e07a0522dddd3935da05dc194fa485c"}, - {file = "brotlipy-0.7.0-cp33-cp33m-manylinux1_i686.whl", hash = "sha256:091b299bf36dd6ef7a06570dbc98c0f80a504a56c5b797f31934d2ad01ae7d17"}, - {file = "brotlipy-0.7.0-cp33-cp33m-manylinux1_x86_64.whl", hash = "sha256:0be698678a114addcf87a4b9496c552c68a2c99bf93cf8e08f5738b392e82057"}, - {file = "brotlipy-0.7.0-cp33-cp33m-win32.whl", hash = "sha256:d2c1c724c4ac375feb2110f1af98ecdc0e5a8ea79d068efb5891f621a5b235cb"}, - {file = "brotlipy-0.7.0-cp33-cp33m-win_amd64.whl", hash = "sha256:3a3e56ced8b15fbbd363380344f70f3b438e0fd1fcf27b7526b6172ea950e867"}, - {file = "brotlipy-0.7.0-cp34-cp34m-macosx_10_6_intel.whl", hash = "sha256:653faef61241bf8bf99d73ca7ec4baa63401ba7b2a2aa88958394869379d67c7"}, - {file = "brotlipy-0.7.0-cp34-cp34m-manylinux1_i686.whl", hash = "sha256:0fa6088a9a87645d43d7e21e32b4a6bf8f7c3939015a50158c10972aa7f425b7"}, - {file = "brotlipy-0.7.0-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:79aaf217072840f3e9a3b641cccc51f7fc23037496bd71e26211856b93f4b4cb"}, - {file = "brotlipy-0.7.0-cp34-cp34m-win32.whl", hash = "sha256:a07647886e24e2fb2d68ca8bf3ada398eb56fd8eac46c733d4d95c64d17f743b"}, - {file = "brotlipy-0.7.0-cp34-cp34m-win_amd64.whl", hash = "sha256:c6cc0036b1304dd0073eec416cb2f6b9e37ac8296afd9e481cac3b1f07f9db25"}, - {file = "brotlipy-0.7.0-cp35-abi3-macosx_10_9_x86_64.whl", hash = "sha256:382971a641125323e90486244d6266ffb0e1f4dd920fbdcf508d2a19acc7c3b3"}, - {file = "brotlipy-0.7.0-cp35-abi3-manylinux1_i686.whl", hash = "sha256:82f61506d001e626ec3a1ac8a69df11eb3555a4878599befcb672c8178befac8"}, - {file = "brotlipy-0.7.0-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:7ff18e42f51ebc9d9d77a0db33f99ad95f01dd431e4491f0eca519b90e9415a9"}, - {file = "brotlipy-0.7.0-cp35-abi3-manylinux2010_i686.whl", hash = "sha256:8ef230ca9e168ce2b7dc173a48a0cc3d78bcdf0bd0ea7743472a317041a4768e"}, - {file = "brotlipy-0.7.0-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:b7cf5bb69e767a59acc3da0d199d4b5d0c9fed7bef3ffa3efa80c6f39095686b"}, - {file = "brotlipy-0.7.0-cp35-abi3-manylinux2014_aarch64.whl", hash = "sha256:e5c549ae5928dda952463196180445c24d6fad2d73cb13bd118293aced31b771"}, - {file = "brotlipy-0.7.0-cp35-abi3-win32.whl", hash = "sha256:79ab3bca8dd12c17e092273484f2ac48b906de2b4828dcdf6a7d520f99646ab3"}, - {file = "brotlipy-0.7.0-cp35-abi3-win_amd64.whl", hash = "sha256:ac1d66c9774ee62e762750e399a0c95e93b180e96179b645f28b162b55ae8adc"}, - {file = "brotlipy-0.7.0-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:07194f4768eb62a4f4ea76b6d0df6ade185e24ebd85877c351daa0a069f1111a"}, - {file = "brotlipy-0.7.0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:7e31f7adcc5851ca06134705fcf3478210da45d35ad75ec181e1ce9ce345bb38"}, - {file = "brotlipy-0.7.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:9448227b0df082e574c45c983fa5cd4bda7bfb11ea6b59def0940c1647be0c3c"}, - {file = "brotlipy-0.7.0-cp35-cp35m-win32.whl", hash = "sha256:dc6c5ee0df9732a44d08edab32f8a616b769cc5a4155a12d2d010d248eb3fb07"}, - {file = "brotlipy-0.7.0-cp35-cp35m-win_amd64.whl", hash = "sha256:3c1d5e2cf945a46975bdb11a19257fa057b67591eb232f393d260e7246d9e571"}, - {file = "brotlipy-0.7.0-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:2a80319ae13ea8dd60ecdc4f5ccf6da3ae64787765923256b62c598c5bba4121"}, - {file = "brotlipy-0.7.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:2699945a0a992c04fc7dc7fa2f1d0575a2c8b4b769f2874a08e8eae46bef36ae"}, - {file = "brotlipy-0.7.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:1ea4e578241504b58f2456a6c69952c88866c794648bdc74baee74839da61d44"}, - {file = "brotlipy-0.7.0-cp36-cp36m-win32.whl", hash = "sha256:2e5c64522364a9ebcdf47c5744a5ddeb3f934742d31e61ebfbbc095460b47162"}, - {file = "brotlipy-0.7.0-cp36-cp36m-win_amd64.whl", hash = "sha256:09ec3e125d16749b31c74f021aba809541b3564e5359f8c265cbae442810b41a"}, - {file = "brotlipy-0.7.0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:4e4638b49835d567d447a2cfacec109f9a777f219f071312268b351b6839436d"}, - {file = "brotlipy-0.7.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:5664fe14f3a613431db622172bad923096a303d3adce55536f4409c8e2eafba4"}, - {file = "brotlipy-0.7.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1379347337dc3d20b2d61456d44ccce13e0625db2611c368023b4194d5e2477f"}, - {file = "brotlipy-0.7.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:22a53ccebcce2425e19f99682c12be510bf27bd75c9b77a1720db63047a77554"}, - {file = "brotlipy-0.7.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:4bac11c1ffba9eaa2894ec958a44e7f17778b3303c2ee9f99c39fcc511c26668"}, - {file = "brotlipy-0.7.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:08a16ebe2ffc52f645c076f96b138f185e74e5d59b4a65e84af17d5997d82890"}, - {file = "brotlipy-0.7.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:7b21341eab7c939214e457e24b265594067a6ad268305289148ebaf2dacef325"}, - {file = "brotlipy-0.7.0-pp226-pp226u-macosx_10_10_x86_64.whl", hash = "sha256:786afc8c9bd67de8d31f46e408a3386331e126829114e4db034f91eacb05396d"}, - {file = "brotlipy-0.7.0-pp36-pypy36_pp73-manylinux1_x86_64.whl", hash = "sha256:890b973039ba26c3ad2e86e8908ab527ed64f9b1357f81a676604da8088e4bf9"}, - {file = "brotlipy-0.7.0-pp37-pypy37_pp73-manylinux1_x86_64.whl", hash = "sha256:4864ac52c116ea3e3a844248a9c9fbebb8797891cbca55484ecb6eed3ebeba24"}, - {file = "brotlipy-0.7.0.tar.gz", hash = "sha256:36def0b859beaf21910157b4c33eb3b06d8ce459c942102f16988cca6ea164df"}, +brotli = [ + {file = "Brotli-1.0.9-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:268fe94547ba25b58ebc724680609c8ee3e5a843202e9a381f6f9c5e8bdb5c70"}, + {file = "Brotli-1.0.9-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:c2415d9d082152460f2bd4e382a1e85aed233abc92db5a3880da2257dc7daf7b"}, + {file = "Brotli-1.0.9-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:5913a1177fc36e30fcf6dc868ce23b0453952c78c04c266d3149b3d39e1410d6"}, + {file = "Brotli-1.0.9-cp27-cp27m-win32.whl", hash = "sha256:afde17ae04d90fbe53afb628f7f2d4ca022797aa093e809de5c3cf276f61bbfa"}, + {file = "Brotli-1.0.9-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:7cb81373984cc0e4682f31bc3d6be9026006d96eecd07ea49aafb06897746452"}, + {file = "Brotli-1.0.9-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:db844eb158a87ccab83e868a762ea8024ae27337fc7ddcbfcddd157f841fdfe7"}, + {file = "Brotli-1.0.9-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:9744a863b489c79a73aba014df554b0e7a0fc44ef3f8a0ef2a52919c7d155031"}, + {file = "Brotli-1.0.9-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a72661af47119a80d82fa583b554095308d6a4c356b2a554fdc2799bc19f2a43"}, + {file = "Brotli-1.0.9-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7ee83d3e3a024a9618e5be64648d6d11c37047ac48adff25f12fa4226cf23d1c"}, + {file = "Brotli-1.0.9-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:19598ecddd8a212aedb1ffa15763dd52a388518c4550e615aed88dc3753c0f0c"}, + {file = "Brotli-1.0.9-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:44bb8ff420c1d19d91d79d8c3574b8954288bdff0273bf788954064d260d7ab0"}, + {file = "Brotli-1.0.9-cp310-cp310-win32.whl", hash = "sha256:26d168aac4aaec9a4394221240e8a5436b5634adc3cd1cdf637f6645cecbf181"}, + {file = "Brotli-1.0.9-cp310-cp310-win_amd64.whl", hash = "sha256:622a231b08899c864eb87e85f81c75e7b9ce05b001e59bbfbf43d4a71f5f32b2"}, + {file = "Brotli-1.0.9-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:c83aa123d56f2e060644427a882a36b3c12db93727ad7a7b9efd7d7f3e9cc2c4"}, + {file = "Brotli-1.0.9-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:6b2ae9f5f67f89aade1fab0f7fd8f2832501311c363a21579d02defa844d9296"}, + {file = "Brotli-1.0.9-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:68715970f16b6e92c574c30747c95cf8cf62804569647386ff032195dc89a430"}, + {file = "Brotli-1.0.9-cp35-cp35m-win32.whl", hash = "sha256:defed7ea5f218a9f2336301e6fd379f55c655bea65ba2476346340a0ce6f74a1"}, + {file = "Brotli-1.0.9-cp35-cp35m-win_amd64.whl", hash = "sha256:88c63a1b55f352b02c6ffd24b15ead9fc0e8bf781dbe070213039324922a2eea"}, + {file = "Brotli-1.0.9-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:503fa6af7da9f4b5780bb7e4cbe0c639b010f12be85d02c99452825dd0feef3f"}, + {file = "Brotli-1.0.9-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:40d15c79f42e0a2c72892bf407979febd9cf91f36f495ffb333d1d04cebb34e4"}, + {file = "Brotli-1.0.9-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:93130612b837103e15ac3f9cbacb4613f9e348b58b3aad53721d92e57f96d46a"}, + {file = "Brotli-1.0.9-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:87fdccbb6bb589095f413b1e05734ba492c962b4a45a13ff3408fa44ffe6479b"}, + {file = "Brotli-1.0.9-cp36-cp36m-win32.whl", hash = "sha256:61a7ee1f13ab913897dac7da44a73c6d44d48a4adff42a5701e3239791c96e14"}, + {file = "Brotli-1.0.9-cp36-cp36m-win_amd64.whl", hash = "sha256:1c48472a6ba3b113452355b9af0a60da5c2ae60477f8feda8346f8fd48e3e87c"}, + {file = "Brotli-1.0.9-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3b78a24b5fd13c03ee2b7b86290ed20efdc95da75a3557cc06811764d5ad1126"}, + {file = "Brotli-1.0.9-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:9d12cf2851759b8de8ca5fde36a59c08210a97ffca0eb94c532ce7b17c6a3d1d"}, + {file = "Brotli-1.0.9-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:6c772d6c0a79ac0f414a9f8947cc407e119b8598de7621f39cacadae3cf57d12"}, + {file = "Brotli-1.0.9-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:29d1d350178e5225397e28ea1b7aca3648fcbab546d20e7475805437bfb0a130"}, + {file = "Brotli-1.0.9-cp37-cp37m-win32.whl", hash = "sha256:f909bbbc433048b499cb9db9e713b5d8d949e8c109a2a548502fb9aa8630f0b1"}, + {file = "Brotli-1.0.9-cp37-cp37m-win_amd64.whl", hash = "sha256:97f715cf371b16ac88b8c19da00029804e20e25f30d80203417255d239f228b5"}, + {file = "Brotli-1.0.9-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e16eb9541f3dd1a3e92b89005e37b1257b157b7256df0e36bd7b33b50be73bcb"}, + {file = "Brotli-1.0.9-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:160c78292e98d21e73a4cc7f76a234390e516afcd982fa17e1422f7c6a9ce9c8"}, + {file = "Brotli-1.0.9-cp38-cp38-manylinux1_i686.whl", hash = "sha256:b663f1e02de5d0573610756398e44c130add0eb9a3fc912a09665332942a2efb"}, + {file = "Brotli-1.0.9-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:5b6ef7d9f9c38292df3690fe3e302b5b530999fa90014853dcd0d6902fb59f26"}, + {file = "Brotli-1.0.9-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8a674ac10e0a87b683f4fa2b6fa41090edfd686a6524bd8dedbd6138b309175c"}, + {file = "Brotli-1.0.9-cp38-cp38-win32.whl", hash = "sha256:35a3edbe18e876e596553c4007a087f8bcfd538f19bc116917b3c7522fca0429"}, + {file = "Brotli-1.0.9-cp38-cp38-win_amd64.whl", hash = "sha256:269a5743a393c65db46a7bb982644c67ecba4b8d91b392403ad8a861ba6f495f"}, + {file = "Brotli-1.0.9-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2aad0e0baa04517741c9bb5b07586c642302e5fb3e75319cb62087bd0995ab19"}, + {file = "Brotli-1.0.9-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5cb1e18167792d7d21e21365d7650b72d5081ed476123ff7b8cac7f45189c0c7"}, + {file = "Brotli-1.0.9-cp39-cp39-manylinux1_i686.whl", hash = "sha256:16d528a45c2e1909c2798f27f7bf0a3feec1dc9e50948e738b961618e38b6a7b"}, + {file = "Brotli-1.0.9-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:56d027eace784738457437df7331965473f2c0da2c70e1a1f6fdbae5402e0389"}, + {file = "Brotli-1.0.9-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9bf919756d25e4114ace16a8ce91eb340eb57a08e2c6950c3cebcbe3dff2a5e7"}, + {file = "Brotli-1.0.9-cp39-cp39-win32.whl", hash = "sha256:cfc391f4429ee0a9370aa93d812a52e1fee0f37a81861f4fdd1f4fb28e8547c3"}, + {file = "Brotli-1.0.9-cp39-cp39-win_amd64.whl", hash = "sha256:854c33dad5ba0fbd6ab69185fec8dab89e13cda6b7d191ba111987df74f38761"}, + {file = "Brotli-1.0.9-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:9749a124280a0ada4187a6cfd1ffd35c350fb3af79c706589d98e088c5044267"}, + {file = "Brotli-1.0.9-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:76ffebb907bec09ff511bb3acc077695e2c32bc2142819491579a695f77ffd4d"}, + {file = "Brotli-1.0.9.zip", hash = "sha256:4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438"}, ] cchardet = [ {file = "cchardet-2.1.7-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:c6f70139aaf47ffb94d89db603af849b82efdf756f187cdd3e566e30976c519f"}, @@ -1294,10 +1359,6 @@ cffi = [ {file = "cffi-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139"}, {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, ] -chardet = [ - {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, - {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, -] charset-normalizer = [ {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"}, {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"}, @@ -1318,6 +1379,80 @@ fastapi = [ {file = "fastapi-0.70.0-py3-none-any.whl", hash = "sha256:a36d5f2fad931aa3575c07a3472c784e81f3e664e3bb5c8b9c88d0ec1104f59c"}, {file = "fastapi-0.70.0.tar.gz", hash = "sha256:66da43cfe5185ea1df99552acffd201f1832c6b364e0f4136c0a99f933466ced"}, ] +frozenlist = [ + {file = "frozenlist-1.2.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:977a1438d0e0d96573fd679d291a1542097ea9f4918a8b6494b06610dfeefbf9"}, + {file = "frozenlist-1.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a8d86547a5e98d9edd47c432f7a14b0c5592624b496ae9880fb6332f34af1edc"}, + {file = "frozenlist-1.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:181754275d5d32487431a0a29add4f897968b7157204bc1eaaf0a0ce80c5ba7d"}, + {file = "frozenlist-1.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5df31bb2b974f379d230a25943d9bf0d3bc666b4b0807394b131a28fca2b0e5f"}, + {file = "frozenlist-1.2.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4766632cd8a68e4f10f156a12c9acd7b1609941525569dd3636d859d79279ed3"}, + {file = "frozenlist-1.2.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:16eef427c51cb1203a7c0ab59d1b8abccaba9a4f58c4bfca6ed278fc896dc193"}, + {file = "frozenlist-1.2.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:01d79515ed5aa3d699b05f6bdcf1fe9087d61d6b53882aa599a10853f0479c6c"}, + {file = "frozenlist-1.2.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:28e164722ea0df0cf6d48c4d5bdf3d19e87aaa6dfb39b0ba91153f224b912020"}, + {file = "frozenlist-1.2.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e63ad0beef6ece06475d29f47d1f2f29727805376e09850ebf64f90777962792"}, + {file = "frozenlist-1.2.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:41de4db9b9501679cf7cddc16d07ac0f10ef7eb58c525a1c8cbff43022bddca4"}, + {file = "frozenlist-1.2.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:c6a9d84ee6427b65a81fc24e6ef589cb794009f5ca4150151251c062773e7ed2"}, + {file = "frozenlist-1.2.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:f5f3b2942c3b8b9bfe76b408bbaba3d3bb305ee3693e8b1d631fe0a0d4f93673"}, + {file = "frozenlist-1.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c98d3c04701773ad60d9545cd96df94d955329efc7743fdb96422c4b669c633b"}, + {file = "frozenlist-1.2.0-cp310-cp310-win32.whl", hash = "sha256:72cfbeab7a920ea9e74b19aa0afe3b4ad9c89471e3badc985d08756efa9b813b"}, + {file = "frozenlist-1.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:11ff401951b5ac8c0701a804f503d72c048173208490c54ebb8d7bb7c07a6d00"}, + {file = "frozenlist-1.2.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:b46f997d5ed6d222a863b02cdc9c299101ee27974d9bbb2fd1b3c8441311c408"}, + {file = "frozenlist-1.2.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:351686ca020d1bcd238596b1fa5c8efcbc21bffda9d0efe237aaa60348421e2a"}, + {file = "frozenlist-1.2.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bfbaa08cf1452acad9cb1c1d7b89394a41e712f88df522cea1a0f296b57782a0"}, + {file = "frozenlist-1.2.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b2ae2f5e9fa10805fb1c9adbfefaaecedd9e31849434be462c3960a0139ed729"}, + {file = "frozenlist-1.2.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6790b8d96bbb74b7a6f4594b6f131bd23056c25f2aa5d816bd177d95245a30e3"}, + {file = "frozenlist-1.2.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:41f62468af1bd4e4b42b5508a3fe8cc46a693f0cdd0ca2f443f51f207893d837"}, + {file = "frozenlist-1.2.0-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:ec6cf345771cdb00791d271af9a0a6fbfc2b6dd44cb753f1eeaa256e21622adb"}, + {file = "frozenlist-1.2.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:14a5cef795ae3e28fb504b73e797c1800e9249f950e1c964bb6bdc8d77871161"}, + {file = "frozenlist-1.2.0-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:8b54cdd2fda15467b9b0bfa78cee2ddf6dbb4585ef23a16e14926f4b076dfae4"}, + {file = "frozenlist-1.2.0-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:f025f1d6825725b09c0038775acab9ae94264453a696cc797ce20c0769a7b367"}, + {file = "frozenlist-1.2.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:84e97f59211b5b9083a2e7a45abf91cfb441369e8bb6d1f5287382c1c526def3"}, + {file = "frozenlist-1.2.0-cp36-cp36m-win32.whl", hash = "sha256:c5328ed53fdb0a73c8a50105306a3bc013e5ca36cca714ec4f7bd31d38d8a97f"}, + {file = "frozenlist-1.2.0-cp36-cp36m-win_amd64.whl", hash = "sha256:9ade70aea559ca98f4b1b1e5650c45678052e76a8ab2f76d90f2ac64180215a2"}, + {file = "frozenlist-1.2.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a0d3ffa8772464441b52489b985d46001e2853a3b082c655ec5fad9fb6a3d618"}, + {file = "frozenlist-1.2.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3457f8cf86deb6ce1ba67e120f1b0128fcba1332a180722756597253c465fc1d"}, + {file = "frozenlist-1.2.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5a72eecf37eface331636951249d878750db84034927c997d47f7f78a573b72b"}, + {file = "frozenlist-1.2.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:acc4614e8d1feb9f46dd829a8e771b8f5c4b1051365d02efb27a3229048ade8a"}, + {file = "frozenlist-1.2.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:87521e32e18a2223311afc2492ef2d99946337da0779ddcda77b82ee7319df59"}, + {file = "frozenlist-1.2.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:8b4c7665a17c3a5430edb663e4ad4e1ad457614d1b2f2b7f87052e2ef4fa45ca"}, + {file = "frozenlist-1.2.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ed58803563a8c87cf4c0771366cf0ad1aa265b6b0ae54cbbb53013480c7ad74d"}, + {file = "frozenlist-1.2.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:aa44c4740b4e23fcfa259e9dd52315d2b1770064cde9507457e4c4a65a04c397"}, + {file = "frozenlist-1.2.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:2de5b931701257d50771a032bba4e448ff958076380b049fd36ed8738fdb375b"}, + {file = "frozenlist-1.2.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:6e105013fa84623c057a4381dc8ea0361f4d682c11f3816cc80f49a1f3bc17c6"}, + {file = "frozenlist-1.2.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:705c184b77565955a99dc360f359e8249580c6b7eaa4dc0227caa861ef46b27a"}, + {file = "frozenlist-1.2.0-cp37-cp37m-win32.whl", hash = "sha256:a37594ad6356e50073fe4f60aa4187b97d15329f2138124d252a5a19c8553ea4"}, + {file = "frozenlist-1.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:25b358aaa7dba5891b05968dd539f5856d69f522b6de0bf34e61f133e077c1a4"}, + {file = "frozenlist-1.2.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:af2a51c8a381d76eabb76f228f565ed4c3701441ecec101dd18be70ebd483cfd"}, + {file = "frozenlist-1.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:82d22f6e6f2916e837c91c860140ef9947e31194c82aaeda843d6551cec92f19"}, + {file = "frozenlist-1.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:1cfe6fef507f8bac40f009c85c7eddfed88c1c0d38c75e72fe10476cef94e10f"}, + {file = "frozenlist-1.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26f602e380a5132880fa245c92030abb0fc6ff34e0c5500600366cedc6adb06a"}, + {file = "frozenlist-1.2.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4ad065b2ebd09f32511ff2be35c5dfafee6192978b5a1e9d279a5c6e121e3b03"}, + {file = "frozenlist-1.2.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:bc93f5f62df3bdc1f677066327fc81f92b83644852a31c6aa9b32c2dde86ea7d"}, + {file = "frozenlist-1.2.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:89fdfc84c6bf0bff2ff3170bb34ecba8a6911b260d318d377171429c4be18c73"}, + {file = "frozenlist-1.2.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:47b2848e464883d0bbdcd9493c67443e5e695a84694efff0476f9059b4cb6257"}, + {file = "frozenlist-1.2.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:4f52d0732e56906f8ddea4bd856192984650282424049c956857fed43697ea43"}, + {file = "frozenlist-1.2.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:16ef7dd5b7d17495404a2e7a49bac1bc13d6d20c16d11f4133c757dd94c4144c"}, + {file = "frozenlist-1.2.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:1cf63243bc5f5c19762943b0aa9e0d3fb3723d0c514d820a18a9b9a5ef864315"}, + {file = "frozenlist-1.2.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:54a1e09ab7a69f843cd28fefd2bcaf23edb9e3a8d7680032c8968b8ac934587d"}, + {file = "frozenlist-1.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:954b154a4533ef28bd3e83ffdf4eadf39deeda9e38fb8feaf066d6069885e034"}, + {file = "frozenlist-1.2.0-cp38-cp38-win32.whl", hash = "sha256:cb3957c39668d10e2b486acc85f94153520a23263b6401e8f59422ef65b9520d"}, + {file = "frozenlist-1.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:0a7c7cce70e41bc13d7d50f0e5dd175f14a4f1837a8549b0936ed0cbe6170bf9"}, + {file = "frozenlist-1.2.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:4c457220468d734e3077580a3642b7f682f5fd9507f17ddf1029452450912cdc"}, + {file = "frozenlist-1.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e74f8b4d8677ebb4015ac01fcaf05f34e8a1f22775db1f304f497f2f88fdc697"}, + {file = "frozenlist-1.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fbd4844ff111449f3bbe20ba24fbb906b5b1c2384d0f3287c9f7da2354ce6d23"}, + {file = "frozenlist-1.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f0081a623c886197ff8de9e635528fd7e6a387dccef432149e25c13946cb0cd0"}, + {file = "frozenlist-1.2.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9b6e21e5770df2dea06cb7b6323fbc008b13c4a4e3b52cb54685276479ee7676"}, + {file = "frozenlist-1.2.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:406aeb340613b4b559db78d86864485f68919b7141dec82aba24d1477fd2976f"}, + {file = "frozenlist-1.2.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:878ebe074839d649a1cdb03a61077d05760624f36d196884a5cafb12290e187b"}, + {file = "frozenlist-1.2.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1fef737fd1388f9b93bba8808c5f63058113c10f4e3c0763ced68431773f72f9"}, + {file = "frozenlist-1.2.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4a495c3d513573b0b3f935bfa887a85d9ae09f0627cf47cad17d0cc9b9ba5c38"}, + {file = "frozenlist-1.2.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:e7d0dd3e727c70c2680f5f09a0775525229809f1a35d8552b92ff10b2b14f2c2"}, + {file = "frozenlist-1.2.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:66a518731a21a55b7d3e087b430f1956a36793acc15912e2878431c7aec54210"}, + {file = "frozenlist-1.2.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:94728f97ddf603d23c8c3dd5cae2644fa12d33116e69f49b1644a71bb77b89ae"}, + {file = "frozenlist-1.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c1e8e9033d34c2c9e186e58279879d78c94dd365068a3607af33f2bc99357a53"}, + {file = "frozenlist-1.2.0-cp39-cp39-win32.whl", hash = "sha256:83334e84a290a158c0c4cc4d22e8c7cfe0bba5b76d37f1c2509dabd22acafe15"}, + {file = "frozenlist-1.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:735f386ec522e384f511614c01d2ef9cf799f051353876b4c6fb93ef67a6d1ee"}, + {file = "frozenlist-1.2.0.tar.gz", hash = "sha256:68201be60ac56aff972dc18085800b6ee07973c49103a8aba669dee3d71079de"}, +] h11 = [ {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, @@ -1360,8 +1495,8 @@ httpx = [ {file = "httpx-0.20.0.tar.gz", hash = "sha256:09606d630f070d07f9ff28104fbcea429ea0014c1e89ac90b4d8de8286c40e7b"}, ] hypercorn = [ - {file = "Hypercorn-0.11.2-py3-none-any.whl", hash = "sha256:8007c10f81566920f8ae12c0e26e146f94ca70506da964b5a727ad610aa1d821"}, - {file = "Hypercorn-0.11.2.tar.gz", hash = "sha256:5ba1e719c521080abd698ff5781a2331e34ef50fc1c89a50960538115a896a9a"}, + {file = "Hypercorn-0.12.0-py3-none-any.whl", hash = "sha256:485a03dc171549dd802c5a2d4cce2d46daf077fbc06c7db90e0862ebc1bd07c9"}, + {file = "Hypercorn-0.12.0.tar.gz", hash = "sha256:0504720bfc3fad83b4520b37fa5032b75ee3f2e71d26d6f7fea41fa2995b0138"}, ] hyperframe = [ {file = "hyperframe-6.0.1-py3-none-any.whl", hash = "sha256:0ec6bafd80d8ad2195c4f03aacba3a8265e57bc4cff261e802bf39970ed02a15"}, @@ -1372,20 +1507,20 @@ idna = [ {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, ] imagesize = [ - {file = "imagesize-1.2.0-py2.py3-none-any.whl", hash = "sha256:6965f19a6a2039c7d48bca7dba2473069ff854c36ae6f19d2cde309d998228a1"}, - {file = "imagesize-1.2.0.tar.gz", hash = "sha256:b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1"}, + {file = "imagesize-1.3.0-py2.py3-none-any.whl", hash = "sha256:1db2f82529e53c3e929e8926a1fa9235aa82d0bd0c580359c67ec31b2fddaa8c"}, + {file = "imagesize-1.3.0.tar.gz", hash = "sha256:cd1750d452385ca327479d45b64d9c7729ecf0b3969a58148298c77092261f9d"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.8.1-py3-none-any.whl", hash = "sha256:b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15"}, - {file = "importlib_metadata-4.8.1.tar.gz", hash = "sha256:f284b3e11256ad1e5d03ab86bb2ccd6f5339688ff17a4d797a0fe7df326f23b1"}, + {file = "importlib_metadata-4.8.2-py3-none-any.whl", hash = "sha256:53ccfd5c134223e497627b9815d5030edf77d2ed573922f7a0b8f8bb81a1c100"}, + {file = "importlib_metadata-4.8.2.tar.gz", hash = "sha256:75bdec14c397f528724c1bfd9709d660b33a4d2e77387a3358f20b848bb5e5fb"}, ] itsdangerous = [ {file = "itsdangerous-2.0.1-py3-none-any.whl", hash = "sha256:5174094b9637652bdb841a3029700391451bd092ba3db90600dea710ba28e97c"}, {file = "itsdangerous-2.0.1.tar.gz", hash = "sha256:9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0"}, ] jinja2 = [ - {file = "Jinja2-3.0.2-py3-none-any.whl", hash = "sha256:8569982d3f0889eed11dd620c706d39b60c36d6d25843961f33f77fb6bc6b20c"}, - {file = "Jinja2-3.0.2.tar.gz", hash = "sha256:827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45"}, + {file = "Jinja2-3.0.3-py3-none-any.whl", hash = "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8"}, + {file = "Jinja2-3.0.3.tar.gz", hash = "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"}, ] loguru = [ {file = "loguru-0.5.3-py3-none-any.whl", hash = "sha256:f8087ac396b5ee5f67c963b495d615ebbceac2796379599820e324419d53667c"}, @@ -1397,6 +1532,9 @@ markupsafe = [ {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"}, {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"}, {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"}, {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"}, {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"}, @@ -1408,6 +1546,9 @@ markupsafe = [ {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"}, @@ -1419,6 +1560,9 @@ markupsafe = [ {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"}, {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"}, @@ -1431,6 +1575,9 @@ markupsafe = [ {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"}, {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"}, {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"}, {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"}, @@ -1443,6 +1590,9 @@ markupsafe = [ {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"}, {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"}, {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"}, {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"}, {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"}, {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"}, @@ -1530,8 +1680,8 @@ nonebot-plugin-test = [ {file = "nonebot_plugin_test-0.3.0-py3-none-any.whl", hash = "sha256:edb880340436323ccd0a13b31d48975136b6bdc71daa178601c4b05b068cc73e"}, ] packaging = [ - {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"}, - {file = "packaging-21.0.tar.gz", hash = "sha256:7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7"}, + {file = "packaging-21.2-py3-none-any.whl", hash = "sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0"}, + {file = "packaging-21.2.tar.gz", hash = "sha256:096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966"}, ] priority = [ {file = "priority-2.0.0-py3-none-any.whl", hash = "sha256:6f8eefce5f3ad59baf2c080a664037bb4725cd0a790d53d59ab4059288faf6aa"}, @@ -1571,8 +1721,8 @@ pycares = [ {file = "pycares-4.1.2.tar.gz", hash = "sha256:03490be0e7b51a0c8073f877bec347eff31003f64f57d9518d419d9369452837"}, ] pycparser = [ - {file = "pycparser-2.20-py2.py3-none-any.whl", hash = "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705"}, - {file = "pycparser-2.20.tar.gz", hash = "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0"}, + {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, + {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] pycryptodome = [ {file = "pycryptodome-3.11.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:ffd0cac13ff41f2d15ed39dc6ba1d2ad88dd2905d656c33d8235852f5d6151fd"}, @@ -1646,8 +1796,8 @@ pyparsing = [ {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"}, ] python-dotenv = [ - {file = "python-dotenv-0.19.1.tar.gz", hash = "sha256:14f8185cc8d494662683e6914addcb7e95374771e707601dfc70166946b4c4b8"}, - {file = "python_dotenv-0.19.1-py2.py3-none-any.whl", hash = "sha256:bbd3da593fc49c249397cbfbcc449cf36cb02e75afc8157fcc6a81df6fb7750a"}, + {file = "python-dotenv-0.19.2.tar.gz", hash = "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"}, + {file = "python_dotenv-0.19.2-py2.py3-none-any.whl", hash = "sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3"}, ] python-engineio = [ {file = "python-engineio-3.14.2.tar.gz", hash = "sha256:eab4553f2804c1ce97054c8b22cf0d5a9ab23128075248b97e1a5b2f29553085"}, @@ -1721,8 +1871,8 @@ snowballstemmer = [ {file = "snowballstemmer-2.1.0.tar.gz", hash = "sha256:e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914"}, ] sphinx = [ - {file = "Sphinx-4.2.0-py3-none-any.whl", hash = "sha256:98a535c62a4fcfcc362528592f69b26f7caec587d32cd55688db580be0287ae0"}, - {file = "Sphinx-4.2.0.tar.gz", hash = "sha256:94078db9184491e15bce0a56d9186e0aec95f16ac20b12d00e06d4e36f1058a6"}, + {file = "Sphinx-4.3.0-py3-none-any.whl", hash = "sha256:7e2b30da5f39170efcd95c6270f07669d623c276521fee27ad6c380f49d2bf5b"}, + {file = "Sphinx-4.3.0.tar.gz", hash = "sha256:6d051ab6e0d06cba786c4656b0fe67ba259fe058410f49e95bee6e49c4052cbf"}, ] sphinx-markdown-builder = [] sphinxcontrib-applehelp = [ @@ -1846,78 +1996,78 @@ yapf = [ {file = "yapf-0.31.0.tar.gz", hash = "sha256:408fb9a2b254c302f49db83c59f9aa0b4b0fd0ec25be3a5c51181327922ff63d"}, ] yarl = [ - {file = "yarl-1.7.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e35d8230e4b08d86ea65c32450533b906a8267a87b873f2954adeaecede85169"}, - {file = "yarl-1.7.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:eb4b3f277880c314e47720b4b6bb2c85114ab3c04c5442c9bc7006b3787904d8"}, - {file = "yarl-1.7.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c7015dcedb91d90a138eebdc7e432aec8966e0147ab2a55f2df27b1904fa7291"}, - {file = "yarl-1.7.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bb3e478175e15e00d659fb0354a6a8db71a7811a2a5052aed98048bc972e5d2b"}, - {file = "yarl-1.7.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8b8c409aa3a7966647e7c1c524846b362a6bcbbe120bf8a176431f940d2b9a2e"}, - {file = "yarl-1.7.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b22ea41c7e98170474a01e3eded1377d46b2dfaef45888a0005c683eaaa49285"}, - {file = "yarl-1.7.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a7dfc46add4cfe5578013dbc4127893edc69fe19132d2836ff2f6e49edc5ecd6"}, - {file = "yarl-1.7.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:82ff6f85f67500a4f74885d81659cd270eb24dfe692fe44e622b8a2fd57e7279"}, - {file = "yarl-1.7.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:f3cd2158b2ed0fb25c6811adfdcc47224efe075f2d68a750071dacc03a7a66e4"}, - {file = "yarl-1.7.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:59c0f13f9592820c51280d1cf811294d753e4a18baf90f0139d1dc93d4b6fc5f"}, - {file = "yarl-1.7.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:7f7655ad83d1a8afa48435a449bf2f3009293da1604f5dd95b5ddcf5f673bd69"}, - {file = "yarl-1.7.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:aa9f0d9b62d15182341b3e9816582f46182cab91c1a57b2d308b9a3c4e2c4f78"}, - {file = "yarl-1.7.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:fdd1b90c225a653b1bd1c0cae8edf1957892b9a09c8bf7ee6321eeb8208eac0f"}, - {file = "yarl-1.7.0-cp310-cp310-win32.whl", hash = "sha256:7c8d0bb76eabc5299db203e952ec55f8f4c53f08e0df4285aac8c92bd9e12675"}, - {file = "yarl-1.7.0-cp310-cp310-win_amd64.whl", hash = "sha256:622a36fa779efb4ff9eff5fe52730ff17521431379851a31e040958fc251670c"}, - {file = "yarl-1.7.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3d461b7a8e139b9e4b41f62eb417ffa0b98d1c46d4caf14c845e6a3b349c0bb1"}, - {file = "yarl-1.7.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:81cfacdd1e40bc931b5519499342efa388d24d262c30a3d31187bfa04f4a7001"}, - {file = "yarl-1.7.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:821b978f2152be7695d4331ef0621d207aedf9bbd591ba23a63412a3efc29a01"}, - {file = "yarl-1.7.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b64bd24c8c9a487f4a12260dc26732bf41028816dbf0c458f17864fbebdb3131"}, - {file = "yarl-1.7.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:98c9ddb92b60a83c21be42c776d3d9d5ec632a762a094c41bda37b7dfbd2cd83"}, - {file = "yarl-1.7.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a532d75ca74431c053a88a802e161fb3d651b8bf5821a3440bc3616e38754583"}, - {file = "yarl-1.7.0-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:053e09817eafb892e94e172d05406c1b3a22a93bc68f6eff5198363a3d764459"}, - {file = "yarl-1.7.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:98c51f02d542945d306c8e934aa2c1e66ba5e9c1c86b5bf37f3a51c8a747067e"}, - {file = "yarl-1.7.0-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:15ec41a5a5fdb7bace6d7b16701f9440007a82734f69127c0fbf6d87e10f4a1e"}, - {file = "yarl-1.7.0-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:a7f08819dba1e1255d6991ed37448a1bf4b1352c004bcd899b9da0c47958513d"}, - {file = "yarl-1.7.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8e3ffab21db0542ffd1887f3b9575ddd58961f2cf61429cb6458afc00c4581e0"}, - {file = "yarl-1.7.0-cp36-cp36m-win32.whl", hash = "sha256:50127634f519b2956005891507e3aa4ac345f66a7ea7bbc2d7dcba7401f41898"}, - {file = "yarl-1.7.0-cp36-cp36m-win_amd64.whl", hash = "sha256:36ec44f15193f6d5288d42ebb8e751b967ebdfb72d6830983838d45ab18edb4f"}, - {file = "yarl-1.7.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:ec1b5a25a25c880c976d0bb3d107def085bb08dbb3db7f4442e0a2b980359d24"}, - {file = "yarl-1.7.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b36f5a63c891f813c6f04ef19675b382efc190fd5ce7e10ab19386d2548bca06"}, - {file = "yarl-1.7.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:38173b8c3a29945e7ecade9a3f6ff39581eee8201338ee6a2c8882db5df3e806"}, - {file = "yarl-1.7.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8ba402f32184f0b405fb281b93bd0d8ab7e3257735b57b62a6ed2e94cdf4fe50"}, - {file = "yarl-1.7.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:be52bc5208d767cdd8308a9e93059b3b36d1e048fecbea0e0346d0d24a76adc0"}, - {file = "yarl-1.7.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:08c2044a956f4ef30405f2f433ce77f1f57c2c773bf81ae43201917831044d5a"}, - {file = "yarl-1.7.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:484d61c047c45670ef5967653a1d0783e232c54bf9dd786a7737036828fa8d54"}, - {file = "yarl-1.7.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b7de92a4af85cfcaf4081f8aa6165b1d63ee5de150af3ee85f954145f93105a7"}, - {file = "yarl-1.7.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:376e41775aab79c5575534924a386c8e0f1a5d91db69fc6133fd27a489bcaf10"}, - {file = "yarl-1.7.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:8a8b10d0e7bac154f959b709fcea593cda527b234119311eb950096653816a86"}, - {file = "yarl-1.7.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:f46cd4c43e6175030e2a56def8f1d83b64e6706eeb2bb9ab0ef4756f65eab23f"}, - {file = "yarl-1.7.0-cp37-cp37m-win32.whl", hash = "sha256:b28cfb46140efe1a6092b8c5c4994a1fe70dc83c38fbcea4992401e0c6fb9cce"}, - {file = "yarl-1.7.0-cp37-cp37m-win_amd64.whl", hash = "sha256:9624154ec9c02a776802da1086eed7f5034bd1971977f5146233869c2ac80297"}, - {file = "yarl-1.7.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:69945d13e1bbf81784a9bc48824feb9cd66491e6a503d4e83f6cd7c7cc861361"}, - {file = "yarl-1.7.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:46a742ed9e363bd01be64160ce7520e92e11989bd4cb224403cfd31c101cc83d"}, - {file = "yarl-1.7.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cb4ff1ac7cb4500f43581b3f4cbd627d702143aa6be1fdc1fa3ebffaf4dc1be5"}, - {file = "yarl-1.7.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3ad51e17cd65ea3debb0e10f0120cf8dd987c741fe423ed2285087368090b33d"}, - {file = "yarl-1.7.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7e37786ea89a5d3ffbbf318ea9790926f8dfda83858544f128553c347ad143c6"}, - {file = "yarl-1.7.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c63c1e208f800daad71715786bfeb1cecdc595d87e2e9b1cd234fd6e597fd71d"}, - {file = "yarl-1.7.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:91cbe24300c11835ef186436363352b3257db7af165e0a767f4f17aa25761388"}, - {file = "yarl-1.7.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e510dbec7c59d32eaa61ffa48173d5e3d7170a67f4a03e8f5e2e9e3971aca622"}, - {file = "yarl-1.7.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:3def6e681cc02397e5d8141ee97b41d02932b2bcf0fb34532ad62855eab7c60e"}, - {file = "yarl-1.7.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:263c81b94e6431942b27f6f671fa62f430a0a5c14bb255f2ab69eeb9b2b66ff7"}, - {file = "yarl-1.7.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:e78c91faefe88d601ddd16e3882918dbde20577a2438e2320f8239c8b7507b8f"}, - {file = "yarl-1.7.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:22b2430c49713bfb2f0a0dd4a8d7aab218b28476ba86fd1c78ad8899462cbcf2"}, - {file = "yarl-1.7.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2e7ad9db939082f5d0b9269cfd92c025cb8f2fbbb1f1b9dc5a393c639db5bd92"}, - {file = "yarl-1.7.0-cp38-cp38-win32.whl", hash = "sha256:3a31e4a8dcb1beaf167b7e7af61b88cb961b220db8d3ba1c839723630e57eef7"}, - {file = "yarl-1.7.0-cp38-cp38-win_amd64.whl", hash = "sha256:d579957439933d752358c6a300c93110f84aae67b63dd0c19dde6ecbf4056f6b"}, - {file = "yarl-1.7.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:87721b549505a546eb003252185103b5ec8147de6d3ad3714d148a5a67b6fe53"}, - {file = "yarl-1.7.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:a1fa866fa24d9f4108f9e58ea8a2135655419885cdb443e36b39a346e1181532"}, - {file = "yarl-1.7.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1d3b8449dfedfe94eaff2b77954258b09b24949f6818dfa444b05dbb05ae1b7e"}, - {file = "yarl-1.7.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:db2372e350794ce8b9f810feb094c606b7e0e4aa6807141ac4fadfe5ddd75bb0"}, - {file = "yarl-1.7.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a06d9d0b9a97fa99b84fee71d9dd11e69e21ac8a27229089f07b5e5e50e8d63c"}, - {file = "yarl-1.7.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a3455c2456d6307bcfa80bc1157b8603f7d93573291f5bdc7144489ca0df4628"}, - {file = "yarl-1.7.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:d30d67e3486aea61bb2cbf7cf81385364c2e4f7ce7469a76ed72af76a5cdfe6b"}, - {file = "yarl-1.7.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c18a4b286e8d780c3a40c31d7b79836aa93b720f71d5743f20c08b7e049ca073"}, - {file = "yarl-1.7.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:d54c925396e7891666cabc0199366ca55b27d003393465acef63fd29b8b7aa92"}, - {file = "yarl-1.7.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:64773840952de17851a1c7346ad7f71688c77e74248d1f0bc230e96680f84028"}, - {file = "yarl-1.7.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:acbf1756d9dc7cd0ae943d883be72e84e04396f6c2ff93a6ddeca929d562039f"}, - {file = "yarl-1.7.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:2e48f27936aa838939c798f466c851ba4ae79e347e8dfce43b009c64b930df12"}, - {file = "yarl-1.7.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:1beef4734ca1ad40a9d8c6b20a76ab46e3a2ed09f38561f01e4aa2ea82cafcef"}, - {file = "yarl-1.7.0-cp39-cp39-win32.whl", hash = "sha256:8ee78c9a5f3c642219d4607680a4693b59239c27a3aa608b64ef79ddc9698039"}, - {file = "yarl-1.7.0-cp39-cp39-win_amd64.whl", hash = "sha256:d750503682605088a14d29a4701548c15c510da4f13c8b17409c4097d5b04c52"}, - {file = "yarl-1.7.0.tar.gz", hash = "sha256:8e7ebaf62e19c2feb097ffb7c94deb0f0c9fab52590784c8cd679d30ab009162"}, + {file = "yarl-1.7.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:f2a8508f7350512434e41065684076f640ecce176d262a7d54f0da41d99c5a95"}, + {file = "yarl-1.7.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:da6df107b9ccfe52d3a48165e48d72db0eca3e3029b5b8cb4fe6ee3cb870ba8b"}, + {file = "yarl-1.7.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a1d0894f238763717bdcfea74558c94e3bc34aeacd3351d769460c1a586a8b05"}, + {file = "yarl-1.7.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dfe4b95b7e00c6635a72e2d00b478e8a28bfb122dc76349a06e20792eb53a523"}, + {file = "yarl-1.7.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c145ab54702334c42237a6c6c4cc08703b6aa9b94e2f227ceb3d477d20c36c63"}, + {file = "yarl-1.7.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1ca56f002eaf7998b5fcf73b2421790da9d2586331805f38acd9997743114e98"}, + {file = "yarl-1.7.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1d3d5ad8ea96bd6d643d80c7b8d5977b4e2fb1bab6c9da7322616fd26203d125"}, + {file = "yarl-1.7.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:167ab7f64e409e9bdd99333fe8c67b5574a1f0495dcfd905bc7454e766729b9e"}, + {file = "yarl-1.7.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:95a1873b6c0dd1c437fb3bb4a4aaa699a48c218ac7ca1e74b0bee0ab16c7d60d"}, + {file = "yarl-1.7.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:6152224d0a1eb254f97df3997d79dadd8bb2c1a02ef283dbb34b97d4f8492d23"}, + {file = "yarl-1.7.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:5bb7d54b8f61ba6eee541fba4b83d22b8a046b4ef4d8eb7f15a7e35db2e1e245"}, + {file = "yarl-1.7.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:9c1f083e7e71b2dd01f7cd7434a5f88c15213194df38bc29b388ccdf1492b739"}, + {file = "yarl-1.7.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f44477ae29025d8ea87ec308539f95963ffdc31a82f42ca9deecf2d505242e72"}, + {file = "yarl-1.7.2-cp310-cp310-win32.whl", hash = "sha256:cff3ba513db55cc6a35076f32c4cdc27032bd075c9faef31fec749e64b45d26c"}, + {file = "yarl-1.7.2-cp310-cp310-win_amd64.whl", hash = "sha256:c9c6d927e098c2d360695f2e9d38870b2e92e0919be07dbe339aefa32a090265"}, + {file = "yarl-1.7.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:9b4c77d92d56a4c5027572752aa35082e40c561eec776048330d2907aead891d"}, + {file = "yarl-1.7.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c01a89a44bb672c38f42b49cdb0ad667b116d731b3f4c896f72302ff77d71656"}, + {file = "yarl-1.7.2-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c19324a1c5399b602f3b6e7db9478e5b1adf5cf58901996fc973fe4fccd73eed"}, + {file = "yarl-1.7.2-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3abddf0b8e41445426d29f955b24aeecc83fa1072be1be4e0d194134a7d9baee"}, + {file = "yarl-1.7.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6a1a9fe17621af43e9b9fcea8bd088ba682c8192d744b386ee3c47b56eaabb2c"}, + {file = "yarl-1.7.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:8b0915ee85150963a9504c10de4e4729ae700af11df0dc5550e6587ed7891e92"}, + {file = "yarl-1.7.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:29e0656d5497733dcddc21797da5a2ab990c0cb9719f1f969e58a4abac66234d"}, + {file = "yarl-1.7.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:bf19725fec28452474d9887a128e98dd67eee7b7d52e932e6949c532d820dc3b"}, + {file = "yarl-1.7.2-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:d6f3d62e16c10e88d2168ba2d065aa374e3c538998ed04996cd373ff2036d64c"}, + {file = "yarl-1.7.2-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:ac10bbac36cd89eac19f4e51c032ba6b412b3892b685076f4acd2de18ca990aa"}, + {file = "yarl-1.7.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:aa32aaa97d8b2ed4e54dc65d241a0da1c627454950f7d7b1f95b13985afd6c5d"}, + {file = "yarl-1.7.2-cp36-cp36m-win32.whl", hash = "sha256:87f6e082bce21464857ba58b569370e7b547d239ca22248be68ea5d6b51464a1"}, + {file = "yarl-1.7.2-cp36-cp36m-win_amd64.whl", hash = "sha256:ac35ccde589ab6a1870a484ed136d49a26bcd06b6a1c6397b1967ca13ceb3913"}, + {file = "yarl-1.7.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a467a431a0817a292121c13cbe637348b546e6ef47ca14a790aa2fa8cc93df63"}, + {file = "yarl-1.7.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6ab0c3274d0a846840bf6c27d2c60ba771a12e4d7586bf550eefc2df0b56b3b4"}, + {file = "yarl-1.7.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d260d4dc495c05d6600264a197d9d6f7fc9347f21d2594926202fd08cf89a8ba"}, + {file = "yarl-1.7.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:fc4dd8b01a8112809e6b636b00f487846956402834a7fd59d46d4f4267181c41"}, + {file = "yarl-1.7.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c1164a2eac148d85bbdd23e07dfcc930f2e633220f3eb3c3e2a25f6148c2819e"}, + {file = "yarl-1.7.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:67e94028817defe5e705079b10a8438b8cb56e7115fa01640e9c0bb3edf67332"}, + {file = "yarl-1.7.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:89ccbf58e6a0ab89d487c92a490cb5660d06c3a47ca08872859672f9c511fc52"}, + {file = "yarl-1.7.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:8cce6f9fa3df25f55521fbb5c7e4a736683148bcc0c75b21863789e5185f9185"}, + {file = "yarl-1.7.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:211fcd65c58bf250fb994b53bc45a442ddc9f441f6fec53e65de8cba48ded986"}, + {file = "yarl-1.7.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:c10ea1e80a697cf7d80d1ed414b5cb8f1eec07d618f54637067ae3c0334133c4"}, + {file = "yarl-1.7.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:52690eb521d690ab041c3919666bea13ab9fbff80d615ec16fa81a297131276b"}, + {file = "yarl-1.7.2-cp37-cp37m-win32.whl", hash = "sha256:695ba021a9e04418507fa930d5f0704edbce47076bdcfeeaba1c83683e5649d1"}, + {file = "yarl-1.7.2-cp37-cp37m-win_amd64.whl", hash = "sha256:c17965ff3706beedafd458c452bf15bac693ecd146a60a06a214614dc097a271"}, + {file = "yarl-1.7.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:fce78593346c014d0d986b7ebc80d782b7f5e19843ca798ed62f8e3ba8728576"}, + {file = "yarl-1.7.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:c2a1ac41a6aa980db03d098a5531f13985edcb451bcd9d00670b03129922cd0d"}, + {file = "yarl-1.7.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:39d5493c5ecd75c8093fa7700a2fb5c94fe28c839c8e40144b7ab7ccba6938c8"}, + {file = "yarl-1.7.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1eb6480ef366d75b54c68164094a6a560c247370a68c02dddb11f20c4c6d3c9d"}, + {file = "yarl-1.7.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5ba63585a89c9885f18331a55d25fe81dc2d82b71311ff8bd378fc8004202ff6"}, + {file = "yarl-1.7.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e39378894ee6ae9f555ae2de332d513a5763276a9265f8e7cbaeb1b1ee74623a"}, + {file = "yarl-1.7.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c0910c6b6c31359d2f6184828888c983d54d09d581a4a23547a35f1d0b9484b1"}, + {file = "yarl-1.7.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:6feca8b6bfb9eef6ee057628e71e1734caf520a907b6ec0d62839e8293e945c0"}, + {file = "yarl-1.7.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:8300401dc88cad23f5b4e4c1226f44a5aa696436a4026e456fe0e5d2f7f486e6"}, + {file = "yarl-1.7.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:788713c2896f426a4e166b11f4ec538b5736294ebf7d5f654ae445fd44270832"}, + {file = "yarl-1.7.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:fd547ec596d90c8676e369dd8a581a21227fe9b4ad37d0dc7feb4ccf544c2d59"}, + {file = "yarl-1.7.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:737e401cd0c493f7e3dd4db72aca11cfe069531c9761b8ea474926936b3c57c8"}, + {file = "yarl-1.7.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:baf81561f2972fb895e7844882898bda1eef4b07b5b385bcd308d2098f1a767b"}, + {file = "yarl-1.7.2-cp38-cp38-win32.whl", hash = "sha256:ede3b46cdb719c794427dcce9d8beb4abe8b9aa1e97526cc20de9bd6583ad1ef"}, + {file = "yarl-1.7.2-cp38-cp38-win_amd64.whl", hash = "sha256:cc8b7a7254c0fc3187d43d6cb54b5032d2365efd1df0cd1749c0c4df5f0ad45f"}, + {file = "yarl-1.7.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:580c1f15500e137a8c37053e4cbf6058944d4c114701fa59944607505c2fe3a0"}, + {file = "yarl-1.7.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3ec1d9a0d7780416e657f1e405ba35ec1ba453a4f1511eb8b9fbab81cb8b3ce1"}, + {file = "yarl-1.7.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3bf8cfe8856708ede6a73907bf0501f2dc4e104085e070a41f5d88e7faf237f3"}, + {file = "yarl-1.7.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1be4bbb3d27a4e9aa5f3df2ab61e3701ce8fcbd3e9846dbce7c033a7e8136746"}, + {file = "yarl-1.7.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:534b047277a9a19d858cde163aba93f3e1677d5acd92f7d10ace419d478540de"}, + {file = "yarl-1.7.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c6ddcd80d79c96eb19c354d9dca95291589c5954099836b7c8d29278a7ec0bda"}, + {file = "yarl-1.7.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:9bfcd43c65fbb339dc7086b5315750efa42a34eefad0256ba114cd8ad3896f4b"}, + {file = "yarl-1.7.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f64394bd7ceef1237cc604b5a89bf748c95982a84bcd3c4bbeb40f685c810794"}, + {file = "yarl-1.7.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:044daf3012e43d4b3538562da94a88fb12a6490652dbc29fb19adfa02cf72eac"}, + {file = "yarl-1.7.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:368bcf400247318382cc150aaa632582d0780b28ee6053cd80268c7e72796dec"}, + {file = "yarl-1.7.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:bab827163113177aee910adb1f48ff7af31ee0289f434f7e22d10baf624a6dfe"}, + {file = "yarl-1.7.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0cba38120db72123db7c58322fa69e3c0efa933040ffb586c3a87c063ec7cae8"}, + {file = "yarl-1.7.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:59218fef177296451b23214c91ea3aba7858b4ae3306dde120224cfe0f7a6ee8"}, + {file = "yarl-1.7.2-cp39-cp39-win32.whl", hash = "sha256:1edc172dcca3f11b38a9d5c7505c83c1913c0addc99cd28e993efeaafdfaa18d"}, + {file = "yarl-1.7.2-cp39-cp39-win_amd64.whl", hash = "sha256:797c2c412b04403d2da075fb93c123df35239cd7b4cc4e0cd9e5839b73f52c58"}, + {file = "yarl-1.7.2.tar.gz", hash = "sha256:45399b46d60c253327a460e99856752009fcee5f5d3c80b2f7c0cae1c38d56dd"}, ] zipp = [ {file = "zipp-3.6.0-py3-none-any.whl", hash = "sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc"}, From c454cf08743dead351ee8edb94391cdc60afcabd Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 12 Nov 2021 18:10:40 +0800 Subject: [PATCH 019/174] :construction: process handler dependency --- nonebot/dependencies/__init__.py | 2 + nonebot/dependencies/models.py | 89 +++++++++++++++++ nonebot/dependencies/utils.py | 150 ++++++++++++++++++++++++++++ nonebot/handler.py | 161 ++----------------------------- nonebot/typing.py | 13 +-- nonebot/utils.py | 7 ++ 6 files changed, 256 insertions(+), 166 deletions(-) create mode 100644 nonebot/dependencies/__init__.py create mode 100644 nonebot/dependencies/models.py create mode 100644 nonebot/dependencies/utils.py diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py new file mode 100644 index 00000000..95e6a040 --- /dev/null +++ b/nonebot/dependencies/__init__.py @@ -0,0 +1,2 @@ +from .models import Depends as Depends +from .utils import get_dependent as get_dependent diff --git a/nonebot/dependencies/models.py b/nonebot/dependencies/models.py new file mode 100644 index 00000000..4232ccec --- /dev/null +++ b/nonebot/dependencies/models.py @@ -0,0 +1,89 @@ +from enum import Enum +from typing import Any, List, Callable, Optional + +from pydantic.fields import Required, FieldInfo, ModelField + +from nonebot.utils import get_name + + +class Depends: + + def __init__(self, + dependency: Optional[Callable[..., Any]] = None, + *, + use_cache: bool = True) -> None: + self.dependency = dependency + self.use_cache = use_cache + + def __repr__(self) -> str: + dep = get_name(self.dependency) + cache = "" if self.use_cache else ", use_cache=False" + return f"{self.__class__.__name__}({dep}{cache})" + + +class Dependent: + + def __init__(self, + *, + func: Optional[Callable[..., Any]] = None, + name: Optional[str] = None, + bot_param: Optional[ModelField] = None, + event_param: Optional[ModelField] = None, + state_param: Optional[ModelField] = None, + matcher_param: Optional[ModelField] = None, + simple_params: Optional[List[ModelField]] = None, + dependencies: Optional[List["Dependent"]] = None, + use_cache: bool = True) -> None: + self.func = func + self.name = name + self.bot_param = bot_param + self.event_param = event_param + self.state_param = state_param + self.matcher_param = matcher_param + self.simple_params = simple_params or [] + self.dependencies = dependencies or [] + self.use_cache = use_cache + self.cache_key = (self.func,) + + +class ParamTypes(Enum): + BOT = "bot" + EVENT = "event" + STATE = "state" + MATCHER = "matcher" + SIMPLE = "simple" + + +class Param(FieldInfo): + in_: ParamTypes + + def __init__(self, default: Any): + super().__init__(default=default) + + def __repr__(self) -> str: + return f"{self.__class__.__name__}" + + +class BotParam(Param): + in_ = ParamTypes.BOT + + +class EventParam(Param): + in_ = ParamTypes.EVENT + + +class StateParam(Param): + in_ = ParamTypes.STATE + + +class MatcherParam(Param): + in_ = ParamTypes.MATCHER + + +class SimpleParam(Param): + in_ = ParamTypes.SIMPLE + + def __init__(self, default: Any): + if default is Required: + raise ValueError("SimpleParam should be given a default value") + super().__init__(default) diff --git a/nonebot/dependencies/utils.py b/nonebot/dependencies/utils.py new file mode 100644 index 00000000..9503fbf1 --- /dev/null +++ b/nonebot/dependencies/utils.py @@ -0,0 +1,150 @@ +import inspect +from typing import Any, Dict, Type, Union, Callable, Optional, ForwardRef + +from pydantic import BaseConfig +from pydantic.class_validators import Validator +from pydantic.typing import evaluate_forwardref +from pydantic.schema import get_annotation_from_field_info +from pydantic.fields import Required, FieldInfo, ModelField, UndefinedType + +from .models import Param, Depends, Dependent, ParamTypes, SimpleParam + + +def get_typed_signature(call: Callable[..., Any]) -> inspect.Signature: + signature = inspect.signature(call) + globalns = getattr(call, "__globals__", {}) + typed_params = [ + inspect.Parameter( + name=param.name, + kind=param.kind, + default=param.default, + annotation=get_typed_annotation(param, globalns), + ) for param in signature.parameters.values() + ] + typed_signature = inspect.Signature(typed_params) + return typed_signature + + +def get_typed_annotation(param: inspect.Parameter, globalns: Dict[str, + Any]) -> Any: + annotation = param.annotation + if isinstance(annotation, str): + annotation = ForwardRef(annotation) + annotation = evaluate_forwardref(annotation, globalns, globalns) + return annotation + + +def get_param_sub_dependent(*, param: inspect.Parameter) -> Dependent: + depends: Depends = param.default + if depends.dependency: + dependency = depends.dependency + else: + dependency = param.annotation + return get_sub_dependant( + depends=depends, + dependency=dependency, + name=param.name, + ) + + +def get_parameterless_sub_dependant(*, depends: Depends) -> Dependent: + assert callable( + depends.dependency + ), "A parameter-less dependency must have a callable dependency" + return get_sub_dependant(depends=depends, dependency=depends.dependency) + + +def get_sub_dependant( + *, + depends: Depends, + dependency: Callable[..., Any], + name: Optional[str] = None, +) -> Dependent: + sub_dependant = get_dependent( + func=dependency, + name=name, + use_cache=depends.use_cache, + ) + return sub_dependant + + +def get_dependent(*, + func: Callable[..., Any], + name: Optional[str] = None, + use_cache: bool = True) -> Dependent: + signature = get_typed_signature(func) + params = signature.parameters + dependent = Dependent(func=func, name=name, use_cache=use_cache) + for param_name, param in params.items(): + if isinstance(param.default, Depends): + sub_dependent = get_param_sub_dependent(param=param) + dependent.dependencies.append(sub_dependent) + continue + param_field = get_param_field(param=param, + param_name=param_name, + default_field_info=SimpleParam) + + return dependent + + +def get_param_field(*, + param: inspect.Parameter, + param_name: str, + default_field_info: Type[Param] = Param, + force_type: Optional[ParamTypes] = None, + ignore_default: bool = False) -> ModelField: + default_value = Required + if param.default != param.empty and not ignore_default: + default_value = param.default + if isinstance(default_value, FieldInfo): + field_info = default_value + default_value = field_info.default + if (isinstance(field_info, Param) and + getattr(field_info, "in_", None) is None): + field_info.in_ = default_field_info.in_ + if force_type: + field_info.in_ = force_type # type: ignore + else: + field_info = default_field_info(default_value) + required: bool = default_value == Required + annotation: Any = Any + if param.annotation != param.empty: + annotation = param.annotation + annotation = get_annotation_from_field_info(annotation, field_info, + param_name) + if not field_info.alias and getattr(field_info, "convert_underscores", + None): + alias = param.name.replace("_", "-") + else: + alias = field_info.alias or param.name + field = create_field( + name=param.name, + type_=annotation, + default=None if required else default_value, + alias=alias, + required=required, + field_info=field_info, + ) + # field.required = required + + return field + + +def create_field(name: str, + type_: Type[Any], + class_validators: Optional[Dict[str, Validator]] = None, + default: Optional[Any] = None, + required: Union[bool, UndefinedType] = False, + model_config: Type[BaseConfig] = BaseConfig, + field_info: Optional[FieldInfo] = None, + alias: Optional[str] = None) -> ModelField: + class_validators = class_validators or {} + field_info = field_info or FieldInfo(None) + return ModelField(name=name, + type_=type_, + class_validators=class_validators, + model_config=model_config, + default=default, + required=required, + alias=alias, + field_info=field_info) diff --git a/nonebot/handler.py b/nonebot/handler.py index 055e6f88..ee31d4cf 100644 --- a/nonebot/handler.py +++ b/nonebot/handler.py @@ -6,171 +6,22 @@ """ import inspect -from typing import _eval_type # type: ignore -from typing import (TYPE_CHECKING, Any, Dict, List, Type, Union, Optional, - ForwardRef) +from typing import Optional -from nonebot.log import logger -from nonebot.typing import T_State, T_Handler +from pydantic.typing import evaluate_forwardref -if TYPE_CHECKING: - from nonebot.matcher import Matcher - from nonebot.adapters import Bot, Event +from nonebot.utils import get_name +from nonebot.typing import T_Handler class Handler: """事件处理函数类""" - def __init__(self, func: T_Handler): + def __init__(self, func: T_Handler, *, name: Optional[str] = None): """装饰事件处理函数以便根据动态参数运行""" self.func: T_Handler = func """ :类型: ``T_Handler`` :说明: 事件处理函数 """ - self.signature: inspect.Signature = self.get_signature() - """ - :类型: ``inspect.Signature`` - :说明: 事件处理函数签名 - """ - - def __repr__(self) -> str: - return (f"") - - def __str__(self) -> str: - return repr(self) - - async def __call__(self, matcher: "Matcher", bot: "Bot", event: "Event", - state: T_State): - BotType = ((self.bot_type is not inspect.Parameter.empty) and - inspect.isclass(self.bot_type) and self.bot_type) - if BotType and not isinstance(bot, BotType): - logger.debug( - f"Matcher {matcher} bot type {type(bot)} not match annotation {BotType}, ignored" - ) - return - - EventType = ((self.event_type is not inspect.Parameter.empty) and - inspect.isclass(self.event_type) and self.event_type) - if EventType and not isinstance(event, EventType): - logger.debug( - f"Matcher {matcher} event type {type(event)} not match annotation {EventType}, ignored" - ) - return - - args = {"bot": bot, "event": event, "state": state, "matcher": matcher} - await self.func( - **{ - k: v - for k, v in args.items() - if self.signature.parameters.get(k, None) is not None - }) - - @property - def bot_type(self) -> Union[Type["Bot"], inspect.Parameter.empty]: - """ - :类型: ``Union[Type["Bot"], inspect.Parameter.empty]`` - :说明: 事件处理函数接受的 Bot 对象类型""" - return self.signature.parameters["bot"].annotation - - @property - def event_type( - self) -> Optional[Union[Type["Event"], inspect.Parameter.empty]]: - """ - :类型: ``Optional[Union[Type[Event], inspect.Parameter.empty]]`` - :说明: 事件处理函数接受的 event 类型 / 不需要 event 参数 - """ - if "event" not in self.signature.parameters: - return None - return self.signature.parameters["event"].annotation - - @property - def state_type(self) -> Optional[Union[T_State, inspect.Parameter.empty]]: - """ - :类型: ``Optional[Union[T_State, inspect.Parameter.empty]]`` - :说明: 事件处理函数是否接受 state 参数 - """ - if "state" not in self.signature.parameters: - return None - return self.signature.parameters["state"].annotation - - @property - def matcher_type( - self) -> Optional[Union[Type["Matcher"], inspect.Parameter.empty]]: - """ - :类型: ``Optional[Union[Type["Matcher"], inspect.Parameter.empty]]`` - :说明: 事件处理函数是否接受 matcher 参数 - """ - if "matcher" not in self.signature.parameters: - return None - return self.signature.parameters["matcher"].annotation - - def get_signature(self) -> inspect.Signature: - wrapped_signature = self._get_typed_signature() - signature = self._get_typed_signature(False) - self._check_params(signature) - self._check_bot_param(signature) - self._check_bot_param(wrapped_signature) - signature.parameters["bot"].replace( - annotation=wrapped_signature.parameters["bot"].annotation) - if "event" in wrapped_signature.parameters and "event" in signature.parameters: - signature.parameters["event"].replace( - annotation=wrapped_signature.parameters["event"].annotation) - return signature - - def update_signature( - self, **kwargs: Union[None, Type["Bot"], Type["Event"], Type["Matcher"], - T_State, inspect.Parameter.empty] - ) -> None: - params: List[inspect.Parameter] = [] - for param in ["bot", "event", "state", "matcher"]: - sig = self.signature.parameters.get(param, None) - if param in kwargs: - sig = inspect.Parameter(param, - inspect.Parameter.POSITIONAL_OR_KEYWORD, - annotation=kwargs[param]) - if sig: - params.append(sig) - - self.signature = inspect.Signature(params) - - def _get_typed_signature(self, - follow_wrapped: bool = True) -> inspect.Signature: - signature = inspect.signature(self.func, follow_wrapped=follow_wrapped) - globalns = getattr(self.func, "__globals__", {}) - typed_params = [ - inspect.Parameter( - name=param.name, - kind=param.kind, - default=param.default, - annotation=param.annotation if follow_wrapped else - self._get_typed_annotation(param, globalns), - ) for param in signature.parameters.values() - ] - typed_signature = inspect.Signature(typed_params) - return typed_signature - - def _get_typed_annotation(self, param: inspect.Parameter, - globalns: Dict[str, Any]) -> Any: - try: - if isinstance(param.annotation, str): - return _eval_type(ForwardRef(param.annotation), globalns, - globalns) - else: - return param.annotation - except Exception: - return param.annotation - - def _check_params(self, signature: inspect.Signature): - if not set(signature.parameters.keys()) <= { - "bot", "event", "state", "matcher" - }: - raise ValueError( - "Handler param names must in `bot`/`event`/`state`/`matcher`") - - def _check_bot_param(self, signature: inspect.Signature): - if not any( - param.name == "bot" for param in signature.parameters.values()): - raise ValueError("Handler missing parameter 'bot'") + self.name = get_name(func) if name is None else name diff --git a/nonebot/typing.py b/nonebot/typing.py index 273661eb..970fbcc7 100644 --- a/nonebot/typing.py +++ b/nonebot/typing.py @@ -143,20 +143,11 @@ T_PermissionChecker = Callable[["Bot", "Event"], Union[bool, Awaitable[bool]]] RuleChecker 即判断是否响应消息的处理函数。 """ -T_Handler = Union[Callable[[Any, Any, Any, Any], Union[Awaitable[None], - Awaitable[NoReturn]]], - Callable[[Any, Any, Any], Union[Awaitable[None], - Awaitable[NoReturn]]], - Callable[[Any, Any], Union[Awaitable[None], - Awaitable[NoReturn]]], - Callable[[Any], Union[Awaitable[None], Awaitable[NoReturn]]]] +T_Handler = Callable[..., Union[Awaitable[None], Awaitable[NoReturn]]] """ :类型: - * ``Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]`` - * ``Callable[[Bot, Event], Union[Awaitable[None], Awaitable[NoReturn]]]`` - * ``Callable[[Bot, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]`` - * ``Callable[[Bot], Union[Awaitable[None], Awaitable[NoReturn]]]`` + * ``Callable[..., Union[Awaitable[None], Awaitable[NoReturn]]]`` :说明: diff --git a/nonebot/utils.py b/nonebot/utils.py index 8183986d..71df0d4b 100644 --- a/nonebot/utils.py +++ b/nonebot/utils.py @@ -1,6 +1,7 @@ import re import json import asyncio +import inspect import dataclasses from functools import wraps, partial from typing import Any, Callable, Optional, Awaitable @@ -51,6 +52,12 @@ def run_sync(func: Callable[..., Any]) -> Callable[..., Awaitable[Any]]: return _wrapper +def get_name(obj: Any) -> str: + if inspect.isfunction(obj) or inspect.isclass(obj): + return obj.__name__ + return obj.__class__.__name__ + + class DataclassEncoder(json.JSONEncoder): """ :说明: From f7eadb48b56e8424fff782251f633e989f54e688 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 12 Nov 2021 20:55:59 +0800 Subject: [PATCH 020/174] :construction: create processor --- nonebot/dependencies/__init__.py | 2 - nonebot/dependencies/models.py | 89 ----------------- nonebot/dependencies/utils.py | 150 ----------------------------- nonebot/handler.py | 27 ------ nonebot/processor/__init__.py | 77 +++++++++++++++ nonebot/processor/handler.py | 43 +++++++++ nonebot/{ => processor}/matcher.py | 2 +- nonebot/processor/models.py | 41 ++++++++ nonebot/processor/utils.py | 43 +++++++++ 9 files changed, 205 insertions(+), 269 deletions(-) delete mode 100644 nonebot/dependencies/__init__.py delete mode 100644 nonebot/dependencies/models.py delete mode 100644 nonebot/dependencies/utils.py delete mode 100644 nonebot/handler.py create mode 100644 nonebot/processor/__init__.py create mode 100644 nonebot/processor/handler.py rename nonebot/{ => processor}/matcher.py (99%) create mode 100644 nonebot/processor/models.py create mode 100644 nonebot/processor/utils.py diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py deleted file mode 100644 index 95e6a040..00000000 --- a/nonebot/dependencies/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .models import Depends as Depends -from .utils import get_dependent as get_dependent diff --git a/nonebot/dependencies/models.py b/nonebot/dependencies/models.py deleted file mode 100644 index 4232ccec..00000000 --- a/nonebot/dependencies/models.py +++ /dev/null @@ -1,89 +0,0 @@ -from enum import Enum -from typing import Any, List, Callable, Optional - -from pydantic.fields import Required, FieldInfo, ModelField - -from nonebot.utils import get_name - - -class Depends: - - def __init__(self, - dependency: Optional[Callable[..., Any]] = None, - *, - use_cache: bool = True) -> None: - self.dependency = dependency - self.use_cache = use_cache - - def __repr__(self) -> str: - dep = get_name(self.dependency) - cache = "" if self.use_cache else ", use_cache=False" - return f"{self.__class__.__name__}({dep}{cache})" - - -class Dependent: - - def __init__(self, - *, - func: Optional[Callable[..., Any]] = None, - name: Optional[str] = None, - bot_param: Optional[ModelField] = None, - event_param: Optional[ModelField] = None, - state_param: Optional[ModelField] = None, - matcher_param: Optional[ModelField] = None, - simple_params: Optional[List[ModelField]] = None, - dependencies: Optional[List["Dependent"]] = None, - use_cache: bool = True) -> None: - self.func = func - self.name = name - self.bot_param = bot_param - self.event_param = event_param - self.state_param = state_param - self.matcher_param = matcher_param - self.simple_params = simple_params or [] - self.dependencies = dependencies or [] - self.use_cache = use_cache - self.cache_key = (self.func,) - - -class ParamTypes(Enum): - BOT = "bot" - EVENT = "event" - STATE = "state" - MATCHER = "matcher" - SIMPLE = "simple" - - -class Param(FieldInfo): - in_: ParamTypes - - def __init__(self, default: Any): - super().__init__(default=default) - - def __repr__(self) -> str: - return f"{self.__class__.__name__}" - - -class BotParam(Param): - in_ = ParamTypes.BOT - - -class EventParam(Param): - in_ = ParamTypes.EVENT - - -class StateParam(Param): - in_ = ParamTypes.STATE - - -class MatcherParam(Param): - in_ = ParamTypes.MATCHER - - -class SimpleParam(Param): - in_ = ParamTypes.SIMPLE - - def __init__(self, default: Any): - if default is Required: - raise ValueError("SimpleParam should be given a default value") - super().__init__(default) diff --git a/nonebot/dependencies/utils.py b/nonebot/dependencies/utils.py deleted file mode 100644 index 9503fbf1..00000000 --- a/nonebot/dependencies/utils.py +++ /dev/null @@ -1,150 +0,0 @@ -import inspect -from typing import Any, Dict, Type, Union, Callable, Optional, ForwardRef - -from pydantic import BaseConfig -from pydantic.class_validators import Validator -from pydantic.typing import evaluate_forwardref -from pydantic.schema import get_annotation_from_field_info -from pydantic.fields import Required, FieldInfo, ModelField, UndefinedType - -from .models import Param, Depends, Dependent, ParamTypes, SimpleParam - - -def get_typed_signature(call: Callable[..., Any]) -> inspect.Signature: - signature = inspect.signature(call) - globalns = getattr(call, "__globals__", {}) - typed_params = [ - inspect.Parameter( - name=param.name, - kind=param.kind, - default=param.default, - annotation=get_typed_annotation(param, globalns), - ) for param in signature.parameters.values() - ] - typed_signature = inspect.Signature(typed_params) - return typed_signature - - -def get_typed_annotation(param: inspect.Parameter, globalns: Dict[str, - Any]) -> Any: - annotation = param.annotation - if isinstance(annotation, str): - annotation = ForwardRef(annotation) - annotation = evaluate_forwardref(annotation, globalns, globalns) - return annotation - - -def get_param_sub_dependent(*, param: inspect.Parameter) -> Dependent: - depends: Depends = param.default - if depends.dependency: - dependency = depends.dependency - else: - dependency = param.annotation - return get_sub_dependant( - depends=depends, - dependency=dependency, - name=param.name, - ) - - -def get_parameterless_sub_dependant(*, depends: Depends) -> Dependent: - assert callable( - depends.dependency - ), "A parameter-less dependency must have a callable dependency" - return get_sub_dependant(depends=depends, dependency=depends.dependency) - - -def get_sub_dependant( - *, - depends: Depends, - dependency: Callable[..., Any], - name: Optional[str] = None, -) -> Dependent: - sub_dependant = get_dependent( - func=dependency, - name=name, - use_cache=depends.use_cache, - ) - return sub_dependant - - -def get_dependent(*, - func: Callable[..., Any], - name: Optional[str] = None, - use_cache: bool = True) -> Dependent: - signature = get_typed_signature(func) - params = signature.parameters - dependent = Dependent(func=func, name=name, use_cache=use_cache) - for param_name, param in params.items(): - if isinstance(param.default, Depends): - sub_dependent = get_param_sub_dependent(param=param) - dependent.dependencies.append(sub_dependent) - continue - param_field = get_param_field(param=param, - param_name=param_name, - default_field_info=SimpleParam) - - return dependent - - -def get_param_field(*, - param: inspect.Parameter, - param_name: str, - default_field_info: Type[Param] = Param, - force_type: Optional[ParamTypes] = None, - ignore_default: bool = False) -> ModelField: - default_value = Required - if param.default != param.empty and not ignore_default: - default_value = param.default - if isinstance(default_value, FieldInfo): - field_info = default_value - default_value = field_info.default - if (isinstance(field_info, Param) and - getattr(field_info, "in_", None) is None): - field_info.in_ = default_field_info.in_ - if force_type: - field_info.in_ = force_type # type: ignore - else: - field_info = default_field_info(default_value) - required: bool = default_value == Required - annotation: Any = Any - if param.annotation != param.empty: - annotation = param.annotation - annotation = get_annotation_from_field_info(annotation, field_info, - param_name) - if not field_info.alias and getattr(field_info, "convert_underscores", - None): - alias = param.name.replace("_", "-") - else: - alias = field_info.alias or param.name - field = create_field( - name=param.name, - type_=annotation, - default=None if required else default_value, - alias=alias, - required=required, - field_info=field_info, - ) - # field.required = required - - return field - - -def create_field(name: str, - type_: Type[Any], - class_validators: Optional[Dict[str, Validator]] = None, - default: Optional[Any] = None, - required: Union[bool, UndefinedType] = False, - model_config: Type[BaseConfig] = BaseConfig, - field_info: Optional[FieldInfo] = None, - alias: Optional[str] = None) -> ModelField: - class_validators = class_validators or {} - field_info = field_info or FieldInfo(None) - return ModelField(name=name, - type_=type_, - class_validators=class_validators, - model_config=model_config, - default=default, - required=required, - alias=alias, - field_info=field_info) diff --git a/nonebot/handler.py b/nonebot/handler.py deleted file mode 100644 index ee31d4cf..00000000 --- a/nonebot/handler.py +++ /dev/null @@ -1,27 +0,0 @@ -""" -事件处理函数 -============ - -该模块实现事件处理函数的封装，以实现动态参数等功能。 -""" - -import inspect -from typing import Optional - -from pydantic.typing import evaluate_forwardref - -from nonebot.utils import get_name -from nonebot.typing import T_Handler - - -class Handler: - """事件处理函数类""" - - def __init__(self, func: T_Handler, *, name: Optional[str] = None): - """装饰事件处理函数以便根据动态参数运行""" - self.func: T_Handler = func - """ - :类型: ``T_Handler`` - :说明: 事件处理函数 - """ - self.name = get_name(func) if name is None else name diff --git a/nonebot/processor/__init__.py b/nonebot/processor/__init__.py new file mode 100644 index 00000000..73b86bbc --- /dev/null +++ b/nonebot/processor/__init__.py @@ -0,0 +1,77 @@ +import inspect +from typing import Any, Callable, Optional + +from .models import Dependent +from .models import Depends as Depends +from nonebot.adapters import Bot, Event +from .utils import get_typed_signature, generic_check_issubclass + + +def get_param_sub_dependent(*, param: inspect.Parameter) -> Dependent: + depends: Depends = param.default + if depends.dependency: + dependency = depends.dependency + else: + dependency = param.annotation + return get_sub_dependant( + depends=depends, + dependency=dependency, + name=param.name, + ) + + +def get_parameterless_sub_dependant(*, depends: Depends) -> Dependent: + assert callable( + depends.dependency + ), "A parameter-less dependency must have a callable dependency" + return get_sub_dependant(depends=depends, dependency=depends.dependency) + + +def get_sub_dependant( + *, + depends: Depends, + dependency: Callable[..., Any], + name: Optional[str] = None, +) -> Dependent: + sub_dependant = get_dependent( + func=dependency, + name=name, + use_cache=depends.use_cache, + ) + return sub_dependant + + +def get_dependent(*, + func: Callable[..., Any], + name: Optional[str] = None, + use_cache: bool = True) -> Dependent: + signature = get_typed_signature(func) + params = signature.parameters + dependent = Dependent(func=func, name=name, use_cache=use_cache) + for param_name, param in params.items(): + if isinstance(param.default, Depends): + sub_dependent = get_param_sub_dependent(param=param) + dependent.dependencies.append(sub_dependent) + continue + + if generic_check_issubclass(param.annotation, Bot): + dependent.bot_param_name = param_name + continue + elif generic_check_issubclass(param.annotation, Event): + dependent.event_param_name = param_name + continue + elif generic_check_issubclass(param.annotation, dict): + dependent.state_param_name = param_name + continue + elif generic_check_issubclass(param.annotation, Matcher): + dependent.matcher_param_name = param_name + continue + + raise ValueError( + f"Unknown parameter {param_name} with type {param.annotation}") + + return dependent + + +from .handler import Handler as Handler +from .matcher import Matcher as Matcher diff --git a/nonebot/processor/handler.py b/nonebot/processor/handler.py new file mode 100644 index 00000000..66366cb7 --- /dev/null +++ b/nonebot/processor/handler.py @@ -0,0 +1,43 @@ +""" +事件处理函数 +============ + +该模块实现事件处理函数的封装，以实现动态参数等功能。 +""" +from typing import TYPE_CHECKING, List, Optional + +from .models import Depends +from nonebot.utils import get_name +from nonebot.typing import T_State, T_Handler +from . import get_dependent, get_parameterless_sub_dependant + +if TYPE_CHECKING: + from .matcher import Matcher + from nonebot.adapters import Bot, Event + + +class Handler: + """事件处理函数类""" + + def __init__(self, + func: T_Handler, + *, + name: Optional[str] = None, + dependencies: Optional[List[Depends]] = None): + """装饰事件处理函数以便根据动态参数运行""" + self.func: T_Handler = func + """ + :类型: ``T_Handler`` + :说明: 事件处理函数 + """ + self.name = get_name(func) if name is None else name + + self.dependencies = dependencies or [] + self.dependent = get_dependent(func=func) + for depends in self.dependencies[::-1]: + self.dependent.dependencies.insert( + 0, get_parameterless_sub_dependant(depends=depends)) + + def __call__(self, bot: Bot, event: Event, state: T_State, + matcher: "Matcher"): + ... diff --git a/nonebot/matcher.py b/nonebot/processor/matcher.py similarity index 99% rename from nonebot/matcher.py rename to nonebot/processor/matcher.py index b8a874f2..256c787d 100644 --- a/nonebot/matcher.py +++ b/nonebot/processor/matcher.py @@ -13,9 +13,9 @@ from collections import defaultdict from typing import (TYPE_CHECKING, Any, Dict, List, Type, Union, Callable, NoReturn, Optional) +from .handler import Handler from nonebot.rule import Rule from nonebot.log import logger -from nonebot.handler import Handler from nonebot.adapters import MessageTemplate from nonebot.permission import USER, Permission from nonebot.exception import (PausedException, StopPropagation, diff --git a/nonebot/processor/models.py b/nonebot/processor/models.py new file mode 100644 index 00000000..14af1699 --- /dev/null +++ b/nonebot/processor/models.py @@ -0,0 +1,41 @@ +from typing import Any, List, Callable, Optional + +from nonebot.utils import get_name + + +class Depends: + + def __init__(self, + dependency: Optional[Callable[..., Any]] = None, + *, + use_cache: bool = True) -> None: + self.dependency = dependency + self.use_cache = use_cache + + def __repr__(self) -> str: + dep = get_name(self.dependency) + cache = "" if self.use_cache else ", use_cache=False" + return f"{self.__class__.__name__}({dep}{cache})" + + +class Dependent: + + def __init__(self, + *, + func: Optional[Callable[..., Any]] = None, + name: Optional[str] = None, + bot_param_name: Optional[str] = None, + event_param_name: Optional[str] = None, + state_param_name: Optional[str] = None, + matcher_param_name: Optional[str] = None, + dependencies: Optional[List["Dependent"]] = None, + use_cache: bool = True) -> None: + self.func = func + self.name = name + self.bot_param_name = bot_param_name + self.event_param_name = event_param_name + self.state_param_name = state_param_name + self.matcher_param_name = matcher_param_name + self.dependencies = dependencies or [] + self.use_cache = use_cache + self.cache_key = (self.func,) diff --git a/nonebot/processor/utils.py b/nonebot/processor/utils.py new file mode 100644 index 00000000..7c3729da --- /dev/null +++ b/nonebot/processor/utils.py @@ -0,0 +1,43 @@ +import inspect +from typing import Any, Dict, Type, Tuple, Union, Callable + +from pydantic.typing import (ForwardRef, GenericAlias, get_args, get_origin, + evaluate_forwardref) + + +def get_typed_signature(call: Callable[..., Any]) -> inspect.Signature: + signature = inspect.signature(call) + globalns = getattr(call, "__globals__", {}) + typed_params = [ + inspect.Parameter( + name=param.name, + kind=param.kind, + default=param.default, + annotation=get_typed_annotation(param, globalns), + ) for param in signature.parameters.values() + ] + typed_signature = inspect.Signature(typed_params) + return typed_signature + + +def get_typed_annotation(param: inspect.Parameter, globalns: Dict[str, + Any]) -> Any: + annotation = param.annotation + if isinstance(annotation, str): + annotation = ForwardRef(annotation) + annotation = evaluate_forwardref(annotation, globalns, globalns) + return annotation + + +def generic_check_issubclass( + cls: Any, class_or_tuple: Union[Type[Any], Tuple[Type[Any], + ...]]) -> bool: + try: + return isinstance(cls, type) and issubclass(cls, class_or_tuple) + except TypeError: + if get_origin(cls) is Union: + for type_ in get_args(cls): + if not generic_check_issubclass(type_, class_or_tuple): + return False + return True + raise From 9d708a6723752a66269ebde93f5960ff62052b6c Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sat, 13 Nov 2021 19:38:01 +0800 Subject: [PATCH 021/174] :construction: process handler call --- nonebot/message.py | 2 +- nonebot/plugin/on.py | 3 +- nonebot/plugin/on.pyi | 3 +- nonebot/plugin/plugin.py | 2 +- nonebot/plugins/single_session.py | 2 +- nonebot/processor/__init__.py | 127 ++++++++++++++++++++++++--- nonebot/processor/handler.py | 71 ++++++++++++--- nonebot/processor/matcher.py | 118 ++++++++++++------------- nonebot/processor/models.py | 9 +- nonebot/processor/utils.py | 8 +- nonebot/typing.py | 2 +- nonebot/utils.py | 23 +++-- poetry.lock | 2 +- pyproject.toml | 1 + tests/test_plugins/test_processor.py | 4 +- 15 files changed, 270 insertions(+), 107 deletions(-) diff --git a/nonebot/message.py b/nonebot/message.py index b853e481..f03a7c6d 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -12,7 +12,7 @@ from typing import TYPE_CHECKING, Set, Type, Optional from nonebot.log import logger from nonebot.rule import TrieRule from nonebot.utils import escape_tag -from nonebot.matcher import Matcher, matchers +from nonebot.processor import Matcher, matchers from nonebot.exception import NoLogException, StopPropagation, IgnoredException from nonebot.typing import (T_State, T_RunPreProcessor, T_RunPostProcessor, T_EventPreProcessor, T_EventPostProcessor) diff --git a/nonebot/plugin/on.py b/nonebot/plugin/on.py index e4da8345..46a5ecfe 100644 --- a/nonebot/plugin/on.py +++ b/nonebot/plugin/on.py @@ -5,10 +5,9 @@ from types import ModuleType from typing import (TYPE_CHECKING, Any, Set, Dict, List, Type, Tuple, Union, Optional) -from nonebot.handler import Handler -from nonebot.matcher import Matcher from .manager import _current_plugin from nonebot.permission import Permission +from nonebot.processor import Handler, Matcher from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_StateFactory from nonebot.rule import (Rule, ArgumentParser, regex, command, keyword, endswith, startswith, shell_command) diff --git a/nonebot/plugin/on.pyi b/nonebot/plugin/on.pyi index 68e8ad62..fbbf9c90 100644 --- a/nonebot/plugin/on.pyi +++ b/nonebot/plugin/on.pyi @@ -1,10 +1,9 @@ import re from typing import Set, List, Type, Tuple, Union, Optional -from nonebot.handler import Handler -from nonebot.matcher import Matcher from nonebot.permission import Permission from nonebot.rule import Rule, ArgumentParser +from nonebot.processor import Handler, Matcher from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_StateFactory diff --git a/nonebot/plugin/plugin.py b/nonebot/plugin/plugin.py index ee5a7c51..bf7773ac 100644 --- a/nonebot/plugin/plugin.py +++ b/nonebot/plugin/plugin.py @@ -3,7 +3,7 @@ from dataclasses import field, dataclass from typing import Set, Dict, Type, Optional from .export import Export -from nonebot.matcher import Matcher +from nonebot.processor import Matcher plugins: Dict[str, "Plugin"] = {} """ diff --git a/nonebot/plugins/single_session.py b/nonebot/plugins/single_session.py index 8a8b3cfb..1b6d4116 100644 --- a/nonebot/plugins/single_session.py +++ b/nonebot/plugins/single_session.py @@ -1,7 +1,7 @@ from typing import Dict, Optional from nonebot.typing import T_State -from nonebot.matcher import Matcher +from nonebot.processor import Matcher from nonebot.adapters import Bot, Event from nonebot.message import (IgnoredException, run_preprocessor, run_postprocessor) diff --git a/nonebot/processor/__init__.py b/nonebot/processor/__init__.py index 73b86bbc..e4f0a09c 100644 --- a/nonebot/processor/__init__.py +++ b/nonebot/processor/__init__.py @@ -1,14 +1,18 @@ import inspect -from typing import Any, Callable, Optional +from itertools import chain +from typing import Any, Dict, List, Tuple, Callable, Optional, cast from .models import Dependent -from .models import Depends as Depends +from nonebot.typing import T_State from nonebot.adapters import Bot, Event -from .utils import get_typed_signature, generic_check_issubclass +from .models import Depends as DependsClass +from nonebot.utils import run_sync, is_coroutine_callable +from .utils import (generic_get_types, get_typed_signature, + generic_check_issubclass) def get_param_sub_dependent(*, param: inspect.Parameter) -> Dependent: - depends: Depends = param.default + depends: DependsClass = param.default if depends.dependency: dependency = depends.dependency else: @@ -20,7 +24,7 @@ def get_param_sub_dependent(*, param: inspect.Parameter) -> Dependent: ) -def get_parameterless_sub_dependant(*, depends: Depends) -> Dependent: +def get_parameterless_sub_dependant(*, depends: DependsClass) -> Dependent: assert callable( depends.dependency ), "A parameter-less dependency must have a callable dependency" @@ -29,7 +33,7 @@ def get_parameterless_sub_dependant(*, depends: Depends) -> Dependent: def get_sub_dependant( *, - depends: Depends, + depends: DependsClass, dependency: Callable[..., Any], name: Optional[str] = None, ) -> Dependent: @@ -49,29 +53,124 @@ def get_dependent(*, params = signature.parameters dependent = Dependent(func=func, name=name, use_cache=use_cache) for param_name, param in params.items(): - if isinstance(param.default, Depends): + if isinstance(param.default, DependsClass): sub_dependent = get_param_sub_dependent(param=param) dependent.dependencies.append(sub_dependent) continue if generic_check_issubclass(param.annotation, Bot): + if dependent.bot_param_name is not None: + raise ValueError(f"{func} has more than one Bot parameter: " + f"{dependent.bot_param_name} / {param_name}") dependent.bot_param_name = param_name - continue + dependent.bot_param_type = generic_get_types(param.annotation) elif generic_check_issubclass(param.annotation, Event): + if dependent.event_param_name is not None: + raise ValueError(f"{func} has more than one Event parameter: " + f"{dependent.event_param_name} / {param_name}") dependent.event_param_name = param_name - continue + dependent.event_param_type = generic_get_types(param.annotation) elif generic_check_issubclass(param.annotation, dict): + if dependent.state_param_name is not None: + raise ValueError(f"{func} has more than one State parameter: " + f"{dependent.state_param_name} / {param_name}") dependent.state_param_name = param_name - continue elif generic_check_issubclass(param.annotation, Matcher): + if dependent.matcher_param_name is not None: + raise ValueError( + f"{func} has more than one Matcher parameter: " + f"{dependent.matcher_param_name} / {param_name}") dependent.matcher_param_name = param_name - continue - - raise ValueError( - f"Unknown parameter {param_name} with type {param.annotation}") + else: + raise ValueError( + f"Unknown parameter {param_name} with type {param.annotation}") return dependent +async def solve_dependencies( + *, + dependent: Dependent, + bot: Bot, + event: Event, + state: T_State, + matcher: "Matcher", + sub_dependents: Optional[List[Dependent]] = None, + dependency_overrides_provider: Optional[Any] = None, + dependency_cache: Optional[Dict[Tuple[Callable[..., Any]], Any]] = None, +) -> Tuple[Dict[str, Any], Dict[Tuple[Callable[..., Any]], Any]]: + values: Dict[str, Any] = {} + dependency_cache = dependency_cache or {} + + # solve sub dependencies + sub_dependant: Dependent + for sub_dependant in chain(sub_dependents or tuple(), + dependent.dependencies): + sub_dependant.func = cast(Callable[..., Any], sub_dependant.func) + sub_dependant.cache_key = cast(Tuple[Callable[..., Any]], + sub_dependant.cache_key) + func = sub_dependant.func + + # dependency overrides + use_sub_dependant = sub_dependant + if (dependency_overrides_provider and + hasattr(dependency_overrides_provider, "dependency_overrides")): + original_call = sub_dependant.func + func = getattr(dependency_overrides_provider, + "dependency_overrides", + {}).get(original_call, original_call) + use_sub_dependant = get_dependent( + func=func, + name=sub_dependant.name, + ) + + # solve sub dependency with current cache + solved_result = await solve_dependencies( + dependent=use_sub_dependant, + bot=bot, + event=event, + state=state, + matcher=matcher, + dependency_overrides_provider=dependency_overrides_provider, + dependency_cache=dependency_cache, + ) + sub_values, sub_dependency_cache = solved_result + # update cache? + dependency_cache.update(sub_dependency_cache) + + # run dependency function + if sub_dependant.use_cache and sub_dependant.cache_key in dependency_cache: + solved = dependency_cache[sub_dependant.cache_key] + elif is_coroutine_callable(func): + solved = await func(**sub_values) + else: + solved = await run_sync(func)(**sub_values) + + # parameter dependency + if sub_dependant.name is not None: + values[sub_dependant.name] = solved + # save current dependency to cache + if sub_dependant.cache_key not in dependency_cache: + dependency_cache[sub_dependant.cache_key] = solved + + # usual dependency + if dependent.bot_param_name is not None: + values[dependent.bot_param_name] = bot + if dependent.event_param_name is not None: + values[dependent.event_param_name] = event + if dependent.state_param_name is not None: + values[dependent.state_param_name] = state + if dependent.matcher_param_name is not None: + values[dependent.matcher_param_name] = matcher + return values, dependency_cache + + +def Depends(dependency: Optional[Callable[..., Any]] = None, + *, + use_cache: bool = True) -> Any: + return DependsClass(dependency=dependency, use_cache=use_cache) + + from .handler import Handler as Handler from .matcher import Matcher as Matcher +from .matcher import matchers as matchers diff --git a/nonebot/processor/handler.py b/nonebot/processor/handler.py index 66366cb7..03e8685b 100644 --- a/nonebot/processor/handler.py +++ b/nonebot/processor/handler.py @@ -4,12 +4,14 @@ 该模块实现事件处理函数的封装，以实现动态参数等功能。 """ -from typing import TYPE_CHECKING, List, Optional -from .models import Depends -from nonebot.utils import get_name +import asyncio +from typing import TYPE_CHECKING, Any, Dict, List, Tuple, Callable, Optional + +from .models import Depends, Dependent +from nonebot.utils import get_name, run_sync from nonebot.typing import T_State, T_Handler -from . import get_dependent, get_parameterless_sub_dependant +from . import get_dependent, solve_dependencies, get_parameterless_sub_dependant if TYPE_CHECKING: from .matcher import Matcher @@ -23,7 +25,8 @@ class Handler: func: T_Handler, *, name: Optional[str] = None, - dependencies: Optional[List[Depends]] = None): + dependencies: Optional[List[Depends]] = None, + dependency_overrides_provider: Optional[Any] = None): """装饰事件处理函数以便根据动态参数运行""" self.func: T_Handler = func """ @@ -33,11 +36,57 @@ class Handler: self.name = get_name(func) if name is None else name self.dependencies = dependencies or [] + self.sub_dependents: Dict[Tuple[Callable[..., Any]], Dependent] = {} + if dependencies: + for depends in dependencies: + if not depends.dependency: + raise ValueError(f"{depends} has no dependency") + if (depends.dependency,) in self.sub_dependents: + raise ValueError(f"{depends} is already in dependencies") + sub_dependant = get_parameterless_sub_dependant(depends=depends) + self.sub_dependents[(depends.dependency,)] = sub_dependant + self.dependency_overrides_provider = dependency_overrides_provider self.dependent = get_dependent(func=func) - for depends in self.dependencies[::-1]: - self.dependent.dependencies.insert( - 0, get_parameterless_sub_dependant(depends=depends)) - def __call__(self, bot: Bot, event: Event, state: T_State, - matcher: "Matcher"): - ... + async def __call__(self, matcher: "Matcher", bot: Bot, event: Event, + state: T_State): + values, _ = await solve_dependencies( + dependent=self.dependent, + bot=bot, + event=event, + state=state, + matcher=matcher, + sub_dependents=[ + self.sub_dependents[(dependency.dependency,)] # type: ignore + for dependency in self.dependencies + ], + dependency_overrides_provider=self.dependency_overrides_provider) + + if asyncio.iscoroutinefunction(self.func): + await self.func(**values) + else: + await run_sync(self.func)(**values) + + def cache_dependent(self, dependency: Depends): + if not dependency.dependency: + raise ValueError(f"{dependency} has no dependency") + if (dependency.dependency,) in self.sub_dependents: + raise ValueError(f"{dependency} is already in dependencies") + sub_dependant = get_parameterless_sub_dependant(depends=dependency) + self.sub_dependents[(dependency.dependency,)] = sub_dependant + + def prepend_dependency(self, dependency: Depends): + self.cache_dependent(dependency) + self.dependencies.insert(0, dependency) + + def append_dependency(self, dependency: Depends): + self.cache_dependent(dependency) + self.dependencies.append(dependency) + + def remove_dependency(self, dependency: Depends): + if not dependency.dependency: + raise ValueError(f"{dependency} has no dependency") + if (dependency.dependency,) in self.sub_dependents: + del self.sub_dependents[(dependency.dependency,)] + if dependency in self.dependencies: + self.dependencies.remove(dependency) diff --git a/nonebot/processor/matcher.py b/nonebot/processor/matcher.py index 256c787d..612b6d36 100644 --- a/nonebot/processor/matcher.py +++ b/nonebot/processor/matcher.py @@ -5,7 +5,6 @@ 该模块实现事件响应器的创建与运行，并提供一些快捷方法来帮助用户更好的与机器人进行对话 。 """ -from functools import wraps from types import ModuleType from datetime import datetime from contextvars import ContextVar @@ -13,8 +12,10 @@ from collections import defaultdict from typing import (TYPE_CHECKING, Any, Dict, List, Type, Union, Callable, NoReturn, Optional) +from .models import Depends from .handler import Handler from nonebot.rule import Rule +from nonebot import get_driver from nonebot.log import logger from nonebot.adapters import MessageTemplate from nonebot.permission import USER, Permission @@ -228,8 +229,8 @@ class Matcher(metaclass=MatcherMeta): "permission": permission or Permission(), "handlers": [ - handler - if isinstance(handler, Handler) else Handler(handler) + handler if isinstance(handler, Handler) else Handler( + handler, dependency_overrides_provider=get_driver()) for handler in handlers ] if handlers else [], "temp": @@ -343,8 +344,12 @@ class Matcher(metaclass=MatcherMeta): return func @classmethod - def append_handler(cls, handler: T_Handler) -> Handler: - handler_ = Handler(handler) + def append_handler(cls, + handler: T_Handler, + dependencies: Optional[List[Depends]] = None) -> Handler: + handler_ = Handler(handler, + dependencies=dependencies, + dependency_overrides_provider=get_driver()) cls.handlers.append(handler_) return handler_ @@ -378,22 +383,19 @@ class Matcher(metaclass=MatcherMeta): * 无 """ - async def _receive(bot: "Bot", event: "Event") -> NoReturn: - raise PausedException - - if cls.handlers: - # 已有前置handlers则接受一条新的消息，否则视为接收初始消息 - receive_handler = cls.append_handler(_receive) - else: - receive_handler = None - def _decorator(func: T_Handler) -> T_Handler: - if not cls.handlers or cls.handlers[-1] is not func: - func_handler = cls.append_handler(func) - if receive_handler: - receive_handler.update_signature( - bot=func_handler.bot_type, - event=func_handler.event_type) + + async def _receive() -> NoReturn: + func_handler.remove_dependency(depend) + raise PausedException + + depend = Depends(_receive) + if cls.handlers and cls.handlers[-1].func is func: + func_handler = cls.handlers[-1] + func_handler.prepend_dependency(depend) + else: + func_handler = cls.append_handler( + func, dependencies=[depend] if cls.handlers else []) return func @@ -419,54 +421,42 @@ class Matcher(metaclass=MatcherMeta): * ``args_parser: Optional[T_ArgsParser]``: 可选参数解析函数，空则使用默认解析函数 """ - async def _key_getter(bot: "Bot", event: "Event", state: T_State): - state["_current_key"] = key - if key not in state: - if prompt is not None: - if isinstance(prompt, MessageTemplate): - _prompt = prompt.format(**state) - else: - _prompt = prompt - await bot.send(event=event, message=_prompt) - raise PausedException - else: - state["_skip_key"] = True - - async def _key_parser(bot: "Bot", event: "Event", state: T_State): - if key in state and state.get("_skip_key"): - del state["_skip_key"] - return - parser = args_parser or cls._default_parser - if parser: - # parser = cast(T_ArgsParser["Bot", "Event"], parser) - await parser(bot, event, state) - else: - state[state["_current_key"]] = str(event.get_message()) - - getter_handler = cls.append_handler(_key_getter) - parser_handler = cls.append_handler(_key_parser) - def _decorator(func: T_Handler) -> T_Handler: - if not hasattr(cls.handlers[-1].func, "__wrapped__"): - parser = cls.handlers.pop() - func_handler = Handler(func) - @wraps(func) - async def wrapper(bot: "Bot", event: "Event", state: T_State, - matcher: Matcher): - await parser(matcher, bot, event, state) - await func_handler(matcher, bot, event, state) - if "_current_key" in state: - del state["_current_key"] + async def _key_getter(bot: "Bot", event: "Event", state: T_State): + func_handler.remove_dependency(get_depend) + state["_current_key"] = key + if key not in state: + if prompt is not None: + if isinstance(prompt, MessageTemplate): + _prompt = prompt.format(**state) + else: + _prompt = prompt + await bot.send(event=event, message=_prompt) + raise PausedException + else: + state["_skip_key"] = True - wrapper_handler = cls.append_handler(wrapper) + async def _key_parser(bot: "Bot", event: "Event", state: T_State): + if key in state and state.get("_skip_key"): + del state["_skip_key"] + return + parser = args_parser or cls._default_parser + if parser: + await parser(bot, event, state) + else: + state[state["_current_key"]] = str(event.get_message()) - getter_handler.update_signature( - bot=wrapper_handler.bot_type, - event=wrapper_handler.event_type) - parser_handler.update_signature( - bot=wrapper_handler.bot_type, - event=wrapper_handler.event_type) + get_depend = Depends(_key_getter) + parser_depend = Depends(_key_parser) + + if cls.handlers and cls.handlers[-1].func is func: + func_handler = cls.handlers[-1] + func_handler.prepend_dependency(parser_depend) + func_handler.prepend_dependency(get_depend) + else: + func_handler = cls.append_handler( + func, dependencies=[get_depend, parser_depend]) return func diff --git a/nonebot/processor/models.py b/nonebot/processor/models.py index 14af1699..996c3be7 100644 --- a/nonebot/processor/models.py +++ b/nonebot/processor/models.py @@ -1,7 +1,10 @@ -from typing import Any, List, Callable, Optional +from typing import TYPE_CHECKING, Any, List, Tuple, Callable, Optional from nonebot.utils import get_name +if TYPE_CHECKING: + from nonebot.adapters import Bot, Event + class Depends: @@ -25,7 +28,9 @@ class Dependent: func: Optional[Callable[..., Any]] = None, name: Optional[str] = None, bot_param_name: Optional[str] = None, + bot_param_type: Optional[Tuple["Bot", ...]] = None, event_param_name: Optional[str] = None, + event_param_type: Optional[Tuple["Event", ...]] = None, state_param_name: Optional[str] = None, matcher_param_name: Optional[str] = None, dependencies: Optional[List["Dependent"]] = None, @@ -33,7 +38,9 @@ class Dependent: self.func = func self.name = name self.bot_param_name = bot_param_name + self.bot_param_type = bot_param_type self.event_param_name = event_param_name + self.event_param_type = event_param_type self.state_param_name = state_param_name self.matcher_param_name = matcher_param_name self.dependencies = dependencies or [] diff --git a/nonebot/processor/utils.py b/nonebot/processor/utils.py index 7c3729da..bdae3aea 100644 --- a/nonebot/processor/utils.py +++ b/nonebot/processor/utils.py @@ -1,7 +1,7 @@ import inspect from typing import Any, Dict, Type, Tuple, Union, Callable -from pydantic.typing import (ForwardRef, GenericAlias, get_args, get_origin, +from pydantic.typing import (ForwardRef, get_args, get_origin, evaluate_forwardref) @@ -41,3 +41,9 @@ def generic_check_issubclass( return False return True raise + + +def generic_get_types(cls: Any) -> Tuple[Type[Any], ...]: + if get_origin(cls) is Union: + return get_args(cls) + return (cls,) diff --git a/nonebot/typing.py b/nonebot/typing.py index 970fbcc7..053fcff7 100644 --- a/nonebot/typing.py +++ b/nonebot/typing.py @@ -22,7 +22,7 @@ from typing import (TYPE_CHECKING, Any, Dict, Union, TypeVar, Callable, NoReturn, Optional, Awaitable) if TYPE_CHECKING: - from nonebot.matcher import Matcher + from nonebot.processor import Matcher from nonebot.adapters import Bot, Event from nonebot.permission import Permission diff --git a/nonebot/utils.py b/nonebot/utils.py index 71df0d4b..f7d78457 100644 --- a/nonebot/utils.py +++ b/nonebot/utils.py @@ -4,11 +4,15 @@ import asyncio import inspect import dataclasses from functools import wraps, partial -from typing import Any, Callable, Optional, Awaitable +from typing_extensions import ParamSpec +from typing import Any, TypeVar, Callable, Optional, Awaitable from nonebot.log import logger from nonebot.typing import overrides +P = ParamSpec("P") +R = TypeVar("R") + def escape_tag(s: str) -> str: """ @@ -27,7 +31,16 @@ def escape_tag(s: str) -> str: return re.sub(r"\s]*)>", r"\\\g<0>", s) -def run_sync(func: Callable[..., Any]) -> Callable[..., Awaitable[Any]]: +def is_coroutine_callable(func: Callable[..., Any]) -> bool: + if inspect.isroutine(func): + return inspect.iscoroutinefunction(func) + if inspect.isclass(func): + return False + func_ = getattr(func, "__call__", None) + return inspect.iscoroutinefunction(func_) + + +def run_sync(func: Callable[P, R]) -> Callable[P, Awaitable[R]]: """ :说明: @@ -35,15 +48,15 @@ def run_sync(func: Callable[..., Any]) -> Callable[..., Awaitable[Any]]: :参数: - * ``func: Callable[..., Any]``: 被装饰的同步函数 + * ``func: Callable[P, R]``: 被装饰的同步函数 :返回: - - ``Callable[..., Awaitable[Any]]`` + - ``Callable[P, Awaitable[R]]`` """ @wraps(func) - async def _wrapper(*args: Any, **kwargs: Any) -> Any: + async def _wrapper(*args: P.args, **kwargs: P.kwargs) -> R: loop = asyncio.get_running_loop() pfunc = partial(func, *args, **kwargs) result = await loop.run_in_executor(None, pfunc) diff --git a/poetry.lock b/poetry.lock index 13e3204d..91c140fc 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1099,7 +1099,7 @@ quart = ["Quart"] [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "51f4f0ce5ced234a65cae790c4f57486e42d7120972657a3f51e733cb4e7c639" +content-hash = "81edd95f4289e55d7cfe632664c930846bde723cb8fa0359fa1e18474853f454" [metadata.files] aiocache = [ diff --git a/pyproject.toml b/pyproject.toml index 6d9a8330..4153931a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,6 +28,7 @@ pygtrie = "^2.4.1" tomlkit = "^0.7.0" fastapi = "^0.70.0" websockets = ">=9.1" +typing-extensions = "^3.10.0" Quart = { version = "^0.15.0", optional = true } httpx = { version = ">=0.20.0, <1.0.0", extras = ["http2"] } pydantic = { version = "~1.8.0", extras = ["dotenv"] } diff --git a/tests/test_plugins/test_processor.py b/tests/test_plugins/test_processor.py index b5aaa298..5eb6b70e 100644 --- a/tests/test_plugins/test_processor.py +++ b/tests/test_plugins/test_processor.py @@ -1,7 +1,7 @@ from nonebot.typing import T_State -from nonebot.matcher import Matcher +from nonebot.processor import Matcher from nonebot.adapters import Bot, Event -from nonebot.message import event_preprocessor, run_preprocessor +from nonebot.message import run_preprocessor, event_preprocessor @event_preprocessor From 7495fee2a22183a54f9b03044827976877515303 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 14 Nov 2021 01:34:25 +0800 Subject: [PATCH 022/174] :sparkles: add bot event type check --- nonebot/processor/__init__.py | 46 +++++++++++++++++++++-------------- nonebot/processor/handler.py | 13 +++++++++- nonebot/processor/models.py | 6 ++--- 3 files changed, 43 insertions(+), 22 deletions(-) diff --git a/nonebot/processor/__init__.py b/nonebot/processor/__init__.py index e4f0a09c..1ef0def8 100644 --- a/nonebot/processor/__init__.py +++ b/nonebot/processor/__init__.py @@ -98,30 +98,38 @@ async def solve_dependencies( sub_dependents: Optional[List[Dependent]] = None, dependency_overrides_provider: Optional[Any] = None, dependency_cache: Optional[Dict[Tuple[Callable[..., Any]], Any]] = None, -) -> Tuple[Dict[str, Any], Dict[Tuple[Callable[..., Any]], Any]]: +) -> Tuple[Dict[str, Any], Dict[Tuple[Callable[..., Any]], Any], bool]: values: Dict[str, Any] = {} dependency_cache = dependency_cache or {} # solve sub dependencies - sub_dependant: Dependent - for sub_dependant in chain(sub_dependents or tuple(), + sub_dependent: Dependent + for sub_dependent in chain(sub_dependents or tuple(), dependent.dependencies): - sub_dependant.func = cast(Callable[..., Any], sub_dependant.func) - sub_dependant.cache_key = cast(Tuple[Callable[..., Any]], - sub_dependant.cache_key) - func = sub_dependant.func + sub_dependent.func = cast(Callable[..., Any], sub_dependent.func) + sub_dependent.cache_key = cast(Tuple[Callable[..., Any]], + sub_dependent.cache_key) + func = sub_dependent.func + + # check bot and event type + if sub_dependent.bot_param_type and not isinstance( + bot, sub_dependent.bot_param_type): + return values, dependency_cache, True + elif sub_dependent.event_param_type and not isinstance( + event, sub_dependent.event_param_type): + return values, dependency_cache, True # dependency overrides - use_sub_dependant = sub_dependant + use_sub_dependant = sub_dependent if (dependency_overrides_provider and hasattr(dependency_overrides_provider, "dependency_overrides")): - original_call = sub_dependant.func + original_call = sub_dependent.func func = getattr(dependency_overrides_provider, "dependency_overrides", {}).get(original_call, original_call) use_sub_dependant = get_dependent( func=func, - name=sub_dependant.name, + name=sub_dependent.name, ) # solve sub dependency with current cache @@ -134,24 +142,26 @@ async def solve_dependencies( dependency_overrides_provider=dependency_overrides_provider, dependency_cache=dependency_cache, ) - sub_values, sub_dependency_cache = solved_result + sub_values, sub_dependency_cache, ignored = solved_result + if ignored: + return values, dependency_cache, True # update cache? dependency_cache.update(sub_dependency_cache) # run dependency function - if sub_dependant.use_cache and sub_dependant.cache_key in dependency_cache: - solved = dependency_cache[sub_dependant.cache_key] + if sub_dependent.use_cache and sub_dependent.cache_key in dependency_cache: + solved = dependency_cache[sub_dependent.cache_key] elif is_coroutine_callable(func): solved = await func(**sub_values) else: solved = await run_sync(func)(**sub_values) # parameter dependency - if sub_dependant.name is not None: - values[sub_dependant.name] = solved + if sub_dependent.name is not None: + values[sub_dependent.name] = solved # save current dependency to cache - if sub_dependant.cache_key not in dependency_cache: - dependency_cache[sub_dependant.cache_key] = solved + if sub_dependent.cache_key not in dependency_cache: + dependency_cache[sub_dependent.cache_key] = solved # usual dependency if dependent.bot_param_name is not None: @@ -162,7 +172,7 @@ async def solve_dependencies( values[dependent.state_param_name] = state if dependent.matcher_param_name is not None: values[dependent.matcher_param_name] = matcher - return values, dependency_cache + return values, dependency_cache, False def Depends(dependency: Optional[Callable[..., Any]] = None, diff --git a/nonebot/processor/handler.py b/nonebot/processor/handler.py index 03e8685b..f21a9b37 100644 --- a/nonebot/processor/handler.py +++ b/nonebot/processor/handler.py @@ -50,7 +50,7 @@ class Handler: async def __call__(self, matcher: "Matcher", bot: Bot, event: Event, state: T_State): - values, _ = await solve_dependencies( + values, _, ignored = await solve_dependencies( dependent=self.dependent, bot=bot, event=event, @@ -62,6 +62,17 @@ class Handler: ], dependency_overrides_provider=self.dependency_overrides_provider) + if ignored: + return + + # check bot and event type + if self.dependent.bot_param_type and not isinstance( + bot, self.dependent.bot_param_type): + return + elif self.dependent.event_param_type and not isinstance( + event, self.dependent.event_param_type): + return + if asyncio.iscoroutinefunction(self.func): await self.func(**values) else: diff --git a/nonebot/processor/models.py b/nonebot/processor/models.py index 996c3be7..0e3cd7e4 100644 --- a/nonebot/processor/models.py +++ b/nonebot/processor/models.py @@ -1,4 +1,4 @@ -from typing import TYPE_CHECKING, Any, List, Tuple, Callable, Optional +from typing import TYPE_CHECKING, Any, List, Type, Tuple, Callable, Optional from nonebot.utils import get_name @@ -28,9 +28,9 @@ class Dependent: func: Optional[Callable[..., Any]] = None, name: Optional[str] = None, bot_param_name: Optional[str] = None, - bot_param_type: Optional[Tuple["Bot", ...]] = None, + bot_param_type: Optional[Tuple[Type["Bot"], ...]] = None, event_param_name: Optional[str] = None, - event_param_type: Optional[Tuple["Event", ...]] = None, + event_param_type: Optional[Tuple[Type["Event"], ...]] = None, state_param_name: Optional[str] = None, matcher_param_name: Optional[str] = None, dependencies: Optional[List["Dependent"]] = None, From 0a1ae75b702d53834a256e45314f565923936fac Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 14 Nov 2021 18:51:23 +0800 Subject: [PATCH 023/174] :sparkles: finish matcher process --- nonebot/permission.py | 25 ++++---- nonebot/plugin/on.py | 11 ++-- nonebot/processor/__init__.py | 9 ++- nonebot/processor/handler.py | 19 +++++- nonebot/processor/matcher.py | 98 ++++++++++++++++-------------- nonebot/processor/utils.py | 18 ++++-- nonebot/rule.py | 32 +++++----- tests/test_plugins/test_depends.py | 17 ++++++ 8 files changed, 139 insertions(+), 90 deletions(-) create mode 100644 tests/test_plugins/test_depends.py diff --git a/nonebot/permission.py b/nonebot/permission.py index 675f546d..7564bb13 100644 --- a/nonebot/permission.py +++ b/nonebot/permission.py @@ -10,14 +10,12 @@ r""" """ import asyncio -from typing import TYPE_CHECKING, Union, Callable, NoReturn, Optional, Awaitable +from typing import Union, Callable, NoReturn, Optional, Awaitable from nonebot.utils import run_sync +from nonebot.adapters import Bot, Event from nonebot.typing import T_PermissionChecker -if TYPE_CHECKING: - from nonebot.adapters import Bot, Event - class Permission: """ @@ -36,9 +34,8 @@ class Permission: """ __slots__ = ("checkers",) - def __init__( - self, *checkers: Callable[["Bot", "Event"], - Awaitable[bool]]) -> None: + def __init__(self, *checkers: Callable[[Bot, Event], + Awaitable[bool]]) -> None: """ :参数: @@ -55,7 +52,7 @@ class Permission: * ``Set[Callable[[Bot, Event], Awaitable[bool]]]`` """ - async def __call__(self, bot: "Bot", event: "Event") -> bool: + async def __call__(self, bot: Bot, event: Event) -> bool: """ :说明: @@ -94,19 +91,19 @@ class Permission: return Permission(*checkers) -async def _message(bot: "Bot", event: "Event") -> bool: +async def _message(bot: Bot, event: Event) -> bool: return event.get_type() == "message" -async def _notice(bot: "Bot", event: "Event") -> bool: +async def _notice(bot: Bot, event: Event) -> bool: return event.get_type() == "notice" -async def _request(bot: "Bot", event: "Event") -> bool: +async def _request(bot: Bot, event: Event) -> bool: return event.get_type() == "request" -async def _metaevent(bot: "Bot", event: "Event") -> bool: +async def _metaevent(bot: Bot, event: Event) -> bool: return event.get_type() == "meta_event" @@ -140,14 +137,14 @@ def USER(*user: str, perm: Optional[Permission] = None): * ``perm: Optional[Permission]``: 需要同时满足的权限 """ - async def _user(bot: "Bot", event: "Event") -> bool: + async def _user(bot: Bot, event: Event) -> bool: return bool(event.get_session_id() in user and (perm is None or await perm(bot, event))) return Permission(_user) -async def _superuser(bot: "Bot", event: "Event") -> bool: +async def _superuser(bot: Bot, event: Event) -> bool: return (event.get_type() == "message" and event.get_user_id() in bot.config.superusers) diff --git a/nonebot/plugin/on.py b/nonebot/plugin/on.py index 46a5ecfe..40038984 100644 --- a/nonebot/plugin/on.py +++ b/nonebot/plugin/on.py @@ -2,19 +2,16 @@ import re import sys import inspect from types import ModuleType -from typing import (TYPE_CHECKING, Any, Set, Dict, List, Type, Tuple, Union, - Optional) +from typing import Any, Set, Dict, List, Type, Tuple, Union, Optional from .manager import _current_plugin +from nonebot.adapters import Bot, Event from nonebot.permission import Permission from nonebot.processor import Handler, Matcher from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_StateFactory from nonebot.rule import (Rule, ArgumentParser, regex, command, keyword, endswith, startswith, shell_command) -if TYPE_CHECKING: - from nonebot.adapters import Bot, Event - def _store_matcher(matcher: Type[Matcher]) -> None: plugin = _current_plugin.get() @@ -375,7 +372,7 @@ def on_command(cmd: Union[str, Tuple[str, ...]], - ``Type[Matcher]`` """ - async def _strip_cmd(bot: "Bot", event: "Event", state: T_State): + async def _strip_cmd(bot: Bot, event: Event, state: T_State): message = event.get_message() if len(message) < 1: return @@ -432,7 +429,7 @@ def on_shell_command(cmd: Union[str, Tuple[str, ...]], - ``Type[Matcher]`` """ - async def _strip_cmd(bot: "Bot", event: "Event", state: T_State): + async def _strip_cmd(bot: Bot, event: Event, state: T_State): message = event.get_message() segment = message.pop(0) new_message = message.__class__( diff --git a/nonebot/processor/__init__.py b/nonebot/processor/__init__.py index 1ef0def8..70689631 100644 --- a/nonebot/processor/__init__.py +++ b/nonebot/processor/__init__.py @@ -3,6 +3,7 @@ from itertools import chain from typing import Any, Dict, List, Tuple, Callable, Optional, cast from .models import Dependent +from nonebot.log import logger from nonebot.typing import T_State from nonebot.adapters import Bot, Event from .models import Depends as DependsClass @@ -70,7 +71,7 @@ def get_dependent(*, f"{dependent.event_param_name} / {param_name}") dependent.event_param_name = param_name dependent.event_param_type = generic_get_types(param.annotation) - elif generic_check_issubclass(param.annotation, dict): + elif generic_check_issubclass(param.annotation, Dict): if dependent.state_param_name is not None: raise ValueError(f"{func} has more than one State parameter: " f"{dependent.state_param_name} / {param_name}") @@ -114,9 +115,15 @@ async def solve_dependencies( # check bot and event type if sub_dependent.bot_param_type and not isinstance( bot, sub_dependent.bot_param_type): + logger.debug( + f"Matcher {matcher} bot type {type(bot)} not match depends {func} " + f"annotation {sub_dependent.bot_param_type}, ignored") return values, dependency_cache, True elif sub_dependent.event_param_type and not isinstance( event, sub_dependent.event_param_type): + logger.debug( + f"Matcher {matcher} event type {type(event)} not match depends {func} " + f"annotation {sub_dependent.event_param_type}, ignored") return values, dependency_cache, True # dependency overrides diff --git a/nonebot/processor/handler.py b/nonebot/processor/handler.py index f21a9b37..0aafc8c9 100644 --- a/nonebot/processor/handler.py +++ b/nonebot/processor/handler.py @@ -8,6 +8,7 @@ import asyncio from typing import TYPE_CHECKING, Any, Dict, List, Tuple, Callable, Optional +from nonebot.log import logger from .models import Depends, Dependent from nonebot.utils import get_name, run_sync from nonebot.typing import T_State, T_Handler @@ -48,7 +49,18 @@ class Handler: self.dependency_overrides_provider = dependency_overrides_provider self.dependent = get_dependent(func=func) - async def __call__(self, matcher: "Matcher", bot: Bot, event: Event, + def __repr__(self) -> str: + return ( + f"") + + def __str__(self) -> str: + return repr(self) + + async def __call__(self, matcher: "Matcher", bot: "Bot", event: "Event", state: T_State): values, _, ignored = await solve_dependencies( dependent=self.dependent, @@ -68,9 +80,14 @@ class Handler: # check bot and event type if self.dependent.bot_param_type and not isinstance( bot, self.dependent.bot_param_type): + logger.debug(f"Matcher {matcher} bot type {type(bot)} not match " + f"annotation {self.dependent.bot_param_type}, ignored") return elif self.dependent.event_param_type and not isinstance( event, self.dependent.event_param_type): + logger.debug( + f"Matcher {matcher} event type {type(event)} not match " + f"annotation {self.dependent.event_param_type}, ignored") return if asyncio.iscoroutinefunction(self.func): diff --git a/nonebot/processor/matcher.py b/nonebot/processor/matcher.py index 612b6d36..9fbceaa9 100644 --- a/nonebot/processor/matcher.py +++ b/nonebot/processor/matcher.py @@ -17,8 +17,9 @@ from .handler import Handler from nonebot.rule import Rule from nonebot import get_driver from nonebot.log import logger -from nonebot.adapters import MessageTemplate from nonebot.permission import USER, Permission +from nonebot.adapters import (Bot, Event, Message, MessageSegment, + MessageTemplate) from nonebot.exception import (PausedException, StopPropagation, FinishedException, RejectedException) from nonebot.typing import (T_State, T_Handler, T_ArgsParser, T_TypeUpdater, @@ -26,15 +27,14 @@ from nonebot.typing import (T_State, T_Handler, T_ArgsParser, T_TypeUpdater, if TYPE_CHECKING: from nonebot.plugin import Plugin - from nonebot.adapters import Bot, Event, Message, MessageSegment matchers: Dict[int, List[Type["Matcher"]]] = defaultdict(list) """ :类型: ``Dict[int, List[Type[Matcher]]]`` :说明: 用于存储当前所有的事件响应器 """ -current_bot: ContextVar["Bot"] = ContextVar("current_bot") -current_event: ContextVar["Event"] = ContextVar("current_event") +current_bot: ContextVar[Bot] = ContextVar("current_bot") +current_event: ContextVar[Event] = ContextVar("current_event") current_state: ContextVar[T_State] = ContextVar("current_state") @@ -259,7 +259,7 @@ class Matcher(metaclass=MatcherMeta): return NewMatcher @classmethod - async def check_perm(cls, bot: "Bot", event: "Event") -> bool: + async def check_perm(cls, bot: Bot, event: Event) -> bool: """ :说明: @@ -279,8 +279,7 @@ class Matcher(metaclass=MatcherMeta): await cls.permission(bot, event)) @classmethod - async def check_rule(cls, bot: "Bot", event: "Event", - state: T_State) -> bool: + async def check_rule(cls, bot: Bot, event: Event, state: T_State) -> bool: """ :说明: @@ -383,18 +382,21 @@ class Matcher(metaclass=MatcherMeta): * 无 """ + async def _receive(state: T_State) -> Union[None, NoReturn]: + if state.get(_receive): + return + state[_receive] = True + raise RejectedException + def _decorator(func: T_Handler) -> T_Handler: - async def _receive() -> NoReturn: - func_handler.remove_dependency(depend) - raise PausedException - depend = Depends(_receive) + if cls.handlers and cls.handlers[-1].func is func: func_handler = cls.handlers[-1] func_handler.prepend_dependency(depend) else: - func_handler = cls.append_handler( + cls.append_handler( func, dependencies=[depend] if cls.handlers else []) return func @@ -405,7 +407,7 @@ class Matcher(metaclass=MatcherMeta): def got( cls, key: str, - prompt: Optional[Union[str, "Message", "MessageSegment", + prompt: Optional[Union[str, Message, MessageSegment, MessageTemplate]] = None, args_parser: Optional[T_ArgsParser] = None ) -> Callable[[T_Handler], T_Handler]: @@ -421,32 +423,36 @@ class Matcher(metaclass=MatcherMeta): * ``args_parser: Optional[T_ArgsParser]``: 可选参数解析函数，空则使用默认解析函数 """ + async def _key_getter(bot: Bot, event: Event, state: T_State): + if state.get(f"_{key}_prompted"): + return + + state["_current_key"] = key + state[f"_{key}_prompted"] = True + if key not in state: + if prompt is not None: + if isinstance(prompt, MessageTemplate): + _prompt = prompt.format(**state) + else: + _prompt = prompt + await bot.send(event=event, message=_prompt) + raise RejectedException + else: + state[f"_{key}_parsed"] = True + + async def _key_parser(bot: Bot, event: Event, state: T_State): + if key in state and state.get(f"_{key}_parsed"): + return + + parser = args_parser or cls._default_parser + if parser: + await parser(bot, event, state) + else: + state[key] = str(event.get_message()) + state[f"_{key}_parsed"] = True + def _decorator(func: T_Handler) -> T_Handler: - async def _key_getter(bot: "Bot", event: "Event", state: T_State): - func_handler.remove_dependency(get_depend) - state["_current_key"] = key - if key not in state: - if prompt is not None: - if isinstance(prompt, MessageTemplate): - _prompt = prompt.format(**state) - else: - _prompt = prompt - await bot.send(event=event, message=_prompt) - raise PausedException - else: - state["_skip_key"] = True - - async def _key_parser(bot: "Bot", event: "Event", state: T_State): - if key in state and state.get("_skip_key"): - del state["_skip_key"] - return - parser = args_parser or cls._default_parser - if parser: - await parser(bot, event, state) - else: - state[state["_current_key"]] = str(event.get_message()) - get_depend = Depends(_key_getter) parser_depend = Depends(_key_parser) @@ -455,15 +461,15 @@ class Matcher(metaclass=MatcherMeta): func_handler.prepend_dependency(parser_depend) func_handler.prepend_dependency(get_depend) else: - func_handler = cls.append_handler( - func, dependencies=[get_depend, parser_depend]) + cls.append_handler(func, + dependencies=[get_depend, parser_depend]) return func return _decorator @classmethod - async def send(cls, message: Union[str, "Message", "MessageSegment", + async def send(cls, message: Union[str, Message, MessageSegment, MessageTemplate], **kwargs) -> Any: """ :说明: @@ -486,7 +492,7 @@ class Matcher(metaclass=MatcherMeta): @classmethod async def finish(cls, - message: Optional[Union[str, "Message", "MessageSegment", + message: Optional[Union[str, Message, MessageSegment, MessageTemplate]] = None, **kwargs) -> NoReturn: """ @@ -512,7 +518,7 @@ class Matcher(metaclass=MatcherMeta): @classmethod async def pause(cls, - prompt: Optional[Union[str, "Message", "MessageSegment", + prompt: Optional[Union[str, Message, MessageSegment, MessageTemplate]] = None, **kwargs) -> NoReturn: """ @@ -538,8 +544,8 @@ class Matcher(metaclass=MatcherMeta): @classmethod async def reject(cls, - prompt: Optional[Union[str, "Message", - "MessageSegment"]] = None, + prompt: Optional[Union[str, Message, + MessageSegment]] = None, **kwargs) -> NoReturn: """ :说明: @@ -554,6 +560,8 @@ class Matcher(metaclass=MatcherMeta): bot = current_bot.get() event = current_event.get() state = current_state.get() + if "_current_key" in state and f"_{state['_current_key']}_parsed" in state: + del state[f"_{state['_current_key']}_parsed"] if isinstance(prompt, MessageTemplate): _prompt = prompt.format(**state) else: @@ -571,7 +579,7 @@ class Matcher(metaclass=MatcherMeta): self.block = True # 运行handlers - async def run(self, bot: "Bot", event: "Event", state: T_State): + async def run(self, bot: Bot, event: Event, state: T_State): b_t = current_bot.set(bot) e_t = current_event.set(event) s_t = current_state.set(self.state) diff --git a/nonebot/processor/utils.py b/nonebot/processor/utils.py index bdae3aea..6f13e96c 100644 --- a/nonebot/processor/utils.py +++ b/nonebot/processor/utils.py @@ -1,8 +1,9 @@ import inspect from typing import Any, Dict, Type, Tuple, Union, Callable +from typing_extensions import GenericAlias, get_args, get_origin # type: ignore -from pydantic.typing import (ForwardRef, get_args, get_origin, - evaluate_forwardref) +from loguru import logger +from pydantic.typing import ForwardRef, evaluate_forwardref def get_typed_signature(call: Callable[..., Any]) -> inspect.Signature: @@ -25,7 +26,13 @@ def get_typed_annotation(param: inspect.Parameter, globalns: Dict[str, annotation = param.annotation if isinstance(annotation, str): annotation = ForwardRef(annotation) - annotation = evaluate_forwardref(annotation, globalns, globalns) + try: + annotation = evaluate_forwardref(annotation, globalns, globalns) + except Exception as e: + logger.opt(colors=True, exception=e).warning( + f"Unknown ForwardRef[\"{param.annotation}\"] for parameter {param.name}" + ) + return inspect.Parameter.empty return annotation @@ -33,13 +40,16 @@ def generic_check_issubclass( cls: Any, class_or_tuple: Union[Type[Any], Tuple[Type[Any], ...]]) -> bool: try: - return isinstance(cls, type) and issubclass(cls, class_or_tuple) + return issubclass(cls, class_or_tuple) except TypeError: if get_origin(cls) is Union: for type_ in get_args(cls): if not generic_check_issubclass(type_, class_or_tuple): return False return True + elif isinstance(cls, GenericAlias): + origin = get_origin(cls) + return bool(origin and issubclass(origin, class_or_tuple)) raise diff --git a/nonebot/rule.py b/nonebot/rule.py index 863339df..40fc1b43 100644 --- a/nonebot/rule.py +++ b/nonebot/rule.py @@ -15,20 +15,18 @@ import asyncio from itertools import product from argparse import Namespace from argparse import ArgumentParser as ArgParser -from typing import (TYPE_CHECKING, Any, Dict, Tuple, Union, Callable, NoReturn, - Optional, Sequence, Awaitable) +from typing import (Any, Dict, Tuple, Union, Callable, NoReturn, Optional, + Sequence, Awaitable) from pygtrie import CharTrie from nonebot import get_driver from nonebot.log import logger from nonebot.utils import run_sync +from nonebot.adapters import Bot, Event from nonebot.exception import ParserExit from nonebot.typing import T_State, T_RuleChecker -if TYPE_CHECKING: - from nonebot.adapters import Bot, Event - class Rule: """ @@ -48,8 +46,8 @@ class Rule: __slots__ = ("checkers",) def __init__( - self, *checkers: Callable[["Bot", "Event", T_State], - Awaitable[bool]]) -> None: + self, *checkers: Callable[[Bot, Event, T_State], + Awaitable[bool]]) -> None: """ :参数: @@ -67,8 +65,7 @@ class Rule: * ``Set[Callable[[Bot, Event, T_State], Awaitable[bool]]]`` """ - async def __call__(self, bot: "Bot", event: "Event", - state: T_State) -> bool: + async def __call__(self, bot: Bot, event: Event, state: T_State) -> bool: """ :说明: @@ -123,7 +120,7 @@ class TrieRule: cls.suffix[suffix[::-1]] = value @classmethod - def get_value(cls, bot: "Bot", event: "Event", + def get_value(cls, bot: Bot, event: Event, state: T_State) -> Tuple[Dict[str, Any], Dict[str, Any]]: if event.get_type() != "message": state["_prefix"] = {"raw_command": None, "command": None} @@ -195,7 +192,7 @@ def startswith(msg: Union[str, Tuple[str, ...]], f"^(?:{'|'.join(re.escape(prefix) for prefix in msg)})", re.IGNORECASE if ignorecase else 0) - async def _startswith(bot: "Bot", event: "Event", state: T_State) -> bool: + async def _startswith(bot: Bot, event: Event, state: T_State) -> bool: if event.get_type() != "message": return False text = event.get_plaintext() @@ -222,7 +219,7 @@ def endswith(msg: Union[str, Tuple[str, ...]], f"(?:{'|'.join(re.escape(prefix) for prefix in msg)})$", re.IGNORECASE if ignorecase else 0) - async def _endswith(bot: "Bot", event: "Event", state: T_State) -> bool: + async def _endswith(bot: Bot, event: Event, state: T_State) -> bool: if event.get_type() != "message": return False text = event.get_plaintext() @@ -242,7 +239,7 @@ def keyword(*keywords: str) -> Rule: * ``*keywords: str``: 关键词 """ - async def _keyword(bot: "Bot", event: "Event", state: T_State) -> bool: + async def _keyword(bot: Bot, event: Event, state: T_State) -> bool: if event.get_type() != "message": return False text = event.get_plaintext() @@ -290,7 +287,7 @@ def command(*cmds: Union[str, Tuple[str, ...]]) -> Rule: for start, sep in product(command_start, command_sep): TrieRule.add_prefix(f"{start}{sep.join(command)}", command) - async def _command(bot: "Bot", event: "Event", state: T_State) -> bool: + async def _command(bot: Bot, event: Event, state: T_State) -> bool: return state["_prefix"]["command"] in commands return Rule(_command) @@ -376,8 +373,7 @@ def shell_command(*cmds: Union[str, Tuple[str, ...]], for start, sep in product(command_start, command_sep): TrieRule.add_prefix(f"{start}{sep.join(command)}", command) - async def _shell_command(bot: "Bot", event: "Event", - state: T_State) -> bool: + async def _shell_command(bot: Bot, event: Event, state: T_State) -> bool: if state["_prefix"]["command"] in commands: message = str(event.get_message()) strip_message = message[len(state["_prefix"]["raw_command"] @@ -417,7 +413,7 @@ def regex(regex: str, flags: Union[int, re.RegexFlag] = 0) -> Rule: pattern = re.compile(regex, flags) - async def _regex(bot: "Bot", event: "Event", state: T_State) -> bool: + async def _regex(bot: Bot, event: Event, state: T_State) -> bool: if event.get_type() != "message": return False matched = pattern.search(str(event.get_message())) @@ -443,7 +439,7 @@ def to_me() -> Rule: * 无 """ - async def _to_me(bot: "Bot", event: "Event", state: T_State) -> bool: + async def _to_me(bot: Bot, event: Event, state: T_State) -> bool: return event.is_tome() return Rule(_to_me) diff --git a/tests/test_plugins/test_depends.py b/tests/test_plugins/test_depends.py new file mode 100644 index 00000000..77580374 --- /dev/null +++ b/tests/test_plugins/test_depends.py @@ -0,0 +1,17 @@ +from nonebot import on_command +from nonebot.log import logger +from nonebot.processor import Depends + +test = on_command("123") + + +def depend(state: dict): + return state + + +@test.got("a", prompt="a") +@test.got("b", prompt="b") +@test.receive() +@test.got("c", prompt="c") +async def _(state: dict = Depends(depend)): + logger.info(f"=======, {state}") From cafe5c9af0d438ed18b81d30e6ac3010b223c107 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 15 Nov 2021 01:28:47 +0800 Subject: [PATCH 024/174] :construction: add generator dependency support --- nonebot/drivers/__init__.py | 5 +++++ nonebot/processor/__init__.py | 22 +++++++++++++++++----- nonebot/processor/handler.py | 31 +++++++++++++++++++++---------- nonebot/processor/models.py | 2 +- nonebot/utils.py | 32 +++++++++++++++++++++++++++++++- 5 files changed, 75 insertions(+), 17 deletions(-) diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py index d08f6b0c..74c42ff6 100644 --- a/nonebot/drivers/__init__.py +++ b/nonebot/drivers/__init__.py @@ -40,6 +40,11 @@ class Driver(abc.ABC): :类型: ``Set[T_BotDisconnectionHook]`` :说明: Bot 连接断开时执行的函数 """ + dependency_overrides: Dict[Callable[..., Any], Callable[..., Any]] = {} + """ + :类型: ``Dict[Callable[..., Any], Callable[..., Any]]`` + :说明: Depends 函数的替换表 + """ def __init__(self, env: Env, config: Config): """ diff --git a/nonebot/processor/__init__.py b/nonebot/processor/__init__.py index 70689631..8b344b01 100644 --- a/nonebot/processor/__init__.py +++ b/nonebot/processor/__init__.py @@ -1,15 +1,17 @@ import inspect from itertools import chain from typing import Any, Dict, List, Tuple, Callable, Optional, cast +from contextlib import AsyncExitStack, contextmanager, asynccontextmanager from .models import Dependent from nonebot.log import logger from nonebot.typing import T_State from nonebot.adapters import Bot, Event from .models import Depends as DependsClass -from nonebot.utils import run_sync, is_coroutine_callable from .utils import (generic_get_types, get_typed_signature, generic_check_issubclass) +from nonebot.utils import (run_sync, is_gen_callable, run_sync_ctx_manager, + is_async_gen_callable, is_coroutine_callable) def get_param_sub_dependent(*, param: inspect.Parameter) -> Dependent: @@ -95,11 +97,12 @@ async def solve_dependencies( bot: Bot, event: Event, state: T_State, - matcher: "Matcher", + matcher: Optional["Matcher"], + stack: Optional[AsyncExitStack] = None, sub_dependents: Optional[List[Dependent]] = None, dependency_overrides_provider: Optional[Any] = None, - dependency_cache: Optional[Dict[Tuple[Callable[..., Any]], Any]] = None, -) -> Tuple[Dict[str, Any], Dict[Tuple[Callable[..., Any]], Any], bool]: + dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, +) -> Tuple[Dict[str, Any], Dict[Callable[..., Any], Any], bool]: values: Dict[str, Any] = {} dependency_cache = dependency_cache or {} @@ -108,7 +111,7 @@ async def solve_dependencies( for sub_dependent in chain(sub_dependents or tuple(), dependent.dependencies): sub_dependent.func = cast(Callable[..., Any], sub_dependent.func) - sub_dependent.cache_key = cast(Tuple[Callable[..., Any]], + sub_dependent.cache_key = cast(Callable[..., Any], sub_dependent.cache_key) func = sub_dependent.func @@ -158,6 +161,15 @@ async def solve_dependencies( # run dependency function if sub_dependent.use_cache and sub_dependent.cache_key in dependency_cache: solved = dependency_cache[sub_dependent.cache_key] + elif is_gen_callable(func) or is_async_gen_callable(func): + assert isinstance( + stack, AsyncExitStack + ), "Generator dependency should be called in context" + if is_gen_callable(func): + cm = run_sync_ctx_manager(contextmanager(func)(**sub_values)) + else: + cm = asynccontextmanager(func)(**sub_values) + solved = await stack.enter_async_context(cm) elif is_coroutine_callable(func): solved = await func(**sub_values) else: diff --git a/nonebot/processor/handler.py b/nonebot/processor/handler.py index 0aafc8c9..57e38af5 100644 --- a/nonebot/processor/handler.py +++ b/nonebot/processor/handler.py @@ -6,6 +6,7 @@ """ import asyncio +from contextlib import AsyncExitStack from typing import TYPE_CHECKING, Any, Dict, List, Tuple, Callable, Optional from nonebot.log import logger @@ -37,15 +38,15 @@ class Handler: self.name = get_name(func) if name is None else name self.dependencies = dependencies or [] - self.sub_dependents: Dict[Tuple[Callable[..., Any]], Dependent] = {} + self.sub_dependents: Dict[Callable[..., Any], Dependent] = {} if dependencies: for depends in dependencies: if not depends.dependency: raise ValueError(f"{depends} has no dependency") - if (depends.dependency,) in self.sub_dependents: + if depends.dependency in self.sub_dependents: raise ValueError(f"{depends} is already in dependencies") sub_dependant = get_parameterless_sub_dependant(depends=depends) - self.sub_dependents[(depends.dependency,)] = sub_dependant + self.sub_dependents[depends.dependency] = sub_dependant self.dependency_overrides_provider = dependency_overrides_provider self.dependent = get_dependent(func=func) @@ -60,19 +61,29 @@ class Handler: def __str__(self) -> str: return repr(self) - async def __call__(self, matcher: "Matcher", bot: "Bot", event: "Event", - state: T_State): + async def __call__( + self, + matcher: "Matcher", + bot: "Bot", + event: "Event", + state: T_State, + *, + stack: Optional[AsyncExitStack] = None, + dependency_cache: Optional[Dict[Callable[..., Any], + Any]] = None) -> Any: values, _, ignored = await solve_dependencies( dependent=self.dependent, bot=bot, event=event, state=state, matcher=matcher, + stack=stack, sub_dependents=[ - self.sub_dependents[(dependency.dependency,)] # type: ignore + self.sub_dependents[dependency.dependency] # type: ignore for dependency in self.dependencies ], - dependency_overrides_provider=self.dependency_overrides_provider) + dependency_overrides_provider=self.dependency_overrides_provider, + dependency_cache=dependency_cache) if ignored: return @@ -101,7 +112,7 @@ class Handler: if (dependency.dependency,) in self.sub_dependents: raise ValueError(f"{dependency} is already in dependencies") sub_dependant = get_parameterless_sub_dependant(depends=dependency) - self.sub_dependents[(dependency.dependency,)] = sub_dependant + self.sub_dependents[dependency.dependency] = sub_dependant def prepend_dependency(self, dependency: Depends): self.cache_dependent(dependency) @@ -114,7 +125,7 @@ class Handler: def remove_dependency(self, dependency: Depends): if not dependency.dependency: raise ValueError(f"{dependency} has no dependency") - if (dependency.dependency,) in self.sub_dependents: - del self.sub_dependents[(dependency.dependency,)] + if dependency.dependency in self.sub_dependents: + del self.sub_dependents[dependency.dependency] if dependency in self.dependencies: self.dependencies.remove(dependency) diff --git a/nonebot/processor/models.py b/nonebot/processor/models.py index 0e3cd7e4..9413fb8a 100644 --- a/nonebot/processor/models.py +++ b/nonebot/processor/models.py @@ -45,4 +45,4 @@ class Dependent: self.matcher_param_name = matcher_param_name self.dependencies = dependencies or [] self.use_cache = use_cache - self.cache_key = (self.func,) + self.cache_key = self.func diff --git a/nonebot/utils.py b/nonebot/utils.py index f7d78457..2786ef1d 100644 --- a/nonebot/utils.py +++ b/nonebot/utils.py @@ -5,13 +5,16 @@ import inspect import dataclasses from functools import wraps, partial from typing_extensions import ParamSpec -from typing import Any, TypeVar, Callable, Optional, Awaitable +from contextlib import asynccontextmanager +from typing import (Any, TypeVar, Callable, Optional, Awaitable, AsyncGenerator, + ContextManager) from nonebot.log import logger from nonebot.typing import overrides P = ParamSpec("P") R = TypeVar("R") +T = TypeVar("T") def escape_tag(s: str) -> str: @@ -40,6 +43,20 @@ def is_coroutine_callable(func: Callable[..., Any]) -> bool: return inspect.iscoroutinefunction(func_) +def is_gen_callable(func: Callable[..., Any]) -> bool: + if inspect.isgeneratorfunction(func): + return True + func_ = getattr(func, "__call__", None) + return inspect.isgeneratorfunction(func_) + + +def is_async_gen_callable(func: Callable[..., Any]) -> bool: + if inspect.isasyncgenfunction(func): + return True + func_ = getattr(func, "__call__", None) + return inspect.isasyncgenfunction(func_) + + def run_sync(func: Callable[P, R]) -> Callable[P, Awaitable[R]]: """ :说明: @@ -65,6 +82,19 @@ def run_sync(func: Callable[P, R]) -> Callable[P, Awaitable[R]]: return _wrapper +@asynccontextmanager +async def run_sync_ctx_manager( + cm: ContextManager[T],) -> AsyncGenerator[T, None]: + try: + yield await run_sync(cm.__enter__)() + except Exception as e: + ok = await run_sync(cm.__exit__)(type(e), e, None) + if not ok: + raise e + else: + await run_sync(cm.__exit__)(None, None, None) + + def get_name(obj: Any) -> str: if inspect.isfunction(obj) or inspect.isclass(obj): return obj.__name__ From d1c6eeb6c2b731c7fd315c59d58592231a30b322 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 15 Nov 2021 21:44:24 +0800 Subject: [PATCH 025/174] :recycle: allow dynamic param types --- nonebot/adapters/_bot.py | 10 +++ nonebot/message.py | 110 +++++++++++++------------- nonebot/processor/__init__.py | 141 ++++++++++++++++++---------------- nonebot/processor/handler.py | 32 +++----- nonebot/processor/matcher.py | 12 ++- nonebot/processor/models.py | 21 ++--- nonebot/processor/params.py | 91 ++++++++++++++++++++++ 7 files changed, 260 insertions(+), 157 deletions(-) create mode 100644 nonebot/processor/params.py diff --git a/nonebot/adapters/_bot.py b/nonebot/adapters/_bot.py index b96e31ae..fba3a134 100644 --- a/nonebot/adapters/_bot.py +++ b/nonebot/adapters/_bot.py @@ -55,6 +55,16 @@ class Bot(abc.ABC): def __getattr__(self, name: str) -> _ApiCall: return partial(self.call_api, name) + @classmethod + def __get_validators__(cls): + yield cls.validate + + @classmethod + def validate(cls, v): + if not isinstance(v, cls): + raise TypeError(f"{v} is not an instance of {cls}") + return v + @property @abc.abstractmethod def type(self) -> str: diff --git a/nonebot/message.py b/nonebot/message.py index f03a7c6d..a74003fe 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -7,7 +7,8 @@ NoneBot 内部处理并按优先级分发事件给所有事件响应器，提供 import asyncio from datetime import datetime -from typing import TYPE_CHECKING, Set, Type, Optional +from contextlib import AsyncExitStack +from typing import TYPE_CHECKING, Set, Type from nonebot.log import logger from nonebot.rule import TrieRule @@ -204,58 +205,63 @@ async def handle_event(bot: "Bot", event: "Event") -> None: logger.opt(colors=True).success(log_msg) state = {} - coros = list(map(lambda x: x(bot, event, state), _event_preprocessors)) - if coros: - try: - if show_log: - logger.debug("Running PreProcessors...") - await asyncio.gather(*coros) - except IgnoredException as e: - logger.opt(colors=True).info( - f"Event {escape_tag(event.get_event_name())} is ignored") - return - except Exception as e: - logger.opt(colors=True, exception=e).error( - "Error when running EventPreProcessors. " - "Event ignored!") - return - # Trie Match - _, _ = TrieRule.get_value(bot, event, state) - - break_flag = False - for priority in sorted(matchers.keys()): - if break_flag: - break - - if show_log: - logger.debug(f"Checking for matchers in priority {priority}...") - - pending_tasks = [ - _check_matcher(priority, matcher, bot, event, state.copy()) - for matcher in matchers[priority] - ] - - results = await asyncio.gather(*pending_tasks, return_exceptions=True) - - for result in results: - if not isinstance(result, Exception): - continue - if isinstance(result, StopPropagation): - break_flag = True - logger.debug("Stop event propagation") - else: - logger.opt(colors=True, exception=result).error( - "Error when checking Matcher." + # TODO + async with AsyncExitStack() as stack: + coros = list(map(lambda x: x(bot, event, state), _event_preprocessors)) + if coros: + try: + if show_log: + logger.debug("Running PreProcessors...") + await asyncio.gather(*coros) + except IgnoredException as e: + logger.opt(colors=True).info( + f"Event {escape_tag(event.get_event_name())} is ignored" ) + return + except Exception as e: + logger.opt(colors=True, exception=e).error( + "Error when running EventPreProcessors. " + "Event ignored!") + return + + # Trie Match + _, _ = TrieRule.get_value(bot, event, state) + + break_flag = False + for priority in sorted(matchers.keys()): + if break_flag: + break - coros = list(map(lambda x: x(bot, event, state), _event_postprocessors)) - if coros: - try: if show_log: - logger.debug("Running PostProcessors...") - await asyncio.gather(*coros) - except Exception as e: - logger.opt(colors=True, exception=e).error( - "Error when running EventPostProcessors" - ) + logger.debug(f"Checking for matchers in priority {priority}...") + + pending_tasks = [ + _check_matcher(priority, matcher, bot, event, state.copy()) + for matcher in matchers[priority] + ] + + results = await asyncio.gather(*pending_tasks, + return_exceptions=True) + + for result in results: + if not isinstance(result, Exception): + continue + if isinstance(result, StopPropagation): + break_flag = True + logger.debug("Stop event propagation") + else: + logger.opt(colors=True, exception=result).error( + "Error when checking Matcher." + ) + + coros = list(map(lambda x: x(bot, event, state), _event_postprocessors)) + if coros: + try: + if show_log: + logger.debug("Running PostProcessors...") + await asyncio.gather(*coros) + except Exception as e: + logger.opt(colors=True, exception=e).error( + "Error when running EventPostProcessors" + ) diff --git a/nonebot/processor/__init__.py b/nonebot/processor/__init__.py index 8b344b01..9860fc8d 100644 --- a/nonebot/processor/__init__.py +++ b/nonebot/processor/__init__.py @@ -1,15 +1,18 @@ import inspect from itertools import chain -from typing import Any, Dict, List, Tuple, Callable, Optional, cast +from typing import Any, Dict, List, Type, Tuple, Callable, Optional, cast from contextlib import AsyncExitStack, contextmanager, asynccontextmanager +from pydantic import BaseConfig +from pydantic.fields import Required, ModelField +from pydantic.schema import get_annotation_from_field_info + from .models import Dependent from nonebot.log import logger from nonebot.typing import T_State +from .utils import get_typed_signature from nonebot.adapters import Bot, Event from .models import Depends as DependsClass -from .utils import (generic_get_types, get_typed_signature, - generic_check_issubclass) from nonebot.utils import (run_sync, is_gen_callable, run_sync_ctx_manager, is_async_gen_callable, is_coroutine_callable) @@ -27,33 +30,42 @@ def get_param_sub_dependent(*, param: inspect.Parameter) -> Dependent: ) -def get_parameterless_sub_dependant(*, depends: DependsClass) -> Dependent: +def get_parameterless_sub_dependant( + *, + depends: DependsClass, + allow_types: Optional[List["ParamTypes"]] = None) -> Dependent: assert callable( depends.dependency ), "A parameter-less dependency must have a callable dependency" - return get_sub_dependant(depends=depends, dependency=depends.dependency) + return get_sub_dependant(depends=depends, + dependency=depends.dependency, + allow_types=allow_types) def get_sub_dependant( - *, - depends: DependsClass, - dependency: Callable[..., Any], - name: Optional[str] = None, -) -> Dependent: - sub_dependant = get_dependent( - func=dependency, - name=name, - use_cache=depends.use_cache, - ) + *, + depends: DependsClass, + dependency: Callable[..., Any], + name: Optional[str] = None, + allow_types: Optional[List["ParamTypes"]] = None) -> Dependent: + sub_dependant = get_dependent(func=dependency, + name=name, + use_cache=depends.use_cache, + allow_types=allow_types) return sub_dependant -def get_dependent(*, - func: Callable[..., Any], - name: Optional[str] = None, - use_cache: bool = True) -> Dependent: +def get_dependent( + *, + func: Callable[..., Any], + name: Optional[str] = None, + use_cache: bool = True, + allow_types: Optional[List["ParamTypes"]] = None) -> Dependent: signature = get_typed_signature(func) params = signature.parameters + allow_types = allow_types or [ + ParamTypes.BOT, ParamTypes.EVENT, ParamTypes.STATE + ] dependent = Dependent(func=func, name=name, use_cache=use_cache) for param_name, param in params.items(): if isinstance(param.default, DependsClass): @@ -61,33 +73,29 @@ def get_dependent(*, dependent.dependencies.append(sub_dependent) continue - if generic_check_issubclass(param.annotation, Bot): - if dependent.bot_param_name is not None: - raise ValueError(f"{func} has more than one Bot parameter: " - f"{dependent.bot_param_name} / {param_name}") - dependent.bot_param_name = param_name - dependent.bot_param_type = generic_get_types(param.annotation) - elif generic_check_issubclass(param.annotation, Event): - if dependent.event_param_name is not None: - raise ValueError(f"{func} has more than one Event parameter: " - f"{dependent.event_param_name} / {param_name}") - dependent.event_param_name = param_name - dependent.event_param_type = generic_get_types(param.annotation) - elif generic_check_issubclass(param.annotation, Dict): - if dependent.state_param_name is not None: - raise ValueError(f"{func} has more than one State parameter: " - f"{dependent.state_param_name} / {param_name}") - dependent.state_param_name = param_name - elif generic_check_issubclass(param.annotation, Matcher): - if dependent.matcher_param_name is not None: - raise ValueError( - f"{func} has more than one Matcher parameter: " - f"{dependent.matcher_param_name} / {param_name}") - dependent.matcher_param_name = param_name + for allow_type in allow_types: + field_info_class: Type[Param] = allow_type.value + if field_info_class._check(param_name, param): + field_info = field_info_class(param.default) + break else: raise ValueError( f"Unknown parameter {param_name} with type {param.annotation}") + annotation: Any = Any + if param.annotation != param.empty: + annotation = param.annotation + annotation = get_annotation_from_field_info(annotation, field_info, + param_name) + dependent.params.append( + ModelField(name=param_name, + type_=annotation, + class_validators=None, + model_config=BaseConfig, + default=Required, + required=True, + field_info=field_info)) + return dependent @@ -97,7 +105,8 @@ async def solve_dependencies( bot: Bot, event: Event, state: T_State, - matcher: Optional["Matcher"], + matcher: Optional["Matcher"] = None, + exception: Optional[Exception] = None, stack: Optional[AsyncExitStack] = None, sub_dependents: Optional[List[Dependent]] = None, dependency_overrides_provider: Optional[Any] = None, @@ -115,20 +124,6 @@ async def solve_dependencies( sub_dependent.cache_key) func = sub_dependent.func - # check bot and event type - if sub_dependent.bot_param_type and not isinstance( - bot, sub_dependent.bot_param_type): - logger.debug( - f"Matcher {matcher} bot type {type(bot)} not match depends {func} " - f"annotation {sub_dependent.bot_param_type}, ignored") - return values, dependency_cache, True - elif sub_dependent.event_param_type and not isinstance( - event, sub_dependent.event_param_type): - logger.debug( - f"Matcher {matcher} event type {type(event)} not match depends {func} " - f"annotation {sub_dependent.event_param_type}, ignored") - return values, dependency_cache, True - # dependency overrides use_sub_dependant = sub_dependent if (dependency_overrides_provider and @@ -183,14 +178,28 @@ async def solve_dependencies( dependency_cache[sub_dependent.cache_key] = solved # usual dependency - if dependent.bot_param_name is not None: - values[dependent.bot_param_name] = bot - if dependent.event_param_name is not None: - values[dependent.event_param_name] = event - if dependent.state_param_name is not None: - values[dependent.state_param_name] = state - if dependent.matcher_param_name is not None: - values[dependent.matcher_param_name] = matcher + for field in dependent.params: + field_info = field.field_info + assert isinstance(field_info, + Param), "Params must be subclasses of Param" + value = field_info._solve(bot=bot, + event=event, + state=state, + matcher=matcher, + exception=exception) + _, errs_ = field.validate(value, + values, + loc=(ParamTypes(type(field_info)).name, + field.alias)) + if errs_: + logger.debug( + f"Matcher {matcher} {ParamTypes(type(field_info)).name} " + f"type {type(value)} not match depends {dependent.func} " + f"annotation {field._type_display()}, ignored") + return values, dependency_cache, True + else: + values[field.name] = value + return values, dependency_cache, False @@ -200,6 +209,8 @@ def Depends(dependency: Optional[Callable[..., Any]] = None, return DependsClass(dependency=dependency, use_cache=use_cache) +from .params import Param from .handler import Handler as Handler from .matcher import Matcher as Matcher from .matcher import matchers as matchers +from .params import ParamTypes as ParamTypes diff --git a/nonebot/processor/handler.py b/nonebot/processor/handler.py index 57e38af5..fed8d92c 100644 --- a/nonebot/processor/handler.py +++ b/nonebot/processor/handler.py @@ -9,7 +9,6 @@ import asyncio from contextlib import AsyncExitStack from typing import TYPE_CHECKING, Any, Dict, List, Tuple, Callable, Optional -from nonebot.log import logger from .models import Depends, Dependent from nonebot.utils import get_name, run_sync from nonebot.typing import T_State, T_Handler @@ -17,6 +16,7 @@ from . import get_dependent, solve_dependencies, get_parameterless_sub_dependant if TYPE_CHECKING: from .matcher import Matcher + from .params import ParamTypes from nonebot.adapters import Bot, Event @@ -28,6 +28,7 @@ class Handler: *, name: Optional[str] = None, dependencies: Optional[List[Depends]] = None, + allow_types: Optional[List["ParamTypes"]] = None, dependency_overrides_provider: Optional[Any] = None): """装饰事件处理函数以便根据动态参数运行""" self.func: T_Handler = func @@ -36,6 +37,7 @@ class Handler: :说明: 事件处理函数 """ self.name = get_name(func) if name is None else name + self.allow_types = allow_types self.dependencies = dependencies or [] self.sub_dependents: Dict[Callable[..., Any], Dependent] = {} @@ -45,18 +47,16 @@ class Handler: raise ValueError(f"{depends} has no dependency") if depends.dependency in self.sub_dependents: raise ValueError(f"{depends} is already in dependencies") - sub_dependant = get_parameterless_sub_dependant(depends=depends) + sub_dependant = get_parameterless_sub_dependant( + depends=depends, allow_types=self.allow_types) self.sub_dependents[depends.dependency] = sub_dependant self.dependency_overrides_provider = dependency_overrides_provider - self.dependent = get_dependent(func=func) + self.dependent = get_dependent(func=func, allow_types=self.allow_types) def __repr__(self) -> str: return ( - f"") + f"" + ) def __str__(self) -> str: return repr(self) @@ -88,19 +88,6 @@ class Handler: if ignored: return - # check bot and event type - if self.dependent.bot_param_type and not isinstance( - bot, self.dependent.bot_param_type): - logger.debug(f"Matcher {matcher} bot type {type(bot)} not match " - f"annotation {self.dependent.bot_param_type}, ignored") - return - elif self.dependent.event_param_type and not isinstance( - event, self.dependent.event_param_type): - logger.debug( - f"Matcher {matcher} event type {type(event)} not match " - f"annotation {self.dependent.event_param_type}, ignored") - return - if asyncio.iscoroutinefunction(self.func): await self.func(**values) else: @@ -111,7 +98,8 @@ class Handler: raise ValueError(f"{dependency} has no dependency") if (dependency.dependency,) in self.sub_dependents: raise ValueError(f"{dependency} is already in dependencies") - sub_dependant = get_parameterless_sub_dependant(depends=dependency) + sub_dependant = get_parameterless_sub_dependant( + depends=dependency, allow_types=self.allow_types) self.sub_dependents[dependency.dependency] = sub_dependant def prepend_dependency(self, dependency: Depends): diff --git a/nonebot/processor/matcher.py b/nonebot/processor/matcher.py index 9fbceaa9..4ae3ca21 100644 --- a/nonebot/processor/matcher.py +++ b/nonebot/processor/matcher.py @@ -15,6 +15,7 @@ from typing import (TYPE_CHECKING, Any, Dict, List, Type, Union, Callable, from .models import Depends from .handler import Handler from nonebot.rule import Rule +from .params import ParamTypes from nonebot import get_driver from nonebot.log import logger from nonebot.permission import USER, Permission @@ -153,6 +154,10 @@ class Matcher(metaclass=MatcherMeta): :说明: 事件响应器权限更新函数 """ + HANDLER_PARAM_TYPES = [ + ParamTypes.BOT, ParamTypes.EVENT, ParamTypes.STATE, ParamTypes.MATCHER + ] + def __init__(self): """实例化 Matcher 以便运行""" self.handlers = self.handlers.copy() @@ -230,7 +235,9 @@ class Matcher(metaclass=MatcherMeta): permission or Permission(), "handlers": [ handler if isinstance(handler, Handler) else Handler( - handler, dependency_overrides_provider=get_driver()) + handler, + dependency_overrides_provider=get_driver(), + allow_types=cls.HANDLER_PARAM_TYPES) for handler in handlers ] if handlers else [], "temp": @@ -348,7 +355,8 @@ class Matcher(metaclass=MatcherMeta): dependencies: Optional[List[Depends]] = None) -> Handler: handler_ = Handler(handler, dependencies=dependencies, - dependency_overrides_provider=get_driver()) + dependency_overrides_provider=get_driver(), + allow_types=cls.HANDLER_PARAM_TYPES) cls.handlers.append(handler_) return handler_ diff --git a/nonebot/processor/models.py b/nonebot/processor/models.py index 9413fb8a..06d11890 100644 --- a/nonebot/processor/models.py +++ b/nonebot/processor/models.py @@ -1,10 +1,9 @@ -from typing import TYPE_CHECKING, Any, List, Type, Tuple, Callable, Optional +from typing import Any, List, Callable, Optional + +from pydantic.fields import ModelField from nonebot.utils import get_name -if TYPE_CHECKING: - from nonebot.adapters import Bot, Event - class Depends: @@ -27,22 +26,12 @@ class Dependent: *, func: Optional[Callable[..., Any]] = None, name: Optional[str] = None, - bot_param_name: Optional[str] = None, - bot_param_type: Optional[Tuple[Type["Bot"], ...]] = None, - event_param_name: Optional[str] = None, - event_param_type: Optional[Tuple[Type["Event"], ...]] = None, - state_param_name: Optional[str] = None, - matcher_param_name: Optional[str] = None, + params: Optional[List[ModelField]] = None, dependencies: Optional[List["Dependent"]] = None, use_cache: bool = True) -> None: self.func = func self.name = name - self.bot_param_name = bot_param_name - self.bot_param_type = bot_param_type - self.event_param_name = event_param_name - self.event_param_type = event_param_type - self.state_param_name = state_param_name - self.matcher_param_name = matcher_param_name + self.params = params or [] self.dependencies = dependencies or [] self.use_cache = use_cache self.cache_key = self.func diff --git a/nonebot/processor/params.py b/nonebot/processor/params.py new file mode 100644 index 00000000..f777889c --- /dev/null +++ b/nonebot/processor/params.py @@ -0,0 +1,91 @@ +import abc +import inspect +from enum import Enum +from typing import Any, Dict, Optional + +from pydantic.fields import FieldInfo + +from nonebot.typing import T_State +from nonebot.adapters import Bot, Event +from .utils import generic_check_issubclass + + +class Param(FieldInfo, abc.ABC): + + def __repr__(self) -> str: + return f"{self.__class__.__name__}" + + def __str__(self) -> str: + return repr(self) + + @classmethod + @abc.abstractmethod + def _check(cls, name: str, param: inspect.Parameter) -> bool: + raise NotImplementedError + + @abc.abstractmethod + def _solve(self, **kwargs: Any) -> Any: + raise NotImplementedError + + +class BotParam(Param): + + @classmethod + def _check(cls, name: str, param: inspect.Parameter) -> bool: + return generic_check_issubclass(param.annotation, Bot) + + def _solve(self, bot: Bot, **kwargs: Any) -> Any: + return bot + + +class EventParam(Param): + + @classmethod + def _check(cls, name: str, param: inspect.Parameter) -> bool: + return generic_check_issubclass(param.annotation, Event) + + def _solve(self, event: Event, **kwargs: Any) -> Any: + return event + + +class StateParam(Param): + + @classmethod + def _check(cls, name: str, param: inspect.Parameter) -> bool: + return generic_check_issubclass(param.annotation, Dict) + + def _solve(self, state: T_State, **kwargs: Any) -> Any: + return state + + +class MatcherParam(Param): + + @classmethod + def _check(cls, name: str, param: inspect.Parameter) -> bool: + return generic_check_issubclass(param.annotation, Matcher) + + def _solve(self, matcher: Optional["Matcher"] = None, **kwargs: Any) -> Any: + return matcher + + +class ExceptionParam(Param): + + @classmethod + def _check(cls, name: str, param: inspect.Parameter) -> bool: + return generic_check_issubclass(param.annotation, Exception) + + def _solve(self, + exception: Optional[Exception] = None, + **kwargs: Any) -> Any: + return exception + + +class ParamTypes(Enum): + BOT = BotParam + EVENT = EventParam + STATE = StateParam + MATCHER = MatcherParam + EXCEPTION = ExceptionParam + + +from .matcher import Matcher From ea502c1fff454718a8b3f7f9cca49fff1fc795f3 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 15 Nov 2021 23:05:05 +0800 Subject: [PATCH 026/174] :loud_sound: add deprecation warning for toml load --- nonebot/plugin/load.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nonebot/plugin/load.py b/nonebot/plugin/load.py index 5e1002dc..75850f91 100644 --- a/nonebot/plugin/load.py +++ b/nonebot/plugin/load.py @@ -1,4 +1,5 @@ import json +import warnings from typing import Set, Iterable, Optional import tomlkit @@ -113,10 +114,15 @@ def load_from_toml(file_path: str, encoding: str = "utf-8") -> Set[Plugin]: with open(file_path, "r", encoding=encoding) as f: data = tomlkit.parse(f.read()) # type: ignore - nonebot_data = data.get("tool", {}).get("nonebot") or data.get( - "nonebot", {}).get("plugins") + nonebot_data = data.get("tool", {}).get("nonebot") if not nonebot_data: - raise ValueError("Cannot find '[tool.nonebot]' in given toml file!") + nonebot_data = data.get("nonebot", {}).get("plugins") + if nonebot_data: + warnings.warn( + "[nonebot.plugins] table are now deprecated. Use [tool.nonebot] instead.", + DeprecationWarning) + else: + raise ValueError("Cannot find '[tool.nonebot]' in given toml file!") plugins = nonebot_data.get("plugins", []) plugin_dirs = nonebot_data.get("plugin_dirs", []) assert isinstance(plugins, list), "plugins must be a list of plugin name" From 4cbdd726e51dfa476c2d75f388e9f01f7c9e51dd Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 16 Nov 2021 18:30:16 +0800 Subject: [PATCH 027/174] :building_construction: change code structure --- docs_build/dependencies.rst | 12 ++ nonebot/__init__.py | 1 + nonebot/adapters/_bot.py | 10 -- .../{processor => dependencies}/__init__.py | 117 +++++++++--------- nonebot/{processor => dependencies}/models.py | 28 ++++- nonebot/{processor => dependencies}/utils.py | 26 +--- nonebot/{processor => }/handler.py | 93 ++++++++------ nonebot/{processor => }/matcher.py | 28 +++-- nonebot/message.py | 60 ++++++--- nonebot/{processor => }/params.py | 55 +++----- nonebot/plugin/on.py | 3 +- nonebot/plugin/on.pyi | 3 +- nonebot/plugin/plugin.py | 2 +- nonebot/plugins/echo.py | 10 +- nonebot/plugins/single_session.py | 7 +- nonebot/typing.py | 12 +- nonebot/utils.py | 25 +++- tests/test_plugins/test_depends.py | 2 +- tests/test_plugins/test_processor.py | 8 +- 19 files changed, 276 insertions(+), 226 deletions(-) create mode 100644 docs_build/dependencies.rst rename nonebot/{processor => dependencies}/__init__.py (71%) rename nonebot/{processor => dependencies}/models.py (59%) rename nonebot/{processor => dependencies}/utils.py (57%) rename nonebot/{processor => }/handler.py (52%) rename nonebot/{processor => }/matcher.py (96%) rename nonebot/{processor => }/params.py (53%) diff --git a/docs_build/dependencies.rst b/docs_build/dependencies.rst new file mode 100644 index 00000000..4db2e19a --- /dev/null +++ b/docs_build/dependencies.rst @@ -0,0 +1,12 @@ +\-\-\- +contentSidebar: true +sidebarDepth: 0 +\-\-\- + +NoneBot.handler 模块 +==================== + +.. automodule:: nonebot.dependencies + :members: + :private-members: + :show-inheritance: diff --git a/nonebot/__init__.py b/nonebot/__init__.py index a9c6d350..809b696c 100644 --- a/nonebot/__init__.py +++ b/nonebot/__init__.py @@ -278,6 +278,7 @@ def run(host: Optional[str] = None, get_driver().run(host, port, *args, **kwargs) +import nonebot.params as params from nonebot.plugin import export as export from nonebot.plugin import require as require from nonebot.plugin import on_regex as on_regex diff --git a/nonebot/adapters/_bot.py b/nonebot/adapters/_bot.py index fba3a134..b96e31ae 100644 --- a/nonebot/adapters/_bot.py +++ b/nonebot/adapters/_bot.py @@ -55,16 +55,6 @@ class Bot(abc.ABC): def __getattr__(self, name: str) -> _ApiCall: return partial(self.call_api, name) - @classmethod - def __get_validators__(cls): - yield cls.validate - - @classmethod - def validate(cls, v): - if not isinstance(v, cls): - raise TypeError(f"{v} is not an instance of {cls}") - return v - @property @abc.abstractmethod def type(self) -> str: diff --git a/nonebot/processor/__init__.py b/nonebot/dependencies/__init__.py similarity index 71% rename from nonebot/processor/__init__.py rename to nonebot/dependencies/__init__.py index 9860fc8d..bbf835fb 100644 --- a/nonebot/processor/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -1,3 +1,10 @@ +""" +依赖注入处理模块 +=============== + +该模块实现了依赖注入的定义与处理。 +""" + import inspect from itertools import chain from typing import Any, Dict, List, Type, Tuple, Callable, Optional, cast @@ -7,33 +14,38 @@ from pydantic import BaseConfig from pydantic.fields import Required, ModelField from pydantic.schema import get_annotation_from_field_info -from .models import Dependent from nonebot.log import logger -from nonebot.typing import T_State +from .models import Param as Param from .utils import get_typed_signature -from nonebot.adapters import Bot, Event -from .models import Depends as DependsClass +from .models import Dependent as Dependent +from .models import DependsWrapper as DependsWrapper from nonebot.utils import (run_sync, is_gen_callable, run_sync_ctx_manager, is_async_gen_callable, is_coroutine_callable) -def get_param_sub_dependent(*, param: inspect.Parameter) -> Dependent: - depends: DependsClass = param.default +class CustomConfig(BaseConfig): + arbitrary_types_allowed = True + + +def get_param_sub_dependent( + *, + param: inspect.Parameter, + allow_types: Optional[List[Type[Param]]] = None) -> Dependent: + depends: DependsWrapper = param.default if depends.dependency: dependency = depends.dependency else: dependency = param.annotation - return get_sub_dependant( - depends=depends, - dependency=dependency, - name=param.name, - ) + return get_sub_dependant(depends=depends, + dependency=dependency, + name=param.name, + allow_types=allow_types) def get_parameterless_sub_dependant( *, - depends: DependsClass, - allow_types: Optional[List["ParamTypes"]] = None) -> Dependent: + depends: DependsWrapper, + allow_types: Optional[List[Type[Param]]] = None) -> Dependent: assert callable( depends.dependency ), "A parameter-less dependency must have a callable dependency" @@ -44,10 +56,10 @@ def get_parameterless_sub_dependant( def get_sub_dependant( *, - depends: DependsClass, + depends: DependsWrapper, dependency: Callable[..., Any], name: Optional[str] = None, - allow_types: Optional[List["ParamTypes"]] = None) -> Dependent: + allow_types: Optional[List[Type[Param]]] = None) -> Dependent: sub_dependant = get_dependent(func=dependency, name=name, use_cache=depends.use_cache, @@ -55,32 +67,32 @@ def get_sub_dependant( return sub_dependant -def get_dependent( - *, - func: Callable[..., Any], - name: Optional[str] = None, - use_cache: bool = True, - allow_types: Optional[List["ParamTypes"]] = None) -> Dependent: +def get_dependent(*, + func: Callable[..., Any], + name: Optional[str] = None, + use_cache: bool = True, + allow_types: Optional[List[Type[Param]]] = None) -> Dependent: signature = get_typed_signature(func) params = signature.parameters - allow_types = allow_types or [ - ParamTypes.BOT, ParamTypes.EVENT, ParamTypes.STATE - ] - dependent = Dependent(func=func, name=name, use_cache=use_cache) + dependent = Dependent(func=func, + name=name, + allow_types=allow_types, + use_cache=use_cache) for param_name, param in params.items(): - if isinstance(param.default, DependsClass): - sub_dependent = get_param_sub_dependent(param=param) + if isinstance(param.default, DependsWrapper): + sub_dependent = get_param_sub_dependent(param=param, + allow_types=allow_types) dependent.dependencies.append(sub_dependent) continue - for allow_type in allow_types: - field_info_class: Type[Param] = allow_type.value - if field_info_class._check(param_name, param): - field_info = field_info_class(param.default) + for allow_type in dependent.allow_types: + if allow_type._check(param_name, param): + field_info = allow_type(param.default) break else: raise ValueError( - f"Unknown parameter {param_name} with type {param.annotation}") + f"Unknown parameter {param_name} for funcction {func} with type {param.annotation}" + ) annotation: Any = Any if param.annotation != param.empty: @@ -91,7 +103,7 @@ def get_dependent( ModelField(name=param_name, type_=annotation, class_validators=None, - model_config=BaseConfig, + model_config=CustomConfig, default=Required, required=True, field_info=field_info)) @@ -102,15 +114,11 @@ def get_dependent( async def solve_dependencies( *, dependent: Dependent, - bot: Bot, - event: Event, - state: T_State, - matcher: Optional["Matcher"] = None, - exception: Optional[Exception] = None, stack: Optional[AsyncExitStack] = None, sub_dependents: Optional[List[Dependent]] = None, dependency_overrides_provider: Optional[Any] = None, dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, + **params: Any ) -> Tuple[Dict[str, Any], Dict[Callable[..., Any], Any], bool]: values: Dict[str, Any] = {} dependency_cache = dependency_cache or {} @@ -135,18 +143,15 @@ async def solve_dependencies( use_sub_dependant = get_dependent( func=func, name=sub_dependent.name, + allow_types=sub_dependent.allow_types, ) # solve sub dependency with current cache solved_result = await solve_dependencies( dependent=use_sub_dependant, - bot=bot, - event=event, - state=state, - matcher=matcher, dependency_overrides_provider=dependency_overrides_provider, dependency_cache=dependency_cache, - ) + **params) sub_values, sub_dependency_cache, ignored = solved_result if ignored: return values, dependency_cache, True @@ -182,18 +187,13 @@ async def solve_dependencies( field_info = field.field_info assert isinstance(field_info, Param), "Params must be subclasses of Param" - value = field_info._solve(bot=bot, - event=event, - state=state, - matcher=matcher, - exception=exception) + value = field_info._solve(**params) _, errs_ = field.validate(value, values, - loc=(ParamTypes(type(field_info)).name, - field.alias)) + loc=(str(field_info), field.alias)) if errs_: logger.debug( - f"Matcher {matcher} {ParamTypes(type(field_info)).name} " + f"{field_info} " f"type {type(value)} not match depends {dependent.func} " f"annotation {field._type_display()}, ignored") return values, dependency_cache, True @@ -206,11 +206,14 @@ async def solve_dependencies( def Depends(dependency: Optional[Callable[..., Any]] = None, *, use_cache: bool = True) -> Any: - return DependsClass(dependency=dependency, use_cache=use_cache) + """ + :说明: + 参数依赖注入装饰器 -from .params import Param -from .handler import Handler as Handler -from .matcher import Matcher as Matcher -from .matcher import matchers as matchers -from .params import ParamTypes as ParamTypes + :参数: + + * ``dependency: Optional[Callable[..., Any]] = None``: 依赖函数。默认为参数的类型注释。 + * ``use_cache: bool = True``: 是否使用缓存。默认为 ``True``。 + """ + return DependsWrapper(dependency=dependency, use_cache=use_cache) diff --git a/nonebot/processor/models.py b/nonebot/dependencies/models.py similarity index 59% rename from nonebot/processor/models.py rename to nonebot/dependencies/models.py index 06d11890..ca764f9b 100644 --- a/nonebot/processor/models.py +++ b/nonebot/dependencies/models.py @@ -1,11 +1,31 @@ -from typing import Any, List, Callable, Optional +import abc +import inspect +from typing import Any, List, Type, Callable, Optional -from pydantic.fields import ModelField +from pydantic.fields import FieldInfo, ModelField from nonebot.utils import get_name -class Depends: +class Param(FieldInfo, abc.ABC): + + def __repr__(self) -> str: + return f"{self.__class__.__name__}" + + def __str__(self) -> str: + return repr(self) + + @classmethod + @abc.abstractmethod + def _check(cls, name: str, param: inspect.Parameter) -> bool: + raise NotImplementedError + + @abc.abstractmethod + def _solve(self, **kwargs: Any) -> Any: + raise NotImplementedError + + +class DependsWrapper: def __init__(self, dependency: Optional[Callable[..., Any]] = None, @@ -27,11 +47,13 @@ class Dependent: func: Optional[Callable[..., Any]] = None, name: Optional[str] = None, params: Optional[List[ModelField]] = None, + allow_types: Optional[List[Type[Param]]] = None, dependencies: Optional[List["Dependent"]] = None, use_cache: bool = True) -> None: self.func = func self.name = name self.params = params or [] + self.allow_types = allow_types or [] self.dependencies = dependencies or [] self.use_cache = use_cache self.cache_key = self.func diff --git a/nonebot/processor/utils.py b/nonebot/dependencies/utils.py similarity index 57% rename from nonebot/processor/utils.py rename to nonebot/dependencies/utils.py index 6f13e96c..ed08b228 100644 --- a/nonebot/processor/utils.py +++ b/nonebot/dependencies/utils.py @@ -1,6 +1,5 @@ import inspect -from typing import Any, Dict, Type, Tuple, Union, Callable -from typing_extensions import GenericAlias, get_args, get_origin # type: ignore +from typing import Any, Dict, Callable from loguru import logger from pydantic.typing import ForwardRef, evaluate_forwardref @@ -34,26 +33,3 @@ def get_typed_annotation(param: inspect.Parameter, globalns: Dict[str, ) return inspect.Parameter.empty return annotation - - -def generic_check_issubclass( - cls: Any, class_or_tuple: Union[Type[Any], Tuple[Type[Any], - ...]]) -> bool: - try: - return issubclass(cls, class_or_tuple) - except TypeError: - if get_origin(cls) is Union: - for type_ in get_args(cls): - if not generic_check_issubclass(type_, class_or_tuple): - return False - return True - elif isinstance(cls, GenericAlias): - origin = get_origin(cls) - return bool(origin and issubclass(origin, class_or_tuple)) - raise - - -def generic_get_types(cls: Any) -> Tuple[Type[Any], ...]: - if get_origin(cls) is Union: - return get_args(cls) - return (cls,) diff --git a/nonebot/processor/handler.py b/nonebot/handler.py similarity index 52% rename from nonebot/processor/handler.py rename to nonebot/handler.py index fed8d92c..232f2200 100644 --- a/nonebot/processor/handler.py +++ b/nonebot/handler.py @@ -7,83 +7,94 @@ import asyncio from contextlib import AsyncExitStack -from typing import TYPE_CHECKING, Any, Dict, List, Tuple, Callable, Optional +from typing import TYPE_CHECKING, Any, Dict, List, Type, Callable, Optional -from .models import Depends, Dependent +from nonebot.typing import T_Handler from nonebot.utils import get_name, run_sync -from nonebot.typing import T_State, T_Handler -from . import get_dependent, solve_dependencies, get_parameterless_sub_dependant +from nonebot.dependencies import (Param, Dependent, DependsWrapper, + get_dependent, solve_dependencies, + get_parameterless_sub_dependant) if TYPE_CHECKING: - from .matcher import Matcher - from .params import ParamTypes + from nonebot.matcher import Matcher from nonebot.adapters import Bot, Event class Handler: - """事件处理函数类""" + """事件处理器类。支持依赖注入。""" def __init__(self, func: T_Handler, *, name: Optional[str] = None, - dependencies: Optional[List[Depends]] = None, - allow_types: Optional[List["ParamTypes"]] = None, + dependencies: Optional[List[DependsWrapper]] = None, + allow_types: Optional[List[Type[Param]]] = None, dependency_overrides_provider: Optional[Any] = None): - """装饰事件处理函数以便根据动态参数运行""" - self.func: T_Handler = func + """ + :说明: + + 装饰一个函数为事件处理器。 + + :参数: + + * ``func: T_Handler``: 事件处理函数。 + * ``name: Optional[str]``: 事件处理器名称。默认为函数名。 + * ``dependencies: Optional[List[DependsWrapper]]``: 额外的非参数依赖注入。 + * ``allow_types: Optional[List[Type[Param]]]``: 允许的参数类型。 + * ``dependency_overrides_provider: Optional[Any]``: 依赖注入覆盖提供者。 + """ + self.func = func """ :类型: ``T_Handler`` :说明: 事件处理函数 """ self.name = get_name(func) if name is None else name - self.allow_types = allow_types + """ + :类型: ``str`` + :说明: 事件处理函数名 + """ + self.allow_types = allow_types or [] + """ + :类型: ``List[Type[Param]]`` + :说明: 事件处理器允许的参数类型 + """ self.dependencies = dependencies or [] + """ + :类型: ``List[DependsWrapper]`` + :说明: 事件处理器的额外依赖 + """ self.sub_dependents: Dict[Callable[..., Any], Dependent] = {} if dependencies: for depends in dependencies: - if not depends.dependency: - raise ValueError(f"{depends} has no dependency") - if depends.dependency in self.sub_dependents: - raise ValueError(f"{depends} is already in dependencies") - sub_dependant = get_parameterless_sub_dependant( - depends=depends, allow_types=self.allow_types) - self.sub_dependents[depends.dependency] = sub_dependant + self.cache_dependent(depends) self.dependency_overrides_provider = dependency_overrides_provider self.dependent = get_dependent(func=func, allow_types=self.allow_types) def __repr__(self) -> str: return ( - f"" + f"" ) def __str__(self) -> str: return repr(self) - async def __call__( - self, - matcher: "Matcher", - bot: "Bot", - event: "Event", - state: T_State, - *, - stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[Dict[Callable[..., Any], - Any]] = None) -> Any: + async def __call__(self, + *, + _stack: Optional[AsyncExitStack] = None, + _dependency_cache: Optional[Dict[Callable[..., Any], + Any]] = None, + **params) -> Any: values, _, ignored = await solve_dependencies( dependent=self.dependent, - bot=bot, - event=event, - state=state, - matcher=matcher, - stack=stack, + stack=_stack, sub_dependents=[ self.sub_dependents[dependency.dependency] # type: ignore for dependency in self.dependencies ], dependency_overrides_provider=self.dependency_overrides_provider, - dependency_cache=dependency_cache) + dependency_cache=_dependency_cache, + **params) if ignored: return @@ -93,24 +104,24 @@ class Handler: else: await run_sync(self.func)(**values) - def cache_dependent(self, dependency: Depends): + def cache_dependent(self, dependency: DependsWrapper): if not dependency.dependency: raise ValueError(f"{dependency} has no dependency") - if (dependency.dependency,) in self.sub_dependents: + if dependency.dependency in self.sub_dependents: raise ValueError(f"{dependency} is already in dependencies") sub_dependant = get_parameterless_sub_dependant( depends=dependency, allow_types=self.allow_types) self.sub_dependents[dependency.dependency] = sub_dependant - def prepend_dependency(self, dependency: Depends): + def prepend_dependency(self, dependency: DependsWrapper): self.cache_dependent(dependency) self.dependencies.insert(0, dependency) - def append_dependency(self, dependency: Depends): + def append_dependency(self, dependency: DependsWrapper): self.cache_dependent(dependency) self.dependencies.append(dependency) - def remove_dependency(self, dependency: Depends): + def remove_dependency(self, dependency: DependsWrapper): if not dependency.dependency: raise ValueError(f"{dependency} has no dependency") if dependency.dependency in self.sub_dependents: diff --git a/nonebot/processor/matcher.py b/nonebot/matcher.py similarity index 96% rename from nonebot/processor/matcher.py rename to nonebot/matcher.py index 4ae3ca21..8856a3cf 100644 --- a/nonebot/processor/matcher.py +++ b/nonebot/matcher.py @@ -12,12 +12,11 @@ from collections import defaultdict from typing import (TYPE_CHECKING, Any, Dict, List, Type, Union, Callable, NoReturn, Optional) -from .models import Depends -from .handler import Handler from nonebot.rule import Rule -from .params import ParamTypes -from nonebot import get_driver from nonebot.log import logger +from nonebot.handler import Handler +from nonebot import params, get_driver +from nonebot.dependencies import DependsWrapper from nonebot.permission import USER, Permission from nonebot.adapters import (Bot, Event, Message, MessageSegment, MessageTemplate) @@ -155,7 +154,8 @@ class Matcher(metaclass=MatcherMeta): """ HANDLER_PARAM_TYPES = [ - ParamTypes.BOT, ParamTypes.EVENT, ParamTypes.STATE, ParamTypes.MATCHER + params.BotParam, params.EventParam, params.StateParam, + params.MatcherParam ] def __init__(self): @@ -350,9 +350,10 @@ class Matcher(metaclass=MatcherMeta): return func @classmethod - def append_handler(cls, - handler: T_Handler, - dependencies: Optional[List[Depends]] = None) -> Handler: + def append_handler( + cls, + handler: T_Handler, + dependencies: Optional[List[DependsWrapper]] = None) -> Handler: handler_ = Handler(handler, dependencies=dependencies, dependency_overrides_provider=get_driver(), @@ -398,7 +399,7 @@ class Matcher(metaclass=MatcherMeta): def _decorator(func: T_Handler) -> T_Handler: - depend = Depends(_receive) + depend = DependsWrapper(_receive) if cls.handlers and cls.handlers[-1].func is func: func_handler = cls.handlers[-1] @@ -461,8 +462,8 @@ class Matcher(metaclass=MatcherMeta): def _decorator(func: T_Handler) -> T_Handler: - get_depend = Depends(_key_getter) - parser_depend = Depends(_key_parser) + get_depend = DependsWrapper(_key_getter) + parser_depend = DependsWrapper(_key_parser) if cls.handlers and cls.handlers[-1].func is func: func_handler = cls.handlers[-1] @@ -600,7 +601,10 @@ class Matcher(metaclass=MatcherMeta): while self.handlers: handler = self.handlers.pop(0) logger.debug(f"Running handler {handler}") - await handler(self, bot, event, self.state) + await handler(matcher=self, + bot=bot, + event=event, + state=self.state) except RejectedException: self.handlers.insert(0, handler) # type: ignore diff --git a/nonebot/message.py b/nonebot/message.py index a74003fe..fec00687 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -12,8 +12,10 @@ from typing import TYPE_CHECKING, Set, Type from nonebot.log import logger from nonebot.rule import TrieRule +from nonebot.handler import Handler from nonebot.utils import escape_tag -from nonebot.processor import Matcher, matchers +from nonebot import params, get_driver +from nonebot.matcher import Matcher, matchers from nonebot.exception import NoLogException, StopPropagation, IgnoredException from nonebot.typing import (T_State, T_RunPreProcessor, T_RunPostProcessor, T_EventPreProcessor, T_EventPostProcessor) @@ -21,10 +23,19 @@ from nonebot.typing import (T_State, T_RunPreProcessor, T_RunPostProcessor, if TYPE_CHECKING: from nonebot.adapters import Bot, Event -_event_preprocessors: Set[T_EventPreProcessor] = set() -_event_postprocessors: Set[T_EventPostProcessor] = set() -_run_preprocessors: Set[T_RunPreProcessor] = set() -_run_postprocessors: Set[T_RunPostProcessor] = set() +_event_preprocessors: Set[Handler] = set() +_event_postprocessors: Set[Handler] = set() +_run_preprocessors: Set[Handler] = set() +_run_postprocessors: Set[Handler] = set() + +EVENT_PCS_PARAMS = [params.BotParam, params.EventParam, params.StateParam] +RUN_PREPCS_PARAMS = [ + params.MatcherParam, params.BotParam, params.EventParam, params.StateParam +] +RUN_POSTPCS_PARAMS = [ + params.MatcherParam, params.ExceptionParam, params.BotParam, + params.EventParam, params.StateParam +] def event_preprocessor(func: T_EventPreProcessor) -> T_EventPreProcessor: @@ -41,7 +52,10 @@ def event_preprocessor(func: T_EventPreProcessor) -> T_EventPreProcessor: * ``event: Event``: Event 对象 * ``state: T_State``: 当前 State """ - _event_preprocessors.add(func) + _event_preprocessors.add( + Handler(func, + allow_types=EVENT_PCS_PARAMS, + dependency_overrides_provider=get_driver())) return func @@ -59,7 +73,10 @@ def event_postprocessor(func: T_EventPostProcessor) -> T_EventPostProcessor: * ``event: Event``: Event 对象 * ``state: T_State``: 当前事件运行前 State """ - _event_postprocessors.add(func) + _event_postprocessors.add( + Handler(func, + allow_types=EVENT_PCS_PARAMS, + dependency_overrides_provider=get_driver())) return func @@ -78,7 +95,10 @@ def run_preprocessor(func: T_RunPreProcessor) -> T_RunPreProcessor: * ``event: Event``: Event 对象 * ``state: T_State``: 当前 State """ - _run_preprocessors.add(func) + _run_preprocessors.add( + Handler(func, + allow_types=RUN_PREPCS_PARAMS, + dependency_overrides_provider=get_driver())) return func @@ -98,7 +118,10 @@ def run_postprocessor(func: T_RunPostProcessor) -> T_RunPostProcessor: * ``event: Event``: Event 对象 * ``state: T_State``: 当前 State """ - _run_postprocessors.add(func) + _run_postprocessors.add( + Handler(func, + allow_types=RUN_POSTPCS_PARAMS, + dependency_overrides_provider=get_driver())) return func @@ -136,7 +159,8 @@ async def _run_matcher(Matcher: Type[Matcher], bot: "Bot", event: "Event", matcher = Matcher() coros = list( - map(lambda x: x(matcher, bot, event, state), _run_preprocessors)) + map(lambda x: x(matcher=matcher, bot=bot, event=event, state=state), + _run_preprocessors)) if coros: try: await asyncio.gather(*coros) @@ -162,8 +186,12 @@ async def _run_matcher(Matcher: Type[Matcher], bot: "Bot", event: "Event", exception = e coros = list( - map(lambda x: x(matcher, exception, bot, event, state), - _run_postprocessors)) + map( + lambda x: x(matcher=matcher, + exception=exception, + bot=bot, + event=event, + state=state), _run_postprocessors)) if coros: try: await asyncio.gather(*coros) @@ -208,7 +236,9 @@ async def handle_event(bot: "Bot", event: "Event") -> None: # TODO async with AsyncExitStack() as stack: - coros = list(map(lambda x: x(bot, event, state), _event_preprocessors)) + coros = list( + map(lambda x: x(bot=bot, event=event, state=state), + _event_preprocessors)) if coros: try: if show_log: @@ -255,7 +285,9 @@ async def handle_event(bot: "Bot", event: "Event") -> None: "Error when checking Matcher." ) - coros = list(map(lambda x: x(bot, event, state), _event_postprocessors)) + coros = list( + map(lambda x: x(bot=bot, event=event, state=state), + _event_postprocessors)) if coros: try: if show_log: diff --git a/nonebot/processor/params.py b/nonebot/params.py similarity index 53% rename from nonebot/processor/params.py rename to nonebot/params.py index f777889c..8b644f91 100644 --- a/nonebot/processor/params.py +++ b/nonebot/params.py @@ -1,38 +1,19 @@ -import abc import inspect -from enum import Enum from typing import Any, Dict, Optional -from pydantic.fields import FieldInfo - from nonebot.typing import T_State +from nonebot.dependencies import Param from nonebot.adapters import Bot, Event -from .utils import generic_check_issubclass - - -class Param(FieldInfo, abc.ABC): - - def __repr__(self) -> str: - return f"{self.__class__.__name__}" - - def __str__(self) -> str: - return repr(self) - - @classmethod - @abc.abstractmethod - def _check(cls, name: str, param: inspect.Parameter) -> bool: - raise NotImplementedError - - @abc.abstractmethod - def _solve(self, **kwargs: Any) -> Any: - raise NotImplementedError +from nonebot.utils import generic_check_issubclass class BotParam(Param): @classmethod def _check(cls, name: str, param: inspect.Parameter) -> bool: - return generic_check_issubclass(param.annotation, Bot) + return generic_check_issubclass( + param.annotation, Bot) or (param.annotation == param.empty and + name == "bot") def _solve(self, bot: Bot, **kwargs: Any) -> Any: return bot @@ -42,7 +23,9 @@ class EventParam(Param): @classmethod def _check(cls, name: str, param: inspect.Parameter) -> bool: - return generic_check_issubclass(param.annotation, Event) + return generic_check_issubclass( + param.annotation, Event) or (param.annotation == param.empty and + name == "event") def _solve(self, event: Event, **kwargs: Any) -> Any: return event @@ -52,7 +35,9 @@ class StateParam(Param): @classmethod def _check(cls, name: str, param: inspect.Parameter) -> bool: - return generic_check_issubclass(param.annotation, Dict) + return generic_check_issubclass( + param.annotation, Dict) or (param.annotation == param.empty and + name == "state") def _solve(self, state: T_State, **kwargs: Any) -> Any: return state @@ -62,7 +47,9 @@ class MatcherParam(Param): @classmethod def _check(cls, name: str, param: inspect.Parameter) -> bool: - return generic_check_issubclass(param.annotation, Matcher) + return generic_check_issubclass( + param.annotation, Matcher) or (param.annotation == param.empty and + name == "matcher") def _solve(self, matcher: Optional["Matcher"] = None, **kwargs: Any) -> Any: return matcher @@ -72,7 +59,9 @@ class ExceptionParam(Param): @classmethod def _check(cls, name: str, param: inspect.Parameter) -> bool: - return generic_check_issubclass(param.annotation, Exception) + return generic_check_issubclass( + param.annotation, Exception) or (param.annotation == param.empty and + name == "exception") def _solve(self, exception: Optional[Exception] = None, @@ -80,12 +69,4 @@ class ExceptionParam(Param): return exception -class ParamTypes(Enum): - BOT = BotParam - EVENT = EventParam - STATE = StateParam - MATCHER = MatcherParam - EXCEPTION = ExceptionParam - - -from .matcher import Matcher +from nonebot.matcher import Matcher diff --git a/nonebot/plugin/on.py b/nonebot/plugin/on.py index 40038984..626e4ed1 100644 --- a/nonebot/plugin/on.py +++ b/nonebot/plugin/on.py @@ -4,10 +4,11 @@ import inspect from types import ModuleType from typing import Any, Set, Dict, List, Type, Tuple, Union, Optional +from nonebot.handler import Handler +from nonebot.matcher import Matcher from .manager import _current_plugin from nonebot.adapters import Bot, Event from nonebot.permission import Permission -from nonebot.processor import Handler, Matcher from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_StateFactory from nonebot.rule import (Rule, ArgumentParser, regex, command, keyword, endswith, startswith, shell_command) diff --git a/nonebot/plugin/on.pyi b/nonebot/plugin/on.pyi index fbbf9c90..68e8ad62 100644 --- a/nonebot/plugin/on.pyi +++ b/nonebot/plugin/on.pyi @@ -1,9 +1,10 @@ import re from typing import Set, List, Type, Tuple, Union, Optional +from nonebot.handler import Handler +from nonebot.matcher import Matcher from nonebot.permission import Permission from nonebot.rule import Rule, ArgumentParser -from nonebot.processor import Handler, Matcher from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_StateFactory diff --git a/nonebot/plugin/plugin.py b/nonebot/plugin/plugin.py index bf7773ac..ee5a7c51 100644 --- a/nonebot/plugin/plugin.py +++ b/nonebot/plugin/plugin.py @@ -3,7 +3,7 @@ from dataclasses import field, dataclass from typing import Set, Dict, Type, Optional from .export import Export -from nonebot.processor import Matcher +from nonebot.matcher import Matcher plugins: Dict[str, "Plugin"] = {} """ diff --git a/nonebot/plugins/echo.py b/nonebot/plugins/echo.py index 5e61fd95..440aa4bf 100644 --- a/nonebot/plugins/echo.py +++ b/nonebot/plugins/echo.py @@ -3,14 +3,14 @@ from functools import reduce from nonebot.rule import to_me from nonebot.plugin import on_command from nonebot.permission import SUPERUSER -from nonebot.adapters.cqhttp import (Bot, Message, MessageEvent, MessageSegment, +from nonebot.adapters.cqhttp import (Message, MessageEvent, MessageSegment, unescape) say = on_command("say", to_me(), permission=SUPERUSER) @say.handle() -async def say_unescape(bot: Bot, event: MessageEvent): +async def say_unescape(event: MessageEvent): def _unescape(message: Message, segment: MessageSegment): if segment.is_text(): @@ -18,12 +18,12 @@ async def say_unescape(bot: Bot, event: MessageEvent): return message.append(segment) message = reduce(_unescape, event.get_message(), Message()) # type: ignore - await bot.send(message=message, event=event) + await say.send(message=message) echo = on_command("echo", to_me()) @echo.handle() -async def echo_escape(bot: Bot, event: MessageEvent): - await bot.send(message=event.get_message(), event=event) +async def echo_escape(event: MessageEvent): + await say.send(message=event.get_message()) diff --git a/nonebot/plugins/single_session.py b/nonebot/plugins/single_session.py index 1b6d4116..81a9a9d1 100644 --- a/nonebot/plugins/single_session.py +++ b/nonebot/plugins/single_session.py @@ -1,7 +1,7 @@ from typing import Dict, Optional from nonebot.typing import T_State -from nonebot.processor import Matcher +from nonebot.matcher import Matcher from nonebot.adapters import Bot, Event from nonebot.message import (IgnoredException, run_preprocessor, run_postprocessor) @@ -10,7 +10,7 @@ _running_matcher: Dict[str, int] = {} @run_preprocessor -async def preprocess(matcher: Matcher, bot: Bot, event: Event, state: T_State): +async def preprocess(event: Event): try: session_id = event.get_session_id() except Exception: @@ -24,8 +24,7 @@ async def preprocess(matcher: Matcher, bot: Bot, event: Event, state: T_State): @run_postprocessor -async def postprocess(matcher: Matcher, exception: Optional[Exception], - bot: Bot, event: Event, state: T_State): +async def postprocess(event: Event): try: session_id = event.get_session_id() except Exception: diff --git a/nonebot/typing.py b/nonebot/typing.py index 053fcff7..3725b301 100644 --- a/nonebot/typing.py +++ b/nonebot/typing.py @@ -22,7 +22,7 @@ from typing import (TYPE_CHECKING, Any, Dict, Union, TypeVar, Callable, NoReturn, Optional, Awaitable) if TYPE_CHECKING: - from nonebot.processor import Matcher + from nonebot.matcher import Matcher from nonebot.adapters import Bot, Event from nonebot.permission import Permission @@ -90,7 +90,7 @@ T_CalledAPIHook = Callable[ ``bot.call_api`` 后执行的函数，参数分别为 bot, exception, api, data, result """ -T_EventPreProcessor = Callable[["Bot", "Event", T_State], Awaitable[None]] +T_EventPreProcessor = Callable[..., Awaitable[None]] """ :类型: ``Callable[[Bot, Event, T_State], Awaitable[None]]`` @@ -98,7 +98,7 @@ T_EventPreProcessor = Callable[["Bot", "Event", T_State], Awaitable[None]] 事件预处理函数 EventPreProcessor 类型 """ -T_EventPostProcessor = Callable[["Bot", "Event", T_State], Awaitable[None]] +T_EventPostProcessor = Callable[..., Awaitable[None]] """ :类型: ``Callable[[Bot, Event, T_State], Awaitable[None]]`` @@ -106,8 +106,7 @@ T_EventPostProcessor = Callable[["Bot", "Event", T_State], Awaitable[None]] 事件预处理函数 EventPostProcessor 类型 """ -T_RunPreProcessor = Callable[["Matcher", "Bot", "Event", T_State], - Awaitable[None]] +T_RunPreProcessor = Callable[..., Awaitable[None]] """ :类型: ``Callable[[Matcher, Bot, Event, T_State], Awaitable[None]]`` @@ -115,8 +114,7 @@ T_RunPreProcessor = Callable[["Matcher", "Bot", "Event", T_State], 事件响应器运行前预处理函数 RunPreProcessor 类型 """ -T_RunPostProcessor = Callable[ - ["Matcher", Optional[Exception], "Bot", "Event", T_State], Awaitable[None]] +T_RunPostProcessor = Callable[..., Awaitable[None]] """ :类型: ``Callable[[Matcher, Optional[Exception], Bot, Event, T_State], Awaitable[None]]`` diff --git a/nonebot/utils.py b/nonebot/utils.py index 2786ef1d..66e905e6 100644 --- a/nonebot/utils.py +++ b/nonebot/utils.py @@ -4,10 +4,11 @@ import asyncio import inspect import dataclasses from functools import wraps, partial -from typing_extensions import ParamSpec from contextlib import asynccontextmanager -from typing import (Any, TypeVar, Callable, Optional, Awaitable, AsyncGenerator, - ContextManager) +from typing_extensions import GenericAlias # type: ignore +from typing_extensions import ParamSpec, get_args, get_origin +from typing import (Any, Type, Tuple, Union, TypeVar, Callable, Optional, + Awaitable, AsyncGenerator, ContextManager) from nonebot.log import logger from nonebot.typing import overrides @@ -34,6 +35,24 @@ def escape_tag(s: str) -> str: return re.sub(r"\s]*)>", r"\\\g<0>", s) +def generic_check_issubclass( + cls: Any, class_or_tuple: Union[Type[Any], Tuple[Type[Any], + ...]]) -> bool: + try: + return issubclass(cls, class_or_tuple) + except TypeError: + if get_origin(cls) is Union: + for type_ in get_args(cls): + if type_ is not type(None) and not generic_check_issubclass( + type_, class_or_tuple): + return False + return True + elif isinstance(cls, GenericAlias): + origin = get_origin(cls) + return bool(origin and issubclass(origin, class_or_tuple)) + raise + + def is_coroutine_callable(func: Callable[..., Any]) -> bool: if inspect.isroutine(func): return inspect.iscoroutinefunction(func) diff --git a/tests/test_plugins/test_depends.py b/tests/test_plugins/test_depends.py index 77580374..c604169b 100644 --- a/tests/test_plugins/test_depends.py +++ b/tests/test_plugins/test_depends.py @@ -1,6 +1,6 @@ from nonebot import on_command from nonebot.log import logger -from nonebot.processor import Depends +from nonebot.dependencies import Depends test = on_command("123") diff --git a/tests/test_plugins/test_processor.py b/tests/test_plugins/test_processor.py index 5eb6b70e..438dda96 100644 --- a/tests/test_plugins/test_processor.py +++ b/tests/test_plugins/test_processor.py @@ -1,15 +1,15 @@ +from nonebot.adapters import Event from nonebot.typing import T_State -from nonebot.processor import Matcher -from nonebot.adapters import Bot, Event +from nonebot.matcher import Matcher from nonebot.message import run_preprocessor, event_preprocessor @event_preprocessor -async def handle(bot: Bot, event: Event, state: T_State): +async def handle(event: Event, state: T_State): state["preprocessed"] = True print(type(event), event) @run_preprocessor -async def run(matcher: Matcher, bot: Bot, event: Event, state: T_State): +async def run(matcher: Matcher): print(matcher) From dc31afbd186beec2250faa975de2d0561bdaccf3 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 17 Nov 2021 00:27:58 +0800 Subject: [PATCH 028/174] :wheelchair: improve command rule types --- nonebot/plugin/on.py | 14 +++--- nonebot/rule.py | 103 +++++++++++++++++++------------------------ 2 files changed, 52 insertions(+), 65 deletions(-) diff --git a/nonebot/plugin/on.py b/nonebot/plugin/on.py index 626e4ed1..1b2cf16e 100644 --- a/nonebot/plugin/on.py +++ b/nonebot/plugin/on.py @@ -4,14 +4,14 @@ import inspect from types import ModuleType from typing import Any, Set, Dict, List, Type, Tuple, Union, Optional +from nonebot.adapters import Event from nonebot.handler import Handler from nonebot.matcher import Matcher from .manager import _current_plugin -from nonebot.adapters import Bot, Event from nonebot.permission import Permission from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_StateFactory -from nonebot.rule import (Rule, ArgumentParser, regex, command, keyword, - endswith, startswith, shell_command) +from nonebot.rule import (PREFIX_KEY, RAW_CMD_KEY, Rule, ArgumentParser, regex, + command, keyword, endswith, startswith, shell_command) def _store_matcher(matcher: Type[Matcher]) -> None: @@ -373,16 +373,16 @@ def on_command(cmd: Union[str, Tuple[str, ...]], - ``Type[Matcher]`` """ - async def _strip_cmd(bot: Bot, event: Event, state: T_State): + async def _strip_cmd(event: Event, state: T_State): message = event.get_message() if len(message) < 1: return segment = message.pop(0) segment_text = str(segment).lstrip() - if not segment_text.startswith(state["_prefix"]["raw_command"]): + if not segment_text.startswith(state[PREFIX_KEY][RAW_CMD_KEY]): return new_message = message.__class__( - segment_text[len(state["_prefix"]["raw_command"]):].lstrip()) + segment_text[len(state[PREFIX_KEY][RAW_CMD_KEY]):].lstrip()) for new_segment in reversed(new_message): message.insert(0, new_segment) @@ -430,7 +430,7 @@ def on_shell_command(cmd: Union[str, Tuple[str, ...]], - ``Type[Matcher]`` """ - async def _strip_cmd(bot: Bot, event: Event, state: T_State): + async def _strip_cmd(event: Event, state: T_State): message = event.get_message() segment = message.pop(0) new_message = message.__class__( diff --git a/nonebot/rule.py b/nonebot/rule.py index 40fc1b43..7ac0fe8d 100644 --- a/nonebot/rule.py +++ b/nonebot/rule.py @@ -14,18 +14,35 @@ import shlex import asyncio from itertools import product from argparse import Namespace +from typing_extensions import TypedDict from argparse import ArgumentParser as ArgParser -from typing import (Any, Dict, Tuple, Union, Callable, NoReturn, Optional, - Sequence, Awaitable) +from typing import (Any, Tuple, Union, Callable, NoReturn, Optional, Sequence, + Awaitable) from pygtrie import CharTrie from nonebot import get_driver from nonebot.log import logger from nonebot.utils import run_sync -from nonebot.adapters import Bot, Event from nonebot.exception import ParserExit from nonebot.typing import T_State, T_RuleChecker +from nonebot.adapters import Bot, Event, MessageSegment + +PREFIX_KEY = "_prefix" +SUFFIX_KEY = "_suffix" +CMD_KEY = "command" +RAW_CMD_KEY = "raw_command" +CMD_RESULT = TypedDict("CMD_RESULT", { + "command": Optional[Tuple[str, ...]], + "raw_command": Optional[str] +}) + +SHELL_ARGS = "_args" +SHELL_ARGV = "_argv" + +REGEX_MATCHED = "_matched" +REGEX_GROUP = "_matched_groups" +REGEX_DICT = "_matched_dict" class Rule: @@ -121,57 +138,27 @@ class TrieRule: @classmethod def get_value(cls, bot: Bot, event: Event, - state: T_State) -> Tuple[Dict[str, Any], Dict[str, Any]]: + state: T_State) -> Tuple[CMD_RESULT, CMD_RESULT]: + prefix = CMD_RESULT(command=None, raw_command=None) + suffix = CMD_RESULT(command=None, raw_command=None) + state[PREFIX_KEY] = prefix + state[SUFFIX_KEY] = suffix if event.get_type() != "message": - state["_prefix"] = {"raw_command": None, "command": None} - state["_suffix"] = {"raw_command": None, "command": None} - return { - "raw_command": None, - "command": None - }, { - "raw_command": None, - "command": None - } + return prefix, suffix - prefix = None - suffix = None message = event.get_message() - message_seg = message[0] + message_seg: MessageSegment = message[0] if message_seg.is_text(): - prefix = cls.prefix.longest_prefix(str(message_seg).lstrip()) - message_seg_r = message[-1] + pf = cls.prefix.longest_prefix(str(message_seg).lstrip()) + prefix[RAW_CMD_KEY] = pf.key + prefix[CMD_KEY] = pf.value + message_seg_r: MessageSegment = message[-1] if message_seg_r.is_text(): - suffix = cls.suffix.longest_prefix( - str(message_seg_r).rstrip()[::-1]) + sf = cls.suffix.longest_prefix(str(message_seg_r).rstrip()[::-1]) + suffix[RAW_CMD_KEY] = sf.key + suffix[CMD_KEY] = sf.value - state["_prefix"] = { - "raw_command": prefix.key, - "command": prefix.value - } if prefix else { - "raw_command": None, - "command": None - } - state["_suffix"] = { - "raw_command": suffix.key, - "command": suffix.value - } if suffix else { - "raw_command": None, - "command": None - } - - return ({ - "raw_command": prefix.key, - "command": prefix.value - } if prefix else { - "raw_command": None, - "command": None - }, { - "raw_command": suffix.key, - "command": suffix.value - } if suffix else { - "raw_command": None, - "command": None - }) + return prefix, suffix def startswith(msg: Union[str, Tuple[str, ...]], @@ -288,7 +275,7 @@ def command(*cmds: Union[str, Tuple[str, ...]]) -> Rule: TrieRule.add_prefix(f"{start}{sep.join(command)}", command) async def _command(bot: Bot, event: Event, state: T_State) -> bool: - return state["_prefix"]["command"] in commands + return state[PREFIX_KEY][CMD_KEY] in commands return Rule(_command) @@ -374,17 +361,17 @@ def shell_command(*cmds: Union[str, Tuple[str, ...]], TrieRule.add_prefix(f"{start}{sep.join(command)}", command) async def _shell_command(bot: Bot, event: Event, state: T_State) -> bool: - if state["_prefix"]["command"] in commands: + if state[PREFIX_KEY][CMD_KEY] in commands: message = str(event.get_message()) - strip_message = message[len(state["_prefix"]["raw_command"] + strip_message = message[len(state[PREFIX_KEY][RAW_CMD_KEY] ):].lstrip() - state["argv"] = shlex.split(strip_message) + state[SHELL_ARGV] = shlex.split(strip_message) if parser: try: - args = parser.parse_args(state["argv"]) - state["args"] = args + args = parser.parse_args(state[SHELL_ARGV]) + state[SHELL_ARGS] = args except ParserExit as e: - state["args"] = e + state[SHELL_ARGS] = e return True else: return False @@ -418,9 +405,9 @@ def regex(regex: str, flags: Union[int, re.RegexFlag] = 0) -> Rule: return False matched = pattern.search(str(event.get_message())) if matched: - state["_matched"] = matched.group() - state["_matched_groups"] = matched.groups() - state["_matched_dict"] = matched.groupdict() + state[REGEX_MATCHED] = matched.group() + state[REGEX_GROUP] = matched.groups() + state[REGEX_DICT] = matched.groupdict() return True else: return False From 36d93b8a3acae88ff685ee4139750c584686e711 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 17 Nov 2021 19:52:12 +0800 Subject: [PATCH 029/174] :arrow_up: update dependencies --- .github/workflows/build_docs.yml | 2 - pages/changelog.md | 4 +- poetry.lock | 257 +++++++++++++++++-------------- pyproject.toml | 4 +- 4 files changed, 145 insertions(+), 122 deletions(-) diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index bd20695a..ed960d53 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -25,8 +25,6 @@ jobs: with: path: ~/.cache/pypoetry/virtualenvs key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }} - restore-keys: | - ${{ runner.os }}-poetry- - name: Set up dependencies run: | diff --git a/pages/changelog.md b/pages/changelog.md index 76c9f1c5..a8565f0c 100644 --- a/pages/changelog.md +++ b/pages/changelog.md @@ -4,11 +4,13 @@ sidebar: auto # 更新日志 -## v2.0.0a17 +## v2.0.0b1 - 新增 `MessageTemplate` 对于 `str` 普通模板的支持 - 移除插件加载的 `NameSpace` 模式 - 修改 toml 加载插件时的键名为 `tool.nonebot` 以符合规范 +- 新增 Handler 依赖注入支持 +- 统一 `Processor`, `Rule`, `Permission` 使用 `Handler` ## v2.0.0a16 diff --git a/poetry.lock b/poetry.lock index 91c140fc..b3568e16 100644 --- a/poetry.lock +++ b/poetry.lock @@ -33,7 +33,7 @@ python-versions = ">=3.6,<4.0" [[package]] name = "aiohttp" -version = "3.8.0" +version = "3.8.1" description = "Async http client/server framework (asyncio)" category = "main" optional = true @@ -297,7 +297,7 @@ python-versions = ">=3.5" [[package]] name = "httpcore" -version = "0.13.7" +version = "0.14.2" description = "A minimal low-level HTTP client." category = "main" optional = false @@ -305,6 +305,7 @@ python-versions = ">=3.6" [package.dependencies] anyio = ">=3.0.0,<4.0.0" +certifi = "*" h11 = ">=0.11,<0.13" sniffio = ">=1.0.0,<2.0.0" @@ -324,7 +325,7 @@ test = ["Cython (==0.29.22)"] [[package]] name = "httpx" -version = "0.20.0" +version = "0.21.1" description = "The next generation HTTP client." category = "main" optional = false @@ -334,7 +335,7 @@ python-versions = ">=3.6" certifi = "*" charset-normalizer = "*" h2 = {version = ">=3,<5", optional = true, markers = "extra == \"http2\""} -httpcore = ">=0.13.3,<0.14.0" +httpcore = ">=0.14.0,<0.15.0" rfc3986 = {version = ">=1.3,<2", extras = ["idna2008"]} sniffio = "*" @@ -771,7 +772,7 @@ python-versions = ">=3.5" [[package]] name = "snowballstemmer" -version = "2.1.0" +version = "2.2.0" description = "This package provides 29 stemmers for 28 languages generated from Snowball algorithms." category = "dev" optional = false @@ -828,7 +829,7 @@ yapf = "*" type = "git" url = "https://github.com/nonebot/sphinx-markdown-builder.git" reference = "master" -resolved_reference = "7a8c8a66dfe42436b4584d1d13f5d0127fc83301" +resolved_reference = "2204923f5938a8f7354c6a69ed58079edd180a43" [[package]] name = "sphinxcontrib-applehelp" @@ -934,11 +935,11 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "typing-extensions" -version = "3.10.0.2" -description = "Backported and Experimental Type Hints for Python 3.5+" +version = "4.0.0" +description = "Backported and Experimental Type Hints for Python 3.6+" category = "main" optional = false -python-versions = "*" +python-versions = ">=3.6" [[package]] name = "unify" @@ -1019,7 +1020,7 @@ python-versions = ">=3.5" [[package]] name = "websockets" -version = "10.0" +version = "10.1" description = "An implementation of the WebSocket Protocol (RFC 6455 & 7692)" category = "main" optional = false @@ -1099,7 +1100,7 @@ quart = ["Quart"] [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "81edd95f4289e55d7cfe632664c930846bde723cb8fa0359fa1e18474853f454" +content-hash = "537c91f98fd6598dbce8c2942530f18dee0858a896b6f393a684252a77dc76c6" [metadata.files] aiocache = [ @@ -1115,78 +1116,78 @@ aiofiles = [ {file = "aiofiles-0.7.0.tar.gz", hash = "sha256:a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4"}, ] aiohttp = [ - {file = "aiohttp-3.8.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:48f218a5257b6bc16bcf26a91d97ecea0c7d29c811a90d965f3dd97c20f016d6"}, - {file = "aiohttp-3.8.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a2fee4d656a7cc9ab47771b2a9e8fad8a9a33331c1b59c3057ecf0ac858f5bfe"}, - {file = "aiohttp-3.8.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:688a1eb8c1a5f7e795c7cb67e0fe600194e6723ba35f138dfae0db20c0cb8f94"}, - {file = "aiohttp-3.8.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7ba09bb3dcb0b7ec936a485db2b64be44fe14cdce0a5eac56f50e55da3627385"}, - {file = "aiohttp-3.8.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d7715daf84f10bcebc083ad137e3eced3e1c8e7fa1f096ade9a8d02b08f0d91c"}, - {file = "aiohttp-3.8.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5e3f81fbbc170418e22918a9585fd7281bbc11d027064d62aa4b507552c92671"}, - {file = "aiohttp-3.8.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1fa9f50aa1f114249b7963c98e20dc35c51be64096a85bc92433185f331de9cc"}, - {file = "aiohttp-3.8.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:8a50150419b741ee048b53146c39c47053f060cb9d98e78be08fdbe942eaa3c4"}, - {file = "aiohttp-3.8.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a84c335337b676d832c1e2bc47c3a97531b46b82de9f959dafb315cbcbe0dfcd"}, - {file = "aiohttp-3.8.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:88d4917c30fcd7f6404fb1dc713fa21de59d3063dcc048f4a8a1a90e6bbbd739"}, - {file = "aiohttp-3.8.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:b76669b7c058b8020b11008283c3b8e9c61bfd978807c45862956119b77ece45"}, - {file = "aiohttp-3.8.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:84fe1732648c1bc303a70faa67cbc2f7f2e810c8a5bca94f6db7818e722e4c0a"}, - {file = "aiohttp-3.8.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:730b7c2b7382194d9985ffdc32ab317e893bca21e0665cb1186bdfbb4089d990"}, - {file = "aiohttp-3.8.0-cp310-cp310-win32.whl", hash = "sha256:0a96473a1f61d7920a9099bc8e729dc8282539d25f79c12573ee0fdb9c8b66a8"}, - {file = "aiohttp-3.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:764c7c6aa1f78bd77bd9674fc07d1ec44654da1818d0eef9fb48aa8371a3c847"}, - {file = "aiohttp-3.8.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:9951c2696c4357703001e1fe6edc6ae8e97553ac630492ea1bf64b429cb712a3"}, - {file = "aiohttp-3.8.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0af379221975054162959e00daf21159ff69a712fc42ed0052caddbd70d52ff4"}, - {file = "aiohttp-3.8.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9689af0f0a89e5032426c143fa3683b0451f06c83bf3b1e27902bd33acfae769"}, - {file = "aiohttp-3.8.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:fe4a327da0c6b6e59f2e474ae79d6ee7745ac3279fd15f200044602fa31e3d79"}, - {file = "aiohttp-3.8.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ecb314e59bedb77188017f26e6b684b1f6d0465e724c3122a726359fa62ca1ba"}, - {file = "aiohttp-3.8.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a5399a44a529083951b55521cf4ecbf6ad79fd54b9df57dbf01699ffa0549fc9"}, - {file = "aiohttp-3.8.0-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:09754a0d5eaab66c37591f2f8fac8f9781a5f61d51aa852a3261c4805ca6b984"}, - {file = "aiohttp-3.8.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:adf0cb251b1b842c9dee5cfcdf880ba0aae32e841b8d0e6b6feeaef002a267c5"}, - {file = "aiohttp-3.8.0-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:a4759e85a191de58e0ea468ab6fd9c03941986eee436e0518d7a9291fab122c8"}, - {file = "aiohttp-3.8.0-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:28369fe331a59d80393ec82df3d43307c7461bfaf9217999e33e2acc7984ff7c"}, - {file = "aiohttp-3.8.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:2f44d1b1c740a9e2275160d77c73a11f61e8a916191c572876baa7b282bcc934"}, - {file = "aiohttp-3.8.0-cp36-cp36m-win32.whl", hash = "sha256:e27cde1e8d17b09730801ce97b6e0c444ba2a1f06348b169fd931b51d3402f0d"}, - {file = "aiohttp-3.8.0-cp36-cp36m-win_amd64.whl", hash = "sha256:15a660d06092b7c92ed17c1dbe6c1eab0a02963992d60e3e8b9d5fa7fa81f01e"}, - {file = "aiohttp-3.8.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:257f4fad1714d26d562572095c8c5cd271d5a333252795cb7a002dca41fdbad7"}, - {file = "aiohttp-3.8.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a6074a3b2fa2d0c9bf0963f8dfc85e1e54a26114cc8594126bc52d3fa061c40e"}, - {file = "aiohttp-3.8.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7a315ceb813208ef32bdd6ec3a85cbe3cb3be9bbda5fd030c234592fa9116993"}, - {file = "aiohttp-3.8.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9a52b141ff3b923a9166595de6e3768a027546e75052ffba267d95b54267f4ab"}, - {file = "aiohttp-3.8.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6a038cb1e6e55b26bb5520ccffab7f539b3786f5553af2ee47eb2ec5cbd7084e"}, - {file = "aiohttp-3.8.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98b1ea2763b33559dd9ec621d67fc17b583484cb90735bfb0ec3614c17b210e4"}, - {file = "aiohttp-3.8.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:9e8723c3256641e141cd18f6ce478d54a004138b9f1a36e41083b36d9ecc5fc5"}, - {file = "aiohttp-3.8.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:14a6f026eca80dfa3d52e86be89feb5cd878f6f4a6adb34457e2c689fd85229b"}, - {file = "aiohttp-3.8.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:c62d4791a8212c885b97a63ef5f3974b2cd41930f0cd224ada9c6ee6654f8150"}, - {file = "aiohttp-3.8.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:90a97c2ed2830e7974cbe45f0838de0aefc1c123313f7c402e21c29ec063fbb4"}, - {file = "aiohttp-3.8.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:dcc4d5dd5fba3affaf4fd08f00ef156407573de8c63338787614ccc64f96b321"}, - {file = "aiohttp-3.8.0-cp37-cp37m-win32.whl", hash = "sha256:de42f513ed7a997bc821bddab356b72e55e8396b1b7ba1bf39926d538a76a90f"}, - {file = "aiohttp-3.8.0-cp37-cp37m-win_amd64.whl", hash = "sha256:7d76e8a83396e06abe3df569b25bd3fc88bf78b7baa2c8e4cf4aaf5983af66a3"}, - {file = "aiohttp-3.8.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5d79174d96446a02664e2bffc95e7b6fa93b9e6d8314536c5840dff130d0878b"}, - {file = "aiohttp-3.8.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4a6551057a846bf72c7a04f73de3fcaca269c0bd85afe475ceb59d261c6a938c"}, - {file = "aiohttp-3.8.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:871d4fdc56288caa58b1094c20f2364215f7400411f76783ea19ad13be7c8e19"}, - {file = "aiohttp-3.8.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3ba08a71caa42eef64357257878fb17f3fba3fba6e81a51d170e32321569e079"}, - {file = "aiohttp-3.8.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:51f90dabd9933b1621260b32c2f0d05d36923c7a5a909eb823e429dba0fd2f3e"}, - {file = "aiohttp-3.8.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f348ebd20554e8bc26e8ef3ed8a134110c0f4bf015b3b4da6a4ddf34e0515b19"}, - {file = "aiohttp-3.8.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:d5f8c04574efa814a24510122810e3a3c77c0552f9f6ff65c9862f1f046be2c3"}, - {file = "aiohttp-3.8.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5ecffdc748d3b40dd3618ede0170e4f5e1d3c9647cfb410d235d19e62cb54ee0"}, - {file = "aiohttp-3.8.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:577cc2c7b807b174814dac2d02e673728f2e46c7f90ceda3a70ea4bb6d90b769"}, - {file = "aiohttp-3.8.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:6b79f6c31e68b6dafc0317ec453c83c86dd8db1f8f0c6f28e97186563fca87a0"}, - {file = "aiohttp-3.8.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:2bdd655732e38b40f8a8344d330cfae3c727fb257585df923316aabbd489ccb8"}, - {file = "aiohttp-3.8.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:63fa57a0708573d3c059f7b5527617bd0c291e4559298473df238d502e4ab98c"}, - {file = "aiohttp-3.8.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d3f90ee275b1d7c942e65b5c44c8fb52d55502a0b9a679837d71be2bd8927661"}, - {file = "aiohttp-3.8.0-cp38-cp38-win32.whl", hash = "sha256:fa818609357dde5c4a94a64c097c6404ad996b1d38ca977a72834b682830a722"}, - {file = "aiohttp-3.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:097ecf52f6b9859b025c1e36401f8aa4573552e887d1b91b4b999d68d0b5a3b3"}, - {file = "aiohttp-3.8.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:be03a7483ad9ea60388f930160bb3728467dd0af538aa5edc60962ee700a0bdc"}, - {file = "aiohttp-3.8.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:78d51e35ed163783d721b6f2ce8ce3f82fccfe471e8e50a10fba13a766d31f5a"}, - {file = "aiohttp-3.8.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:bda75d73e7400e81077b0910c9a60bf9771f715420d7e35fa7739ae95555f195"}, - {file = "aiohttp-3.8.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:707adc30ea6918fba725c3cb3fe782d271ba352b22d7ae54a7f9f2e8a8488c41"}, - {file = "aiohttp-3.8.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f58aa995b905ab82fe228acd38538e7dc1509e01508dcf307dad5046399130f"}, - {file = "aiohttp-3.8.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c996eb91bfbdab1e01e2c02e7ff678c51e2b28e3a04e26e41691991cc55795"}, - {file = "aiohttp-3.8.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:d6a1a66bb8bac9bc2892c2674ea363486bfb748b86504966a390345a11b1680e"}, - {file = "aiohttp-3.8.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:dafc01a32b4a1d7d3ef8bfd3699406bb44f7b2e0d3eb8906d574846e1019b12f"}, - {file = "aiohttp-3.8.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:949a605ef3907254b122f845baa0920407080cdb1f73aa64f8d47df4a7f4c4f9"}, - {file = "aiohttp-3.8.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:0d7b056fd3972d353cb4bc305c03f9381583766b7f8c7f1c44478dba69099e33"}, - {file = "aiohttp-3.8.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:6f1d39a744101bf4043fa0926b3ead616607578192d0a169974fb5265ab1e9d2"}, - {file = "aiohttp-3.8.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:67ca7032dfac8d001023fadafc812d9f48bf8a8c3bb15412d9cdcf92267593f4"}, - {file = "aiohttp-3.8.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:cb751ef712570d3bda9a73fd765ff3e1aba943ec5d52a54a0c2e89c7eef9da1e"}, - {file = "aiohttp-3.8.0-cp39-cp39-win32.whl", hash = "sha256:6d3e027fe291b77f6be9630114a0200b2c52004ef20b94dc50ca59849cd623b3"}, - {file = "aiohttp-3.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:3c5e9981e449d54308c6824f172ec8ab63eb9c5f922920970249efee83f7e919"}, - {file = "aiohttp-3.8.0.tar.gz", hash = "sha256:d3b19d8d183bcfd68b25beebab8dc3308282fe2ca3d6ea3cb4cd101b3c279f8d"}, + {file = "aiohttp-3.8.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1ed0b6477896559f17b9eaeb6d38e07f7f9ffe40b9f0f9627ae8b9926ae260a8"}, + {file = "aiohttp-3.8.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7dadf3c307b31e0e61689cbf9e06be7a867c563d5a63ce9dca578f956609abf8"}, + {file = "aiohttp-3.8.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a79004bb58748f31ae1cbe9fa891054baaa46fb106c2dc7af9f8e3304dc30316"}, + {file = "aiohttp-3.8.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:12de6add4038df8f72fac606dff775791a60f113a725c960f2bab01d8b8e6b15"}, + {file = "aiohttp-3.8.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6f0d5f33feb5f69ddd57a4a4bd3d56c719a141080b445cbf18f238973c5c9923"}, + {file = "aiohttp-3.8.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:eaba923151d9deea315be1f3e2b31cc39a6d1d2f682f942905951f4e40200922"}, + {file = "aiohttp-3.8.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:099ebd2c37ac74cce10a3527d2b49af80243e2a4fa39e7bce41617fbc35fa3c1"}, + {file = "aiohttp-3.8.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:2e5d962cf7e1d426aa0e528a7e198658cdc8aa4fe87f781d039ad75dcd52c516"}, + {file = "aiohttp-3.8.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:fa0ffcace9b3aa34d205d8130f7873fcfefcb6a4dd3dd705b0dab69af6712642"}, + {file = "aiohttp-3.8.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:61bfc23df345d8c9716d03717c2ed5e27374e0fe6f659ea64edcd27b4b044cf7"}, + {file = "aiohttp-3.8.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:31560d268ff62143e92423ef183680b9829b1b482c011713ae941997921eebc8"}, + {file = "aiohttp-3.8.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:01d7bdb774a9acc838e6b8f1d114f45303841b89b95984cbb7d80ea41172a9e3"}, + {file = "aiohttp-3.8.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:97ef77eb6b044134c0b3a96e16abcb05ecce892965a2124c566af0fd60f717e2"}, + {file = "aiohttp-3.8.1-cp310-cp310-win32.whl", hash = "sha256:c2aef4703f1f2ddc6df17519885dbfa3514929149d3ff900b73f45998f2532fa"}, + {file = "aiohttp-3.8.1-cp310-cp310-win_amd64.whl", hash = "sha256:713ac174a629d39b7c6a3aa757b337599798da4c1157114a314e4e391cd28e32"}, + {file = "aiohttp-3.8.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:473d93d4450880fe278696549f2e7aed8cd23708c3c1997981464475f32137db"}, + {file = "aiohttp-3.8.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99b5eeae8e019e7aad8af8bb314fb908dd2e028b3cdaad87ec05095394cce632"}, + {file = "aiohttp-3.8.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3af642b43ce56c24d063325dd2cf20ee012d2b9ba4c3c008755a301aaea720ad"}, + {file = "aiohttp-3.8.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c3630c3ef435c0a7c549ba170a0633a56e92629aeed0e707fec832dee313fb7a"}, + {file = "aiohttp-3.8.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:4a4a4e30bf1edcad13fb0804300557aedd07a92cabc74382fdd0ba6ca2661091"}, + {file = "aiohttp-3.8.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:6f8b01295e26c68b3a1b90efb7a89029110d3a4139270b24fda961893216c440"}, + {file = "aiohttp-3.8.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:a25fa703a527158aaf10dafd956f7d42ac6d30ec80e9a70846253dd13e2f067b"}, + {file = "aiohttp-3.8.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:5bfde62d1d2641a1f5173b8c8c2d96ceb4854f54a44c23102e2ccc7e02f003ec"}, + {file = "aiohttp-3.8.1-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:51467000f3647d519272392f484126aa716f747859794ac9924a7aafa86cd411"}, + {file = "aiohttp-3.8.1-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:03a6d5349c9ee8f79ab3ff3694d6ce1cfc3ced1c9d36200cb8f08ba06bd3b782"}, + {file = "aiohttp-3.8.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:102e487eeb82afac440581e5d7f8f44560b36cf0bdd11abc51a46c1cd88914d4"}, + {file = "aiohttp-3.8.1-cp36-cp36m-win32.whl", hash = "sha256:4aed991a28ea3ce320dc8ce655875e1e00a11bdd29fe9444dd4f88c30d558602"}, + {file = "aiohttp-3.8.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b0e20cddbd676ab8a64c774fefa0ad787cc506afd844de95da56060348021e96"}, + {file = "aiohttp-3.8.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:37951ad2f4a6df6506750a23f7cbabad24c73c65f23f72e95897bb2cecbae676"}, + {file = "aiohttp-3.8.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5c23b1ad869653bc818e972b7a3a79852d0e494e9ab7e1a701a3decc49c20d51"}, + {file = "aiohttp-3.8.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:15b09b06dae900777833fe7fc4b4aa426556ce95847a3e8d7548e2d19e34edb8"}, + {file = "aiohttp-3.8.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:477c3ea0ba410b2b56b7efb072c36fa91b1e6fc331761798fa3f28bb224830dd"}, + {file = "aiohttp-3.8.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2f2f69dca064926e79997f45b2f34e202b320fd3782f17a91941f7eb85502ee2"}, + {file = "aiohttp-3.8.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ef9612483cb35171d51d9173647eed5d0069eaa2ee812793a75373447d487aa4"}, + {file = "aiohttp-3.8.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:6d69f36d445c45cda7b3b26afef2fc34ef5ac0cdc75584a87ef307ee3c8c6d00"}, + {file = "aiohttp-3.8.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:55c3d1072704d27401c92339144d199d9de7b52627f724a949fc7d5fc56d8b93"}, + {file = "aiohttp-3.8.1-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:b9d00268fcb9f66fbcc7cd9fe423741d90c75ee029a1d15c09b22d23253c0a44"}, + {file = "aiohttp-3.8.1-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:07b05cd3305e8a73112103c834e91cd27ce5b4bd07850c4b4dbd1877d3f45be7"}, + {file = "aiohttp-3.8.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:c34dc4958b232ef6188c4318cb7b2c2d80521c9a56c52449f8f93ab7bc2a8a1c"}, + {file = "aiohttp-3.8.1-cp37-cp37m-win32.whl", hash = "sha256:d2f9b69293c33aaa53d923032fe227feac867f81682f002ce33ffae978f0a9a9"}, + {file = "aiohttp-3.8.1-cp37-cp37m-win_amd64.whl", hash = "sha256:6ae828d3a003f03ae31915c31fa684b9890ea44c9c989056fea96e3d12a9fa17"}, + {file = "aiohttp-3.8.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:0c7ebbbde809ff4e970824b2b6cb7e4222be6b95a296e46c03cf050878fc1785"}, + {file = "aiohttp-3.8.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8b7ef7cbd4fec9a1e811a5de813311ed4f7ac7d93e0fda233c9b3e1428f7dd7b"}, + {file = "aiohttp-3.8.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c3d6a4d0619e09dcd61021debf7059955c2004fa29f48788a3dfaf9c9901a7cd"}, + {file = "aiohttp-3.8.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:718626a174e7e467f0558954f94af117b7d4695d48eb980146016afa4b580b2e"}, + {file = "aiohttp-3.8.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:589c72667a5febd36f1315aa6e5f56dd4aa4862df295cb51c769d16142ddd7cd"}, + {file = "aiohttp-3.8.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2ed076098b171573161eb146afcb9129b5ff63308960aeca4b676d9d3c35e700"}, + {file = "aiohttp-3.8.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:086f92daf51a032d062ec5f58af5ca6a44d082c35299c96376a41cbb33034675"}, + {file = "aiohttp-3.8.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:11691cf4dc5b94236ccc609b70fec991234e7ef8d4c02dd0c9668d1e486f5abf"}, + {file = "aiohttp-3.8.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:31d1e1c0dbf19ebccbfd62eff461518dcb1e307b195e93bba60c965a4dcf1ba0"}, + {file = "aiohttp-3.8.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:11a67c0d562e07067c4e86bffc1553f2cf5b664d6111c894671b2b8712f3aba5"}, + {file = "aiohttp-3.8.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:bb01ba6b0d3f6c68b89fce7305080145d4877ad3acaed424bae4d4ee75faa950"}, + {file = "aiohttp-3.8.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:44db35a9e15d6fe5c40d74952e803b1d96e964f683b5a78c3cc64eb177878155"}, + {file = "aiohttp-3.8.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:844a9b460871ee0a0b0b68a64890dae9c415e513db0f4a7e3cab41a0f2fedf33"}, + {file = "aiohttp-3.8.1-cp38-cp38-win32.whl", hash = "sha256:7d08744e9bae2ca9c382581f7dce1273fe3c9bae94ff572c3626e8da5b193c6a"}, + {file = "aiohttp-3.8.1-cp38-cp38-win_amd64.whl", hash = "sha256:04d48b8ce6ab3cf2097b1855e1505181bdd05586ca275f2505514a6e274e8e75"}, + {file = "aiohttp-3.8.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f5315a2eb0239185af1bddb1abf472d877fede3cc8d143c6cddad37678293237"}, + {file = "aiohttp-3.8.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:a996d01ca39b8dfe77440f3cd600825d05841088fd6bc0144cc6c2ec14cc5f74"}, + {file = "aiohttp-3.8.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:13487abd2f761d4be7c8ff9080de2671e53fff69711d46de703c310c4c9317ca"}, + {file = "aiohttp-3.8.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea302f34477fda3f85560a06d9ebdc7fa41e82420e892fc50b577e35fc6a50b2"}, + {file = "aiohttp-3.8.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a2f635ce61a89c5732537a7896b6319a8fcfa23ba09bec36e1b1ac0ab31270d2"}, + {file = "aiohttp-3.8.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e999f2d0e12eea01caeecb17b653f3713d758f6dcc770417cf29ef08d3931421"}, + {file = "aiohttp-3.8.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0770e2806a30e744b4e21c9d73b7bee18a1cfa3c47991ee2e5a65b887c49d5cf"}, + {file = "aiohttp-3.8.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d15367ce87c8e9e09b0f989bfd72dc641bcd04ba091c68cd305312d00962addd"}, + {file = "aiohttp-3.8.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:6c7cefb4b0640703eb1069835c02486669312bf2f12b48a748e0a7756d0de33d"}, + {file = "aiohttp-3.8.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:71927042ed6365a09a98a6377501af5c9f0a4d38083652bcd2281a06a5976724"}, + {file = "aiohttp-3.8.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:28d490af82bc6b7ce53ff31337a18a10498303fe66f701ab65ef27e143c3b0ef"}, + {file = "aiohttp-3.8.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:b6613280ccedf24354406caf785db748bebbddcf31408b20c0b48cb86af76866"}, + {file = "aiohttp-3.8.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:81e3d8c34c623ca4e36c46524a3530e99c0bc95ed068fd6e9b55cb721d408fb2"}, + {file = "aiohttp-3.8.1-cp39-cp39-win32.whl", hash = "sha256:7187a76598bdb895af0adbd2fb7474d7f6025d170bc0a1130242da817ce9e7d1"}, + {file = "aiohttp-3.8.1-cp39-cp39-win_amd64.whl", hash = "sha256:1c182cb873bc91b411e184dab7a2b664d4fea2743df0e4d57402f7f3fa644bac"}, + {file = "aiohttp-3.8.1.tar.gz", hash = "sha256:fc5471e1a54de15ef71c1bc6ebe80d4dc681ea600e68bfd1cbce40427f0b7578"}, ] aiosignal = [ {file = "aiosignal-1.2.0-py3-none-any.whl", hash = "sha256:26e62109036cd181df6e6ad646f91f0dcfd05fe16d0cb924138ff2ab75d64e3a"}, @@ -1470,8 +1471,8 @@ html2text = [ {file = "html2text-2020.1.16.tar.gz", hash = "sha256:e296318e16b059ddb97f7a8a1d6a5c1d7af4544049a01e261731d2d5cc277bbb"}, ] httpcore = [ - {file = "httpcore-0.13.7-py3-none-any.whl", hash = "sha256:369aa481b014cf046f7067fddd67d00560f2f00426e79569d99cb11245134af0"}, - {file = "httpcore-0.13.7.tar.gz", hash = "sha256:036f960468759e633574d7c121afba48af6419615d36ab8ede979f1ad6276fa3"}, + {file = "httpcore-0.14.2-py3-none-any.whl", hash = "sha256:47d7c8f755719d4a57be0b6e022897e9e963bf9ce4b15b9cc006a38a1cfa2932"}, + {file = "httpcore-0.14.2.tar.gz", hash = "sha256:ff8f8b9434ec4823f95a30596fbe78039913e706d3e598b0b8955b1e1828e093"}, ] httptools = [ {file = "httptools-0.2.0-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:79dbc21f3612a78b28384e989b21872e2e3cf3968532601544696e4ed0007ce5"}, @@ -1491,8 +1492,8 @@ httptools = [ {file = "httptools-0.2.0.tar.gz", hash = "sha256:94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"}, ] httpx = [ - {file = "httpx-0.20.0-py3-none-any.whl", hash = "sha256:33af5aad9bdc82ef1fc89219c1e36f5693bf9cd0ebe330884df563445682c0f8"}, - {file = "httpx-0.20.0.tar.gz", hash = "sha256:09606d630f070d07f9ff28104fbcea429ea0014c1e89ac90b4d8de8286c40e7b"}, + {file = "httpx-0.21.1-py3-none-any.whl", hash = "sha256:208e5ef2ad4d105213463cfd541898ed9d11851b346473539a8425e644bb7c66"}, + {file = "httpx-0.21.1.tar.gz", hash = "sha256:02af20df486b78892a614a7ccd4e4e86a5409ec4981ab0e422c579a887acad83"}, ] hypercorn = [ {file = "Hypercorn-0.12.0-py3-none-any.whl", hash = "sha256:485a03dc171549dd802c5a2d4cce2d46daf077fbc06c7db90e0862ebc1bd07c9"}, @@ -1867,8 +1868,8 @@ sniffio = [ {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, ] snowballstemmer = [ - {file = "snowballstemmer-2.1.0-py2.py3-none-any.whl", hash = "sha256:b51b447bea85f9968c13b650126a888aabd4cb4463fca868ec596826325dedc2"}, - {file = "snowballstemmer-2.1.0.tar.gz", hash = "sha256:e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914"}, + {file = "snowballstemmer-2.2.0-py2.py3-none-any.whl", hash = "sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a"}, + {file = "snowballstemmer-2.2.0.tar.gz", hash = "sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"}, ] sphinx = [ {file = "Sphinx-4.3.0-py3-none-any.whl", hash = "sha256:7e2b30da5f39170efcd95c6270f07669d623c276521fee27ad6c380f49d2bf5b"}, @@ -1912,9 +1913,8 @@ tomlkit = [ {file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"}, ] typing-extensions = [ - {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, - {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"}, - {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, + {file = "typing_extensions-4.0.0-py3-none-any.whl", hash = "sha256:829704698b22e13ec9eaf959122315eabb370b0884400e9818334d8b677023d9"}, + {file = "typing_extensions-4.0.0.tar.gz", hash = "sha256:2cdf80e4e04866a9b3689a51869016d36db0814d84b8d8a568d22781d45d27ed"}, ] unify = [ {file = "unify-0.5.tar.gz", hash = "sha256:8ddce812b2457212b7598fe574c9e6eb3ad69710f445391338270c7f8a71723c"}, @@ -1953,31 +1953,54 @@ watchgod = [ {file = "watchgod-0.7.tar.gz", hash = "sha256:48140d62b0ebe9dd9cf8381337f06351e1f2e70b2203fa9c6eff4e572ca84f29"}, ] websockets = [ - {file = "websockets-10.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:cd8c6f2ec24aedace251017bc7a414525171d4e6578f914acab9349362def4da"}, - {file = "websockets-10.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:1f6b814cff6aadc4288297cb3a248614829c6e4ff5556593c44a115e9dd49939"}, - {file = "websockets-10.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:01db0ecd1a0ca6702d02a5ed40413e18b7d22f94afb3bbe0d323bac86c42c1c8"}, - {file = "websockets-10.0-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:82b17524b1ce6ae7f7dd93e4d18e9b9474071e28b65dbf1dfe9b5767778db379"}, - {file = "websockets-10.0-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:8bbf8660c3f833ddc8b1afab90213f2e672a9ddac6eecb3cde968e6b2807c1c7"}, - {file = "websockets-10.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b8176deb6be540a46695960a765a77c28ac8b2e3ef2ec95d50a4f5df901edb1c"}, - {file = "websockets-10.0-cp37-cp37m-win32.whl", hash = "sha256:706e200fc7f03bed99ad0574cd1ea8b0951477dd18cc978ccb190683c69dba76"}, - {file = "websockets-10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:5b2600e01c7ca6f840c42c747ffbe0254f319594ed108db847eb3d75f4aacb80"}, - {file = "websockets-10.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:085bb8a6e780d30eaa1ba48ac7f3a6707f925edea787cfb761ce5a39e77ac09b"}, - {file = "websockets-10.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:9a4d889162bd48588e80950e07fa5e039eee9deb76a58092e8c3ece96d7ef537"}, - {file = "websockets-10.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:b4ade7569b6fd17912452f9c3757d96f8e4044016b6d22b3b8391e641ca50456"}, - {file = "websockets-10.0-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:2a43072e434c041a99f2e1eb9b692df0232a38c37c61d00e9f24db79474329e4"}, - {file = "websockets-10.0-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:7f79f02c7f9a8320aff7d3321cd1c7e3a7dbc15d922ac996cca827301ee75238"}, - {file = "websockets-10.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:1ac35426fe3e7d3d0fac3d63c8965c76ed67a8fd713937be072bf0ce22808539"}, - {file = "websockets-10.0-cp38-cp38-win32.whl", hash = "sha256:ff59c6bdb87b31f7e2d596f09353d5a38c8c8ff571b0e2238e8ee2d55ad68465"}, - {file = "websockets-10.0-cp38-cp38-win_amd64.whl", hash = "sha256:d67646ddd17a86117ae21c27005d83c1895c0cef5d7be548b7549646372f868a"}, - {file = "websockets-10.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:82bd921885231f4a30d9bc550552495b3fc36b1235add6d374e7c65c3babd805"}, - {file = "websockets-10.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:7d2e12e4f901f1bc062dfdf91831712c4106ed18a9a4cdb65e2e5f502124ca37"}, - {file = "websockets-10.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:71358c7816e2762f3e4af3adf0040f268e219f5a38cb3487a9d0fc2e554fef6a"}, - {file = "websockets-10.0-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:fe83b3ec9ef34063d86dfe1029160a85f24a5a94271036e5714a57acfdd089a1"}, - {file = "websockets-10.0-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:eb282127e9c136f860c6068a4fba5756eb25e755baffb5940b6f1eae071928b2"}, - {file = "websockets-10.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:62160772314920397f9d219147f958b33fa27a12c662d4455c9ccbba9a07e474"}, - {file = "websockets-10.0-cp39-cp39-win32.whl", hash = "sha256:e42a1f1e03437b017af341e9bbfdc09252cd48ef32a8c3c3ead769eab3b17368"}, - {file = "websockets-10.0-cp39-cp39-win_amd64.whl", hash = "sha256:c5880442f5fc268f1ef6d37b2c152c114deccca73f48e3a8c48004d2f16f4567"}, - {file = "websockets-10.0.tar.gz", hash = "sha256:c4fc9a1d242317892590abe5b61a9127f1a61740477bfb121743f290b8054002"}, + {file = "websockets-10.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:38db6e2163b021642d0a43200ee2dec8f4980bdbda96db54fde72b283b54cbfc"}, + {file = "websockets-10.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e1b60fd297adb9fc78375778a5220da7f07bf54d2a33ac781319650413fc6a60"}, + {file = "websockets-10.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3477146d1f87ead8df0f27e8960249f5248dceb7c2741e8bbec9aa5338d0c053"}, + {file = "websockets-10.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bb01ea7b5f52e7125bdc3c5807aeaa2d08a0553979cf2d96a8b7803ea33e15e7"}, + {file = "websockets-10.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:9fd62c6dc83d5d35fb6a84ff82ec69df8f4657fff05f9cd6c7d9bec0dd57f0f6"}, + {file = "websockets-10.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3bbf080f3892ba1dc8838786ec02899516a9d227abe14a80ef6fd17d4fb57127"}, + {file = "websockets-10.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5560558b0dace8312c46aa8915da977db02738ac8ecffbc61acfbfe103e10155"}, + {file = "websockets-10.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:667c41351a6d8a34b53857ceb8343a45c85d438ee4fd835c279591db8aeb85be"}, + {file = "websockets-10.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:468f0031fdbf4d643f89403a66383247eb82803430b14fa27ce2d44d2662ca37"}, + {file = "websockets-10.1-cp310-cp310-win32.whl", hash = "sha256:d0d81b46a5c87d443e40ce2272436da8e6092aa91f5fbeb60d1be9f11eff5b4c"}, + {file = "websockets-10.1-cp310-cp310-win_amd64.whl", hash = "sha256:b68b6caecb9a0c6db537aa79750d1b592a841e4f1a380c6196091e65b2ad35f9"}, + {file = "websockets-10.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a249139abc62ef333e9e85064c27fefb113b16ffc5686cefc315bdaef3eefbc8"}, + {file = "websockets-10.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8877861e3dee38c8d302eee0d5dbefa6663de3b46dc6a888f70cd7e82562d1f7"}, + {file = "websockets-10.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:e3872ae57acd4306ecf937d36177854e218e999af410a05c17168cd99676c512"}, + {file = "websockets-10.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b66e6d514f12c28d7a2d80bb2a48ef223342e99c449782d9831b0d29a9e88a17"}, + {file = "websockets-10.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:9f304a22ece735a3da8a51309bc2c010e23961a8f675fae46fdf62541ed62123"}, + {file = "websockets-10.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:189ed478395967d6a98bb293abf04e8815349e17456a0a15511f1088b6cb26e4"}, + {file = "websockets-10.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:08a42856158307e231b199671c4fce52df5786dd3d703f36b5d8ac76b206c485"}, + {file = "websockets-10.1-cp37-cp37m-win32.whl", hash = "sha256:3ef6f73854cded34e78390dbdf40dfdcf0b89b55c0e282468ef92646fce8d13a"}, + {file = "websockets-10.1-cp37-cp37m-win_amd64.whl", hash = "sha256:89e985d40d407545d5f5e2e58e1fdf19a22bd2d8cd54d20a882e29f97e930a0a"}, + {file = "websockets-10.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:002071169d2e44ce8eb9e5ebac9fbce142ba4b5146eef1cfb16b177a27662657"}, + {file = "websockets-10.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:cfae282c2aa7f0c4be45df65c248481f3509f8c40ca8b15ed96c35668ae0ff69"}, + {file = "websockets-10.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:97b4b68a2ddaf5c4707ae79c110bfd874c5be3c6ac49261160fb243fa45d8bbb"}, + {file = "websockets-10.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7c9407719f42cb77049975410490c58a705da6af541adb64716573e550e5c9db"}, + {file = "websockets-10.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1d858fb31e5ac992a2cdf17e874c95f8a5b1e917e1fb6b45ad85da30734b223f"}, + {file = "websockets-10.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:7bdd3d26315db0a9cf8a0af30ca95e0aa342eda9c1377b722e71ccd86bc5d1dd"}, + {file = "websockets-10.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:e259be0863770cb91b1a6ccf6907f1ac2f07eff0b7f01c249ed751865a70cb0d"}, + {file = "websockets-10.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:6b014875fae19577a392372075e937ebfebf53fd57f613df07b35ab210f31534"}, + {file = "websockets-10.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:98de71f86bdb29430fd7ba9997f47a6b10866800e3ea577598a786a785701bb0"}, + {file = "websockets-10.1-cp38-cp38-win32.whl", hash = "sha256:3a02ab91d84d9056a9ee833c254895421a6333d7ae7fff94b5c68e4fa8095519"}, + {file = "websockets-10.1-cp38-cp38-win_amd64.whl", hash = "sha256:7d6673b2753f9c5377868a53445d0c321ef41ff3c8e3b6d57868e72054bfce5f"}, + {file = "websockets-10.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:ddab2dc69ee5ae27c74dbfe9d7bb6fee260826c136dca257faa1a41d1db61a89"}, + {file = "websockets-10.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:14e9cf68a08d1a5d42109549201aefba473b1d925d233ae19035c876dd845da9"}, + {file = "websockets-10.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e4819c6fb4f336fd5388372cb556b1f3a165f3f68e66913d1a2fc1de55dc6f58"}, + {file = "websockets-10.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:05e7f098c76b0a4743716590bb8f9706de19f1ef5148d61d0cf76495ec3edb9c"}, + {file = "websockets-10.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5bb6256de5a4fb1d42b3747b4e2268706c92965d75d0425be97186615bf2f24f"}, + {file = "websockets-10.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:888a5fa2a677e0c2b944f9826c756475980f1b276b6302e606f5c4ff5635be9e"}, + {file = "websockets-10.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:6fdec1a0b3e5630c58e3d8704d2011c678929fce90b40908c97dfc47de8dca72"}, + {file = "websockets-10.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:531d8eb013a9bc6b3ad101588182aa9b6dd994b190c56df07f0d84a02b85d530"}, + {file = "websockets-10.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0d93b7cadc761347d98da12ec1930b5c71b2096f1ceed213973e3cda23fead9c"}, + {file = "websockets-10.1-cp39-cp39-win32.whl", hash = "sha256:d9b245db5a7e64c95816e27d72830e51411c4609c05673d1ae81eb5d23b0be54"}, + {file = "websockets-10.1-cp39-cp39-win_amd64.whl", hash = "sha256:882c0b8bdff3bf1bd7f024ce17c6b8006042ec4cceba95cf15df57e57efa471c"}, + {file = "websockets-10.1-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:10edd9d7d3581cfb9ff544ac09fc98cab7ee8f26778a5a8b2d5fd4b0684c5ba5"}, + {file = "websockets-10.1-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:baa83174390c0ff4fc1304fbe24393843ac7a08fdd59295759c4b439e06b1536"}, + {file = "websockets-10.1-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:483edee5abed738a0b6a908025be47f33634c2ad8e737edd03ffa895bd600909"}, + {file = "websockets-10.1-pp37-pypy37_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:816ae7dac2c6522cfa620947ead0ca95ac654916eebf515c94d7c28de5601a6e"}, + {file = "websockets-10.1-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:1dafe98698ece09b8ccba81b910643ff37198e43521d977be76caf37709cf62b"}, + {file = "websockets-10.1.tar.gz", hash = "sha256:181d2b25de5a437b36aefedaf006ecb6fa3aa1328ec0236cdde15f32f9d3ff6d"}, ] werkzeug = [ {file = "Werkzeug-2.0.2-py3-none-any.whl", hash = "sha256:63d3dc1cf60e7b7e35e97fa9861f7397283b75d765afcaefd993d6046899de8f"}, diff --git a/pyproject.toml b/pyproject.toml index 4153931a..404eb0ac 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nonebot2" -version = "2.0.0-alpha.16" +version = "2.0.0-beta.1" description = "An asynchronous python bot framework." authors = ["yanyongyu "] license = "MIT" @@ -28,7 +28,7 @@ pygtrie = "^2.4.1" tomlkit = "^0.7.0" fastapi = "^0.70.0" websockets = ">=9.1" -typing-extensions = "^3.10.0" +typing-extensions = ">=3.10.0,<5.0.0" Quart = { version = "^0.15.0", optional = true } httpx = { version = ">=0.20.0, <1.0.0", extras = ["http2"] } pydantic = { version = "~1.8.0", extras = ["dotenv"] } From ee619a33a97fb7afbc62cb64731c1b47c6188b47 Mon Sep 17 00:00:00 2001 From: nonebot Date: Wed, 17 Nov 2021 12:38:35 +0000 Subject: [PATCH 030/174] :memo: update api docs --- docs/api/dependencies.md | 28 ++++++++++++++ docs/api/drivers/README.md | 15 ++++++++ docs/api/handler.md | 77 +++++++++++++++++--------------------- docs/api/typing.md | 11 +----- docs/api/utils.md | 4 +- 5 files changed, 81 insertions(+), 54 deletions(-) create mode 100644 docs/api/dependencies.md diff --git a/docs/api/dependencies.md b/docs/api/dependencies.md new file mode 100644 index 00000000..d88aabaa --- /dev/null +++ b/docs/api/dependencies.md @@ -0,0 +1,28 @@ +--- +contentSidebar: true +sidebarDepth: 0 +--- + +# NoneBot.handler 模块 + +## 依赖注入处理模块 + +该模块实现了依赖注入的定义与处理。 + + +## `Depends(dependency=None, *, use_cache=True)` + + +* **说明** + + 参数依赖注入装饰器 + + + +* **参数** + + + * `dependency: Optional[Callable[..., Any]] = None`: 依赖函数。默认为参数的类型注释。 + + + * `use_cache: bool = True`: 是否使用缓存。默认为 `True`。 diff --git a/docs/api/drivers/README.md b/docs/api/drivers/README.md index 9f8ee3ee..d67b9bd8 100644 --- a/docs/api/drivers/README.md +++ b/docs/api/drivers/README.md @@ -62,6 +62,21 @@ Driver 基类。 +### `dependency_overrides` + + +* **类型** + + `Dict[Callable[..., Any], Callable[..., Any]]` + + + +* **说明** + + Depends 函数的替换表 + + + ### `__init__(env, config)` diff --git a/docs/api/handler.md b/docs/api/handler.md index dc2ab74f..977cbccb 100644 --- a/docs/api/handler.md +++ b/docs/api/handler.md @@ -14,12 +14,35 @@ sidebarDepth: 0 基类：`object` -事件处理函数类 +事件处理器类。支持依赖注入。 -### `__init__(func)` +### `__init__(func, *, name=None, dependencies=None, allow_types=None, dependency_overrides_provider=None)` + + +* **说明** + + 装饰一个函数为事件处理器。 + + + +* **参数** + + + * `func: T_Handler`: 事件处理函数。 + + + * `name: Optional[str]`: 事件处理器名称。默认为函数名。 + + + * `dependencies: Optional[List[DependsWrapper]]`: 额外的非参数依赖注入。 + + + * `allow_types: Optional[List[Type[Param]]]`: 允许的参数类型。 + + + * `dependency_overrides_provider: Optional[Any]`: 依赖注入覆盖提供者。 -装饰事件处理函数以便根据动态参数运行 ### `func` @@ -37,75 +60,45 @@ sidebarDepth: 0 -### `signature` +### `name` * **类型** - `inspect.Signature` + `str` * **说明** - 事件处理函数签名 + 事件处理函数名 -### _property_ `bot_type` +### `allow_types` * **类型** - `Union[Type["Bot"], inspect.Parameter.empty]` + `List[Type[Param]]` * **说明** - 事件处理函数接受的 Bot 对象类型 + 事件处理器允许的参数类型 -### _property_ `event_type` +### `dependencies` * **类型** - `Optional[Union[Type[Event], inspect.Parameter.empty]]` + `List[DependsWrapper]` * **说明** - 事件处理函数接受的 event 类型 / 不需要 event 参数 - - - -### _property_ `state_type` - - -* **类型** - - `Optional[Union[T_State, inspect.Parameter.empty]]` - - - -* **说明** - - 事件处理函数是否接受 state 参数 - - - -### _property_ `matcher_type` - - -* **类型** - - `Optional[Union[Type["Matcher"], inspect.Parameter.empty]]` - - - -* **说明** - - 事件处理函数是否接受 matcher 参数 + 事件处理器的额外依赖 diff --git a/docs/api/typing.md b/docs/api/typing.md index 6d339e12..a5597e8d 100644 --- a/docs/api/typing.md +++ b/docs/api/typing.md @@ -212,16 +212,7 @@ sidebarDepth: 0 * **类型** - * `Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - * `Callable[[Bot, Event], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - * `Callable[[Bot, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - * `Callable[[Bot], Union[Awaitable[None], Awaitable[NoReturn]]]` + * `Callable[..., Union[Awaitable[None], Awaitable[NoReturn]]]` diff --git a/docs/api/utils.md b/docs/api/utils.md index 8584f390..54aa11cb 100644 --- a/docs/api/utils.md +++ b/docs/api/utils.md @@ -41,14 +41,14 @@ sidebarDepth: 0 * **参数** - * `func: Callable[..., Any]`: 被装饰的同步函数 + * `func: Callable[P, R]`: 被装饰的同步函数 * **返回** - * `Callable[..., Awaitable[Any]]` + * `Callable[P, Awaitable[R]]` From 471d306e13772670946fb91e229467c6e3838438 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 19 Nov 2021 18:18:53 +0800 Subject: [PATCH 031/174] :alembic: change rule to use handler --- nonebot/dependencies/__init__.py | 48 +++++----- nonebot/drivers/aiohttp.py | 3 +- nonebot/drivers/fastapi.py | 3 +- nonebot/exception.py | 157 ++++++++++++++++++------------- nonebot/handler.py | 32 +++---- nonebot/matcher.py | 16 ++-- nonebot/rule.py | 66 ++++++++----- nonebot/typing.py | 5 +- 8 files changed, 182 insertions(+), 148 deletions(-) diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index bbf835fb..f9a6ab63 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -18,6 +18,7 @@ from nonebot.log import logger from .models import Param as Param from .utils import get_typed_signature from .models import Dependent as Dependent +from nonebot.exception import SkippedException from .models import DependsWrapper as DependsWrapper from nonebot.utils import (run_sync, is_gen_callable, run_sync_ctx_manager, is_async_gen_callable, is_coroutine_callable) @@ -112,21 +113,20 @@ def get_dependent(*, async def solve_dependencies( - *, - dependent: Dependent, - stack: Optional[AsyncExitStack] = None, - sub_dependents: Optional[List[Dependent]] = None, - dependency_overrides_provider: Optional[Any] = None, - dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, - **params: Any -) -> Tuple[Dict[str, Any], Dict[Callable[..., Any], Any], bool]: + *, + _dependent: Dependent, + _stack: Optional[AsyncExitStack] = None, + _sub_dependents: Optional[List[Dependent]] = None, + _dependency_overrides_provider: Optional[Any] = None, + _dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, + **params: Any) -> Tuple[Dict[str, Any], Dict[Callable[..., Any], Any]]: values: Dict[str, Any] = {} - dependency_cache = dependency_cache or {} + dependency_cache = _dependency_cache or {} # solve sub dependencies sub_dependent: Dependent - for sub_dependent in chain(sub_dependents or tuple(), - dependent.dependencies): + for sub_dependent in chain(_sub_dependents or tuple(), + _dependent.dependencies): sub_dependent.func = cast(Callable[..., Any], sub_dependent.func) sub_dependent.cache_key = cast(Callable[..., Any], sub_dependent.cache_key) @@ -134,10 +134,10 @@ async def solve_dependencies( # dependency overrides use_sub_dependant = sub_dependent - if (dependency_overrides_provider and - hasattr(dependency_overrides_provider, "dependency_overrides")): + if (_dependency_overrides_provider and hasattr( + _dependency_overrides_provider, "dependency_overrides")): original_call = sub_dependent.func - func = getattr(dependency_overrides_provider, + func = getattr(_dependency_overrides_provider, "dependency_overrides", {}).get(original_call, original_call) use_sub_dependant = get_dependent( @@ -148,13 +148,11 @@ async def solve_dependencies( # solve sub dependency with current cache solved_result = await solve_dependencies( - dependent=use_sub_dependant, - dependency_overrides_provider=dependency_overrides_provider, + _dependent=use_sub_dependant, + _dependency_overrides_provider=_dependency_overrides_provider, dependency_cache=dependency_cache, **params) - sub_values, sub_dependency_cache, ignored = solved_result - if ignored: - return values, dependency_cache, True + sub_values, sub_dependency_cache = solved_result # update cache? dependency_cache.update(sub_dependency_cache) @@ -163,13 +161,13 @@ async def solve_dependencies( solved = dependency_cache[sub_dependent.cache_key] elif is_gen_callable(func) or is_async_gen_callable(func): assert isinstance( - stack, AsyncExitStack + _stack, AsyncExitStack ), "Generator dependency should be called in context" if is_gen_callable(func): cm = run_sync_ctx_manager(contextmanager(func)(**sub_values)) else: cm = asynccontextmanager(func)(**sub_values) - solved = await stack.enter_async_context(cm) + solved = await _stack.enter_async_context(cm) elif is_coroutine_callable(func): solved = await func(**sub_values) else: @@ -183,7 +181,7 @@ async def solve_dependencies( dependency_cache[sub_dependent.cache_key] = solved # usual dependency - for field in dependent.params: + for field in _dependent.params: field_info = field.field_info assert isinstance(field_info, Param), "Params must be subclasses of Param" @@ -194,13 +192,13 @@ async def solve_dependencies( if errs_: logger.debug( f"{field_info} " - f"type {type(value)} not match depends {dependent.func} " + f"type {type(value)} not match depends {_dependent.func} " f"annotation {field._type_display()}, ignored") - return values, dependency_cache, True + raise SkippedException else: values[field.name] = value - return values, dependency_cache, False + return values, dependency_cache def Depends(dependency: Optional[Callable[..., Any]] = None, diff --git a/nonebot/drivers/aiohttp.py b/nonebot/drivers/aiohttp.py index 20ca668f..3670c414 100644 --- a/nonebot/drivers/aiohttp.py +++ b/nonebot/drivers/aiohttp.py @@ -248,6 +248,8 @@ class Driver(ForwardDriver): await asyncio.sleep(3) continue + setup_ = cast(HTTPPollingSetup, setup_) + if not bot: request = await _build_request(setup_) if not request: @@ -264,7 +266,6 @@ class Driver(ForwardDriver): bot.request = request request = cast(HTTPRequest, request) - setup_ = cast(HTTPPollingSetup, setup_) headers = request.headers timeout = aiohttp.ClientTimeout(30) diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index 0ace2e31..e0d47d79 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -409,6 +409,8 @@ class Driver(ReverseDriver, ForwardDriver): await asyncio.sleep(3) continue + setup_ = cast(HTTPPollingSetup, setup_) + if not bot: request = await _build_request(setup_) if not request: @@ -423,7 +425,6 @@ class Driver(ReverseDriver, ForwardDriver): continue bot.request = request - setup_ = cast(HTTPPollingSetup, setup_) request = cast(HTTPRequest, request) headers = request.headers diff --git a/nonebot/exception.py b/nonebot/exception.py index 3cad317a..227d8e10 100644 --- a/nonebot/exception.py +++ b/nonebot/exception.py @@ -6,6 +6,8 @@ 这些异常并非所有需要用户处理，在 NoneBot 内部运行时被捕获，并进行对应操作。 """ +from typing import Optional + class NoneBotException(Exception): """ @@ -13,9 +15,33 @@ class NoneBotException(Exception): 所有 NoneBot 发生的异常基类。 """ - pass +# Rule Exception +class ParserExit(NoneBotException): + """ + :说明: + + ``shell command`` 处理消息失败时返回的异常 + + :参数: + + * ``status`` + * ``message`` + """ + + def __init__(self, status: int = 0, message: Optional[str] = None): + self.status = status + self.message = message + + def __repr__(self): + return f"" + + def __str__(self): + return self.__repr__() + + +# Processor Exception class IgnoredException(NoneBotException): """ :说明: @@ -37,71 +63,6 @@ class IgnoredException(NoneBotException): return self.__repr__() -class ParserExit(NoneBotException): - """ - :说明: - - ``shell command`` 处理消息失败时返回的异常 - - :参数: - - * ``status`` - * ``message`` - """ - - def __init__(self, status=0, message=None): - self.status = status - self.message = message - - def __repr__(self): - return f"" - - def __str__(self): - return self.__repr__() - - -class PausedException(NoneBotException): - """ - :说明: - - 指示 NoneBot 结束当前 ``Handler`` 并等待下一条消息后继续下一个 ``Handler``。 - 可用于用户输入新信息。 - - :用法: - - 可以在 ``Handler`` 中通过 ``Matcher.pause()`` 抛出。 - """ - pass - - -class RejectedException(NoneBotException): - """ - :说明: - - 指示 NoneBot 结束当前 ``Handler`` 并等待下一条消息后重新运行当前 ``Handler``。 - 可用于用户重新输入。 - - :用法: - - 可以在 ``Handler`` 中通过 ``Matcher.reject()`` 抛出。 - """ - pass - - -class FinishedException(NoneBotException): - """ - :说明: - - 指示 NoneBot 结束当前 ``Handler`` 且后续 ``Handler`` 不再被运行。 - 可用于结束用户会话。 - - :用法: - - 可以在 ``Handler`` 中通过 ``Matcher.finish()`` 抛出。 - """ - pass - - class StopPropagation(NoneBotException): """ :说明: @@ -112,9 +73,69 @@ class StopPropagation(NoneBotException): 在 ``Matcher.block == True`` 时抛出。 """ - pass +# Matcher Exceptions +class MatcherException(NoneBotException): + """ + :说明: + + 所有 Matcher 发生的异常基类。 + """ + + +class SkippedException(MatcherException): + """ + :说明: + + 指示 NoneBot 立即结束当前 ``Handler`` 的处理，继续处理下一个 ``Handler``。 + + :用法: + + 可以在 ``Handler`` 中通过 ``Matcher.skip()`` 抛出。 + """ + + +class PausedException(MatcherException): + """ + :说明: + + 指示 NoneBot 结束当前 ``Handler`` 并等待下一条消息后继续下一个 ``Handler``。 + 可用于用户输入新信息。 + + :用法: + + 可以在 ``Handler`` 中通过 ``Matcher.pause()`` 抛出。 + """ + + +class RejectedException(MatcherException): + """ + :说明: + + 指示 NoneBot 结束当前 ``Handler`` 并等待下一条消息后重新运行当前 ``Handler``。 + 可用于用户重新输入。 + + :用法: + + 可以在 ``Handler`` 中通过 ``Matcher.reject()`` 抛出。 + """ + + +class FinishedException(MatcherException): + """ + :说明: + + 指示 NoneBot 结束当前 ``Handler`` 且后续 ``Handler`` 不再被运行。 + 可用于结束用户会话。 + + :用法: + + 可以在 ``Handler`` 中通过 ``Matcher.finish()`` 抛出。 + """ + + +# Adapter Exceptions class AdapterException(NoneBotException): """ :说明: @@ -130,7 +151,7 @@ class AdapterException(NoneBotException): self.adapter_name = adapter_name -class NoLogException(Exception): +class NoLogException(AdapterException): """ :说明: diff --git a/nonebot/handler.py b/nonebot/handler.py index 232f2200..d6df70dd 100644 --- a/nonebot/handler.py +++ b/nonebot/handler.py @@ -7,24 +7,19 @@ import asyncio from contextlib import AsyncExitStack -from typing import TYPE_CHECKING, Any, Dict, List, Type, Callable, Optional +from typing import Any, Dict, List, Type, Callable, Optional -from nonebot.typing import T_Handler from nonebot.utils import get_name, run_sync from nonebot.dependencies import (Param, Dependent, DependsWrapper, get_dependent, solve_dependencies, get_parameterless_sub_dependant) -if TYPE_CHECKING: - from nonebot.matcher import Matcher - from nonebot.adapters import Bot, Event - class Handler: """事件处理器类。支持依赖注入。""" def __init__(self, - func: T_Handler, + func: Callable[..., Any], *, name: Optional[str] = None, dependencies: Optional[List[DependsWrapper]] = None, @@ -37,7 +32,7 @@ class Handler: :参数: - * ``func: T_Handler``: 事件处理函数。 + * ``func: Callable[..., Any]``: 事件处理函数。 * ``name: Optional[str]``: 事件处理器名称。默认为函数名。 * ``dependencies: Optional[List[DependsWrapper]]``: 额外的非参数依赖注入。 * ``allow_types: Optional[List[Type[Param]]]``: 允许的参数类型。 @@ -45,7 +40,7 @@ class Handler: """ self.func = func """ - :类型: ``T_Handler`` + :类型: ``Callable[..., Any]`` :说明: 事件处理函数 """ self.name = get_name(func) if name is None else name @@ -85,24 +80,21 @@ class Handler: _dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, **params) -> Any: - values, _, ignored = await solve_dependencies( - dependent=self.dependent, - stack=_stack, - sub_dependents=[ + values, cache = await solve_dependencies( + _dependent=self.dependent, + _stack=_stack, + _sub_dependents=[ self.sub_dependents[dependency.dependency] # type: ignore for dependency in self.dependencies ], - dependency_overrides_provider=self.dependency_overrides_provider, - dependency_cache=_dependency_cache, + _dependency_overrides_provider=self.dependency_overrides_provider, + _dependency_cache=_dependency_cache, **params) - if ignored: - return - if asyncio.iscoroutinefunction(self.func): - await self.func(**values) + return await self.func(**values) else: - await run_sync(self.func)(**values) + return await run_sync(self.func)(**values) def cache_dependent(self, dependency: DependsWrapper): if not dependency.dependency: diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 8856a3cf..0967d5c3 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -20,10 +20,11 @@ from nonebot.dependencies import DependsWrapper from nonebot.permission import USER, Permission from nonebot.adapters import (Bot, Event, Message, MessageSegment, MessageTemplate) -from nonebot.exception import (PausedException, StopPropagation, - FinishedException, RejectedException) from nonebot.typing import (T_State, T_Handler, T_ArgsParser, T_TypeUpdater, T_StateFactory, T_PermissionUpdater) +from nonebot.exception import (PausedException, StopPropagation, + SkippedException, FinishedException, + RejectedException) if TYPE_CHECKING: from nonebot.plugin import Plugin @@ -601,10 +602,13 @@ class Matcher(metaclass=MatcherMeta): while self.handlers: handler = self.handlers.pop(0) logger.debug(f"Running handler {handler}") - await handler(matcher=self, - bot=bot, - event=event, - state=self.state) + try: + await handler(matcher=self, + bot=bot, + event=event, + state=self.state) + except SkippedException: + pass except RejectedException: self.handlers.insert(0, handler) # type: ignore diff --git a/nonebot/rule.py b/nonebot/rule.py index 7ac0fe8d..3a1c2c33 100644 --- a/nonebot/rule.py +++ b/nonebot/rule.py @@ -14,16 +14,18 @@ import shlex import asyncio from itertools import product from argparse import Namespace +from contextlib import AsyncExitStack from typing_extensions import TypedDict from argparse import ArgumentParser as ArgParser -from typing import (Any, Tuple, Union, Callable, NoReturn, Optional, Sequence, - Awaitable) +from typing import (Any, Dict, Tuple, Union, Callable, NoReturn, Optional, + Sequence, Awaitable) from pygtrie import CharTrie -from nonebot import get_driver from nonebot.log import logger from nonebot.utils import run_sync +from nonebot.handler import Handler +from nonebot import params, get_driver from nonebot.exception import ParserExit from nonebot.typing import T_State, T_RuleChecker from nonebot.adapters import Bot, Event, MessageSegment @@ -62,16 +64,22 @@ class Rule: """ __slots__ = ("checkers",) - def __init__( - self, *checkers: Callable[[Bot, Event, T_State], - Awaitable[bool]]) -> None: + HANDLER_PARAM_TYPES = [ + params.BotParam, params.EventParam, params.StateParam + ] + + def __init__(self, *checkers: T_RuleChecker) -> None: """ :参数: - * ``*checkers: Callable[[Bot, Event, T_State], Awaitable[bool]]``: **异步** RuleChecker + * ``*checkers: T_RuleChecker``: RuleChecker """ - self.checkers = set(checkers) + self.checkers = set( + Handler(checker, + allow_types=self.HANDLER_PARAM_TYPES, + dependency_overrides_provider=get_driver()) + for checker in checkers) """ :说明: @@ -79,10 +87,17 @@ class Rule: :类型: - * ``Set[Callable[[Bot, Event, T_State], Awaitable[bool]]]`` + * ``Set[Handler]`` """ - async def __call__(self, bot: Bot, event: Event, state: T_State) -> bool: + async def __call__( + self, + bot: Bot, + event: Event, + state: T_State, + stack: Optional[AsyncExitStack] = None, + dependency_cache: Optional[Dict[Callable[..., Any], + Any]] = None) -> bool: """ :说明: @@ -99,19 +114,21 @@ class Rule: - ``bool`` """ results = await asyncio.gather( - *map(lambda c: c(bot, event, state), self.checkers)) + checker(bot=bot, + event=event, + state=state, + _stack=stack, + _dependency_cache=dependency_cache) + for checker in self.checkers) return all(results) def __and__(self, other: Optional[Union["Rule", T_RuleChecker]]) -> "Rule": - checkers = self.checkers.copy() if other is None: return self elif isinstance(other, Rule): - checkers |= other.checkers - elif asyncio.iscoroutinefunction(other): - checkers.add(other) # type: ignore + checkers = [*self.checkers, *other.checkers] else: - checkers.add(run_sync(other)) + checkers = [*self.checkers, other] return Rule(*checkers) def __or__(self, other) -> NoReturn: @@ -226,7 +243,7 @@ def keyword(*keywords: str) -> Rule: * ``*keywords: str``: 关键词 """ - async def _keyword(bot: Bot, event: Event, state: T_State) -> bool: + async def _keyword(event: Event) -> bool: if event.get_type() != "message": return False text = event.get_plaintext() @@ -274,7 +291,7 @@ def command(*cmds: Union[str, Tuple[str, ...]]) -> Rule: for start, sep in product(command_start, command_sep): TrieRule.add_prefix(f"{start}{sep.join(command)}", command) - async def _command(bot: Bot, event: Event, state: T_State) -> bool: + async def _command(state: T_State) -> bool: return state[PREFIX_KEY][CMD_KEY] in commands return Rule(_command) @@ -294,7 +311,7 @@ class ArgumentParser(ArgParser): old_message += message setattr(self, "message", old_message) - def exit(self, status=0, message=None): + def exit(self, status: int = 0, message: Optional[str] = None): raise ParserExit(status=status, message=message or getattr(self, "message", None)) @@ -360,7 +377,7 @@ def shell_command(*cmds: Union[str, Tuple[str, ...]], for start, sep in product(command_start, command_sep): TrieRule.add_prefix(f"{start}{sep.join(command)}", command) - async def _shell_command(bot: Bot, event: Event, state: T_State) -> bool: + async def _shell_command(event: Event, state: T_State) -> bool: if state[PREFIX_KEY][CMD_KEY] in commands: message = str(event.get_message()) strip_message = message[len(state[PREFIX_KEY][RAW_CMD_KEY] @@ -400,7 +417,7 @@ def regex(regex: str, flags: Union[int, re.RegexFlag] = 0) -> Rule: pattern = re.compile(regex, flags) - async def _regex(bot: Bot, event: Event, state: T_State) -> bool: + async def _regex(event: Event, state: T_State) -> bool: if event.get_type() != "message": return False matched = pattern.search(str(event.get_message())) @@ -415,6 +432,10 @@ def regex(regex: str, flags: Union[int, re.RegexFlag] = 0) -> Rule: return Rule(_regex) +async def _to_me(event: Event) -> bool: + return event.is_tome() + + def to_me() -> Rule: """ :说明: @@ -426,7 +447,4 @@ def to_me() -> Rule: * 无 """ - async def _to_me(bot: Bot, event: Event, state: T_State) -> bool: - return event.is_tome() - return Rule(_to_me) diff --git a/nonebot/typing.py b/nonebot/typing.py index 3725b301..337ff426 100644 --- a/nonebot/typing.py +++ b/nonebot/typing.py @@ -123,10 +123,9 @@ T_RunPostProcessor = Callable[..., Awaitable[None]] 事件响应器运行前预处理函数 RunPostProcessor 类型，第二个参数为运行时产生的错误（如果存在） """ -T_RuleChecker = Callable[["Bot", "Event", T_State], Union[bool, - Awaitable[bool]]] +T_RuleChecker = Callable[..., Union[bool, Awaitable[bool]]] """ -:类型: ``Callable[[Bot, Event, T_State], Union[bool, Awaitable[bool]]]`` +:类型: ``Callable[..., Union[bool, Awaitable[bool]]]`` :说明: From a5948fb5e3132948c7ed90312f57aa1c76b3c754 Mon Sep 17 00:00:00 2001 From: nonebot Date: Fri, 19 Nov 2021 10:20:20 +0000 Subject: [PATCH 032/174] :memo: update api docs --- docs/api/exception.md | 148 +++++++++++++++++++++++++----------------- docs/api/handler.md | 4 +- docs/api/rule.md | 6 +- docs/api/typing.md | 2 +- 4 files changed, 94 insertions(+), 66 deletions(-) diff --git a/docs/api/exception.md b/docs/api/exception.md index f48a493b..bf281b11 100644 --- a/docs/api/exception.md +++ b/docs/api/exception.md @@ -22,24 +22,6 @@ sidebarDepth: 0 -## _exception_ `IgnoredException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 应该忽略该事件。可由 PreProcessor 抛出。 - - - -* **参数** - - - * `reason`: 忽略事件的原因 - - - ## _exception_ `ParserExit` 基类：`nonebot.exception.NoneBotException` @@ -61,57 +43,21 @@ sidebarDepth: 0 -## _exception_ `PausedException` +## _exception_ `IgnoredException` 基类：`nonebot.exception.NoneBotException` * **说明** - 指示 NoneBot 结束当前 `Handler` 并等待下一条消息后继续下一个 `Handler`。 - 可用于用户输入新信息。 + 指示 NoneBot 应该忽略该事件。可由 PreProcessor 抛出。 -* **用法** +* **参数** - 可以在 `Handler` 中通过 `Matcher.pause()` 抛出。 - - - -## _exception_ `RejectedException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 结束当前 `Handler` 并等待下一条消息后重新运行当前 `Handler`。 - 可用于用户重新输入。 - - - -* **用法** - - 可以在 `Handler` 中通过 `Matcher.reject()` 抛出。 - - - -## _exception_ `FinishedException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 结束当前 `Handler` 且后续 `Handler` 不再被运行。 - 可用于结束用户会话。 - - - -* **用法** - - 可以在 `Handler` 中通过 `Matcher.finish()` 抛出。 + + * `reason`: 忽略事件的原因 @@ -132,6 +78,88 @@ sidebarDepth: 0 +## _exception_ `MatcherException` + +基类：`nonebot.exception.NoneBotException` + + +* **说明** + + 所有 Matcher 发生的异常基类。 + + + +## _exception_ `SkippedException` + +基类：`nonebot.exception.MatcherException` + + +* **说明** + + 指示 NoneBot 立即结束当前 `Handler` 的处理，继续处理下一个 `Handler`。 + + + +* **用法** + + 可以在 `Handler` 中通过 `Matcher.skip()` 抛出。 + + + +## _exception_ `PausedException` + +基类：`nonebot.exception.MatcherException` + + +* **说明** + + 指示 NoneBot 结束当前 `Handler` 并等待下一条消息后继续下一个 `Handler`。 + 可用于用户输入新信息。 + + + +* **用法** + + 可以在 `Handler` 中通过 `Matcher.pause()` 抛出。 + + + +## _exception_ `RejectedException` + +基类：`nonebot.exception.MatcherException` + + +* **说明** + + 指示 NoneBot 结束当前 `Handler` 并等待下一条消息后重新运行当前 `Handler`。 + 可用于用户重新输入。 + + + +* **用法** + + 可以在 `Handler` 中通过 `Matcher.reject()` 抛出。 + + + +## _exception_ `FinishedException` + +基类：`nonebot.exception.MatcherException` + + +* **说明** + + 指示 NoneBot 结束当前 `Handler` 且后续 `Handler` 不再被运行。 + 可用于结束用户会话。 + + + +* **用法** + + 可以在 `Handler` 中通过 `Matcher.finish()` 抛出。 + + + ## _exception_ `AdapterException` 基类：`nonebot.exception.NoneBotException` @@ -152,7 +180,7 @@ sidebarDepth: 0 ## _exception_ `NoLogException` -基类：`Exception` +基类：`nonebot.exception.AdapterException` * **说明** diff --git a/docs/api/handler.md b/docs/api/handler.md index 977cbccb..8d36478b 100644 --- a/docs/api/handler.md +++ b/docs/api/handler.md @@ -29,7 +29,7 @@ sidebarDepth: 0 * **参数** - * `func: T_Handler`: 事件处理函数。 + * `func: Callable[..., Any]`: 事件处理函数。 * `name: Optional[str]`: 事件处理器名称。默认为函数名。 @@ -50,7 +50,7 @@ sidebarDepth: 0 * **类型** - `T_Handler` + `Callable[..., Any]` diff --git a/docs/api/rule.md b/docs/api/rule.md index 0ee615df..8a930b5b 100644 --- a/docs/api/rule.md +++ b/docs/api/rule.md @@ -42,7 +42,7 @@ Rule(async_function, run_sync(sync_function)) * **参数** - * `*checkers: Callable[[Bot, Event, T_State], Awaitable[bool]]`: **异步** RuleChecker + * `*checkers: T_RuleChecker`: RuleChecker @@ -58,11 +58,11 @@ Rule(async_function, run_sync(sync_function)) * **类型** - * `Set[Callable[[Bot, Event, T_State], Awaitable[bool]]]` + * `Set[Handler]` -### _async_ `__call__(bot, event, state)` +### _async_ `__call__(bot, event, state, stack=None, dependency_cache=None)` * **说明** diff --git a/docs/api/typing.md b/docs/api/typing.md index a5597e8d..08de8de4 100644 --- a/docs/api/typing.md +++ b/docs/api/typing.md @@ -179,7 +179,7 @@ sidebarDepth: 0 * **类型** - `Callable[[Bot, Event, T_State], Union[bool, Awaitable[bool]]]` + `Callable[..., Union[bool, Awaitable[bool]]]` From b4d12d905d3523792e26d44ef9131cf5a81b5d50 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 21 Nov 2021 12:36:44 +0800 Subject: [PATCH 033/174] :alembic: change permission to use handler --- nonebot/dependencies/__init__.py | 11 ++-- nonebot/dependencies/models.py | 7 ++- nonebot/dependencies/utils.py | 10 ++-- nonebot/matcher.py | 52 +++++++++++------ nonebot/message.py | 98 ++++++++++++++++---------------- nonebot/permission.py | 50 +++++++++++----- nonebot/plugin/on.py | 3 +- nonebot/rule.py | 23 +++++--- nonebot/typing.py | 75 ++++++++++++++++++------ 9 files changed, 207 insertions(+), 122 deletions(-) diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index f9a6ab63..dd27ce9f 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -20,6 +20,7 @@ from .utils import get_typed_signature from .models import Dependent as Dependent from nonebot.exception import SkippedException from .models import DependsWrapper as DependsWrapper +from nonebot.typing import T_Handler, T_DependencyCache from nonebot.utils import (run_sync, is_gen_callable, run_sync_ctx_manager, is_async_gen_callable, is_coroutine_callable) @@ -58,7 +59,7 @@ def get_parameterless_sub_dependant( def get_sub_dependant( *, depends: DependsWrapper, - dependency: Callable[..., Any], + dependency: T_Handler, name: Optional[str] = None, allow_types: Optional[List[Type[Param]]] = None) -> Dependent: sub_dependant = get_dependent(func=dependency, @@ -69,7 +70,7 @@ def get_sub_dependant( def get_dependent(*, - func: Callable[..., Any], + func: T_Handler, name: Optional[str] = None, use_cache: bool = True, allow_types: Optional[List[Type[Param]]] = None) -> Dependent: @@ -118,8 +119,8 @@ async def solve_dependencies( _stack: Optional[AsyncExitStack] = None, _sub_dependents: Optional[List[Dependent]] = None, _dependency_overrides_provider: Optional[Any] = None, - _dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, - **params: Any) -> Tuple[Dict[str, Any], Dict[Callable[..., Any], Any]]: + _dependency_cache: Optional[T_DependencyCache] = None, + **params: Any) -> Tuple[Dict[str, Any], T_DependencyCache]: values: Dict[str, Any] = {} dependency_cache = _dependency_cache or {} @@ -201,7 +202,7 @@ async def solve_dependencies( return values, dependency_cache -def Depends(dependency: Optional[Callable[..., Any]] = None, +def Depends(dependency: Optional[T_Handler] = None, *, use_cache: bool = True) -> Any: """ diff --git a/nonebot/dependencies/models.py b/nonebot/dependencies/models.py index ca764f9b..4431d11c 100644 --- a/nonebot/dependencies/models.py +++ b/nonebot/dependencies/models.py @@ -5,9 +5,10 @@ from typing import Any, List, Type, Callable, Optional from pydantic.fields import FieldInfo, ModelField from nonebot.utils import get_name +from nonebot.typing import T_Handler -class Param(FieldInfo, abc.ABC): +class Param(abc.ABC, FieldInfo): def __repr__(self) -> str: return f"{self.__class__.__name__}" @@ -28,7 +29,7 @@ class Param(FieldInfo, abc.ABC): class DependsWrapper: def __init__(self, - dependency: Optional[Callable[..., Any]] = None, + dependency: Optional[T_Handler] = None, *, use_cache: bool = True) -> None: self.dependency = dependency @@ -44,7 +45,7 @@ class Dependent: def __init__(self, *, - func: Optional[Callable[..., Any]] = None, + func: Optional[T_Handler] = None, name: Optional[str] = None, params: Optional[List[ModelField]] = None, allow_types: Optional[List[Type[Param]]] = None, diff --git a/nonebot/dependencies/utils.py b/nonebot/dependencies/utils.py index ed08b228..ade7fd97 100644 --- a/nonebot/dependencies/utils.py +++ b/nonebot/dependencies/utils.py @@ -1,13 +1,15 @@ import inspect -from typing import Any, Dict, Callable +from typing import Any, Dict from loguru import logger from pydantic.typing import ForwardRef, evaluate_forwardref +from nonebot.typing import T_Handler -def get_typed_signature(call: Callable[..., Any]) -> inspect.Signature: - signature = inspect.signature(call) - globalns = getattr(call, "__globals__", {}) + +def get_typed_signature(func: T_Handler) -> inspect.Signature: + signature = inspect.signature(func) + globalns = getattr(func, "__globals__", {}) typed_params = [ inspect.Parameter( name=param.name, diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 0967d5c3..f68c78de 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -9,6 +9,7 @@ from types import ModuleType from datetime import datetime from contextvars import ContextVar from collections import defaultdict +from contextlib import AsyncExitStack from typing import (TYPE_CHECKING, Any, Dict, List, Type, Union, Callable, NoReturn, Optional) @@ -20,11 +21,12 @@ from nonebot.dependencies import DependsWrapper from nonebot.permission import USER, Permission from nonebot.adapters import (Bot, Event, Message, MessageSegment, MessageTemplate) -from nonebot.typing import (T_State, T_Handler, T_ArgsParser, T_TypeUpdater, - T_StateFactory, T_PermissionUpdater) from nonebot.exception import (PausedException, StopPropagation, SkippedException, FinishedException, RejectedException) +from nonebot.typing import (T_State, T_Handler, T_ArgsParser, T_TypeUpdater, + T_StateFactory, T_DependencyCache, + T_PermissionUpdater) if TYPE_CHECKING: from nonebot.plugin import Plugin @@ -267,7 +269,13 @@ class Matcher(metaclass=MatcherMeta): return NewMatcher @classmethod - async def check_perm(cls, bot: Bot, event: Event) -> bool: + async def check_perm( + cls, + bot: Bot, + event: Event, + stack: Optional[AsyncExitStack] = None, + dependency_cache: Optional[Dict[Callable[..., Any], + Any]] = None) -> bool: """ :说明: @@ -284,10 +292,17 @@ class Matcher(metaclass=MatcherMeta): """ event_type = event.get_type() return (event_type == (cls.type or event_type) and - await cls.permission(bot, event)) + await cls.permission(bot, event, stack, dependency_cache)) @classmethod - async def check_rule(cls, bot: Bot, event: Event, state: T_State) -> bool: + async def check_rule( + cls, + bot: Bot, + event: Event, + state: T_State, + stack: Optional[AsyncExitStack] = None, + dependency_cache: Optional[Dict[Callable[..., Any], + Any]] = None) -> bool: """ :说明: @@ -305,7 +320,7 @@ class Matcher(metaclass=MatcherMeta): """ event_type = event.get_type() return (event_type == (cls.type or event_type) and - await cls.rule(bot, event, state)) + await cls.rule(bot, event, state, stack, dependency_cache)) @classmethod def args_parser(cls, func: T_ArgsParser) -> T_ArgsParser: @@ -589,7 +604,12 @@ class Matcher(metaclass=MatcherMeta): self.block = True # 运行handlers - async def run(self, bot: Bot, event: Event, state: T_State): + async def run(self, + bot: Bot, + event: Event, + state: T_State, + stack: Optional[AsyncExitStack] = None, + dependency_cache: Optional[T_DependencyCache] = None): b_t = current_bot.set(bot) e_t = current_event.set(event) s_t = current_state.set(self.state) @@ -606,7 +626,9 @@ class Matcher(metaclass=MatcherMeta): await handler(matcher=self, bot=bot, event=event, - state=self.state) + state=self.state, + _stack=stack, + _dependency_cache=dependency_cache) except SkippedException: pass @@ -624,11 +646,8 @@ class Matcher(metaclass=MatcherMeta): updater = self.__class__._default_permission_updater if updater: - permission = await updater( - bot, - event, - self.state, # type: ignore - self.permission) + permission = await updater(bot, event, self.state, + self.permission) else: permission = USER(event.get_session_id(), perm=self.permission) @@ -661,11 +680,8 @@ class Matcher(metaclass=MatcherMeta): updater = self.__class__._default_permission_updater if updater: - permission = await updater( - bot, - event, - self.state, # type: ignore - self.permission) + permission = await updater(bot, event, self.state, + self.permission) else: permission = USER(event.get_session_id(), perm=self.permission) diff --git a/nonebot/message.py b/nonebot/message.py index fec00687..66379e77 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -8,7 +8,7 @@ NoneBot 内部处理并按优先级分发事件给所有事件响应器，提供 import asyncio from datetime import datetime from contextlib import AsyncExitStack -from typing import TYPE_CHECKING, Set, Type +from typing import TYPE_CHECKING, Any, Set, Dict, Type, Callable, Optional from nonebot.log import logger from nonebot.rule import TrieRule @@ -17,8 +17,9 @@ from nonebot.utils import escape_tag from nonebot import params, get_driver from nonebot.matcher import Matcher, matchers from nonebot.exception import NoLogException, StopPropagation, IgnoredException -from nonebot.typing import (T_State, T_RunPreProcessor, T_RunPostProcessor, - T_EventPreProcessor, T_EventPostProcessor) +from nonebot.typing import (T_State, T_DependencyCache, T_RunPreProcessor, + T_RunPostProcessor, T_EventPreProcessor, + T_EventPostProcessor) if TYPE_CHECKING: from nonebot.adapters import Bot, Event @@ -43,14 +44,6 @@ def event_preprocessor(func: T_EventPreProcessor) -> T_EventPreProcessor: :说明: 事件预处理。装饰一个函数，使它在每次接收到事件并分发给各响应器之前执行。 - - :参数: - - 事件预处理函数接收三个参数。 - - * ``bot: Bot``: Bot 对象 - * ``event: Event``: Event 对象 - * ``state: T_State``: 当前 State """ _event_preprocessors.add( Handler(func, @@ -64,14 +57,6 @@ def event_postprocessor(func: T_EventPostProcessor) -> T_EventPostProcessor: :说明: 事件后处理。装饰一个函数，使它在每次接收到事件并分发给各响应器之后执行。 - - :参数: - - 事件后处理函数接收三个参数。 - - * ``bot: Bot``: Bot 对象 - * ``event: Event``: Event 对象 - * ``state: T_State``: 当前事件运行前 State """ _event_postprocessors.add( Handler(func, @@ -85,15 +70,6 @@ def run_preprocessor(func: T_RunPreProcessor) -> T_RunPreProcessor: :说明: 运行预处理。装饰一个函数，使它在每次事件响应器运行前执行。 - - :参数: - - 运行预处理函数接收四个参数。 - - * ``matcher: Matcher``: 当前要运行的事件响应器 - * ``bot: Bot``: Bot 对象 - * ``event: Event``: Event 对象 - * ``state: T_State``: 当前 State """ _run_preprocessors.add( Handler(func, @@ -107,16 +83,6 @@ def run_postprocessor(func: T_RunPostProcessor) -> T_RunPostProcessor: :说明: 运行后处理。装饰一个函数，使它在每次事件响应器运行后执行。 - - :参数: - - 运行后处理函数接收五个参数。 - - * ``matcher: Matcher``: 运行完毕的事件响应器 - * ``exception: Optional[Exception]``: 事件响应器运行错误（如果存在） - * ``bot: Bot``: Bot 对象 - * ``event: Event``: Event 对象 - * ``state: T_State``: 当前 State """ _run_postprocessors.add( Handler(func, @@ -125,8 +91,14 @@ def run_postprocessor(func: T_RunPostProcessor) -> T_RunPostProcessor: return func -async def _check_matcher(priority: int, Matcher: Type[Matcher], bot: "Bot", - event: "Event", state: T_State) -> None: +async def _check_matcher( + priority: int, + Matcher: Type[Matcher], + bot: "Bot", + event: "Event", + state: T_State, + stack: Optional[AsyncExitStack] = None, + dependency_cache: Optional[T_DependencyCache] = None) -> None: if Matcher.expire_time and datetime.now() > Matcher.expire_time: try: matchers[priority].remove(Matcher) @@ -136,7 +108,9 @@ async def _check_matcher(priority: int, Matcher: Type[Matcher], bot: "Bot", try: if not await Matcher.check_perm( - bot, event) or not await Matcher.check_rule(bot, event, state): + bot, event, stack, + dependency_cache) or not await Matcher.check_rule( + bot, event, state, stack, dependency_cache): return except Exception as e: logger.opt(colors=True, exception=e).error( @@ -149,17 +123,28 @@ async def _check_matcher(priority: int, Matcher: Type[Matcher], bot: "Bot", except Exception: pass - await _run_matcher(Matcher, bot, event, state) + await _run_matcher(Matcher, bot, event, state, stack, dependency_cache) -async def _run_matcher(Matcher: Type[Matcher], bot: "Bot", event: "Event", - state: T_State) -> None: +async def _run_matcher( + Matcher: Type[Matcher], + bot: "Bot", + event: "Event", + state: T_State, + stack: Optional[AsyncExitStack] = None, + dependency_cache: Optional[T_DependencyCache] = None) -> None: logger.info(f"Event will be handled by {Matcher}") matcher = Matcher() coros = list( - map(lambda x: x(matcher=matcher, bot=bot, event=event, state=state), + map( + lambda x: x(matcher=matcher, + bot=bot, + event=event, + state=state, + _stack=stack, + _dependency_cache=dependency_cache), _run_preprocessors)) if coros: try: @@ -191,7 +176,10 @@ async def _run_matcher(Matcher: Type[Matcher], bot: "Bot", event: "Event", exception=exception, bot=bot, event=event, - state=state), _run_postprocessors)) + state=state, + _stack=stack, + _dependency_cache=dependency_cache), + _run_postprocessors)) if coros: try: await asyncio.gather(*coros) @@ -232,12 +220,17 @@ async def handle_event(bot: "Bot", event: "Event") -> None: if show_log: logger.opt(colors=True).success(log_msg) - state = {} + state: Dict[Any, Any] = {} + dependency_cache: T_DependencyCache = {} - # TODO async with AsyncExitStack() as stack: coros = list( - map(lambda x: x(bot=bot, event=event, state=state), + map( + lambda x: x(bot=bot, + event=event, + state=state, + _stack=stack, + _dependency_cache=dependency_cache), _event_preprocessors)) if coros: try: @@ -286,7 +279,12 @@ async def handle_event(bot: "Bot", event: "Event") -> None: ) coros = list( - map(lambda x: x(bot=bot, event=event, state=state), + map( + lambda x: x(bot=bot, + event=event, + state=state, + _stack=stack, + _dependency_cache=dependency_cache), _event_postprocessors)) if coros: try: diff --git a/nonebot/permission.py b/nonebot/permission.py index 7564bb13..b83be58a 100644 --- a/nonebot/permission.py +++ b/nonebot/permission.py @@ -10,9 +10,12 @@ r""" """ import asyncio -from typing import Union, Callable, NoReturn, Optional, Awaitable +from contextlib import AsyncExitStack +from typing import Any, Dict, List, Type, Union, Callable, NoReturn, Optional -from nonebot.utils import run_sync +from nonebot import params +from nonebot.handler import Handler +from nonebot.dependencies import Param from nonebot.adapters import Bot, Event from nonebot.typing import T_PermissionChecker @@ -34,14 +37,23 @@ class Permission: """ __slots__ = ("checkers",) - def __init__(self, *checkers: Callable[[Bot, Event], - Awaitable[bool]]) -> None: + HANDLER_PARAM_TYPES: List[Type[Param]] = [ + params.BotParam, params.EventParam + ] + + def __init__(self, + *checkers: T_PermissionChecker, + dependency_overrides_provider: Optional[Any] = None) -> None: """ :参数: - * ``*checkers: Callable[[Bot, Event], Awaitable[bool]]``: **异步** PermissionChecker + * ``*checkers: T_PermissionChecker``: PermissionChecker """ - self.checkers = set(checkers) + self.checkers = set( + Handler(checker, + allow_types=self.HANDLER_PARAM_TYPES, + dependency_overrides_provider=dependency_overrides_provider) + for checker in checkers) """ :说明: @@ -49,10 +61,16 @@ class Permission: :类型: - * ``Set[Callable[[Bot, Event], Awaitable[bool]]]`` + * ``Set[Handler]`` """ - async def __call__(self, bot: Bot, event: Event) -> bool: + async def __call__( + self, + bot: Bot, + event: Event, + stack: Optional[AsyncExitStack] = None, + dependency_cache: Optional[Dict[Callable[..., Any], + Any]] = None) -> bool: """ :说明: @@ -62,6 +80,8 @@ class Permission: * ``bot: Bot``: Bot 对象 * ``event: Event``: Event 对象 + * ``stack: Optional[AsyncExitStack]``: 异步上下文栈 + * ``dependency_cache: Optional[Dict[Callable[..., Any], Any]]``: 依赖缓存 :返回: @@ -70,7 +90,11 @@ class Permission: if not self.checkers: return True results = await asyncio.gather( - *map(lambda c: c(bot, event), self.checkers)) + checker(bot=bot, + event=event, + _stack=stack, + _dependency_cache=dependency_cache) + for checker in self.checkers) return any(results) def __and__(self, other) -> NoReturn: @@ -79,16 +103,12 @@ class Permission: def __or__( self, other: Optional[Union["Permission", T_PermissionChecker]]) -> "Permission": - checkers = self.checkers.copy() if other is None: return self elif isinstance(other, Permission): - checkers |= other.checkers - elif asyncio.iscoroutinefunction(other): - checkers.add(other) # type: ignore + return Permission(*self.checkers, *other.checkers) else: - checkers.add(run_sync(other)) - return Permission(*checkers) + return Permission(*self.checkers, other) async def _message(bot: Bot, event: Event) -> bool: diff --git a/nonebot/plugin/on.py b/nonebot/plugin/on.py index 1b2cf16e..5b0f2979 100644 --- a/nonebot/plugin/on.py +++ b/nonebot/plugin/on.py @@ -434,8 +434,7 @@ def on_shell_command(cmd: Union[str, Tuple[str, ...]], message = event.get_message() segment = message.pop(0) new_message = message.__class__( - str(segment) - [len(state["_prefix"]["raw_command"]):].strip()) # type: ignore + str(segment)[len(state[PREFIX_KEY][RAW_CMD_KEY]):].strip()) for new_segment in reversed(new_message): message.insert(0, new_segment) diff --git a/nonebot/rule.py b/nonebot/rule.py index 3a1c2c33..c2ac4401 100644 --- a/nonebot/rule.py +++ b/nonebot/rule.py @@ -17,15 +17,15 @@ from argparse import Namespace from contextlib import AsyncExitStack from typing_extensions import TypedDict from argparse import ArgumentParser as ArgParser -from typing import (Any, Dict, Tuple, Union, Callable, NoReturn, Optional, - Sequence, Awaitable) +from typing import (Any, Dict, List, Type, Tuple, Union, Callable, NoReturn, + Optional, Sequence) from pygtrie import CharTrie from nonebot.log import logger -from nonebot.utils import run_sync from nonebot.handler import Handler from nonebot import params, get_driver +from nonebot.dependencies import Param from nonebot.exception import ParserExit from nonebot.typing import T_State, T_RuleChecker from nonebot.adapters import Bot, Event, MessageSegment @@ -64,11 +64,13 @@ class Rule: """ __slots__ = ("checkers",) - HANDLER_PARAM_TYPES = [ + HANDLER_PARAM_TYPES: List[Type[Param]] = [ params.BotParam, params.EventParam, params.StateParam ] - def __init__(self, *checkers: T_RuleChecker) -> None: + def __init__(self, + *checkers: T_RuleChecker, + dependency_overrides_provider: Optional[Any] = None) -> None: """ :参数: @@ -78,7 +80,7 @@ class Rule: self.checkers = set( Handler(checker, allow_types=self.HANDLER_PARAM_TYPES, - dependency_overrides_provider=get_driver()) + dependency_overrides_provider=dependency_overrides_provider) for checker in checkers) """ :说明: @@ -108,11 +110,15 @@ class Rule: * ``bot: Bot``: Bot 对象 * ``event: Event``: Event 对象 * ``state: T_State``: 当前 State + * ``stack: Optional[AsyncExitStack]``: 异步上下文栈 + * ``dependency_cache: Optional[Dict[Callable[..., Any], Any]]``: 依赖缓存 :返回: - ``bool`` """ + if not self.checkers: + return True results = await asyncio.gather( checker(bot=bot, event=event, @@ -126,10 +132,9 @@ class Rule: if other is None: return self elif isinstance(other, Rule): - checkers = [*self.checkers, *other.checkers] + return Rule(*self.checkers, *other.checkers) else: - checkers = [*self.checkers, other] - return Rule(*checkers) + return Rule(*self.checkers, other) def __or__(self, other) -> NoReturn: raise RuntimeError("Or operation between rules is not allowed.") diff --git a/nonebot/typing.py b/nonebot/typing.py index 337ff426..ac5a2335 100644 --- a/nonebot/typing.py +++ b/nonebot/typing.py @@ -22,7 +22,6 @@ from typing import (TYPE_CHECKING, Any, Dict, Union, TypeVar, Callable, NoReturn, Optional, Awaitable) if TYPE_CHECKING: - from nonebot.matcher import Matcher from nonebot.adapters import Bot, Event from nonebot.permission import Permission @@ -90,33 +89,60 @@ T_CalledAPIHook = Callable[ ``bot.call_api`` 后执行的函数，参数分别为 bot, exception, api, data, result """ -T_EventPreProcessor = Callable[..., Awaitable[None]] +T_EventPreProcessor = Callable[..., Union[None, Awaitable[None]]] """ -:类型: ``Callable[[Bot, Event, T_State], Awaitable[None]]`` +:类型: ``Callable[..., Union[None, Awaitable[None]]]`` + +:依赖参数: + + * ``BotParam``: Bot 对象 + * ``EventParam``: Event 对象 + * ``StateParam``: State 对象 :说明: 事件预处理函数 EventPreProcessor 类型 """ -T_EventPostProcessor = Callable[..., Awaitable[None]] +T_EventPostProcessor = Callable[..., Union[None, Awaitable[None]]] """ -:类型: ``Callable[[Bot, Event, T_State], Awaitable[None]]`` +:类型: ``Callable[..., Union[None, Awaitable[None]]]`` + +:依赖参数: + + * ``BotParam``: Bot 对象 + * ``EventParam``: Event 对象 + * ``StateParam``: State 对象 :说明: 事件预处理函数 EventPostProcessor 类型 """ -T_RunPreProcessor = Callable[..., Awaitable[None]] +T_RunPreProcessor = Callable[..., Union[None, Awaitable[None]]] """ -:类型: ``Callable[[Matcher, Bot, Event, T_State], Awaitable[None]]`` +:类型: ``Callable[..., Union[None, Awaitable[None]]]`` + +:依赖参数: + + * ``BotParam``: Bot 对象 + * ``EventParam``: Event 对象 + * ``StateParam``: State 对象 + * ``MatcherParam``: Matcher 对象 :说明: 事件响应器运行前预处理函数 RunPreProcessor 类型 """ -T_RunPostProcessor = Callable[..., Awaitable[None]] +T_RunPostProcessor = Callable[..., Union[None, Awaitable[None]]] """ -:类型: ``Callable[[Matcher, Optional[Exception], Bot, Event, T_State], Awaitable[None]]`` +:类型: ``Callable[..., Union[None, Awaitable[None]]]`` + +:依赖参数: + + * ``BotParam``: Bot 对象 + * ``EventParam``: Event 对象 + * ``StateParam``: State 对象 + * ``MatcherParam``: Matcher 对象 + * ``ExceptionParam``: 异常对象（可能为 None） :说明: @@ -127,28 +153,45 @@ T_RuleChecker = Callable[..., Union[bool, Awaitable[bool]]] """ :类型: ``Callable[..., Union[bool, Awaitable[bool]]]`` +:依赖参数: + + * ``BotParam``: Bot 对象 + * ``EventParam``: Event 对象 + * ``StateParam``: State 对象 + :说明: RuleChecker 即判断是否响应事件的处理函数。 """ -T_PermissionChecker = Callable[["Bot", "Event"], Union[bool, Awaitable[bool]]] +T_PermissionChecker = Callable[..., Union[bool, Awaitable[bool]]] """ -:类型: ``Callable[[Bot, Event], Union[bool, Awaitable[bool]]]`` +:类型: ``Callable[..., Union[bool, Awaitable[bool]]]`` + +:依赖参数: + + * ``BotParam``: Bot 对象 + * ``EventParam``: Event 对象 :说明: RuleChecker 即判断是否响应消息的处理函数。 """ -T_Handler = Callable[..., Union[Awaitable[None], Awaitable[NoReturn]]] +T_Handler = Callable[..., Any] """ -:类型: - - * ``Callable[..., Union[Awaitable[None], Awaitable[NoReturn]]]`` +:类型: ``Callable[..., Any]`` :说明: - Handler 即事件的处理函数。 + Handler 处理函数。 +""" +T_DependencyCache = Dict[T_Handler, Any] +""" +:类型: ``Dict[T_Handler, Any]`` + +:说明: + + 依赖缓存, 用于存储依赖函数的返回值 """ T_ArgsParser = Callable[["Bot", "Event", T_State], Union[Awaitable[None], Awaitable[NoReturn]]] From d22630e7686ea10459022699e3d8ee15d1c6c467 Mon Sep 17 00:00:00 2001 From: nonebot Date: Sun, 21 Nov 2021 04:37:46 +0000 Subject: [PATCH 034/174] :memo: update api docs --- docs/api/matcher.md | 4 +- docs/api/message.md | 69 ------------------------- docs/api/permission.md | 14 +++-- docs/api/rule.md | 8 ++- docs/api/typing.md | 115 ++++++++++++++++++++++++++++++++++++++--- 5 files changed, 126 insertions(+), 84 deletions(-) diff --git a/docs/api/matcher.md b/docs/api/matcher.md index 5cd6b03f..d520c8b1 100644 --- a/docs/api/matcher.md +++ b/docs/api/matcher.md @@ -348,7 +348,7 @@ sidebarDepth: 0 -### _async classmethod_ `check_perm(bot, event)` +### _async classmethod_ `check_perm(bot, event, stack=None, dependency_cache=None)` * **说明** @@ -374,7 +374,7 @@ sidebarDepth: 0 -### _async classmethod_ `check_rule(bot, event, state)` +### _async classmethod_ `check_rule(bot, event, state, stack=None, dependency_cache=None)` * **说明** diff --git a/docs/api/message.md b/docs/api/message.md index 5bd6c332..645ac8cd 100644 --- a/docs/api/message.md +++ b/docs/api/message.md @@ -19,21 +19,6 @@ NoneBot 内部处理并按优先级分发事件给所有事件响应器，提供 -* **参数** - - 事件预处理函数接收三个参数。 - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前 State - - - ## `event_postprocessor(func)` @@ -43,21 +28,6 @@ NoneBot 内部处理并按优先级分发事件给所有事件响应器，提供 -* **参数** - - 事件后处理函数接收三个参数。 - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前事件运行前 State - - - ## `run_preprocessor(func)` @@ -67,24 +37,6 @@ NoneBot 内部处理并按优先级分发事件给所有事件响应器，提供 -* **参数** - - 运行预处理函数接收四个参数。 - - - * `matcher: Matcher`: 当前要运行的事件响应器 - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前 State - - - ## `run_postprocessor(func)` @@ -94,27 +46,6 @@ NoneBot 内部处理并按优先级分发事件给所有事件响应器，提供 -* **参数** - - 运行后处理函数接收五个参数。 - - - * `matcher: Matcher`: 运行完毕的事件响应器 - - - * `exception: Optional[Exception]`: 事件响应器运行错误（如果存在） - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前 State - - - ## _async_ `handle_event(bot, event)` diff --git a/docs/api/permission.md b/docs/api/permission.md index e99b7e8b..3faf39d8 100644 --- a/docs/api/permission.md +++ b/docs/api/permission.md @@ -36,13 +36,13 @@ Permission(async_function, run_sync(sync_function)) ``` -### `__init__(*checkers)` +### `__init__(*checkers, dependency_overrides_provider=None)` * **参数** - * `*checkers: Callable[[Bot, Event], Awaitable[bool]]`: **异步** PermissionChecker + * `*checkers: T_PermissionChecker`: PermissionChecker @@ -58,11 +58,11 @@ Permission(async_function, run_sync(sync_function)) * **类型** - * `Set[Callable[[Bot, Event], Awaitable[bool]]]` + * `Set[Handler]` -### _async_ `__call__(bot, event)` +### _async_ `__call__(bot, event, stack=None, dependency_cache=None)` * **说明** @@ -80,6 +80,12 @@ Permission(async_function, run_sync(sync_function)) * `event: Event`: Event 对象 + * `stack: Optional[AsyncExitStack]`: 异步上下文栈 + + + * `dependency_cache: Optional[Dict[Callable[..., Any], Any]]`: 依赖缓存 + + * **返回** diff --git a/docs/api/rule.md b/docs/api/rule.md index 8a930b5b..f11525dc 100644 --- a/docs/api/rule.md +++ b/docs/api/rule.md @@ -36,7 +36,7 @@ Rule(async_function, run_sync(sync_function)) ``` -### `__init__(*checkers)` +### `__init__(*checkers, dependency_overrides_provider=None)` * **参数** @@ -83,6 +83,12 @@ Rule(async_function, run_sync(sync_function)) * `state: T_State`: 当前 State + * `stack: Optional[AsyncExitStack]`: 异步上下文栈 + + + * `dependency_cache: Optional[Dict[Callable[..., Any], Any]]`: 依赖缓存 + + * **返回** diff --git a/docs/api/typing.md b/docs/api/typing.md index 08de8de4..403c7f53 100644 --- a/docs/api/typing.md +++ b/docs/api/typing.md @@ -115,7 +115,20 @@ sidebarDepth: 0 * **类型** - `Callable[[Bot, Event, T_State], Awaitable[None]]` + `Callable[..., Union[None, Awaitable[None]]]` + + + +* **依赖参数** + + + * `BotParam`: Bot 对象 + + + * `EventParam`: Event 对象 + + + * `StateParam`: State 对象 @@ -131,7 +144,20 @@ sidebarDepth: 0 * **类型** - `Callable[[Bot, Event, T_State], Awaitable[None]]` + `Callable[..., Union[None, Awaitable[None]]]` + + + +* **依赖参数** + + + * `BotParam`: Bot 对象 + + + * `EventParam`: Event 对象 + + + * `StateParam`: State 对象 @@ -147,7 +173,23 @@ sidebarDepth: 0 * **类型** - `Callable[[Matcher, Bot, Event, T_State], Awaitable[None]]` + `Callable[..., Union[None, Awaitable[None]]]` + + + +* **依赖参数** + + + * `BotParam`: Bot 对象 + + + * `EventParam`: Event 对象 + + + * `StateParam`: State 对象 + + + * `MatcherParam`: Matcher 对象 @@ -163,7 +205,26 @@ sidebarDepth: 0 * **类型** - `Callable[[Matcher, Optional[Exception], Bot, Event, T_State], Awaitable[None]]` + `Callable[..., Union[None, Awaitable[None]]]` + + + +* **依赖参数** + + + * `BotParam`: Bot 对象 + + + * `EventParam`: Event 对象 + + + * `StateParam`: State 对象 + + + * `MatcherParam`: Matcher 对象 + + + * `ExceptionParam`: 异常对象（可能为 None） @@ -183,6 +244,19 @@ sidebarDepth: 0 +* **依赖参数** + + + * `BotParam`: Bot 对象 + + + * `EventParam`: Event 对象 + + + * `StateParam`: State 对象 + + + * **说明** RuleChecker 即判断是否响应事件的处理函数。 @@ -195,7 +269,17 @@ sidebarDepth: 0 * **类型** - `Callable[[Bot, Event], Union[bool, Awaitable[bool]]]` + `Callable[..., Union[bool, Awaitable[bool]]]` + + + +* **依赖参数** + + + * `BotParam`: Bot 对象 + + + * `EventParam`: Event 对象 @@ -211,14 +295,29 @@ sidebarDepth: 0 * **类型** - - * `Callable[..., Union[Awaitable[None], Awaitable[NoReturn]]]` + `Callable[..., Any]` * **说明** - Handler 即事件的处理函数。 + Handler 处理函数。 + + + + +## `T_DependencyCache` + + +* **类型** + + `Dict[T_Handler, Any]` + + + +* **说明** + + 依赖缓存, 用于存储依赖函数的返回值 From 75d4cd95658053f6b5cf3a7499489e44afde40aa Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 21 Nov 2021 15:46:48 +0800 Subject: [PATCH 035/174] :bug: fix cache concurrency --- nonebot/dependencies/__init__.py | 57 +++++++------- nonebot/handler.py | 2 +- nonebot/message.py | 5 +- nonebot/permission.py | 30 ++++---- nonebot/rule.py | 23 +++--- nonebot/utils.py | 76 ++++++++++++++++++- .../nonebot/adapters/cqhttp/permission.py | 25 +++--- tests/test_plugins/test_depends.py | 17 ++++- 8 files changed, 162 insertions(+), 73 deletions(-) diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index dd27ce9f..f863d5d9 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -21,8 +21,11 @@ from .models import Dependent as Dependent from nonebot.exception import SkippedException from .models import DependsWrapper as DependsWrapper from nonebot.typing import T_Handler, T_DependencyCache -from nonebot.utils import (run_sync, is_gen_callable, run_sync_ctx_manager, - is_async_gen_callable, is_coroutine_callable) +from nonebot.utils import (CacheLock, run_sync, is_gen_callable, + run_sync_ctx_manager, is_async_gen_callable, + is_coroutine_callable) + +cache_lock = CacheLock() class CustomConfig(BaseConfig): @@ -93,7 +96,7 @@ def get_dependent(*, break else: raise ValueError( - f"Unknown parameter {param_name} for funcction {func} with type {param.annotation}" + f"Unknown parameter {param_name} for function {func} with type {param.annotation}" ) annotation: Any = Any @@ -122,7 +125,7 @@ async def solve_dependencies( _dependency_cache: Optional[T_DependencyCache] = None, **params: Any) -> Tuple[Dict[str, Any], T_DependencyCache]: values: Dict[str, Any] = {} - dependency_cache = _dependency_cache or {} + dependency_cache = {} if _dependency_cache is None else _dependency_cache # solve sub dependencies sub_dependent: Dependent @@ -151,35 +154,37 @@ async def solve_dependencies( solved_result = await solve_dependencies( _dependent=use_sub_dependant, _dependency_overrides_provider=_dependency_overrides_provider, - dependency_cache=dependency_cache, + _dependency_cache=dependency_cache, **params) sub_values, sub_dependency_cache = solved_result # update cache? - dependency_cache.update(sub_dependency_cache) + # dependency_cache.update(sub_dependency_cache) # run dependency function - if sub_dependent.use_cache and sub_dependent.cache_key in dependency_cache: - solved = dependency_cache[sub_dependent.cache_key] - elif is_gen_callable(func) or is_async_gen_callable(func): - assert isinstance( - _stack, AsyncExitStack - ), "Generator dependency should be called in context" - if is_gen_callable(func): - cm = run_sync_ctx_manager(contextmanager(func)(**sub_values)) + async with cache_lock: + if sub_dependent.use_cache and sub_dependent.cache_key in dependency_cache: + solved = dependency_cache[sub_dependent.cache_key] + elif is_gen_callable(func) or is_async_gen_callable(func): + assert isinstance( + _stack, AsyncExitStack + ), "Generator dependency should be called in context" + if is_gen_callable(func): + cm = run_sync_ctx_manager( + contextmanager(func)(**sub_values)) + else: + cm = asynccontextmanager(func)(**sub_values) + solved = await _stack.enter_async_context(cm) + elif is_coroutine_callable(func): + solved = await func(**sub_values) else: - cm = asynccontextmanager(func)(**sub_values) - solved = await _stack.enter_async_context(cm) - elif is_coroutine_callable(func): - solved = await func(**sub_values) - else: - solved = await run_sync(func)(**sub_values) + solved = await run_sync(func)(**sub_values) - # parameter dependency - if sub_dependent.name is not None: - values[sub_dependent.name] = solved - # save current dependency to cache - if sub_dependent.cache_key not in dependency_cache: - dependency_cache[sub_dependent.cache_key] = solved + # parameter dependency + if sub_dependent.name is not None: + values[sub_dependent.name] = solved + # save current dependency to cache + if sub_dependent.cache_key not in dependency_cache: + dependency_cache[sub_dependent.cache_key] = solved # usual dependency for field in _dependent.params: diff --git a/nonebot/handler.py b/nonebot/handler.py index d6df70dd..a39003b1 100644 --- a/nonebot/handler.py +++ b/nonebot/handler.py @@ -80,7 +80,7 @@ class Handler: _dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, **params) -> Any: - values, cache = await solve_dependencies( + values, _ = await solve_dependencies( _dependent=self.dependent, _stack=_stack, _sub_dependents=[ diff --git a/nonebot/message.py b/nonebot/message.py index 66379e77..3c00423b 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -163,7 +163,7 @@ async def _run_matcher( try: logger.debug(f"Running matcher {matcher}") - await matcher.run(bot, event, state) + await matcher.run(bot, event, state, stack, dependency_cache) except Exception as e: logger.opt(colors=True, exception=e).error( f"Running matcher {matcher} failed." @@ -260,7 +260,8 @@ async def handle_event(bot: "Bot", event: "Event") -> None: logger.debug(f"Checking for matchers in priority {priority}...") pending_tasks = [ - _check_matcher(priority, matcher, bot, event, state.copy()) + _check_matcher(priority, matcher, bot, event, state.copy(), + stack, dependency_cache) for matcher in matchers[priority] ] diff --git a/nonebot/permission.py b/nonebot/permission.py index b83be58a..48781e32 100644 --- a/nonebot/permission.py +++ b/nonebot/permission.py @@ -42,17 +42,19 @@ class Permission: ] def __init__(self, - *checkers: T_PermissionChecker, + *checkers: Union[T_PermissionChecker, Handler], dependency_overrides_provider: Optional[Any] = None) -> None: """ :参数: - * ``*checkers: T_PermissionChecker``: PermissionChecker + * ``*checkers: Union[T_PermissionChecker, Handler]``: PermissionChecker """ + self.checkers = set( - Handler(checker, - allow_types=self.HANDLER_PARAM_TYPES, - dependency_overrides_provider=dependency_overrides_provider) + checker if isinstance(checker, Handler) else Handler( + checker, + allow_types=self.HANDLER_PARAM_TYPES, + dependency_overrides_provider=dependency_overrides_provider) for checker in checkers) """ :说明: @@ -90,11 +92,11 @@ class Permission: if not self.checkers: return True results = await asyncio.gather( - checker(bot=bot, - event=event, - _stack=stack, - _dependency_cache=dependency_cache) - for checker in self.checkers) + *(checker(bot=bot, + event=event, + _stack=stack, + _dependency_cache=dependency_cache) + for checker in self.checkers)) return any(results) def __and__(self, other) -> NoReturn: @@ -111,19 +113,19 @@ class Permission: return Permission(*self.checkers, other) -async def _message(bot: Bot, event: Event) -> bool: +async def _message(event: Event) -> bool: return event.get_type() == "message" -async def _notice(bot: Bot, event: Event) -> bool: +async def _notice(event: Event) -> bool: return event.get_type() == "notice" -async def _request(bot: Bot, event: Event) -> bool: +async def _request(event: Event) -> bool: return event.get_type() == "request" -async def _metaevent(bot: Bot, event: Event) -> bool: +async def _metaevent(event: Event) -> bool: return event.get_type() == "meta_event" diff --git a/nonebot/rule.py b/nonebot/rule.py index c2ac4401..177b59d7 100644 --- a/nonebot/rule.py +++ b/nonebot/rule.py @@ -69,18 +69,19 @@ class Rule: ] def __init__(self, - *checkers: T_RuleChecker, + *checkers: Union[T_RuleChecker, Handler], dependency_overrides_provider: Optional[Any] = None) -> None: """ :参数: - * ``*checkers: T_RuleChecker``: RuleChecker + * ``*checkers: Union[T_RuleChecker, Handler]``: RuleChecker """ self.checkers = set( - Handler(checker, - allow_types=self.HANDLER_PARAM_TYPES, - dependency_overrides_provider=dependency_overrides_provider) + checker if isinstance(checker, Handler) else Handler( + checker, + allow_types=self.HANDLER_PARAM_TYPES, + dependency_overrides_provider=dependency_overrides_provider) for checker in checkers) """ :说明: @@ -120,12 +121,12 @@ class Rule: if not self.checkers: return True results = await asyncio.gather( - checker(bot=bot, - event=event, - state=state, - _stack=stack, - _dependency_cache=dependency_cache) - for checker in self.checkers) + *(checker(bot=bot, + event=event, + state=state, + _stack=stack, + _dependency_cache=dependency_cache) + for checker in self.checkers)) return all(results) def __and__(self, other: Optional[Union["Rule", T_RuleChecker]]) -> "Rule": diff --git a/nonebot/utils.py b/nonebot/utils.py index 66e905e6..32eca0db 100644 --- a/nonebot/utils.py +++ b/nonebot/utils.py @@ -2,12 +2,13 @@ import re import json import asyncio import inspect +import collections import dataclasses from functools import wraps, partial from contextlib import asynccontextmanager from typing_extensions import GenericAlias # type: ignore from typing_extensions import ParamSpec, get_args, get_origin -from typing import (Any, Type, Tuple, Union, TypeVar, Callable, Optional, +from typing import (Any, Type, Deque, Tuple, Union, TypeVar, Callable, Optional, Awaitable, AsyncGenerator, ContextManager) from nonebot.log import logger @@ -120,6 +121,79 @@ def get_name(obj: Any) -> str: return obj.__class__.__name__ +class CacheLock: + + def __init__(self): + self._waiters: Optional[Deque[asyncio.Future]] = None + self._locked = False + + def __repr__(self): + extra = "locked" if self._locked else "unlocked" + if self._waiters: + extra = f"{extra}, waiters: {len(self._waiters)}" + return f"<{self.__class__.__name__} [{extra}]>" + + async def __aenter__(self): + await self.acquire() + return None + + async def __aexit__(self, exc_type, exc, tb): + self.release() + + def locked(self): + return self._locked + + async def acquire(self): + if (not self._locked and (self._waiters is None or + all(w.cancelled() for w in self._waiters))): + self._locked = True + return True + + if self._waiters is None: + self._waiters = collections.deque() + + loop = asyncio.get_running_loop() + future = loop.create_future() + self._waiters.append(future) + + # Finally block should be called before the CancelledError + # handling as we don't want CancelledError to call + # _wake_up_first() and attempt to wake up itself. + try: + try: + await future + finally: + self._waiters.remove(future) + except asyncio.CancelledError: + if not self._locked: + self._wake_up_first() + raise + + self._locked = True + return True + + def release(self): + if self._locked: + self._locked = False + self._wake_up_first() + else: + raise RuntimeError("Lock is not acquired.") + + def _wake_up_first(self): + if not self._waiters: + return + try: + future = next(iter(self._waiters)) + except StopIteration: + return + + # .done() necessarily means that a waiter will wake up later on and + # either take the lock, or, if it was cancelled and lock wasn't + # taken already, will hit this again and wake up a new waiter. + if not future.done(): + future.set_result(True) + + class DataclassEncoder(json.JSONEncoder): """ :说明: diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/permission.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/permission.py index 1d3b3f36..09ea7b7a 100644 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/permission.py +++ b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/permission.py @@ -1,26 +1,21 @@ -from typing import TYPE_CHECKING - +from nonebot.adapters import Event from nonebot.permission import Permission - -from .event import PrivateMessageEvent, GroupMessageEvent - -if TYPE_CHECKING: - from nonebot.adapters import Bot, Event +from .event import GroupMessageEvent, PrivateMessageEvent -async def _private(bot: "Bot", event: "Event") -> bool: +async def _private(event: Event) -> bool: return isinstance(event, PrivateMessageEvent) -async def _private_friend(bot: "Bot", event: "Event") -> bool: +async def _private_friend(event: Event) -> bool: return isinstance(event, PrivateMessageEvent) and event.sub_type == "friend" -async def _private_group(bot: "Bot", event: "Event") -> bool: +async def _private_group(event: Event) -> bool: return isinstance(event, PrivateMessageEvent) and event.sub_type == "group" -async def _private_other(bot: "Bot", event: "Event") -> bool: +async def _private_other(event: Event) -> bool: return isinstance(event, PrivateMessageEvent) and event.sub_type == "other" @@ -42,20 +37,20 @@ PRIVATE_OTHER = Permission(_private_other) """ -async def _group(bot: "Bot", event: "Event") -> bool: +async def _group(event: Event) -> bool: return isinstance(event, GroupMessageEvent) -async def _group_member(bot: "Bot", event: "Event") -> bool: +async def _group_member(event: Event) -> bool: return isinstance(event, GroupMessageEvent) and event.sender.role == "member" -async def _group_admin(bot: "Bot", event: "Event") -> bool: +async def _group_admin(event: Event) -> bool: return isinstance(event, GroupMessageEvent) and event.sender.role == "admin" -async def _group_owner(bot: "Bot", event: "Event") -> bool: +async def _group_owner(event: Event) -> bool: return isinstance(event, GroupMessageEvent) and event.sender.role == "owner" diff --git a/tests/test_plugins/test_depends.py b/tests/test_plugins/test_depends.py index c604169b..e23c9c4e 100644 --- a/tests/test_plugins/test_depends.py +++ b/tests/test_plugins/test_depends.py @@ -1,11 +1,12 @@ -from nonebot import on_command from nonebot.log import logger from nonebot.dependencies import Depends +from nonebot import on_command, on_message test = on_command("123") def depend(state: dict): + print("==== depends running =====") return state @@ -13,5 +14,15 @@ def depend(state: dict): @test.got("b", prompt="b") @test.receive() @test.got("c", prompt="c") -async def _(state: dict = Depends(depend)): - logger.info(f"=======, {state}") +async def _(x: dict = Depends(depend)): + logger.info(f"=======, {x}") + + +test_cache1 = on_message() +test_cache2 = on_message() + + +@test_cache1.handle() +@test_cache2.handle() +async def _(x: dict = Depends(depend)): + logger.info(f"======= test, {x}") From a864b36e9fa02765f1d5e8bd53220961e7a3e1eb Mon Sep 17 00:00:00 2001 From: nonebot Date: Sun, 21 Nov 2021 07:48:02 +0000 Subject: [PATCH 036/174] :memo: update api docs --- docs/api/permission.md | 2 +- docs/api/rule.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api/permission.md b/docs/api/permission.md index 3faf39d8..18ba75cb 100644 --- a/docs/api/permission.md +++ b/docs/api/permission.md @@ -42,7 +42,7 @@ Permission(async_function, run_sync(sync_function)) * **参数** - * `*checkers: T_PermissionChecker`: PermissionChecker + * `*checkers: Union[T_PermissionChecker, Handler]`: PermissionChecker diff --git a/docs/api/rule.md b/docs/api/rule.md index f11525dc..ee33cd91 100644 --- a/docs/api/rule.md +++ b/docs/api/rule.md @@ -42,7 +42,7 @@ Rule(async_function, run_sync(sync_function)) * **参数** - * `*checkers: T_RuleChecker`: RuleChecker + * `*checkers: Union[T_RuleChecker, Handler]`: RuleChecker From 760ac693c0ab8a17e2a3161c44d5cee595e29078 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 21 Nov 2021 16:12:36 +0800 Subject: [PATCH 037/174] :fire: remove dependency override provider --- nonebot/config.py | 3 +-- nonebot/dependencies/__init__.py | 18 +------------- nonebot/dependencies/models.py | 2 +- nonebot/drivers/__init__.py | 5 ---- nonebot/handler.py | 6 +---- nonebot/matcher.py | 7 ++---- nonebot/message.py | 24 +++++-------------- nonebot/permission.py | 10 +++----- nonebot/plugins/echo.py | 2 +- nonebot/plugins/single_session.py | 6 ++--- nonebot/py.typed | 1 - nonebot/rule.py | 12 ++++------ nonebot/typing.py | 4 ++-- .../nonebot/adapters/cqhttp/event.py | 5 ++-- .../nonebot/adapters/cqhttp/exception.py | 13 ++++++---- 15 files changed, 35 insertions(+), 83 deletions(-) diff --git a/nonebot/config.py b/nonebot/config.py index 05baf53b..82fca0d3 100644 --- a/nonebot/config.py +++ b/nonebot/config.py @@ -67,8 +67,7 @@ class CustomEnvSettings(EnvSettingsSource): env_val = settings.__config__.json_loads(env_val) except ValueError as e: raise SettingsError( - f'error parsing JSON for "{env_name}"' # type: ignore - ) from e + f'error parsing JSON for "{env_name}"') from e d[field.alias] = env_val if env_file_vars: diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index f863d5d9..7d0138a8 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -121,7 +121,6 @@ async def solve_dependencies( _dependent: Dependent, _stack: Optional[AsyncExitStack] = None, _sub_dependents: Optional[List[Dependent]] = None, - _dependency_overrides_provider: Optional[Any] = None, _dependency_cache: Optional[T_DependencyCache] = None, **params: Any) -> Tuple[Dict[str, Any], T_DependencyCache]: values: Dict[str, Any] = {} @@ -136,24 +135,9 @@ async def solve_dependencies( sub_dependent.cache_key) func = sub_dependent.func - # dependency overrides - use_sub_dependant = sub_dependent - if (_dependency_overrides_provider and hasattr( - _dependency_overrides_provider, "dependency_overrides")): - original_call = sub_dependent.func - func = getattr(_dependency_overrides_provider, - "dependency_overrides", - {}).get(original_call, original_call) - use_sub_dependant = get_dependent( - func=func, - name=sub_dependent.name, - allow_types=sub_dependent.allow_types, - ) - # solve sub dependency with current cache solved_result = await solve_dependencies( - _dependent=use_sub_dependant, - _dependency_overrides_provider=_dependency_overrides_provider, + _dependent=sub_dependent, _dependency_cache=dependency_cache, **params) sub_values, sub_dependency_cache = solved_result diff --git a/nonebot/dependencies/models.py b/nonebot/dependencies/models.py index 4431d11c..36ee5af0 100644 --- a/nonebot/dependencies/models.py +++ b/nonebot/dependencies/models.py @@ -1,6 +1,6 @@ import abc import inspect -from typing import Any, List, Type, Callable, Optional +from typing import Any, List, Type, Optional from pydantic.fields import FieldInfo, ModelField diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py index 74c42ff6..d08f6b0c 100644 --- a/nonebot/drivers/__init__.py +++ b/nonebot/drivers/__init__.py @@ -40,11 +40,6 @@ class Driver(abc.ABC): :类型: ``Set[T_BotDisconnectionHook]`` :说明: Bot 连接断开时执行的函数 """ - dependency_overrides: Dict[Callable[..., Any], Callable[..., Any]] = {} - """ - :类型: ``Dict[Callable[..., Any], Callable[..., Any]]`` - :说明: Depends 函数的替换表 - """ def __init__(self, env: Env, config: Config): """ diff --git a/nonebot/handler.py b/nonebot/handler.py index a39003b1..6203bebd 100644 --- a/nonebot/handler.py +++ b/nonebot/handler.py @@ -23,8 +23,7 @@ class Handler: *, name: Optional[str] = None, dependencies: Optional[List[DependsWrapper]] = None, - allow_types: Optional[List[Type[Param]]] = None, - dependency_overrides_provider: Optional[Any] = None): + allow_types: Optional[List[Type[Param]]] = None): """ :说明: @@ -36,7 +35,6 @@ class Handler: * ``name: Optional[str]``: 事件处理器名称。默认为函数名。 * ``dependencies: Optional[List[DependsWrapper]]``: 额外的非参数依赖注入。 * ``allow_types: Optional[List[Type[Param]]]``: 允许的参数类型。 - * ``dependency_overrides_provider: Optional[Any]``: 依赖注入覆盖提供者。 """ self.func = func """ @@ -63,7 +61,6 @@ class Handler: if dependencies: for depends in dependencies: self.cache_dependent(depends) - self.dependency_overrides_provider = dependency_overrides_provider self.dependent = get_dependent(func=func, allow_types=self.allow_types) def __repr__(self) -> str: @@ -87,7 +84,6 @@ class Handler: self.sub_dependents[dependency.dependency] # type: ignore for dependency in self.dependencies ], - _dependency_overrides_provider=self.dependency_overrides_provider, _dependency_cache=_dependency_cache, **params) diff --git a/nonebot/matcher.py b/nonebot/matcher.py index f68c78de..7eeda5ab 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -13,10 +13,10 @@ from contextlib import AsyncExitStack from typing import (TYPE_CHECKING, Any, Dict, List, Type, Union, Callable, NoReturn, Optional) +from nonebot import params from nonebot.rule import Rule from nonebot.log import logger from nonebot.handler import Handler -from nonebot import params, get_driver from nonebot.dependencies import DependsWrapper from nonebot.permission import USER, Permission from nonebot.adapters import (Bot, Event, Message, MessageSegment, @@ -238,9 +238,7 @@ class Matcher(metaclass=MatcherMeta): permission or Permission(), "handlers": [ handler if isinstance(handler, Handler) else Handler( - handler, - dependency_overrides_provider=get_driver(), - allow_types=cls.HANDLER_PARAM_TYPES) + handler, allow_types=cls.HANDLER_PARAM_TYPES) for handler in handlers ] if handlers else [], "temp": @@ -372,7 +370,6 @@ class Matcher(metaclass=MatcherMeta): dependencies: Optional[List[DependsWrapper]] = None) -> Handler: handler_ = Handler(handler, dependencies=dependencies, - dependency_overrides_provider=get_driver(), allow_types=cls.HANDLER_PARAM_TYPES) cls.handlers.append(handler_) return handler_ diff --git a/nonebot/message.py b/nonebot/message.py index 3c00423b..bedf778c 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -8,13 +8,13 @@ NoneBot 内部处理并按优先级分发事件给所有事件响应器，提供 import asyncio from datetime import datetime from contextlib import AsyncExitStack -from typing import TYPE_CHECKING, Any, Set, Dict, Type, Callable, Optional +from typing import TYPE_CHECKING, Any, Set, Dict, Type, Optional +from nonebot import params from nonebot.log import logger from nonebot.rule import TrieRule from nonebot.handler import Handler from nonebot.utils import escape_tag -from nonebot import params, get_driver from nonebot.matcher import Matcher, matchers from nonebot.exception import NoLogException, StopPropagation, IgnoredException from nonebot.typing import (T_State, T_DependencyCache, T_RunPreProcessor, @@ -45,10 +45,7 @@ def event_preprocessor(func: T_EventPreProcessor) -> T_EventPreProcessor: 事件预处理。装饰一个函数，使它在每次接收到事件并分发给各响应器之前执行。 """ - _event_preprocessors.add( - Handler(func, - allow_types=EVENT_PCS_PARAMS, - dependency_overrides_provider=get_driver())) + _event_preprocessors.add(Handler(func, allow_types=EVENT_PCS_PARAMS)) return func @@ -58,10 +55,7 @@ def event_postprocessor(func: T_EventPostProcessor) -> T_EventPostProcessor: 事件后处理。装饰一个函数，使它在每次接收到事件并分发给各响应器之后执行。 """ - _event_postprocessors.add( - Handler(func, - allow_types=EVENT_PCS_PARAMS, - dependency_overrides_provider=get_driver())) + _event_postprocessors.add(Handler(func, allow_types=EVENT_PCS_PARAMS)) return func @@ -71,10 +65,7 @@ def run_preprocessor(func: T_RunPreProcessor) -> T_RunPreProcessor: 运行预处理。装饰一个函数，使它在每次事件响应器运行前执行。 """ - _run_preprocessors.add( - Handler(func, - allow_types=RUN_PREPCS_PARAMS, - dependency_overrides_provider=get_driver())) + _run_preprocessors.add(Handler(func, allow_types=RUN_PREPCS_PARAMS)) return func @@ -84,10 +75,7 @@ def run_postprocessor(func: T_RunPostProcessor) -> T_RunPostProcessor: 运行后处理。装饰一个函数，使它在每次事件响应器运行后执行。 """ - _run_postprocessors.add( - Handler(func, - allow_types=RUN_POSTPCS_PARAMS, - dependency_overrides_provider=get_driver())) + _run_postprocessors.add(Handler(func, allow_types=RUN_POSTPCS_PARAMS)) return func diff --git a/nonebot/permission.py b/nonebot/permission.py index 48781e32..e52058cb 100644 --- a/nonebot/permission.py +++ b/nonebot/permission.py @@ -2,7 +2,7 @@ r""" 权限 ==== -每个 ``Matcher`` 拥有一个 ``Permission`` ，其中是 **异步** ``PermissionChecker`` 的集合，只要有一个 ``PermissionChecker`` 检查结果为 ``True`` 时就会继续运行。 +每个 ``Matcher`` 拥有一个 ``Permission`` ，其中是 ``PermissionChecker`` 的集合，只要有一个 ``PermissionChecker`` 检查结果为 ``True`` 时就会继续运行。 \:\:\:tip 提示 ``PermissionChecker`` 既可以是 async function 也可以是 sync function @@ -41,9 +41,7 @@ class Permission: params.BotParam, params.EventParam ] - def __init__(self, - *checkers: Union[T_PermissionChecker, Handler], - dependency_overrides_provider: Optional[Any] = None) -> None: + def __init__(self, *checkers: Union[T_PermissionChecker, Handler]) -> None: """ :参数: @@ -52,9 +50,7 @@ class Permission: self.checkers = set( checker if isinstance(checker, Handler) else Handler( - checker, - allow_types=self.HANDLER_PARAM_TYPES, - dependency_overrides_provider=dependency_overrides_provider) + checker, allow_types=self.HANDLER_PARAM_TYPES) for checker in checkers) """ :说明: diff --git a/nonebot/plugins/echo.py b/nonebot/plugins/echo.py index 440aa4bf..763fd715 100644 --- a/nonebot/plugins/echo.py +++ b/nonebot/plugins/echo.py @@ -26,4 +26,4 @@ echo = on_command("echo", to_me()) @echo.handle() async def echo_escape(event: MessageEvent): - await say.send(message=event.get_message()) + await echo.send(message=event.get_message()) diff --git a/nonebot/plugins/single_session.py b/nonebot/plugins/single_session.py index 81a9a9d1..7bb4d52e 100644 --- a/nonebot/plugins/single_session.py +++ b/nonebot/plugins/single_session.py @@ -1,8 +1,6 @@ -from typing import Dict, Optional +from typing import Dict -from nonebot.typing import T_State -from nonebot.matcher import Matcher -from nonebot.adapters import Bot, Event +from nonebot.adapters import Event from nonebot.message import (IgnoredException, run_preprocessor, run_postprocessor) diff --git a/nonebot/py.typed b/nonebot/py.typed index 8b137891..e69de29b 100644 --- a/nonebot/py.typed +++ b/nonebot/py.typed @@ -1 +0,0 @@ - diff --git a/nonebot/rule.py b/nonebot/rule.py index 177b59d7..1621aef6 100644 --- a/nonebot/rule.py +++ b/nonebot/rule.py @@ -2,10 +2,10 @@ r""" 规则 ==== -每个事件响应器 ``Matcher`` 拥有一个匹配规则 ``Rule`` ，其中是 **异步** ``RuleChecker`` 的集合，只有当所有 ``RuleChecker`` 检查结果为 ``True`` 时继续运行。 +每个事件响应器 ``Matcher`` 拥有一个匹配规则 ``Rule`` ，其中是 ``RuleChecker`` 的集合，只有当所有 ``RuleChecker`` 检查结果为 ``True`` 时继续运行。 \:\:\:tip 提示 -``RuleChecker`` 既可以是 async function 也可以是 sync function，但在最终会被 ``nonebot.utils.run_sync`` 转换为 async function +``RuleChecker`` 既可以是 async function 也可以是 sync function \:\:\: """ @@ -68,9 +68,7 @@ class Rule: params.BotParam, params.EventParam, params.StateParam ] - def __init__(self, - *checkers: Union[T_RuleChecker, Handler], - dependency_overrides_provider: Optional[Any] = None) -> None: + def __init__(self, *checkers: Union[T_RuleChecker, Handler]) -> None: """ :参数: @@ -79,9 +77,7 @@ class Rule: """ self.checkers = set( checker if isinstance(checker, Handler) else Handler( - checker, - allow_types=self.HANDLER_PARAM_TYPES, - dependency_overrides_provider=dependency_overrides_provider) + checker, allow_types=self.HANDLER_PARAM_TYPES) for checker in checkers) """ :说明: diff --git a/nonebot/typing.py b/nonebot/typing.py index ac5a2335..3394cd6f 100644 --- a/nonebot/typing.py +++ b/nonebot/typing.py @@ -17,7 +17,7 @@ .. _typing: https://docs.python.org/3/library/typing.html """ -from collections.abc import Callable as BaseCallable + from typing import (TYPE_CHECKING, Any, Dict, Union, TypeVar, Callable, NoReturn, Optional, Awaitable) @@ -25,7 +25,7 @@ if TYPE_CHECKING: from nonebot.adapters import Bot, Event from nonebot.permission import Permission -T_Wrapped = TypeVar("T_Wrapped", bound=BaseCallable) +T_Wrapped = TypeVar("T_Wrapped", bound=Callable) def overrides(InterfaceClass: object): diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/event.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/event.py index cfa61315..690a8437 100644 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/event.py +++ b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/event.py @@ -5,13 +5,12 @@ from typing import TYPE_CHECKING, List, Type, Optional from pydantic import BaseModel from pygtrie import StringTrie +from .message import Message from nonebot.typing import overrides from nonebot.utils import escape_tag -from nonebot.exception import NoLogException +from .exception import NoLogException from nonebot.adapters import Event as BaseEvent -from .message import Message - if TYPE_CHECKING: from .bot import Bot diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/exception.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/exception.py index af3ae6cd..4d3fd1e9 100644 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/exception.py +++ b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/exception.py @@ -1,9 +1,10 @@ from typing import Optional -from nonebot.exception import (AdapterException, ActionFailed as - BaseActionFailed, NetworkError as - BaseNetworkError, ApiNotAvailable as - BaseApiNotAvailable) +from nonebot.exception import AdapterException +from nonebot.exception import ActionFailed as BaseActionFailed +from nonebot.exception import NetworkError as BaseNetworkError +from nonebot.exception import NoLogException as BaseNoLogException +from nonebot.exception import ApiNotAvailable as BaseApiNotAvailable class CQHTTPAdapterException(AdapterException): @@ -12,6 +13,10 @@ class CQHTTPAdapterException(AdapterException): super().__init__("cqhttp") +class NoLogException(BaseNoLogException, CQHTTPAdapterException): + pass + + class ActionFailed(BaseActionFailed, CQHTTPAdapterException): """ :说明: From 9a29966e2d42eaee2ee86255fc480a7c51ee5593 Mon Sep 17 00:00:00 2001 From: nonebot Date: Sun, 21 Nov 2021 08:13:56 +0000 Subject: [PATCH 038/174] :memo: update api docs --- docs/api/drivers/README.md | 15 --------------- docs/api/handler.md | 5 +---- docs/api/permission.md | 4 ++-- docs/api/rule.md | 6 +++--- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/docs/api/drivers/README.md b/docs/api/drivers/README.md index d67b9bd8..9f8ee3ee 100644 --- a/docs/api/drivers/README.md +++ b/docs/api/drivers/README.md @@ -62,21 +62,6 @@ Driver 基类。 -### `dependency_overrides` - - -* **类型** - - `Dict[Callable[..., Any], Callable[..., Any]]` - - - -* **说明** - - Depends 函数的替换表 - - - ### `__init__(env, config)` diff --git a/docs/api/handler.md b/docs/api/handler.md index 8d36478b..6f319435 100644 --- a/docs/api/handler.md +++ b/docs/api/handler.md @@ -17,7 +17,7 @@ sidebarDepth: 0 事件处理器类。支持依赖注入。 -### `__init__(func, *, name=None, dependencies=None, allow_types=None, dependency_overrides_provider=None)` +### `__init__(func, *, name=None, dependencies=None, allow_types=None)` * **说明** @@ -41,9 +41,6 @@ sidebarDepth: 0 * `allow_types: Optional[List[Type[Param]]]`: 允许的参数类型。 - * `dependency_overrides_provider: Optional[Any]`: 依赖注入覆盖提供者。 - - ### `func` diff --git a/docs/api/permission.md b/docs/api/permission.md index 18ba75cb..f2ee1973 100644 --- a/docs/api/permission.md +++ b/docs/api/permission.md @@ -7,7 +7,7 @@ sidebarDepth: 0 ## 权限 -每个 `Matcher` 拥有一个 `Permission` ，其中是 **异步** `PermissionChecker` 的集合，只要有一个 `PermissionChecker` 检查结果为 `True` 时就会继续运行。 +每个 `Matcher` 拥有一个 `Permission` ，其中是 `PermissionChecker` 的集合，只要有一个 `PermissionChecker` 检查结果为 `True` 时就会继续运行。 :::tip 提示 `PermissionChecker` 既可以是 async function 也可以是 sync function @@ -36,7 +36,7 @@ Permission(async_function, run_sync(sync_function)) ``` -### `__init__(*checkers, dependency_overrides_provider=None)` +### `__init__(*checkers)` * **参数** diff --git a/docs/api/rule.md b/docs/api/rule.md index ee33cd91..872cb73d 100644 --- a/docs/api/rule.md +++ b/docs/api/rule.md @@ -7,10 +7,10 @@ sidebarDepth: 0 ## 规则 -每个事件响应器 `Matcher` 拥有一个匹配规则 `Rule` ，其中是 **异步** `RuleChecker` 的集合，只有当所有 `RuleChecker` 检查结果为 `True` 时继续运行。 +每个事件响应器 `Matcher` 拥有一个匹配规则 `Rule` ，其中是 `RuleChecker` 的集合，只有当所有 `RuleChecker` 检查结果为 `True` 时继续运行。 :::tip 提示 -`RuleChecker` 既可以是 async function 也可以是 sync function，但在最终会被 `nonebot.utils.run_sync` 转换为 async function +`RuleChecker` 既可以是 async function 也可以是 sync function ::: @@ -36,7 +36,7 @@ Rule(async_function, run_sync(sync_function)) ``` -### `__init__(*checkers, dependency_overrides_provider=None)` +### `__init__(*checkers)` * **参数** From 23c237cb2a5517e137892e6377db28a691fdcd27 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 21 Nov 2021 17:09:31 +0800 Subject: [PATCH 039/174] :bulb: add depends example --- docs/api/dependencies.md | 15 +++++++++++++++ nonebot/dependencies/__init__.py | 14 ++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/docs/api/dependencies.md b/docs/api/dependencies.md index d88aabaa..a93902dc 100644 --- a/docs/api/dependencies.md +++ b/docs/api/dependencies.md @@ -26,3 +26,18 @@ sidebarDepth: 0 * `use_cache: bool = True`: 是否使用缓存。默认为 `True`。 + + +```python +def depend_func() -> Any: + return ... + +def depend_gen_func(): + try: + yield ... + finally: + ... + +async def handler(param_name: Any = Depends(depend_func), gen: Any = Depends(depend_gen_func)): + ... +``` diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index 7d0138a8..eb502e95 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -203,5 +203,19 @@ def Depends(dependency: Optional[T_Handler] = None, * ``dependency: Optional[Callable[..., Any]] = None``: 依赖函数。默认为参数的类型注释。 * ``use_cache: bool = True``: 是否使用缓存。默认为 ``True``。 + + .. code-block:: python + + def depend_func() -> Any: + return ... + + def depend_gen_func(): + try: + yield ... + finally: + ... + + async def handler(param_name: Any = Depends(depend_func), gen: Any = Depends(depend_gen_func)): + ... """ return DependsWrapper(dependency=dependency, use_cache=use_cache) From 3120abacb37d4b59d69c605f8c11872a11dda823 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 22 Nov 2021 11:38:42 +0800 Subject: [PATCH 040/174] :wheelchair: allow extra param with default value --- nonebot/dependencies/__init__.py | 31 +++++++++++++++++++++---------- nonebot/dependencies/models.py | 6 ------ nonebot/matcher.py | 2 +- nonebot/message.py | 9 ++++++--- nonebot/params.py | 12 ++++++++++++ nonebot/permission.py | 5 ++--- nonebot/rule.py | 6 +++--- 7 files changed, 45 insertions(+), 26 deletions(-) diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index eb502e95..44f568f7 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -11,8 +11,8 @@ from typing import Any, Dict, List, Type, Tuple, Callable, Optional, cast from contextlib import AsyncExitStack, contextmanager, asynccontextmanager from pydantic import BaseConfig -from pydantic.fields import Required, ModelField from pydantic.schema import get_annotation_from_field_info +from pydantic.fields import Required, Undefined, ModelField from nonebot.log import logger from .models import Param as Param @@ -90,16 +90,25 @@ def get_dependent(*, dependent.dependencies.append(sub_dependent) continue - for allow_type in dependent.allow_types: - if allow_type._check(param_name, param): - field_info = allow_type(param.default) - break + default_value = Required + if param.default != param.empty: + default_value = param.default + + if isinstance(default_value, Param): + field_info = default_value + default_value = field_info.default else: - raise ValueError( - f"Unknown parameter {param_name} for function {func} with type {param.annotation}" - ) + for allow_type in dependent.allow_types: + if allow_type._check(param_name, param): + field_info = allow_type(default_value) + break + else: + raise ValueError( + f"Unknown parameter {param_name} for function {func} with type {param.annotation}" + ) annotation: Any = Any + required = default_value == Required if param.annotation != param.empty: annotation = param.annotation annotation = get_annotation_from_field_info(annotation, field_info, @@ -109,8 +118,8 @@ def get_dependent(*, type_=annotation, class_validators=None, model_config=CustomConfig, - default=Required, - required=True, + default=None if required else default_value, + required=required, field_info=field_info)) return dependent @@ -176,6 +185,8 @@ async def solve_dependencies( assert isinstance(field_info, Param), "Params must be subclasses of Param" value = field_info._solve(**params) + if value == Undefined: + value = field.get_default() _, errs_ = field.validate(value, values, loc=(str(field_info), field.alias)) diff --git a/nonebot/dependencies/models.py b/nonebot/dependencies/models.py index 36ee5af0..9acba4db 100644 --- a/nonebot/dependencies/models.py +++ b/nonebot/dependencies/models.py @@ -10,12 +10,6 @@ from nonebot.typing import T_Handler class Param(abc.ABC, FieldInfo): - def __repr__(self) -> str: - return f"{self.__class__.__name__}" - - def __str__(self) -> str: - return repr(self) - @classmethod @abc.abstractmethod def _check(cls, name: str, param: inspect.Parameter) -> bool: diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 7eeda5ab..cbaab224 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -158,7 +158,7 @@ class Matcher(metaclass=MatcherMeta): HANDLER_PARAM_TYPES = [ params.BotParam, params.EventParam, params.StateParam, - params.MatcherParam + params.MatcherParam, params.DefaultParam ] def __init__(self): diff --git a/nonebot/message.py b/nonebot/message.py index bedf778c..87184362 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -29,13 +29,16 @@ _event_postprocessors: Set[Handler] = set() _run_preprocessors: Set[Handler] = set() _run_postprocessors: Set[Handler] = set() -EVENT_PCS_PARAMS = [params.BotParam, params.EventParam, params.StateParam] +EVENT_PCS_PARAMS = [ + params.BotParam, params.EventParam, params.StateParam, params.DefaultParam +] RUN_PREPCS_PARAMS = [ - params.MatcherParam, params.BotParam, params.EventParam, params.StateParam + params.MatcherParam, params.BotParam, params.EventParam, params.StateParam, + params.DefaultParam ] RUN_POSTPCS_PARAMS = [ params.MatcherParam, params.ExceptionParam, params.BotParam, - params.EventParam, params.StateParam + params.EventParam, params.StateParam, params.DefaultParam ] diff --git a/nonebot/params.py b/nonebot/params.py index 8b644f91..06fb6987 100644 --- a/nonebot/params.py +++ b/nonebot/params.py @@ -1,6 +1,8 @@ import inspect from typing import Any, Dict, Optional +from pydantic.fields import Undefined + from nonebot.typing import T_State from nonebot.dependencies import Param from nonebot.adapters import Bot, Event @@ -69,4 +71,14 @@ class ExceptionParam(Param): return exception +class DefaultParam(Param): + + @classmethod + def _check(cls, name: str, param: inspect.Parameter) -> bool: + return param.default != param.empty + + def _solve(self, **kwargs: Any) -> Any: + return Undefined + + from nonebot.matcher import Matcher diff --git a/nonebot/permission.py b/nonebot/permission.py index e52058cb..4e7e89da 100644 --- a/nonebot/permission.py +++ b/nonebot/permission.py @@ -15,7 +15,6 @@ from typing import Any, Dict, List, Type, Union, Callable, NoReturn, Optional from nonebot import params from nonebot.handler import Handler -from nonebot.dependencies import Param from nonebot.adapters import Bot, Event from nonebot.typing import T_PermissionChecker @@ -37,8 +36,8 @@ class Permission: """ __slots__ = ("checkers",) - HANDLER_PARAM_TYPES: List[Type[Param]] = [ - params.BotParam, params.EventParam + HANDLER_PARAM_TYPES = [ + params.BotParam, params.EventParam, params.DefaultParam ] def __init__(self, *checkers: Union[T_PermissionChecker, Handler]) -> None: diff --git a/nonebot/rule.py b/nonebot/rule.py index 1621aef6..2059ceac 100644 --- a/nonebot/rule.py +++ b/nonebot/rule.py @@ -25,7 +25,6 @@ from pygtrie import CharTrie from nonebot.log import logger from nonebot.handler import Handler from nonebot import params, get_driver -from nonebot.dependencies import Param from nonebot.exception import ParserExit from nonebot.typing import T_State, T_RuleChecker from nonebot.adapters import Bot, Event, MessageSegment @@ -64,8 +63,9 @@ class Rule: """ __slots__ = ("checkers",) - HANDLER_PARAM_TYPES: List[Type[Param]] = [ - params.BotParam, params.EventParam, params.StateParam + HANDLER_PARAM_TYPES = [ + params.BotParam, params.EventParam, params.StateParam, + params.DefaultParam ] def __init__(self, *checkers: Union[T_RuleChecker, Handler]) -> None: From a98d98cd1279ca040decbae8a12646db9e43aa90 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 22 Nov 2021 23:21:26 +0800 Subject: [PATCH 041/174] :art: format code using black and isort --- .style.yapf | 2 - nonebot/__init__.py | 36 +- nonebot/adapters/__init__.py | 6 +- nonebot/adapters/_bot.py | 17 +- nonebot/adapters/_event.py | 3 +- nonebot/adapters/_message.py | 31 +- nonebot/adapters/_template.py | 74 +- nonebot/config.py | 50 +- nonebot/dependencies/__init__.py | 137 ++-- nonebot/dependencies/models.py | 28 +- nonebot/dependencies/utils.py | 8 +- nonebot/drivers/__init__.py | 42 +- nonebot/drivers/aiohttp.py | 112 +-- nonebot/drivers/fastapi.py | 165 +++-- nonebot/drivers/quart.py | 96 ++- nonebot/exception.py | 4 + nonebot/handler.py | 48 +- nonebot/log.py | 27 +- nonebot/matcher.py | 271 ++++---- nonebot/message.py | 154 +++-- nonebot/params.py | 40 +- nonebot/permission.py | 46 +- nonebot/plugin/__init__.py | 5 +- nonebot/plugin/export.py | 3 +- nonebot/plugin/load.py | 16 +- nonebot/plugin/manager.py | 47 +- nonebot/plugin/on.py | 397 ++++++----- nonebot/plugin/on.pyi | 648 +++++++++--------- nonebot/plugin/plugin.py | 1 + nonebot/plugins/echo.py | 9 +- nonebot/plugins/single_session.py | 7 +- nonebot/rule.py | 101 +-- nonebot/typing.py | 30 +- nonebot/utils.py | 34 +- .../nonebot/adapters/cqhttp/bot.py | 146 ++-- .../nonebot/adapters/cqhttp/bot.pyi | 1 - .../nonebot/adapters/cqhttp/config.py | 9 +- .../nonebot/adapters/cqhttp/event.py | 125 +++- .../nonebot/adapters/cqhttp/exception.py | 8 +- .../nonebot/adapters/cqhttp/message.py | 186 ++--- .../nonebot/adapters/cqhttp/permission.py | 14 +- .../nonebot/adapters/cqhttp/utils.py | 12 +- .../nonebot-adapter-cqhttp/pyproject.toml | 15 + .../nonebot/adapters/ding/bot.py | 99 +-- .../nonebot/adapters/ding/config.py | 1 + .../nonebot/adapters/ding/event.py | 10 +- .../nonebot/adapters/ding/exception.py | 14 +- .../nonebot/adapters/ding/message.py | 43 +- .../nonebot/adapters/ding/utils.py | 12 +- packages/nonebot-adapter-ding/pyproject.toml | 15 + .../nonebot/adapters/feishu/__init__.py | 2 +- .../nonebot/adapters/feishu/bot.py | 155 +++-- .../nonebot/adapters/feishu/config.py | 9 +- .../nonebot/adapters/feishu/event.py | 8 +- .../nonebot/adapters/feishu/exception.py | 12 +- .../nonebot/adapters/feishu/message.py | 97 +-- .../nonebot/adapters/feishu/utils.py | 13 +- .../nonebot-adapter-feishu/pyproject.toml | 15 + .../nonebot/adapters/mirai/bot.py | 313 +++++---- .../nonebot/adapters/mirai/config.py | 11 +- .../nonebot/adapters/mirai/event/__init__.py | 65 +- .../nonebot/adapters/mirai/event/base.py | 36 +- .../nonebot/adapters/mirai/event/message.py | 14 +- .../nonebot/adapters/mirai/event/meta.py | 8 +- .../nonebot/adapters/mirai/event/notice.py | 37 +- .../nonebot/adapters/mirai/event/request.py | 144 ++-- .../nonebot/adapters/mirai/message.py | 132 ++-- .../nonebot/adapters/mirai/utils.py | 56 +- packages/nonebot-adapter-mirai/pyproject.toml | 15 + .../nonebot_plugin_docs/__init__.py | 8 +- .../nonebot_plugin_docs/drivers/fastapi.py | 4 +- packages/nonebot-plugin-docs/pyproject.toml | 15 + poetry.lock | 217 +++++- pyproject.toml | 15 +- tests/bot.py | 8 +- tests/test_plugins/test_ding.py | 144 ++-- tests/test_plugins/test_feishu.py | 5 +- tests/test_plugins/test_get_export.py | 1 - tests/test_plugins/test_group/__init__.py | 2 +- tests/test_plugins/test_group/commands.py | 3 +- tests/test_plugins/test_group/matches.py | 3 +- tests/test_plugins/test_metaevent.py | 2 +- tests/test_plugins/test_mirai.py | 8 +- tests/test_plugins/test_overload.py | 2 +- tests/test_plugins/test_permission.py | 2 +- tests/test_plugins/test_shell.py | 2 +- 86 files changed, 2893 insertions(+), 2095 deletions(-) delete mode 100644 .style.yapf diff --git a/.style.yapf b/.style.yapf deleted file mode 100644 index 0e9640c2..00000000 --- a/.style.yapf +++ /dev/null @@ -1,2 +0,0 @@ -[style] -based_on_style = google diff --git a/nonebot/__init__.py b/nonebot/__init__.py index 809b696c..9d90ac19 100644 --- a/nonebot/__init__.py +++ b/nonebot/__init__.py @@ -40,8 +40,7 @@ from nonebot.log import logger, default_filter from nonebot.drivers import Driver, ReverseDriver try: - _dist: pkg_resources.Distribution = pkg_resources.get_distribution( - "nonebot2") + _dist: pkg_resources.Distribution = pkg_resources.get_distribution("nonebot2") __version__ = _dist.version VERSION = _dist.parsed_version except pkg_resources.DistributionNotFound: @@ -100,8 +99,8 @@ def get_app() -> Any: """ driver = get_driver() assert isinstance( - driver, - ReverseDriver), "app object is only available for reverse driver" + driver, ReverseDriver + ), "app object is only available for reverse driver" return driver.server_app @@ -128,8 +127,8 @@ def get_asgi() -> Any: """ driver = get_driver() assert isinstance( - driver, - ReverseDriver), "asgi object is only available for reverse driver" + driver, ReverseDriver + ), "asgi object is only available for reverse driver" return driver.asgi @@ -226,17 +225,23 @@ def init(*, _env_file: Optional[str] = None, **kwargs): if not _driver: logger.success("NoneBot is initializing...") env = Env() - config = Config(**kwargs, - _common_config=env.dict(), - _env_file=_env_file or f".env.{env.environment}") + config = Config( + **kwargs, + _common_config=env.dict(), + _env_file=_env_file or f".env.{env.environment}", + ) default_filter.level = ( - "DEBUG" if config.debug else - "INFO") if config.log_level is None else config.log_level + ("DEBUG" if config.debug else "INFO") + if config.log_level is None + else config.log_level + ) logger.opt(colors=True).info( - f"Current Env: {escape_tag(env.environment)}") + f"Current Env: {escape_tag(env.environment)}" + ) logger.opt(colors=True).debug( - f"Loaded Config: {escape_tag(str(config.dict()))}") + f"Loaded Config: {escape_tag(str(config.dict()))}" + ) modulename, _, cls = config.driver.partition(":") module = importlib.import_module(modulename) @@ -247,10 +252,7 @@ def init(*, _env_file: Optional[str] = None, **kwargs): _driver = DriverClass(env, config) -def run(host: Optional[str] = None, - port: Optional[int] = None, - *args, - **kwargs): +def run(host: Optional[str] = None, port: Optional[int] = None, *args, **kwargs): """ :说明: diff --git a/nonebot/adapters/__init__.py b/nonebot/adapters/__init__.py index 74d26f69..a3080971 100644 --- a/nonebot/adapters/__init__.py +++ b/nonebot/adapters/__init__.py @@ -9,13 +9,13 @@ from typing import Iterable try: import pkg_resources + pkg_resources.declare_namespace(__name__) del pkg_resources except ImportError: import pkgutil - __path__: Iterable[str] = pkgutil.extend_path( - __path__, # type: ignore - __name__) + + __path__: Iterable[str] = pkgutil.extend_path(__path__, __name__) # type: ignore del pkgutil except Exception: pass diff --git a/nonebot/adapters/_bot.py b/nonebot/adapters/_bot.py index b96e31ae..6ed7b2b2 100644 --- a/nonebot/adapters/_bot.py +++ b/nonebot/adapters/_bot.py @@ -15,7 +15,6 @@ if TYPE_CHECKING: class _ApiCall(Protocol): - async def __call__(self, **kwargs: Any) -> Any: ... @@ -146,7 +145,8 @@ class Bot(abc.ABC): except Exception as e: logger.opt(colors=True, exception=e).error( "Error when running CallingAPI hook. " - "Running cancelled!") + "Running cancelled!" + ) exception = None result = None @@ -157,8 +157,8 @@ class Bot(abc.ABC): exception = e coros = list( - map(lambda x: x(self, exception, api, data, result), - self._called_api_hook)) + map(lambda x: x(self, exception, api, data, result), self._called_api_hook) + ) if coros: try: logger.debug("Running CalledAPI hooks...") @@ -166,16 +166,17 @@ class Bot(abc.ABC): except Exception as e: logger.opt(colors=True, exception=e).error( "Error when running CalledAPI hook. " - "Running cancelled!") + "Running cancelled!" + ) if exception: raise exception return result @abc.abstractmethod - async def send(self, event: "Event", message: Union[str, "Message", - "MessageSegment"], - **kwargs) -> Any: + async def send( + self, event: "Event", message: Union[str, "Message", "MessageSegment"], **kwargs + ) -> Any: """ :说明: diff --git a/nonebot/adapters/_event.py b/nonebot/adapters/_event.py index 669b4cf2..933a7085 100644 --- a/nonebot/adapters/_event.py +++ b/nonebot/adapters/_event.py @@ -2,9 +2,8 @@ import abc from pydantic import BaseModel -from nonebot.utils import DataclassEncoder - from ._message import Message +from nonebot.utils import DataclassEncoder class Event(abc.ABC, BaseModel): diff --git a/nonebot/adapters/_message.py b/nonebot/adapters/_message.py index b05a35a6..3175bed8 100644 --- a/nonebot/adapters/_message.py +++ b/nonebot/adapters/_message.py @@ -1,8 +1,17 @@ import abc from copy import deepcopy from dataclasses import field, asdict, dataclass -from typing import (Any, Dict, List, Type, Union, Generic, Mapping, TypeVar, - Iterable) +from typing import ( + Any, + Dict, + List, + Type, + Union, + Generic, + Mapping, + TypeVar, + Iterable, +) from ._template import MessageTemplate @@ -14,6 +23,7 @@ TM = TypeVar("TM", bound="Message") @dataclass class MessageSegment(Mapping, abc.ABC, Generic[TM]): """消息段基类""" + type: str """ - 类型: ``str`` @@ -82,11 +92,12 @@ class MessageSegment(Mapping, abc.ABC, Generic[TM]): class Message(List[TMS], abc.ABC): """消息数组""" - def __init__(self: TM, - message: Union[str, None, Mapping, Iterable[Mapping], TMS, TM, - Any] = None, - *args, - **kwargs): + def __init__( + self: TM, + message: Union[str, None, Mapping, Iterable[Mapping], TMS, TM, Any] = None, + *args, + **kwargs, + ): """ :参数: @@ -103,8 +114,7 @@ class Message(List[TMS], abc.ABC): self.extend(self._construct(message)) @classmethod - def template(cls: Type[TM], - format_string: Union[str, TM]) -> MessageTemplate[TM]: + def template(cls: Type[TM], format_string: Union[str, TM]) -> MessageTemplate[TM]: """ :说明: @@ -156,8 +166,7 @@ class Message(List[TMS], abc.ABC): @staticmethod @abc.abstractmethod - def _construct( - msg: Union[str, Mapping, Iterable[Mapping], Any]) -> Iterable[TMS]: + def _construct(msg: Union[str, Mapping, Iterable[Mapping], Any]) -> Iterable[TMS]: raise NotImplementedError def __add__(self: TM, other: Union[str, Mapping, Iterable[Mapping]]) -> TM: diff --git a/nonebot/adapters/_template.py b/nonebot/adapters/_template.py index 94472018..fad17d84 100644 --- a/nonebot/adapters/_template.py +++ b/nonebot/adapters/_template.py @@ -1,8 +1,21 @@ import inspect import functools from string import Formatter -from typing import (TYPE_CHECKING, Any, Set, List, Type, Tuple, Union, Generic, - Mapping, TypeVar, Sequence, cast, overload) +from typing import ( + TYPE_CHECKING, + Any, + Set, + List, + Type, + Tuple, + Union, + Generic, + Mapping, + TypeVar, + Sequence, + cast, + overload, +) if TYPE_CHECKING: from . import Message, MessageSegment @@ -15,14 +28,15 @@ class MessageTemplate(Formatter, Generic[TF]): """消息模板格式化实现类""" @overload - def __init__(self: "MessageTemplate[str]", - template: str, - factory: Type[str] = str) -> None: + def __init__( + self: "MessageTemplate[str]", template: str, factory: Type[str] = str + ) -> None: ... @overload - def __init__(self: "MessageTemplate[TM]", template: Union[str, TM], - factory: Type[TM]) -> None: + def __init__( + self: "MessageTemplate[TM]", template: Union[str, TM], factory: Type[TM] + ) -> None: ... def __init__(self, template, factory=str) -> None: @@ -51,15 +65,15 @@ class MessageTemplate(Formatter, Generic[TF]): elif isinstance(self.template, self.factory): template = cast("Message[MessageSegment]", self.template) for seg in template: - msg += self.vformat(str(seg), args, - kwargs) if seg.is_text() else seg + msg += self.vformat(str(seg), args, kwargs) if seg.is_text() else seg else: - raise TypeError('template must be a string or instance of Message!') + raise TypeError("template must be a string or instance of Message!") return msg - def vformat(self, format_string: str, args: Sequence[Any], - kwargs: Mapping[str, Any]) -> TF: + def vformat( + self, format_string: str, args: Sequence[Any], kwargs: Mapping[str, Any] + ) -> TF: used_args = set() result, _ = self._vformat(format_string, args, kwargs, used_args, 2) self.check_unused_args(list(used_args), args, kwargs) @@ -79,8 +93,9 @@ class MessageTemplate(Formatter, Generic[TF]): results: List[Any] = [] - for (literal_text, field_name, format_spec, - conversion) in self.parse(format_string): + for (literal_text, field_name, format_spec, conversion) in self.parse( + format_string + ): # output the literal text if literal_text: @@ -96,14 +111,16 @@ class MessageTemplate(Formatter, Generic[TF]): if auto_arg_index is False: raise ValueError( "cannot switch from manual field specification to " - "automatic field numbering") + "automatic field numbering" + ) field_name = str(auto_arg_index) auto_arg_index += 1 elif field_name.isdigit(): if auto_arg_index: raise ValueError( "cannot switch from manual field specification to " - "automatic field numbering") + "automatic field numbering" + ) # disable auto arg incrementing, if it gets # used later on, then an exception will be raised auto_arg_index = False @@ -132,8 +149,10 @@ class MessageTemplate(Formatter, Generic[TF]): formatted_text = self.format_field(obj, str(format_control)) results.append(formatted_text) - return self.factory(functools.reduce(self._add, results or - [""])), auto_arg_index + return ( + self.factory(functools.reduce(self._add, results or [""])), + auto_arg_index, + ) def format_field(self, value: Any, format_spec: str) -> Any: if issubclass(self.factory, str): @@ -142,11 +161,20 @@ class MessageTemplate(Formatter, Generic[TF]): segment_class: Type[MessageSegment] = self.factory.get_segment_class() method = getattr(segment_class, format_spec, None) method_type = inspect.getattr_static(segment_class, format_spec, None) - return (super().format_field(value, format_spec) if - ((method is None) or - (not isinstance(method_type, (classmethod, staticmethod)) - ) # Only Call staticmethod or classmethod - ) else method(value)) if format_spec else value + return ( + ( + super().format_field(value, format_spec) + if ( + (method is None) + or ( + not isinstance(method_type, (classmethod, staticmethod)) + ) # Only Call staticmethod or classmethod + ) + else method(value) + ) + if format_spec + else value + ) def _add(self, a: Any, b: Any) -> Any: try: diff --git a/nonebot/config.py b/nonebot/config.py index 82fca0d3..4bbbf1f9 100644 --- a/nonebot/config.py +++ b/nonebot/config.py @@ -20,13 +20,17 @@ from ipaddress import IPv4Address from typing import Any, Set, Dict, Tuple, Union, Mapping, Optional from pydantic import BaseSettings, IPvAnyAddress -from pydantic.env_settings import (SettingsError, EnvSettingsSource, - InitSettingsSource, SettingsSourceCallable, - read_env_file, env_file_sentinel) +from pydantic.env_settings import ( + SettingsError, + EnvSettingsSource, + InitSettingsSource, + SettingsSourceCallable, + read_env_file, + env_file_sentinel, +) class CustomEnvSettings(EnvSettingsSource): - def __call__(self, settings: BaseSettings) -> Dict[str, Any]: """ Build environment variables suitable for passing to the Model. @@ -39,15 +43,24 @@ class CustomEnvSettings(EnvSettingsSource): env_vars = {k.lower(): v for k, v in os.environ.items()} env_file_vars: Dict[str, Optional[str]] = {} - env_file = self.env_file if self.env_file != env_file_sentinel else settings.__config__.env_file - env_file_encoding = self.env_file_encoding if self.env_file_encoding is not None else settings.__config__.env_file_encoding + env_file = ( + self.env_file + if self.env_file != env_file_sentinel + else settings.__config__.env_file + ) + env_file_encoding = ( + self.env_file_encoding + if self.env_file_encoding is not None + else settings.__config__.env_file_encoding + ) if env_file is not None: env_path = Path(env_file) if env_path.is_file(): env_file_vars = read_env_file( env_path, encoding=env_file_encoding, - case_sensitive=settings.__config__.case_sensitive) + case_sensitive=settings.__config__.case_sensitive, + ) env_vars = {**env_file_vars, **env_vars} for field in settings.__fields__.values(): @@ -66,14 +79,12 @@ class CustomEnvSettings(EnvSettingsSource): try: env_val = settings.__config__.json_loads(env_val) except ValueError as e: - raise SettingsError( - f'error parsing JSON for "{env_name}"') from e + raise SettingsError(f'error parsing JSON for "{env_name}"') from e d[field.alias] = env_val if env_file_vars: for env_name, env_val in env_file_vars.items(): - if (env_val is None or - len(env_val) == 0) and env_name in env_vars: + if (env_val is None or len(env_val) == 0) and env_name in env_vars: env_val = env_vars[env_name] try: if env_val: @@ -87,12 +98,10 @@ class CustomEnvSettings(EnvSettingsSource): class BaseConfig(BaseSettings): - def __getattr__(self, name: str) -> Any: return self.__dict__.get(name) class Config: - @classmethod def customise_sources( cls, @@ -101,10 +110,14 @@ class BaseConfig(BaseSettings): file_secret_settings: SettingsSourceCallable, ) -> Tuple[SettingsSourceCallable, ...]: common_config = init_settings.init_kwargs.pop("_common_config", {}) - return (init_settings, - CustomEnvSettings(env_settings.env_file, - env_settings.env_file_encoding), - InitSettingsSource(common_config), file_secret_settings) + return ( + init_settings, + CustomEnvSettings( + env_settings.env_file, env_settings.env_file_encoding + ), + InitSettingsSource(common_config), + file_secret_settings, + ) class Env(BaseConfig): @@ -135,6 +148,7 @@ class Config(BaseConfig): 除了 NoneBot 的配置项外，还可以自行添加配置项到 ``.env.{environment}`` 文件中。 这些配置将会在 json 反序列化后一起带入 ``Config`` 类中。 """ + # nonebot configs driver: str = "nonebot.drivers.fastapi" """ @@ -210,7 +224,7 @@ class Config(BaseConfig): API_ROOT={"123456": "http://127.0.0.1:5700"} """ - api_timeout: Optional[float] = 30. + api_timeout: Optional[float] = 30.0 """ - **类型**: ``Optional[float]`` - **默认值**: ``30.`` diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index 44f568f7..c32a9ffe 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -21,9 +21,14 @@ from .models import Dependent as Dependent from nonebot.exception import SkippedException from .models import DependsWrapper as DependsWrapper from nonebot.typing import T_Handler, T_DependencyCache -from nonebot.utils import (CacheLock, run_sync, is_gen_callable, - run_sync_ctx_manager, is_async_gen_callable, - is_coroutine_callable) +from nonebot.utils import ( + CacheLock, + run_sync, + is_gen_callable, + run_sync_ctx_manager, + is_async_gen_callable, + is_coroutine_callable, +) cache_lock = CacheLock() @@ -33,60 +38,59 @@ class CustomConfig(BaseConfig): def get_param_sub_dependent( - *, - param: inspect.Parameter, - allow_types: Optional[List[Type[Param]]] = None) -> Dependent: + *, param: inspect.Parameter, allow_types: Optional[List[Type[Param]]] = None +) -> Dependent: depends: DependsWrapper = param.default if depends.dependency: dependency = depends.dependency else: dependency = param.annotation - return get_sub_dependant(depends=depends, - dependency=dependency, - name=param.name, - allow_types=allow_types) + return get_sub_dependant( + depends=depends, dependency=dependency, name=param.name, allow_types=allow_types + ) def get_parameterless_sub_dependant( - *, - depends: DependsWrapper, - allow_types: Optional[List[Type[Param]]] = None) -> Dependent: + *, depends: DependsWrapper, allow_types: Optional[List[Type[Param]]] = None +) -> Dependent: assert callable( depends.dependency ), "A parameter-less dependency must have a callable dependency" - return get_sub_dependant(depends=depends, - dependency=depends.dependency, - allow_types=allow_types) + return get_sub_dependant( + depends=depends, dependency=depends.dependency, allow_types=allow_types + ) def get_sub_dependant( - *, - depends: DependsWrapper, - dependency: T_Handler, - name: Optional[str] = None, - allow_types: Optional[List[Type[Param]]] = None) -> Dependent: - sub_dependant = get_dependent(func=dependency, - name=name, - use_cache=depends.use_cache, - allow_types=allow_types) + *, + depends: DependsWrapper, + dependency: T_Handler, + name: Optional[str] = None, + allow_types: Optional[List[Type[Param]]] = None, +) -> Dependent: + sub_dependant = get_dependent( + func=dependency, name=name, use_cache=depends.use_cache, allow_types=allow_types + ) return sub_dependant -def get_dependent(*, - func: T_Handler, - name: Optional[str] = None, - use_cache: bool = True, - allow_types: Optional[List[Type[Param]]] = None) -> Dependent: +def get_dependent( + *, + func: T_Handler, + name: Optional[str] = None, + use_cache: bool = True, + allow_types: Optional[List[Type[Param]]] = None, +) -> Dependent: signature = get_typed_signature(func) params = signature.parameters - dependent = Dependent(func=func, - name=name, - allow_types=allow_types, - use_cache=use_cache) + dependent = Dependent( + func=func, name=name, allow_types=allow_types, use_cache=use_cache + ) for param_name, param in params.items(): if isinstance(param.default, DependsWrapper): - sub_dependent = get_param_sub_dependent(param=param, - allow_types=allow_types) + sub_dependent = get_param_sub_dependent( + param=param, allow_types=allow_types + ) dependent.dependencies.append(sub_dependent) continue @@ -111,44 +115,44 @@ def get_dependent(*, required = default_value == Required if param.annotation != param.empty: annotation = param.annotation - annotation = get_annotation_from_field_info(annotation, field_info, - param_name) + annotation = get_annotation_from_field_info(annotation, field_info, param_name) dependent.params.append( - ModelField(name=param_name, - type_=annotation, - class_validators=None, - model_config=CustomConfig, - default=None if required else default_value, - required=required, - field_info=field_info)) + ModelField( + name=param_name, + type_=annotation, + class_validators=None, + model_config=CustomConfig, + default=None if required else default_value, + required=required, + field_info=field_info, + ) + ) return dependent async def solve_dependencies( - *, - _dependent: Dependent, - _stack: Optional[AsyncExitStack] = None, - _sub_dependents: Optional[List[Dependent]] = None, - _dependency_cache: Optional[T_DependencyCache] = None, - **params: Any) -> Tuple[Dict[str, Any], T_DependencyCache]: + *, + _dependent: Dependent, + _stack: Optional[AsyncExitStack] = None, + _sub_dependents: Optional[List[Dependent]] = None, + _dependency_cache: Optional[T_DependencyCache] = None, + **params: Any, +) -> Tuple[Dict[str, Any], T_DependencyCache]: values: Dict[str, Any] = {} dependency_cache = {} if _dependency_cache is None else _dependency_cache # solve sub dependencies sub_dependent: Dependent - for sub_dependent in chain(_sub_dependents or tuple(), - _dependent.dependencies): + for sub_dependent in chain(_sub_dependents or tuple(), _dependent.dependencies): sub_dependent.func = cast(Callable[..., Any], sub_dependent.func) - sub_dependent.cache_key = cast(Callable[..., Any], - sub_dependent.cache_key) + sub_dependent.cache_key = cast(Callable[..., Any], sub_dependent.cache_key) func = sub_dependent.func # solve sub dependency with current cache solved_result = await solve_dependencies( - _dependent=sub_dependent, - _dependency_cache=dependency_cache, - **params) + _dependent=sub_dependent, _dependency_cache=dependency_cache, **params + ) sub_values, sub_dependency_cache = solved_result # update cache? # dependency_cache.update(sub_dependency_cache) @@ -162,8 +166,7 @@ async def solve_dependencies( _stack, AsyncExitStack ), "Generator dependency should be called in context" if is_gen_callable(func): - cm = run_sync_ctx_manager( - contextmanager(func)(**sub_values)) + cm = run_sync_ctx_manager(contextmanager(func)(**sub_values)) else: cm = asynccontextmanager(func)(**sub_values) solved = await _stack.enter_async_context(cm) @@ -182,19 +185,17 @@ async def solve_dependencies( # usual dependency for field in _dependent.params: field_info = field.field_info - assert isinstance(field_info, - Param), "Params must be subclasses of Param" + assert isinstance(field_info, Param), "Params must be subclasses of Param" value = field_info._solve(**params) if value == Undefined: value = field.get_default() - _, errs_ = field.validate(value, - values, - loc=(str(field_info), field.alias)) + _, errs_ = field.validate(value, values, loc=(str(field_info), field.alias)) if errs_: logger.debug( f"{field_info} " f"type {type(value)} not match depends {_dependent.func} " - f"annotation {field._type_display()}, ignored") + f"annotation {field._type_display()}, ignored" + ) raise SkippedException else: values[field.name] = value @@ -202,9 +203,7 @@ async def solve_dependencies( return values, dependency_cache -def Depends(dependency: Optional[T_Handler] = None, - *, - use_cache: bool = True) -> Any: +def Depends(dependency: Optional[T_Handler] = None, *, use_cache: bool = True) -> Any: """ :说明: diff --git a/nonebot/dependencies/models.py b/nonebot/dependencies/models.py index 9acba4db..3fdb8e81 100644 --- a/nonebot/dependencies/models.py +++ b/nonebot/dependencies/models.py @@ -9,7 +9,6 @@ from nonebot.typing import T_Handler class Param(abc.ABC, FieldInfo): - @classmethod @abc.abstractmethod def _check(cls, name: str, param: inspect.Parameter) -> bool: @@ -21,11 +20,9 @@ class Param(abc.ABC, FieldInfo): class DependsWrapper: - - def __init__(self, - dependency: Optional[T_Handler] = None, - *, - use_cache: bool = True) -> None: + def __init__( + self, dependency: Optional[T_Handler] = None, *, use_cache: bool = True + ) -> None: self.dependency = dependency self.use_cache = use_cache @@ -36,15 +33,16 @@ class DependsWrapper: class Dependent: - - def __init__(self, - *, - func: Optional[T_Handler] = None, - name: Optional[str] = None, - params: Optional[List[ModelField]] = None, - allow_types: Optional[List[Type[Param]]] = None, - dependencies: Optional[List["Dependent"]] = None, - use_cache: bool = True) -> None: + def __init__( + self, + *, + func: Optional[T_Handler] = None, + name: Optional[str] = None, + params: Optional[List[ModelField]] = None, + allow_types: Optional[List[Type[Param]]] = None, + dependencies: Optional[List["Dependent"]] = None, + use_cache: bool = True, + ) -> None: self.func = func self.name = name self.params = params or [] diff --git a/nonebot/dependencies/utils.py b/nonebot/dependencies/utils.py index ade7fd97..44a6b4c9 100644 --- a/nonebot/dependencies/utils.py +++ b/nonebot/dependencies/utils.py @@ -16,14 +16,14 @@ def get_typed_signature(func: T_Handler) -> inspect.Signature: kind=param.kind, default=param.default, annotation=get_typed_annotation(param, globalns), - ) for param in signature.parameters.values() + ) + for param in signature.parameters.values() ] typed_signature = inspect.Signature(typed_params) return typed_signature -def get_typed_annotation(param: inspect.Parameter, globalns: Dict[str, - Any]) -> Any: +def get_typed_annotation(param: inspect.Parameter, globalns: Dict[str, Any]) -> Any: annotation = param.annotation if isinstance(annotation, str): annotation = ForwardRef(annotation) @@ -31,7 +31,7 @@ def get_typed_annotation(param: inspect.Parameter, globalns: Dict[str, annotation = evaluate_forwardref(annotation, globalns, globalns) except Exception as e: logger.opt(colors=True, exception=e).warning( - f"Unknown ForwardRef[\"{param.annotation}\"] for parameter {param.name}" + f'Unknown ForwardRef["{param.annotation}"] for parameter {param.name}' ) return inspect.Parameter.empty return annotation diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py index d08f6b0c..4add8a19 100644 --- a/nonebot/drivers/__init__.py +++ b/nonebot/drivers/__init__.py @@ -8,8 +8,17 @@ import abc import asyncio from dataclasses import field, dataclass -from typing import (TYPE_CHECKING, Any, Set, Dict, Type, Union, Callable, - Optional, Awaitable) +from typing import ( + TYPE_CHECKING, + Any, + Set, + Dict, + Type, + Union, + Callable, + Optional, + Awaitable, +) from nonebot.log import logger from nonebot.utils import escape_tag @@ -90,12 +99,14 @@ class Driver(abc.ABC): """ if name in self._adapters: logger.opt(colors=True).debug( - f'Adapter "{escape_tag(name)}" already exists') + f'Adapter "{escape_tag(name)}" already exists' + ) return self._adapters[name] = adapter adapter.register(self, self.config, **kwargs) logger.opt(colors=True).debug( - f'Succeeded to load adapter "{escape_tag(name)}"') + f'Succeeded to load adapter "{escape_tag(name)}"' + ) @property @abc.abstractmethod @@ -121,7 +132,8 @@ class Driver(abc.ABC): * ``**kwargs`` """ logger.opt(colors=True).debug( - f"Loaded adapters: {escape_tag(', '.join(self._adapters))}") + f"Loaded adapters: {escape_tag(', '.join(self._adapters))}" + ) @abc.abstractmethod def on_startup(self, func: Callable) -> Callable: @@ -146,8 +158,7 @@ class Driver(abc.ABC): self._bot_connection_hook.add(func) return func - def on_bot_disconnect( - self, func: T_BotDisconnectionHook) -> T_BotDisconnectionHook: + def on_bot_disconnect(self, func: T_BotDisconnectionHook) -> T_BotDisconnectionHook: """ :说明: @@ -172,7 +183,8 @@ class Driver(abc.ABC): except Exception as e: logger.opt(colors=True, exception=e).error( "Error when running WebSocketConnection hook. " - "Running cancelled!") + "Running cancelled!" + ) asyncio.create_task(_run_hook(bot)) @@ -189,7 +201,8 @@ class Driver(abc.ABC): except Exception as e: logger.opt(colors=True, exception=e).error( "Error when running WebSocketDisConnection hook. " - "Running cancelled!") + "Running cancelled!" + ) asyncio.create_task(_run_hook(bot)) @@ -201,8 +214,8 @@ class ForwardDriver(Driver): @abc.abstractmethod def setup_http_polling( - self, setup: Union["HTTPPollingSetup", - Callable[[], Awaitable["HTTPPollingSetup"]]] + self, + setup: Union["HTTPPollingSetup", Callable[[], Awaitable["HTTPPollingSetup"]]], ) -> None: """ :说明: @@ -217,8 +230,7 @@ class ForwardDriver(Driver): @abc.abstractmethod def setup_websocket( - self, setup: Union["WebSocketSetup", - Callable[[], Awaitable["WebSocketSetup"]]] + self, setup: Union["WebSocketSetup", Callable[[], Awaitable["WebSocketSetup"]]] ) -> None: """ :说明: @@ -288,6 +300,7 @@ class HTTPRequest(HTTPConnection): .. _asgi http scope: https://asgi.readthedocs.io/en/latest/specs/www.html#http-connection-scope """ + method: str = "GET" """The HTTP method name, uppercased.""" body: bytes = b"" @@ -309,6 +322,7 @@ class HTTPResponse: .. _asgi http scope: https://asgi.readthedocs.io/en/latest/specs/www.html#http-connection-scope """ + status: int """HTTP status code.""" body: Optional[bytes] = None @@ -416,5 +430,5 @@ class WebSocketSetup: """URL""" headers: Dict[str, str] = field(default_factory=dict) """HTTP headers""" - reconnect_interval: float = 3. + reconnect_interval: float = 3.0 """WebSocket 重连间隔""" diff --git a/nonebot/drivers/aiohttp.py b/nonebot/drivers/aiohttp.py index 3670c414..40879d62 100644 --- a/nonebot/drivers/aiohttp.py +++ b/nonebot/drivers/aiohttp.py @@ -20,13 +20,16 @@ from nonebot.typing import overrides from nonebot.utils import escape_tag from nonebot.config import Env, Config from nonebot.drivers import WebSocket as BaseWebSocket -from nonebot.drivers import (HTTPRequest, ForwardDriver, WebSocketSetup, - HTTPPollingSetup) +from nonebot.drivers import ( + HTTPRequest, + ForwardDriver, + WebSocketSetup, + HTTPPollingSetup, +) STARTUP_FUNC = Callable[[], Awaitable[None]] SHUTDOWN_FUNC = Callable[[], Awaitable[None]] -HTTPPOLLING_SETUP = Union[HTTPPollingSetup, - Callable[[], Awaitable[HTTPPollingSetup]]] +HTTPPOLLING_SETUP = Union[HTTPPollingSetup, Callable[[], Awaitable[HTTPPollingSetup]]] WEBSOCKET_SETUP = Union[WebSocketSetup, Callable[[], Awaitable[WebSocketSetup]]] HANDLED_SIGNALS = ( signal.SIGINT, # Unix signal 2. Sent by Ctrl+C. @@ -146,7 +149,8 @@ class Driver(ForwardDriver): except Exception as e: logger.opt(colors=True, exception=e).error( "Error when running startup function. " - "Ignored!") + "Ignored!" + ) async def main_loop(self): await self.should_exit.wait() @@ -160,24 +164,20 @@ class Driver(ForwardDriver): except Exception as e: logger.opt(colors=True, exception=e).error( "Error when running shutdown function. " - "Ignored!") + "Ignored!" + ) for task in self.connections: if not task.done(): task.cancel() await asyncio.sleep(0.1) - tasks = [ - t for t in asyncio.all_tasks() if t is not asyncio.current_task() - ] + tasks = [t for t in asyncio.all_tasks() if t is not asyncio.current_task()] if tasks and not self.force_exit: logger.info("Waiting for tasks to finish. (CTRL+C to force quit)") while tasks and not self.force_exit: await asyncio.sleep(0.1) - tasks = [ - t for t in asyncio.all_tasks() - if t is not asyncio.current_task() - ] + tasks = [t for t in asyncio.all_tasks() if t is not asyncio.current_task()] for task in tasks: task.cancel() @@ -209,9 +209,7 @@ class Driver(ForwardDriver): self.should_exit.set() async def _http_loop(self, setup: HTTPPOLLING_SETUP): - - async def _build_request( - setup: HTTPPollingSetup) -> Optional[HTTPRequest]: + async def _build_request(setup: HTTPPollingSetup) -> Optional[HTTPRequest]: url = URL(setup.url) if not url.is_absolute() or not url.host: logger.opt(colors=True).error( @@ -219,10 +217,15 @@ class Driver(ForwardDriver): ) return host = f"{url.host}:{url.port}" if url.port else url.host - return HTTPRequest(setup.http_version, url.scheme, url.path, - url.raw_query_string.encode("latin-1"), { - **setup.headers, "host": host - }, setup.method, setup.body) + return HTTPRequest( + setup.http_version, + url.scheme, + url.path, + url.raw_query_string.encode("latin-1"), + {**setup.headers, "host": host}, + setup.method, + setup.body, + ) bot: Optional[Bot] = None request: Optional[HTTPRequest] = None @@ -230,7 +233,8 @@ class Driver(ForwardDriver): logger.opt(colors=True).info( f"Start http polling for {escape_tag(setup.adapter.upper())} " - f"Bot {escape_tag(setup.self_id)}") + f"Bot {escape_tag(setup.self_id)}" + ) try: async with aiohttp.ClientSession() as session: @@ -244,7 +248,8 @@ class Driver(ForwardDriver): except Exception as e: logger.opt(colors=True, exception=e).error( "Error while parsing setup " - f"{escape_tag(repr(setup))}.") + f"{escape_tag(repr(setup))}." + ) await asyncio.sleep(3) continue @@ -286,19 +291,22 @@ class Driver(ForwardDriver): ) try: - async with session.request(request.method, - setup_.url, - data=request.body, - headers=headers, - timeout=timeout, - version=version) as response: + async with session.request( + request.method, + setup_.url, + data=request.body, + headers=headers, + timeout=timeout, + version=version, + ) as response: response.raise_for_status() data = await response.read() asyncio.create_task(bot.handle_message(data)) except aiohttp.ClientResponseError as e: logger.opt(colors=True, exception=e).error( f"Error occurred while requesting {escape_tag(setup_.url)}. " - "Try to reconnect...") + "Try to reconnect..." + ) await asyncio.sleep(setup_.poll_interval) @@ -307,7 +315,8 @@ class Driver(ForwardDriver): except Exception as e: logger.opt(colors=True, exception=e).error( "Unexpected exception occurred " - "while http polling") + "while http polling" + ) finally: if bot: self._bot_disconnect(bot) @@ -327,7 +336,8 @@ class Driver(ForwardDriver): except Exception as e: logger.opt(colors=True, exception=e).error( "Error while parsing setup " - f"{escape_tag(repr(setup))}.") + f"{escape_tag(repr(setup))}." + ) await asyncio.sleep(3) continue @@ -346,17 +356,21 @@ class Driver(ForwardDriver): f"Bot {setup_.self_id} from adapter {setup_.adapter} connecting to {url}" ) try: - async with session.ws_connect(url, - headers=headers, - timeout=30.) as ws: + async with session.ws_connect( + url, headers=headers, timeout=30.0 + ) as ws: logger.opt(colors=True).info( f"WebSocket Connection to {escape_tag(setup_.adapter.upper())} " f"Bot {escape_tag(setup_.self_id)} succeeded!" ) request = WebSocket( - "1.1", url.scheme, url.path, - url.raw_query_string.encode("latin-1"), headers, - ws) + "1.1", + url.scheme, + url.path, + url.raw_query_string.encode("latin-1"), + headers, + ws, + ) BotClass = self._adapters[setup_.adapter] bot = BotClass(setup_.self_id, request) @@ -365,25 +379,30 @@ class Driver(ForwardDriver): msg = await ws.receive() if msg.type == aiohttp.WSMsgType.text: asyncio.create_task( - bot.handle_message(msg.data.encode())) + bot.handle_message(msg.data.encode()) + ) elif msg.type == aiohttp.WSMsgType.binary: - asyncio.create_task( - bot.handle_message(msg.data)) + asyncio.create_task(bot.handle_message(msg.data)) elif msg.type == aiohttp.WSMsgType.error: logger.opt(colors=True).error( "Error while handling websocket frame. " - "Try to reconnect...") + "Try to reconnect..." + ) break else: logger.opt(colors=True).error( "WebSocket connection closed by peer. " - "Try to reconnect...") + "Try to reconnect..." + ) break - except (aiohttp.ClientResponseError, - aiohttp.ClientConnectionError) as e: + except ( + aiohttp.ClientResponseError, + aiohttp.ClientConnectionError, + ) as e: logger.opt(colors=True, exception=e).error( f"Error while connecting to {escape_tag(str(url))}. " - "Try to reconnect...") + "Try to reconnect..." + ) finally: if bot: self._bot_disconnect(bot) @@ -395,7 +414,8 @@ class Driver(ForwardDriver): except Exception as e: logger.opt(colors=True, exception=e).error( "Unexpected exception occurred " - "while websocket loop") + "while websocket loop" + ) @dataclass diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index e0d47d79..db9abf41 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -32,11 +32,15 @@ from nonebot.typing import overrides from nonebot.utils import escape_tag from nonebot.config import Config as NoneBotConfig from nonebot.drivers import WebSocket as BaseWebSocket -from nonebot.drivers import (HTTPRequest, ForwardDriver, ReverseDriver, - WebSocketSetup, HTTPPollingSetup) +from nonebot.drivers import ( + HTTPRequest, + ForwardDriver, + ReverseDriver, + WebSocketSetup, + HTTPPollingSetup, +) -HTTPPOLLING_SETUP = Union[HTTPPollingSetup, - Callable[[], Awaitable[HTTPPollingSetup]]] +HTTPPOLLING_SETUP = Union[HTTPPollingSetup, Callable[[], Awaitable[HTTPPollingSetup]]] WEBSOCKET_SETUP = Union[WebSocketSetup, Callable[[], Awaitable[WebSocketSetup]]] @@ -44,6 +48,7 @@ class Config(BaseSettings): """ FastAPI 驱动框架设置，详情参考 FastAPI 文档 """ + fastapi_openapi_url: Optional[str] = None """ :类型: @@ -226,12 +231,14 @@ class Driver(ReverseDriver, ForwardDriver): self.websockets.append(setup) @overrides(ReverseDriver) - def run(self, - host: Optional[str] = None, - port: Optional[int] = None, - *, - app: Optional[str] = None, - **kwargs): + def run( + self, + host: Optional[str] = None, + port: Optional[int] = None, + *, + app: Optional[str] = None, + **kwargs, + ): """使用 ``uvicorn`` 启动 FastAPI""" super().run(host, port, app, **kwargs) LOGGING_CONFIG = { @@ -243,10 +250,7 @@ class Driver(ReverseDriver, ForwardDriver): }, }, "loggers": { - "uvicorn.error": { - "handlers": ["default"], - "level": "INFO" - }, + "uvicorn.error": {"handlers": ["default"], "level": "INFO"}, "uvicorn.access": { "handlers": ["default"], "level": "INFO", @@ -258,15 +262,16 @@ class Driver(ReverseDriver, ForwardDriver): host=host or str(self.config.host), port=port or self.config.port, reload=self.fastapi_config.fastapi_reload - if self.fastapi_config.fastapi_reload is not None else - (bool(app) and self.config.debug), + if self.fastapi_config.fastapi_reload is not None + else (bool(app) and self.config.debug), reload_dirs=self.fastapi_config.fastapi_reload_dirs, reload_delay=self.fastapi_config.fastapi_reload_delay, reload_includes=self.fastapi_config.fastapi_reload_includes, reload_excludes=self.fastapi_config.fastapi_reload_excludes, debug=self.config.debug, log_config=LOGGING_CONFIG, - **kwargs) + **kwargs, + ) def _run_forward(self): for setup in self.http_pollings: @@ -287,39 +292,49 @@ class Driver(ReverseDriver, ForwardDriver): logger.warning( f"Unknown adapter {adapter}. Please register the adapter before use." ) - raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, - detail="adapter not found") + raise HTTPException( + status_code=status.HTTP_404_NOT_FOUND, detail="adapter not found" + ) # 创建 Bot 对象 BotClass = self._adapters[adapter] - http_request = HTTPRequest(request.scope["http_version"], - request.url.scheme, request.url.path, - request.scope["query_string"], - dict(request.headers), request.method, data) - x_self_id, response = await BotClass.check_permission( - self, http_request) + http_request = HTTPRequest( + request.scope["http_version"], + request.url.scheme, + request.url.path, + request.scope["query_string"], + dict(request.headers), + request.method, + data, + ) + x_self_id, response = await BotClass.check_permission(self, http_request) if not x_self_id: raise HTTPException( - response and response.status or 401, response and - response.body and response.body.decode("utf-8")) + response and response.status or 401, + response and response.body and response.body.decode("utf-8"), + ) if x_self_id in self._clients: - logger.warning("There's already a reverse websocket connection," - "so the event may be handled twice.") + logger.warning( + "There's already a reverse websocket connection," + "so the event may be handled twice." + ) bot = BotClass(x_self_id, http_request) asyncio.create_task(bot.handle_message(data)) - return Response(response and response.body, - response and response.status or 200) + return Response(response and response.body, response and response.status or 200) - async def _handle_ws_reverse(self, adapter: str, - websocket: FastAPIWebSocket): - ws = WebSocket(websocket.scope.get("http_version", - "1.1"), websocket.url.scheme, - websocket.url.path, websocket.scope["query_string"], - dict(websocket.headers), websocket) + async def _handle_ws_reverse(self, adapter: str, websocket: FastAPIWebSocket): + ws = WebSocket( + websocket.scope.get("http_version", "1.1"), + websocket.url.scheme, + websocket.url.path, + websocket.scope["query_string"], + dict(websocket.headers), + websocket, + ) if adapter not in self._adapters: logger.warning( @@ -349,7 +364,8 @@ class Driver(ReverseDriver, ForwardDriver): await ws.accept() logger.opt(colors=True).info( f"WebSocket Connection from {escape_tag(adapter.upper())} " - f"Bot {escape_tag(self_id)} Accepted!") + f"Bot {escape_tag(self_id)} Accepted!" + ) self._bot_connect(bot) @@ -362,7 +378,8 @@ class Driver(ReverseDriver, ForwardDriver): break except Exception as e: logger.opt(exception=e).error( - "Error when receiving data from websocket.") + "Error when receiving data from websocket." + ) break asyncio.create_task(bot.handle_message(data.encode())) @@ -370,9 +387,7 @@ class Driver(ReverseDriver, ForwardDriver): self._bot_disconnect(bot) async def _http_loop(self, setup: HTTPPOLLING_SETUP): - - async def _build_request( - setup: HTTPPollingSetup) -> Optional[HTTPRequest]: + async def _build_request(setup: HTTPPollingSetup) -> Optional[HTTPRequest]: url = httpx.URL(setup.url) if not url.netloc: logger.opt(colors=True).error( @@ -380,9 +395,14 @@ class Driver(ReverseDriver, ForwardDriver): ) return return HTTPRequest( - setup.http_version, url.scheme, url.path, url.query, { - **setup.headers, "host": url.netloc.decode("ascii") - }, setup.method, setup.body) + setup.http_version, + url.scheme, + url.path, + url.query, + {**setup.headers, "host": url.netloc.decode("ascii")}, + setup.method, + setup.body, + ) bot: Optional[Bot] = None request: Optional[HTTPRequest] = None @@ -390,11 +410,11 @@ class Driver(ReverseDriver, ForwardDriver): logger.opt(colors=True).info( f"Start http polling for {escape_tag(setup.adapter.upper())} " - f"Bot {escape_tag(setup.self_id)}") + f"Bot {escape_tag(setup.self_id)}" + ) try: - async with httpx.AsyncClient(http2=True, - follow_redirects=True) as session: + async with httpx.AsyncClient(http2=True, follow_redirects=True) as session: while not self.shutdown.is_set(): try: @@ -405,7 +425,8 @@ class Driver(ReverseDriver, ForwardDriver): except Exception as e: logger.opt(colors=True, exception=e).error( "Error while parsing setup " - f"{escape_tag(repr(setup))}.") + f"{escape_tag(repr(setup))}." + ) await asyncio.sleep(3) continue @@ -432,18 +453,21 @@ class Driver(ReverseDriver, ForwardDriver): f"Bot {setup_.self_id} from adapter {setup_.adapter} request {setup_.url}" ) try: - response = await session.request(request.method, - setup_.url, - content=request.body, - headers=headers, - timeout=30.) + response = await session.request( + request.method, + setup_.url, + content=request.body, + headers=headers, + timeout=30.0, + ) response.raise_for_status() data = response.read() asyncio.create_task(bot.handle_message(data)) except httpx.HTTPError as e: logger.opt(colors=True, exception=e).error( f"Error occurred while requesting {escape_tag(setup_.url)}. " - "Try to reconnect...") + "Try to reconnect..." + ) await asyncio.sleep(setup_.poll_interval) @@ -452,7 +476,8 @@ class Driver(ReverseDriver, ForwardDriver): except Exception as e: logger.opt(colors=True, exception=e).error( "Unexpected exception occurred " - "while http polling") + "while http polling" + ) finally: if bot: self._bot_disconnect(bot) @@ -471,7 +496,8 @@ class Driver(ReverseDriver, ForwardDriver): except Exception as e: logger.opt(colors=True, exception=e).error( "Error while parsing setup " - f"{escape_tag(repr(setup))}.") + f"{escape_tag(repr(setup))}." + ) await asyncio.sleep(3) continue @@ -491,9 +517,11 @@ class Driver(ReverseDriver, ForwardDriver): async with connection as ws: logger.opt(colors=True).info( f"WebSocket Connection to {escape_tag(setup_.adapter.upper())} " - f"Bot {escape_tag(setup_.self_id)} succeeded!") - request = WebSocket("1.1", url.scheme, url.path, - url.query, headers, ws) + f"Bot {escape_tag(setup_.self_id)} succeeded!" + ) + request = WebSocket( + "1.1", url.scheme, url.path, url.query, headers, ws + ) BotClass = self._adapters[setup_.adapter] bot = BotClass(setup_.self_id, request) @@ -506,12 +534,14 @@ class Driver(ReverseDriver, ForwardDriver): except ConnectionClosed: logger.opt(colors=True).error( "WebSocket connection closed by peer. " - "Try to reconnect...") + "Try to reconnect..." + ) break except Exception as e: logger.opt(colors=True, exception=e).error( f"Error while connecting to {url}. " - "Try to reconnect...") + "Try to reconnect..." + ) finally: if bot: self._bot_disconnect(bot) @@ -523,21 +553,22 @@ class Driver(ReverseDriver, ForwardDriver): except Exception as e: logger.opt(colors=True, exception=e).error( "Unexpected exception occurred " - "while websocket loop") + "while websocket loop" + ) @dataclass class WebSocket(BaseWebSocket): - websocket: Union[FastAPIWebSocket, - WebSocketClientProtocol] = None # type: ignore + websocket: Union[FastAPIWebSocket, WebSocketClientProtocol] = None # type: ignore @property @overrides(BaseWebSocket) def closed(self) -> bool: if isinstance(self.websocket, FastAPIWebSocket): return ( - self.websocket.client_state == WebSocketState.DISCONNECTED or - self.websocket.application_state == WebSocketState.DISCONNECTED) + self.websocket.client_state == WebSocketState.DISCONNECTED + or self.websocket.application_state == WebSocketState.DISCONNECTED + ) else: return self.websocket.closed diff --git a/nonebot/drivers/quart.py b/nonebot/drivers/quart.py index 5359c270..79055eb9 100644 --- a/nonebot/drivers/quart.py +++ b/nonebot/drivers/quart.py @@ -30,8 +30,7 @@ try: from quart import Quart, Request, Response from quart import Websocket as QuartWebSocket except ImportError: - raise ValueError( - 'Please install Quart by using `pip install nonebot2[quart]`') + raise ValueError("Please install Quart by using `pip install nonebot2[quart]`") _AsyncCallable = TypeVar("_AsyncCallable", bound=Callable[..., Coroutine]) @@ -40,6 +39,7 @@ class Config(BaseSettings): """ Quart 驱动框架设置 """ + quart_reload: Optional[bool] = None """ :类型: @@ -111,11 +111,12 @@ class Driver(ReverseDriver): self.quart_config = Config(**config.dict()) self._server_app = Quart(self.__class__.__qualname__) - self._server_app.add_url_rule("//http", - methods=["POST"], - view_func=self._handle_http) - self._server_app.add_websocket("//ws", - view_func=self._handle_ws_reverse) + self._server_app.add_url_rule( + "//http", methods=["POST"], view_func=self._handle_http + ) + self._server_app.add_websocket( + "//ws", view_func=self._handle_ws_reverse + ) @property @overrides(ReverseDriver) @@ -156,12 +157,14 @@ class Driver(ReverseDriver): return self.server_app.after_serving(func) # type: ignore @overrides(ReverseDriver) - def run(self, - host: Optional[str] = None, - port: Optional[int] = None, - *, - app: Optional[str] = None, - **kwargs): + def run( + self, + host: Optional[str] = None, + port: Optional[int] = None, + *, + app: Optional[str] = None, + **kwargs, + ): """使用 ``uvicorn`` 启动 Quart""" super().run(host, port, app, **kwargs) LOGGING_CONFIG = { @@ -173,10 +176,7 @@ class Driver(ReverseDriver): }, }, "loggers": { - "uvicorn.error": { - "handlers": ["default"], - "level": "INFO" - }, + "uvicorn.error": {"handlers": ["default"], "level": "INFO"}, "uvicorn.access": { "handlers": ["default"], "level": "INFO", @@ -188,52 +188,69 @@ class Driver(ReverseDriver): host=host or str(self.config.host), port=port or self.config.port, reload=self.quart_config.quart_reload - if self.quart_config.quart_reload is not None else - (bool(app) and self.config.debug), + if self.quart_config.quart_reload is not None + else (bool(app) and self.config.debug), reload_dirs=self.quart_config.quart_reload_dirs, reload_delay=self.quart_config.quart_reload_delay, reload_includes=self.quart_config.quart_reload_includes, reload_excludes=self.quart_config.quart_reload_excludes, debug=self.config.debug, log_config=LOGGING_CONFIG, - **kwargs) + **kwargs, + ) async def _handle_http(self, adapter: str): request: Request = _request data: bytes = await request.get_data() # type: ignore if adapter not in self._adapters: - logger.warning(f'Unknown adapter {adapter}. ' - 'Please register the adapter before use.') + logger.warning( + f"Unknown adapter {adapter}. " "Please register the adapter before use." + ) raise exceptions.NotFound() BotClass = self._adapters[adapter] - http_request = HTTPRequest(request.http_version, request.scheme, - request.path, request.query_string, - dict(request.headers), request.method, data) + http_request = HTTPRequest( + request.http_version, + request.scheme, + request.path, + request.query_string, + dict(request.headers), + request.method, + data, + ) self_id, response = await BotClass.check_permission(self, http_request) if not self_id: raise exceptions.Unauthorized( - description=(response and response.body or b"").decode()) + description=(response and response.body or b"").decode() + ) if self_id in self._clients: - logger.warning("There's already a reverse websocket connection," - "so the event may be handled twice.") + logger.warning( + "There's already a reverse websocket connection," + "so the event may be handled twice." + ) bot = BotClass(self_id, http_request) asyncio.create_task(bot.handle_message(data)) - return Response(response and response.body or "", - response and response.status or 200) + return Response( + response and response.body or "", response and response.status or 200 + ) async def _handle_ws_reverse(self, adapter: str): websocket: QuartWebSocket = _websocket - ws = WebSocket(websocket.http_version, websocket.scheme, - websocket.path, websocket.query_string, - dict(websocket.headers), websocket) + ws = WebSocket( + websocket.http_version, + websocket.scheme, + websocket.path, + websocket.query_string, + dict(websocket.headers), + websocket, + ) if adapter not in self._adapters: logger.warning( - f'Unknown adapter {adapter}. Please register the adapter before use.' + f"Unknown adapter {adapter}. Please register the adapter before use." ) raise exceptions.NotFound() @@ -242,20 +259,22 @@ class Driver(ReverseDriver): if not self_id: raise exceptions.Unauthorized( - description=(response and response.body or b"").decode()) + description=(response and response.body or b"").decode() + ) if self_id in self._clients: logger.opt(colors=True).warning( "There's already a websocket connection, " f"{escape_tag(adapter.upper())} Bot {escape_tag(self_id)} ignored." ) - raise exceptions.Forbidden(description='Client already exists.') + raise exceptions.Forbidden(description="Client already exists.") bot = BotClass(self_id, ws) await ws.accept() logger.opt(colors=True).info( f"WebSocket Connection from {escape_tag(adapter.upper())} " - f"Bot {escape_tag(self_id)} Accepted!") + f"Bot {escape_tag(self_id)} Accepted!" + ) self._bot_connect(bot) try: @@ -267,7 +286,8 @@ class Driver(ReverseDriver): break except Exception as e: logger.opt(exception=e).error( - "Error when receiving data from websocket.") + "Error when receiving data from websocket." + ) break asyncio.create_task(bot.handle_message(data.encode())) diff --git a/nonebot/exception.py b/nonebot/exception.py index 227d8e10..e602ee93 100644 --- a/nonebot/exception.py +++ b/nonebot/exception.py @@ -157,6 +157,7 @@ class NoLogException(AdapterException): 指示 NoneBot 对当前 ``Event`` 进行处理但不显示 Log 信息，可在 ``get_log_string`` 时抛出 """ + pass @@ -166,6 +167,7 @@ class ApiNotAvailable(AdapterException): 在 API 连接不可用时抛出。 """ + pass @@ -175,6 +177,7 @@ class NetworkError(AdapterException): 在网络出现问题时抛出，如: API 请求地址不正确, API 请求无返回或返回状态非正常等。 """ + pass @@ -184,4 +187,5 @@ class ActionFailed(AdapterException): API 请求成功返回数据，但 API 操作失败。 """ + pass diff --git a/nonebot/handler.py b/nonebot/handler.py index 6203bebd..78ec21b9 100644 --- a/nonebot/handler.py +++ b/nonebot/handler.py @@ -10,20 +10,27 @@ from contextlib import AsyncExitStack from typing import Any, Dict, List, Type, Callable, Optional from nonebot.utils import get_name, run_sync -from nonebot.dependencies import (Param, Dependent, DependsWrapper, - get_dependent, solve_dependencies, - get_parameterless_sub_dependant) +from nonebot.dependencies import ( + Param, + Dependent, + DependsWrapper, + get_dependent, + solve_dependencies, + get_parameterless_sub_dependant, +) class Handler: """事件处理器类。支持依赖注入。""" - def __init__(self, - func: Callable[..., Any], - *, - name: Optional[str] = None, - dependencies: Optional[List[DependsWrapper]] = None, - allow_types: Optional[List[Type[Param]]] = None): + def __init__( + self, + func: Callable[..., Any], + *, + name: Optional[str] = None, + dependencies: Optional[List[DependsWrapper]] = None, + allow_types: Optional[List[Type[Param]]] = None, + ): """ :说明: @@ -64,19 +71,18 @@ class Handler: self.dependent = get_dependent(func=func, allow_types=self.allow_types) def __repr__(self) -> str: - return ( - f"" - ) + return f"" def __str__(self) -> str: return repr(self) - async def __call__(self, - *, - _stack: Optional[AsyncExitStack] = None, - _dependency_cache: Optional[Dict[Callable[..., Any], - Any]] = None, - **params) -> Any: + async def __call__( + self, + *, + _stack: Optional[AsyncExitStack] = None, + _dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, + **params, + ) -> Any: values, _ = await solve_dependencies( _dependent=self.dependent, _stack=_stack, @@ -85,7 +91,8 @@ class Handler: for dependency in self.dependencies ], _dependency_cache=_dependency_cache, - **params) + **params, + ) if asyncio.iscoroutinefunction(self.func): return await self.func(**values) @@ -98,7 +105,8 @@ class Handler: if dependency.dependency in self.sub_dependents: raise ValueError(f"{dependency} is already in dependencies") sub_dependant = get_parameterless_sub_dependant( - depends=dependency, allow_types=self.allow_types) + depends=dependency, allow_types=self.allow_types + ) self.sub_dependents[dependency.dependency] = sub_dependant def prepend_dependency(self, dependency: DependsWrapper): diff --git a/nonebot/log.py b/nonebot/log.py index 8b1cc38c..8541f6b8 100644 --- a/nonebot/log.py +++ b/nonebot/log.py @@ -48,7 +48,6 @@ logger: "Logger" = loguru.logger class Filter: - def __init__(self) -> None: self.level: Union[int, str] = "DEBUG" @@ -58,13 +57,13 @@ class Filter: if module: module_name = getattr(module, "__module_name__", module_name) record["name"] = module_name.split(".")[0] - levelno = logger.level(self.level).no if isinstance(self.level, - str) else self.level + levelno = ( + logger.level(self.level).no if isinstance(self.level, str) else self.level + ) return record["level"].no >= levelno class LoguruHandler(logging.Handler): - def emit(self, record): try: level = logger.level(record.levelname).name @@ -76,8 +75,9 @@ class LoguruHandler(logging.Handler): frame = frame.f_back depth += 1 - logger.opt(depth=depth, - exception=record.exc_info).log(level, record.getMessage()) + logger.opt(depth=depth, exception=record.exc_info).log( + level, record.getMessage() + ) logger.remove() @@ -87,9 +87,12 @@ default_format = ( "[{level}] " "{name} | " # "{function}:{line}| " - "{message}") -logger_id = logger.add(sys.stdout, - colorize=True, - diagnose=False, - filter=default_filter, - format=default_format) + "{message}" +) +logger_id = logger.add( + sys.stdout, + colorize=True, + diagnose=False, + filter=default_filter, + format=default_format, +) diff --git a/nonebot/matcher.py b/nonebot/matcher.py index cbaab224..6f42dcf2 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -10,8 +10,17 @@ from datetime import datetime from contextvars import ContextVar from collections import defaultdict from contextlib import AsyncExitStack -from typing import (TYPE_CHECKING, Any, Dict, List, Type, Union, Callable, - NoReturn, Optional) +from typing import ( + TYPE_CHECKING, + Any, + Dict, + List, + Type, + Union, + Callable, + NoReturn, + Optional, +) from nonebot import params from nonebot.rule import Rule @@ -19,14 +28,29 @@ from nonebot.log import logger from nonebot.handler import Handler from nonebot.dependencies import DependsWrapper from nonebot.permission import USER, Permission -from nonebot.adapters import (Bot, Event, Message, MessageSegment, - MessageTemplate) -from nonebot.exception import (PausedException, StopPropagation, - SkippedException, FinishedException, - RejectedException) -from nonebot.typing import (T_State, T_Handler, T_ArgsParser, T_TypeUpdater, - T_StateFactory, T_DependencyCache, - T_PermissionUpdater) +from nonebot.adapters import ( + Bot, + Event, + Message, + MessageSegment, + MessageTemplate, +) +from nonebot.exception import ( + PausedException, + StopPropagation, + SkippedException, + FinishedException, + RejectedException, +) +from nonebot.typing import ( + T_State, + T_Handler, + T_ArgsParser, + T_TypeUpdater, + T_StateFactory, + T_DependencyCache, + T_PermissionUpdater, +) if TYPE_CHECKING: from nonebot.plugin import Plugin @@ -57,9 +81,11 @@ class MatcherMeta(type): expire_time: Optional[datetime] def __repr__(self) -> str: - return (f"") + return ( + f"" + ) def __str__(self) -> str: return repr(self) @@ -67,6 +93,7 @@ class MatcherMeta(type): class Matcher(metaclass=MatcherMeta): """事件响应器类""" + plugin: Optional["Plugin"] = None """ :类型: ``Optional[Plugin]`` @@ -157,8 +184,11 @@ class Matcher(metaclass=MatcherMeta): """ HANDLER_PARAM_TYPES = [ - params.BotParam, params.EventParam, params.StateParam, - params.MatcherParam, params.DefaultParam + params.BotParam, + params.EventParam, + params.StateParam, + params.MatcherParam, + params.DefaultParam, ] def __init__(self): @@ -169,7 +199,8 @@ class Matcher(metaclass=MatcherMeta): def __repr__(self) -> str: return ( f"") + f"priority={self.priority}, temp={self.temp}>" + ) def __str__(self) -> str: return repr(self) @@ -180,8 +211,9 @@ class Matcher(metaclass=MatcherMeta): type_: str = "", rule: Optional[Rule] = None, permission: Optional[Permission] = None, - handlers: Optional[Union[List[T_Handler], List[Handler], - List[Union[T_Handler, Handler]]]] = None, + handlers: Optional[ + Union[List[T_Handler], List[Handler], List[Union[T_Handler, Handler]]] + ] = None, temp: bool = False, priority: int = 1, block: bool = False, @@ -193,7 +225,7 @@ class Matcher(metaclass=MatcherMeta): default_state_factory: Optional[T_StateFactory] = None, default_parser: Optional[T_ArgsParser] = None, default_type_updater: Optional[T_TypeUpdater] = None, - default_permission_updater: Optional[T_PermissionUpdater] = None + default_permission_updater: Optional[T_PermissionUpdater] = None, ) -> Type["Matcher"]: """ :说明: @@ -221,46 +253,37 @@ class Matcher(metaclass=MatcherMeta): """ NewMatcher = type( - "Matcher", (Matcher,), { - "plugin": - plugin, - "module": - module, - "plugin_name": - plugin and plugin.name, - "module_name": - module and module.__name__, - "type": - type_, - "rule": - rule or Rule(), - "permission": - permission or Permission(), + "Matcher", + (Matcher,), + { + "plugin": plugin, + "module": module, + "plugin_name": plugin and plugin.name, + "module_name": module and module.__name__, + "type": type_, + "rule": rule or Rule(), + "permission": permission or Permission(), "handlers": [ - handler if isinstance(handler, Handler) else Handler( - handler, allow_types=cls.HANDLER_PARAM_TYPES) + handler + if isinstance(handler, Handler) + else Handler(handler, allow_types=cls.HANDLER_PARAM_TYPES) for handler in handlers - ] if handlers else [], - "temp": - temp, - "expire_time": - expire_time, - "priority": - priority, - "block": - block, - "_default_state": - default_state or {}, - "_default_state_factory": - staticmethod(default_state_factory) - if default_state_factory else None, - "_default_parser": - default_parser, - "_default_type_updater": - default_type_updater, - "_default_permission_updater": - default_permission_updater - }) + ] + if handlers + else [], + "temp": temp, + "expire_time": expire_time, + "priority": priority, + "block": block, + "_default_state": default_state or {}, + "_default_state_factory": staticmethod(default_state_factory) + if default_state_factory + else None, + "_default_parser": default_parser, + "_default_type_updater": default_type_updater, + "_default_permission_updater": default_permission_updater, + }, + ) matchers[priority].append(NewMatcher) @@ -272,8 +295,8 @@ class Matcher(metaclass=MatcherMeta): bot: Bot, event: Event, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[Dict[Callable[..., Any], - Any]] = None) -> bool: + dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, + ) -> bool: """ :说明: @@ -289,8 +312,9 @@ class Matcher(metaclass=MatcherMeta): - ``bool``: 是否满足权限 """ event_type = event.get_type() - return (event_type == (cls.type or event_type) and - await cls.permission(bot, event, stack, dependency_cache)) + return event_type == (cls.type or event_type) and await cls.permission( + bot, event, stack, dependency_cache + ) @classmethod async def check_rule( @@ -299,8 +323,8 @@ class Matcher(metaclass=MatcherMeta): event: Event, state: T_State, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[Dict[Callable[..., Any], - Any]] = None) -> bool: + dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, + ) -> bool: """ :说明: @@ -317,8 +341,9 @@ class Matcher(metaclass=MatcherMeta): - ``bool``: 是否满足匹配规则 """ event_type = event.get_type() - return (event_type == (cls.type or event_type) and - await cls.rule(bot, event, state, stack, dependency_cache)) + return event_type == (cls.type or event_type) and await cls.rule( + bot, event, state, stack, dependency_cache + ) @classmethod def args_parser(cls, func: T_ArgsParser) -> T_ArgsParser: @@ -349,8 +374,7 @@ class Matcher(metaclass=MatcherMeta): return func @classmethod - def permission_updater(cls, - func: T_PermissionUpdater) -> T_PermissionUpdater: + def permission_updater(cls, func: T_PermissionUpdater) -> T_PermissionUpdater: """ :说明: @@ -365,12 +389,11 @@ class Matcher(metaclass=MatcherMeta): @classmethod def append_handler( - cls, - handler: T_Handler, - dependencies: Optional[List[DependsWrapper]] = None) -> Handler: - handler_ = Handler(handler, - dependencies=dependencies, - allow_types=cls.HANDLER_PARAM_TYPES) + cls, handler: T_Handler, dependencies: Optional[List[DependsWrapper]] = None + ) -> Handler: + handler_ = Handler( + handler, dependencies=dependencies, allow_types=cls.HANDLER_PARAM_TYPES + ) cls.handlers.append(handler_) return handler_ @@ -418,8 +441,7 @@ class Matcher(metaclass=MatcherMeta): func_handler = cls.handlers[-1] func_handler.prepend_dependency(depend) else: - cls.append_handler( - func, dependencies=[depend] if cls.handlers else []) + cls.append_handler(func, dependencies=[depend] if cls.handlers else []) return func @@ -429,9 +451,8 @@ class Matcher(metaclass=MatcherMeta): def got( cls, key: str, - prompt: Optional[Union[str, Message, MessageSegment, - MessageTemplate]] = None, - args_parser: Optional[T_ArgsParser] = None + prompt: Optional[Union[str, Message, MessageSegment, MessageTemplate]] = None, + args_parser: Optional[T_ArgsParser] = None, ) -> Callable[[T_Handler], T_Handler]: """ :说明: @@ -483,16 +504,16 @@ class Matcher(metaclass=MatcherMeta): func_handler.prepend_dependency(parser_depend) func_handler.prepend_dependency(get_depend) else: - cls.append_handler(func, - dependencies=[get_depend, parser_depend]) + cls.append_handler(func, dependencies=[get_depend, parser_depend]) return func return _decorator @classmethod - async def send(cls, message: Union[str, Message, MessageSegment, - MessageTemplate], **kwargs) -> Any: + async def send( + cls, message: Union[str, Message, MessageSegment, MessageTemplate], **kwargs + ) -> Any: """ :说明: @@ -513,10 +534,11 @@ class Matcher(metaclass=MatcherMeta): return await bot.send(event=event, message=_message, **kwargs) @classmethod - async def finish(cls, - message: Optional[Union[str, Message, MessageSegment, - MessageTemplate]] = None, - **kwargs) -> NoReturn: + async def finish( + cls, + message: Optional[Union[str, Message, MessageSegment, MessageTemplate]] = None, + **kwargs, + ) -> NoReturn: """ :说明: @@ -539,10 +561,11 @@ class Matcher(metaclass=MatcherMeta): raise FinishedException @classmethod - async def pause(cls, - prompt: Optional[Union[str, Message, MessageSegment, - MessageTemplate]] = None, - **kwargs) -> NoReturn: + async def pause( + cls, + prompt: Optional[Union[str, Message, MessageSegment, MessageTemplate]] = None, + **kwargs, + ) -> NoReturn: """ :说明: @@ -565,10 +588,9 @@ class Matcher(metaclass=MatcherMeta): raise PausedException @classmethod - async def reject(cls, - prompt: Optional[Union[str, Message, - MessageSegment]] = None, - **kwargs) -> NoReturn: + async def reject( + cls, prompt: Optional[Union[str, Message, MessageSegment]] = None, **kwargs + ) -> NoReturn: """ :说明: @@ -601,31 +623,38 @@ class Matcher(metaclass=MatcherMeta): self.block = True # 运行handlers - async def run(self, - bot: Bot, - event: Event, - state: T_State, - stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[T_DependencyCache] = None): + async def run( + self, + bot: Bot, + event: Event, + state: T_State, + stack: Optional[AsyncExitStack] = None, + dependency_cache: Optional[T_DependencyCache] = None, + ): b_t = current_bot.set(bot) e_t = current_event.set(event) s_t = current_state.set(self.state) try: # Refresh preprocess state - self.state = await self._default_state_factory( - bot, event) if self._default_state_factory else self.state + self.state = ( + await self._default_state_factory(bot, event) + if self._default_state_factory + else self.state + ) self.state.update(state) while self.handlers: handler = self.handlers.pop(0) logger.debug(f"Running handler {handler}") try: - await handler(matcher=self, - bot=bot, - event=event, - state=self.state, - _stack=stack, - _dependency_cache=dependency_cache) + await handler( + matcher=self, + bot=bot, + event=event, + state=self.state, + _stack=stack, + _dependency_cache=dependency_cache, + ) except SkippedException: pass @@ -633,18 +662,13 @@ class Matcher(metaclass=MatcherMeta): self.handlers.insert(0, handler) # type: ignore updater = self.__class__._default_type_updater if updater: - type_ = await updater( - bot, - event, - self.state, # type: ignore - self.type) + type_ = await updater(bot, event, self.state, self.type) # type: ignore else: type_ = "message" updater = self.__class__._default_permission_updater if updater: - permission = await updater(bot, event, self.state, - self.permission) + permission = await updater(bot, event, self.state, self.permission) else: permission = USER(event.get_session_id(), perm=self.permission) @@ -662,23 +686,18 @@ class Matcher(metaclass=MatcherMeta): default_state=self.state, default_parser=self.__class__._default_parser, default_type_updater=self.__class__._default_type_updater, - default_permission_updater=self.__class__. - _default_permission_updater) + default_permission_updater=self.__class__._default_permission_updater, + ) except PausedException: updater = self.__class__._default_type_updater if updater: - type_ = await updater( - bot, - event, - self.state, # type: ignore - self.type) + type_ = await updater(bot, event, self.state, self.type) # type: ignore else: type_ = "message" updater = self.__class__._default_permission_updater if updater: - permission = await updater(bot, event, self.state, - self.permission) + permission = await updater(bot, event, self.state, self.permission) else: permission = USER(event.get_session_id(), perm=self.permission) @@ -696,8 +715,8 @@ class Matcher(metaclass=MatcherMeta): default_state=self.state, default_parser=self.__class__._default_parser, default_type_updater=self.__class__._default_type_updater, - default_permission_updater=self.__class__. - _default_permission_updater) + default_permission_updater=self.__class__._default_permission_updater, + ) except FinishedException: pass except StopPropagation: diff --git a/nonebot/message.py b/nonebot/message.py index 87184362..f2ff0ca9 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -17,9 +17,14 @@ from nonebot.handler import Handler from nonebot.utils import escape_tag from nonebot.matcher import Matcher, matchers from nonebot.exception import NoLogException, StopPropagation, IgnoredException -from nonebot.typing import (T_State, T_DependencyCache, T_RunPreProcessor, - T_RunPostProcessor, T_EventPreProcessor, - T_EventPostProcessor) +from nonebot.typing import ( + T_State, + T_DependencyCache, + T_RunPreProcessor, + T_RunPostProcessor, + T_EventPreProcessor, + T_EventPostProcessor, +) if TYPE_CHECKING: from nonebot.adapters import Bot, Event @@ -30,15 +35,25 @@ _run_preprocessors: Set[Handler] = set() _run_postprocessors: Set[Handler] = set() EVENT_PCS_PARAMS = [ - params.BotParam, params.EventParam, params.StateParam, params.DefaultParam + params.BotParam, + params.EventParam, + params.StateParam, + params.DefaultParam, ] RUN_PREPCS_PARAMS = [ - params.MatcherParam, params.BotParam, params.EventParam, params.StateParam, - params.DefaultParam + params.MatcherParam, + params.BotParam, + params.EventParam, + params.StateParam, + params.DefaultParam, ] RUN_POSTPCS_PARAMS = [ - params.MatcherParam, params.ExceptionParam, params.BotParam, - params.EventParam, params.StateParam, params.DefaultParam + params.MatcherParam, + params.ExceptionParam, + params.BotParam, + params.EventParam, + params.StateParam, + params.DefaultParam, ] @@ -83,13 +98,14 @@ def run_postprocessor(func: T_RunPostProcessor) -> T_RunPostProcessor: async def _check_matcher( - priority: int, - Matcher: Type[Matcher], - bot: "Bot", - event: "Event", - state: T_State, - stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[T_DependencyCache] = None) -> None: + priority: int, + Matcher: Type[Matcher], + bot: "Bot", + event: "Event", + state: T_State, + stack: Optional[AsyncExitStack] = None, + dependency_cache: Optional[T_DependencyCache] = None, +) -> None: if Matcher.expire_time and datetime.now() > Matcher.expire_time: try: matchers[priority].remove(Matcher) @@ -99,13 +115,13 @@ async def _check_matcher( try: if not await Matcher.check_perm( - bot, event, stack, - dependency_cache) or not await Matcher.check_rule( - bot, event, state, stack, dependency_cache): + bot, event, stack, dependency_cache + ) or not await Matcher.check_rule(bot, event, state, stack, dependency_cache): return except Exception as e: logger.opt(colors=True, exception=e).error( - f"Rule check failed for {Matcher}.") + f"Rule check failed for {Matcher}." + ) return if Matcher.temp: @@ -118,36 +134,43 @@ async def _check_matcher( async def _run_matcher( - Matcher: Type[Matcher], - bot: "Bot", - event: "Event", - state: T_State, - stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[T_DependencyCache] = None) -> None: + Matcher: Type[Matcher], + bot: "Bot", + event: "Event", + state: T_State, + stack: Optional[AsyncExitStack] = None, + dependency_cache: Optional[T_DependencyCache] = None, +) -> None: logger.info(f"Event will be handled by {Matcher}") matcher = Matcher() coros = list( map( - lambda x: x(matcher=matcher, - bot=bot, - event=event, - state=state, - _stack=stack, - _dependency_cache=dependency_cache), - _run_preprocessors)) + lambda x: x( + matcher=matcher, + bot=bot, + event=event, + state=state, + _stack=stack, + _dependency_cache=dependency_cache, + ), + _run_preprocessors, + ) + ) if coros: try: await asyncio.gather(*coros) except IgnoredException: logger.opt(colors=True).info( - f"Matcher {matcher} running is cancelled") + f"Matcher {matcher} running is cancelled" + ) return except Exception as e: logger.opt(colors=True, exception=e).error( "Error when running RunPreProcessors. " - "Running cancelled!") + "Running cancelled!" + ) return exception = None @@ -163,14 +186,18 @@ async def _run_matcher( coros = list( map( - lambda x: x(matcher=matcher, - exception=exception, - bot=bot, - event=event, - state=state, - _stack=stack, - _dependency_cache=dependency_cache), - _run_postprocessors)) + lambda x: x( + matcher=matcher, + exception=exception, + bot=bot, + event=event, + state=state, + _stack=stack, + _dependency_cache=dependency_cache, + ), + _run_postprocessors, + ) + ) if coros: try: await asyncio.gather(*coros) @@ -217,12 +244,16 @@ async def handle_event(bot: "Bot", event: "Event") -> None: async with AsyncExitStack() as stack: coros = list( map( - lambda x: x(bot=bot, - event=event, - state=state, - _stack=stack, - _dependency_cache=dependency_cache), - _event_preprocessors)) + lambda x: x( + bot=bot, + event=event, + state=state, + _stack=stack, + _dependency_cache=dependency_cache, + ), + _event_preprocessors, + ) + ) if coros: try: if show_log: @@ -236,7 +267,8 @@ async def handle_event(bot: "Bot", event: "Event") -> None: except Exception as e: logger.opt(colors=True, exception=e).error( "Error when running EventPreProcessors. " - "Event ignored!") + "Event ignored!" + ) return # Trie Match @@ -251,13 +283,13 @@ async def handle_event(bot: "Bot", event: "Event") -> None: logger.debug(f"Checking for matchers in priority {priority}...") pending_tasks = [ - _check_matcher(priority, matcher, bot, event, state.copy(), - stack, dependency_cache) + _check_matcher( + priority, matcher, bot, event, state.copy(), stack, dependency_cache + ) for matcher in matchers[priority] ] - results = await asyncio.gather(*pending_tasks, - return_exceptions=True) + results = await asyncio.gather(*pending_tasks, return_exceptions=True) for result in results: if not isinstance(result, Exception): @@ -272,12 +304,16 @@ async def handle_event(bot: "Bot", event: "Event") -> None: coros = list( map( - lambda x: x(bot=bot, - event=event, - state=state, - _stack=stack, - _dependency_cache=dependency_cache), - _event_postprocessors)) + lambda x: x( + bot=bot, + event=event, + state=state, + _stack=stack, + _dependency_cache=dependency_cache, + ), + _event_postprocessors, + ) + ) if coros: try: if show_log: diff --git a/nonebot/params.py b/nonebot/params.py index 06fb6987..484c4d21 100644 --- a/nonebot/params.py +++ b/nonebot/params.py @@ -10,69 +10,61 @@ from nonebot.utils import generic_check_issubclass class BotParam(Param): - @classmethod def _check(cls, name: str, param: inspect.Parameter) -> bool: - return generic_check_issubclass( - param.annotation, Bot) or (param.annotation == param.empty and - name == "bot") + return generic_check_issubclass(param.annotation, Bot) or ( + param.annotation == param.empty and name == "bot" + ) def _solve(self, bot: Bot, **kwargs: Any) -> Any: return bot class EventParam(Param): - @classmethod def _check(cls, name: str, param: inspect.Parameter) -> bool: - return generic_check_issubclass( - param.annotation, Event) or (param.annotation == param.empty and - name == "event") + return generic_check_issubclass(param.annotation, Event) or ( + param.annotation == param.empty and name == "event" + ) def _solve(self, event: Event, **kwargs: Any) -> Any: return event class StateParam(Param): - @classmethod def _check(cls, name: str, param: inspect.Parameter) -> bool: - return generic_check_issubclass( - param.annotation, Dict) or (param.annotation == param.empty and - name == "state") + return generic_check_issubclass(param.annotation, Dict) or ( + param.annotation == param.empty and name == "state" + ) def _solve(self, state: T_State, **kwargs: Any) -> Any: return state class MatcherParam(Param): - @classmethod def _check(cls, name: str, param: inspect.Parameter) -> bool: - return generic_check_issubclass( - param.annotation, Matcher) or (param.annotation == param.empty and - name == "matcher") + return generic_check_issubclass(param.annotation, Matcher) or ( + param.annotation == param.empty and name == "matcher" + ) def _solve(self, matcher: Optional["Matcher"] = None, **kwargs: Any) -> Any: return matcher class ExceptionParam(Param): - @classmethod def _check(cls, name: str, param: inspect.Parameter) -> bool: - return generic_check_issubclass( - param.annotation, Exception) or (param.annotation == param.empty and - name == "exception") + return generic_check_issubclass(param.annotation, Exception) or ( + param.annotation == param.empty and name == "exception" + ) - def _solve(self, - exception: Optional[Exception] = None, - **kwargs: Any) -> Any: + def _solve(self, exception: Optional[Exception] = None, **kwargs: Any) -> Any: return exception class DefaultParam(Param): - @classmethod def _check(cls, name: str, param: inspect.Parameter) -> bool: return param.default != param.empty diff --git a/nonebot/permission.py b/nonebot/permission.py index 4e7e89da..7724d1dd 100644 --- a/nonebot/permission.py +++ b/nonebot/permission.py @@ -34,11 +34,10 @@ class Permission: from nonebot.utils import run_sync Permission(async_function, run_sync(sync_function)) """ + __slots__ = ("checkers",) - HANDLER_PARAM_TYPES = [ - params.BotParam, params.EventParam, params.DefaultParam - ] + HANDLER_PARAM_TYPES = [params.BotParam, params.EventParam, params.DefaultParam] def __init__(self, *checkers: Union[T_PermissionChecker, Handler]) -> None: """ @@ -48,9 +47,11 @@ class Permission: """ self.checkers = set( - checker if isinstance(checker, Handler) else Handler( - checker, allow_types=self.HANDLER_PARAM_TYPES) - for checker in checkers) + checker + if isinstance(checker, Handler) + else Handler(checker, allow_types=self.HANDLER_PARAM_TYPES) + for checker in checkers + ) """ :说明: @@ -66,8 +67,8 @@ class Permission: bot: Bot, event: Event, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[Dict[Callable[..., Any], - Any]] = None) -> bool: + dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, + ) -> bool: """ :说明: @@ -87,19 +88,24 @@ class Permission: if not self.checkers: return True results = await asyncio.gather( - *(checker(bot=bot, - event=event, - _stack=stack, - _dependency_cache=dependency_cache) - for checker in self.checkers)) + *( + checker( + bot=bot, + event=event, + _stack=stack, + _dependency_cache=dependency_cache, + ) + for checker in self.checkers + ) + ) return any(results) def __and__(self, other) -> NoReturn: raise RuntimeError("And operation between Permissions is not allowed.") def __or__( - self, other: Optional[Union["Permission", - T_PermissionChecker]]) -> "Permission": + self, other: Optional[Union["Permission", T_PermissionChecker]] + ) -> "Permission": if other is None: return self elif isinstance(other, Permission): @@ -155,15 +161,17 @@ def USER(*user: str, perm: Optional[Permission] = None): """ async def _user(bot: Bot, event: Event) -> bool: - return bool(event.get_session_id() in user and - (perm is None or await perm(bot, event))) + return bool( + event.get_session_id() in user and (perm is None or await perm(bot, event)) + ) return Permission(_user) async def _superuser(bot: Bot, event: Event) -> bool: - return (event.get_type() == "message" and - event.get_user_id() in bot.config.superusers) + return ( + event.get_type() == "message" and event.get_user_id() in bot.config.superusers + ) SUPERUSER = Permission(_superuser) diff --git a/nonebot/plugin/__init__.py b/nonebot/plugin/__init__.py index 69a34e63..e55e1180 100644 --- a/nonebot/plugin/__init__.py +++ b/nonebot/plugin/__init__.py @@ -9,8 +9,9 @@ from typing import List, Optional from contextvars import ContextVar _managers: List["PluginManager"] = [] -_current_plugin: ContextVar[Optional["Plugin"]] = ContextVar("_current_plugin", - default=None) +_current_plugin: ContextVar[Optional["Plugin"]] = ContextVar( + "_current_plugin", default=None +) from .on import on as on from .manager import PluginManager diff --git a/nonebot/plugin/export.py b/nonebot/plugin/export.py index 9c7c3f57..2a792a01 100644 --- a/nonebot/plugin/export.py +++ b/nonebot/plugin/export.py @@ -33,8 +33,7 @@ class Export(dict): return func def __setitem__(self, key, value): - super().__setitem__(key, - Export(value) if isinstance(value, dict) else value) + super().__setitem__(key, Export(value) if isinstance(value, dict) else value) def __setattr__(self, name, value): self[name] = Export(value) if isinstance(value, dict) else value diff --git a/nonebot/plugin/load.py b/nonebot/plugin/load.py index 75850f91..bfd08918 100644 --- a/nonebot/plugin/load.py +++ b/nonebot/plugin/load.py @@ -49,8 +49,9 @@ def load_plugins(*plugin_dir: str) -> Set[Plugin]: return manager.load_all_plugins() -def load_all_plugins(module_path: Iterable[str], - plugin_dir: Iterable[str]) -> Set[Plugin]: +def load_all_plugins( + module_path: Iterable[str], plugin_dir: Iterable[str] +) -> Set[Plugin]: """ :说明: @@ -90,8 +91,7 @@ def load_from_json(file_path: str, encoding: str = "utf-8") -> Set[Plugin]: plugins = data.get("plugins") plugin_dirs = data.get("plugin_dirs") assert isinstance(plugins, list), "plugins must be a list of plugin name" - assert isinstance(plugin_dirs, - list), "plugin_dirs must be a list of directories" + assert isinstance(plugin_dirs, list), "plugin_dirs must be a list of directories" return load_all_plugins(set(plugins), set(plugin_dirs)) @@ -120,14 +120,14 @@ def load_from_toml(file_path: str, encoding: str = "utf-8") -> Set[Plugin]: if nonebot_data: warnings.warn( "[nonebot.plugins] table are now deprecated. Use [tool.nonebot] instead.", - DeprecationWarning) + DeprecationWarning, + ) else: raise ValueError("Cannot find '[tool.nonebot]' in given toml file!") plugins = nonebot_data.get("plugins", []) plugin_dirs = nonebot_data.get("plugin_dirs", []) assert isinstance(plugins, list), "plugins must be a list of plugin name" - assert isinstance(plugin_dirs, - list), "plugin_dirs must be a list of directories" + assert isinstance(plugin_dirs, list), "plugin_dirs must be a list of directories" return load_all_plugins(plugins, plugin_dirs) @@ -163,5 +163,5 @@ def require(name: str) -> Export: """ plugin = get_plugin(name) or load_plugin(name) if not plugin: - raise RuntimeError(f"Cannot load plugin \"{name}\"!") + raise RuntimeError(f'Cannot load plugin "{name}"!') return plugin.export diff --git a/nonebot/plugin/manager.py b/nonebot/plugin/manager.py index e98495d0..a4b375ab 100644 --- a/nonebot/plugin/manager.py +++ b/nonebot/plugin/manager.py @@ -15,7 +15,6 @@ from . import _managers, _current_plugin class PluginManager: - def __init__( self, plugins: Optional[Iterable[str]] = None, @@ -39,14 +38,15 @@ class PluginManager: def _previous_plugins(self) -> List[str]: _pre_managers: List[PluginManager] if self in _managers: - _pre_managers = _managers[:_managers.index(self)] + _pre_managers = _managers[: _managers.index(self)] else: _pre_managers = _managers[:] return [ *chain.from_iterable( [*manager.plugins, *manager.searched_plugins.keys()] - for manager in _pre_managers) + for manager in _pre_managers + ) ] def list_plugins(self) -> Set[str]: @@ -57,13 +57,14 @@ class PluginManager: for module_info in pkgutil.iter_modules(self.search_path): if module_info.name.startswith("_"): continue - if module_info.name in searched_plugins.keys( - ) or module_info.name in previous_plugins: + if ( + module_info.name in searched_plugins.keys() + or module_info.name in previous_plugins + ): raise RuntimeError( f"Plugin already exists: {module_info.name}! Check your plugin name" ) - module_spec = module_info.module_finder.find_spec( - module_info.name, None) + module_spec = module_info.module_finder.find_spec(module_info.name, None) if not module_spec: continue module_path = module_spec.origin @@ -80,14 +81,15 @@ class PluginManager: if name in self.plugins: module = importlib.import_module(name) elif name not in self.searched_plugins: - raise RuntimeError( - f"Plugin not found: {name}! Check your plugin name") + raise RuntimeError(f"Plugin not found: {name}! Check your plugin name") else: module = importlib.import_module( - self._path_to_module_name(self.searched_plugins[name])) + self._path_to_module_name(self.searched_plugins[name]) + ) logger.opt(colors=True).success( - f'Succeeded to import "{escape_tag(name)}"') + f'Succeeded to import "{escape_tag(name)}"' + ) return getattr(module, "__plugin__", None) except Exception as e: logger.opt(colors=True, exception=e).error( @@ -96,16 +98,17 @@ class PluginManager: def load_all_plugins(self) -> Set[Plugin]: return set( - filter(None, - (self.load_plugin(name) for name in self.list_plugins()))) + filter(None, (self.load_plugin(name) for name in self.list_plugins())) + ) class PluginFinder(MetaPathFinder): - - def find_spec(self, - fullname: str, - path: Optional[Sequence[Union[bytes, str]]], - target: Optional[ModuleType] = None): + def find_spec( + self, + fullname: str, + path: Optional[Sequence[Union[bytes, str]]], + target: Optional[ModuleType] = None, + ): if _managers: index = -1 module_spec = PathFinder.find_spec(fullname, path, target) @@ -119,10 +122,11 @@ class PluginFinder(MetaPathFinder): while -index <= len(_managers): manager = _managers[index] - if fullname in manager.plugins or module_path in manager.searched_plugins.values( + if ( + fullname in manager.plugins + or module_path in manager.searched_plugins.values() ): - module_spec.loader = PluginLoader(manager, fullname, - module_origin) + module_spec.loader = PluginLoader(manager, fullname, module_origin) return module_spec index -= 1 @@ -130,7 +134,6 @@ class PluginFinder(MetaPathFinder): class PluginLoader(SourceFileLoader): - def __init__(self, manager: PluginManager, fullname: str, path) -> None: self.manager = manager self.loaded = False diff --git a/nonebot/plugin/on.py b/nonebot/plugin/on.py index 5b0f2979..a60d45d5 100644 --- a/nonebot/plugin/on.py +++ b/nonebot/plugin/on.py @@ -10,8 +10,18 @@ from nonebot.matcher import Matcher from .manager import _current_plugin from nonebot.permission import Permission from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_StateFactory -from nonebot.rule import (PREFIX_KEY, RAW_CMD_KEY, Rule, ArgumentParser, regex, - command, keyword, endswith, startswith, shell_command) +from nonebot.rule import ( + PREFIX_KEY, + RAW_CMD_KEY, + Rule, + ArgumentParser, + regex, + command, + keyword, + endswith, + startswith, + shell_command, +) def _store_matcher(matcher: Type[Matcher]) -> None: @@ -30,17 +40,19 @@ def _get_matcher_module(depth: int = 1) -> Optional[ModuleType]: return sys.modules.get(module_name) -def on(type: str = "", - rule: Optional[Union[Rule, T_RuleChecker]] = None, - permission: Optional[Permission] = None, - *, - handlers: Optional[List[Union[T_Handler, Handler]]] = None, - temp: bool = False, - priority: int = 1, - block: bool = False, - state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None, - _depth: int = 0) -> Type[Matcher]: +def on( + type: str = "", + rule: Optional[Union[Rule, T_RuleChecker]] = None, + permission: Optional[Permission] = None, + *, + handlers: Optional[List[Union[T_Handler, Handler]]] = None, + temp: bool = False, + priority: int = 1, + block: bool = False, + state: Optional[T_State] = None, + state_factory: Optional[T_StateFactory] = None, + _depth: int = 0, +) -> Type[Matcher]: """ :说明: @@ -62,30 +74,34 @@ def on(type: str = "", - ``Type[Matcher]`` """ - matcher = Matcher.new(type, - Rule() & rule, - permission or Permission(), - temp=temp, - priority=priority, - block=block, - handlers=handlers, - plugin=_current_plugin.get(), - module=_get_matcher_module(_depth + 1), - default_state=state, - default_state_factory=state_factory) + matcher = Matcher.new( + type, + Rule() & rule, + permission or Permission(), + temp=temp, + priority=priority, + block=block, + handlers=handlers, + plugin=_current_plugin.get(), + module=_get_matcher_module(_depth + 1), + default_state=state, + default_state_factory=state_factory, + ) _store_matcher(matcher) return matcher -def on_metaevent(rule: Optional[Union[Rule, T_RuleChecker]] = None, - *, - handlers: Optional[List[Union[T_Handler, Handler]]] = None, - temp: bool = False, - priority: int = 1, - block: bool = False, - state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None, - _depth: int = 0) -> Type[Matcher]: +def on_metaevent( + rule: Optional[Union[Rule, T_RuleChecker]] = None, + *, + handlers: Optional[List[Union[T_Handler, Handler]]] = None, + temp: bool = False, + priority: int = 1, + block: bool = False, + state: Optional[T_State] = None, + state_factory: Optional[T_StateFactory] = None, + _depth: int = 0, +) -> Type[Matcher]: """ :说明: @@ -105,31 +121,35 @@ def on_metaevent(rule: Optional[Union[Rule, T_RuleChecker]] = None, - ``Type[Matcher]`` """ - matcher = Matcher.new("meta_event", - Rule() & rule, - Permission(), - temp=temp, - priority=priority, - block=block, - handlers=handlers, - plugin=_current_plugin.get(), - module=_get_matcher_module(_depth + 1), - default_state=state, - default_state_factory=state_factory) + matcher = Matcher.new( + "meta_event", + Rule() & rule, + Permission(), + temp=temp, + priority=priority, + block=block, + handlers=handlers, + plugin=_current_plugin.get(), + module=_get_matcher_module(_depth + 1), + default_state=state, + default_state_factory=state_factory, + ) _store_matcher(matcher) return matcher -def on_message(rule: Optional[Union[Rule, T_RuleChecker]] = None, - permission: Optional[Permission] = None, - *, - handlers: Optional[List[Union[T_Handler, Handler]]] = None, - temp: bool = False, - priority: int = 1, - block: bool = True, - state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None, - _depth: int = 0) -> Type[Matcher]: +def on_message( + rule: Optional[Union[Rule, T_RuleChecker]] = None, + permission: Optional[Permission] = None, + *, + handlers: Optional[List[Union[T_Handler, Handler]]] = None, + temp: bool = False, + priority: int = 1, + block: bool = True, + state: Optional[T_State] = None, + state_factory: Optional[T_StateFactory] = None, + _depth: int = 0, +) -> Type[Matcher]: """ :说明: @@ -150,30 +170,34 @@ def on_message(rule: Optional[Union[Rule, T_RuleChecker]] = None, - ``Type[Matcher]`` """ - matcher = Matcher.new("message", - Rule() & rule, - permission or Permission(), - temp=temp, - priority=priority, - block=block, - handlers=handlers, - plugin=_current_plugin.get(), - module=_get_matcher_module(_depth + 1), - default_state=state, - default_state_factory=state_factory) + matcher = Matcher.new( + "message", + Rule() & rule, + permission or Permission(), + temp=temp, + priority=priority, + block=block, + handlers=handlers, + plugin=_current_plugin.get(), + module=_get_matcher_module(_depth + 1), + default_state=state, + default_state_factory=state_factory, + ) _store_matcher(matcher) return matcher -def on_notice(rule: Optional[Union[Rule, T_RuleChecker]] = None, - *, - handlers: Optional[List[Union[T_Handler, Handler]]] = None, - temp: bool = False, - priority: int = 1, - block: bool = False, - state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None, - _depth: int = 0) -> Type[Matcher]: +def on_notice( + rule: Optional[Union[Rule, T_RuleChecker]] = None, + *, + handlers: Optional[List[Union[T_Handler, Handler]]] = None, + temp: bool = False, + priority: int = 1, + block: bool = False, + state: Optional[T_State] = None, + state_factory: Optional[T_StateFactory] = None, + _depth: int = 0, +) -> Type[Matcher]: """ :说明: @@ -193,30 +217,34 @@ def on_notice(rule: Optional[Union[Rule, T_RuleChecker]] = None, - ``Type[Matcher]`` """ - matcher = Matcher.new("notice", - Rule() & rule, - Permission(), - temp=temp, - priority=priority, - block=block, - handlers=handlers, - plugin=_current_plugin.get(), - module=_get_matcher_module(_depth + 1), - default_state=state, - default_state_factory=state_factory) + matcher = Matcher.new( + "notice", + Rule() & rule, + Permission(), + temp=temp, + priority=priority, + block=block, + handlers=handlers, + plugin=_current_plugin.get(), + module=_get_matcher_module(_depth + 1), + default_state=state, + default_state_factory=state_factory, + ) _store_matcher(matcher) return matcher -def on_request(rule: Optional[Union[Rule, T_RuleChecker]] = None, - *, - handlers: Optional[List[Union[T_Handler, Handler]]] = None, - temp: bool = False, - priority: int = 1, - block: bool = False, - state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None, - _depth: int = 0) -> Type[Matcher]: +def on_request( + rule: Optional[Union[Rule, T_RuleChecker]] = None, + *, + handlers: Optional[List[Union[T_Handler, Handler]]] = None, + temp: bool = False, + priority: int = 1, + block: bool = False, + state: Optional[T_State] = None, + state_factory: Optional[T_StateFactory] = None, + _depth: int = 0, +) -> Type[Matcher]: """ :说明: @@ -236,26 +264,30 @@ def on_request(rule: Optional[Union[Rule, T_RuleChecker]] = None, - ``Type[Matcher]`` """ - matcher = Matcher.new("request", - Rule() & rule, - Permission(), - temp=temp, - priority=priority, - block=block, - handlers=handlers, - plugin=_current_plugin.get(), - module=_get_matcher_module(_depth + 1), - default_state=state, - default_state_factory=state_factory) + matcher = Matcher.new( + "request", + Rule() & rule, + Permission(), + temp=temp, + priority=priority, + block=block, + handlers=handlers, + plugin=_current_plugin.get(), + module=_get_matcher_module(_depth + 1), + default_state=state, + default_state_factory=state_factory, + ) _store_matcher(matcher) return matcher -def on_startswith(msg: Union[str, Tuple[str, ...]], - rule: Optional[Optional[Union[Rule, T_RuleChecker]]] = None, - ignorecase: bool = False, - _depth: int = 0, - **kwargs) -> Type[Matcher]: +def on_startswith( + msg: Union[str, Tuple[str, ...]], + rule: Optional[Optional[Union[Rule, T_RuleChecker]]] = None, + ignorecase: bool = False, + _depth: int = 0, + **kwargs, +) -> Type[Matcher]: """ :说明: @@ -278,16 +310,16 @@ def on_startswith(msg: Union[str, Tuple[str, ...]], - ``Type[Matcher]`` """ - return on_message(startswith(msg, ignorecase) & rule, - **kwargs, - _depth=_depth + 1) + return on_message(startswith(msg, ignorecase) & rule, **kwargs, _depth=_depth + 1) -def on_endswith(msg: Union[str, Tuple[str, ...]], - rule: Optional[Optional[Union[Rule, T_RuleChecker]]] = None, - ignorecase: bool = False, - _depth: int = 0, - **kwargs) -> Type[Matcher]: +def on_endswith( + msg: Union[str, Tuple[str, ...]], + rule: Optional[Optional[Union[Rule, T_RuleChecker]]] = None, + ignorecase: bool = False, + _depth: int = 0, + **kwargs, +) -> Type[Matcher]: """ :说明: @@ -310,15 +342,15 @@ def on_endswith(msg: Union[str, Tuple[str, ...]], - ``Type[Matcher]`` """ - return on_message(endswith(msg, ignorecase) & rule, - **kwargs, - _depth=_depth + 1) + return on_message(endswith(msg, ignorecase) & rule, **kwargs, _depth=_depth + 1) -def on_keyword(keywords: Set[str], - rule: Optional[Union[Rule, T_RuleChecker]] = None, - _depth: int = 0, - **kwargs) -> Type[Matcher]: +def on_keyword( + keywords: Set[str], + rule: Optional[Union[Rule, T_RuleChecker]] = None, + _depth: int = 0, + **kwargs, +) -> Type[Matcher]: """ :说明: @@ -343,11 +375,13 @@ def on_keyword(keywords: Set[str], return on_message(keyword(*keywords) & rule, **kwargs, _depth=_depth + 1) -def on_command(cmd: Union[str, Tuple[str, ...]], - rule: Optional[Union[Rule, T_RuleChecker]] = None, - aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = None, - _depth: int = 0, - **kwargs) -> Type[Matcher]: +def on_command( + cmd: Union[str, Tuple[str, ...]], + rule: Optional[Union[Rule, T_RuleChecker]] = None, + aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = None, + _depth: int = 0, + **kwargs, +) -> Type[Matcher]: """ :说明: @@ -382,7 +416,8 @@ def on_command(cmd: Union[str, Tuple[str, ...]], if not segment_text.startswith(state[PREFIX_KEY][RAW_CMD_KEY]): return new_message = message.__class__( - segment_text[len(state[PREFIX_KEY][RAW_CMD_KEY]):].lstrip()) + segment_text[len(state[PREFIX_KEY][RAW_CMD_KEY]) :].lstrip() + ) for new_segment in reversed(new_message): message.insert(0, new_segment) @@ -390,18 +425,19 @@ def on_command(cmd: Union[str, Tuple[str, ...]], handlers.insert(0, _strip_cmd) commands = set([cmd]) | (aliases or set()) - return on_message(command(*commands) & rule, - handlers=handlers, - **kwargs, - _depth=_depth + 1) + return on_message( + command(*commands) & rule, handlers=handlers, **kwargs, _depth=_depth + 1 + ) -def on_shell_command(cmd: Union[str, Tuple[str, ...]], - rule: Optional[Union[Rule, T_RuleChecker]] = None, - aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = None, - parser: Optional[ArgumentParser] = None, - _depth: int = 0, - **kwargs) -> Type[Matcher]: +def on_shell_command( + cmd: Union[str, Tuple[str, ...]], + rule: Optional[Union[Rule, T_RuleChecker]] = None, + aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = None, + parser: Optional[ArgumentParser] = None, + _depth: int = 0, + **kwargs, +) -> Type[Matcher]: """ :说明: @@ -434,7 +470,8 @@ def on_shell_command(cmd: Union[str, Tuple[str, ...]], message = event.get_message() segment = message.pop(0) new_message = message.__class__( - str(segment)[len(state[PREFIX_KEY][RAW_CMD_KEY]):].strip()) + str(segment)[len(state[PREFIX_KEY][RAW_CMD_KEY]) :].strip() + ) for new_segment in reversed(new_message): message.insert(0, new_segment) @@ -442,17 +479,21 @@ def on_shell_command(cmd: Union[str, Tuple[str, ...]], handlers.insert(0, _strip_cmd) commands = set([cmd]) | (aliases or set()) - return on_message(shell_command(*commands, parser=parser) & rule, - handlers=handlers, - **kwargs, - _depth=_depth + 1) + return on_message( + shell_command(*commands, parser=parser) & rule, + handlers=handlers, + **kwargs, + _depth=_depth + 1, + ) -def on_regex(pattern: str, - flags: Union[int, re.RegexFlag] = 0, - rule: Optional[Union[Rule, T_RuleChecker]] = None, - _depth: int = 0, - **kwargs) -> Type[Matcher]: +def on_regex( + pattern: str, + flags: Union[int, re.RegexFlag] = 0, + rule: Optional[Union[Rule, T_RuleChecker]] = None, + _depth: int = 0, + **kwargs, +) -> Type[Matcher]: """ :说明: @@ -503,8 +544,7 @@ class CommandGroup: - **说明**: 其他传递给 ``on_command`` 的参数默认值 """ - def command(self, cmd: Union[str, Tuple[str, ...]], - **kwargs) -> Type[Matcher]: + def command(self, cmd: Union[str, Tuple[str, ...]], **kwargs) -> Type[Matcher]: """ :说明: @@ -526,8 +566,9 @@ class CommandGroup: final_kwargs.update(kwargs) return on_command(cmd, **final_kwargs, _depth=1) - def shell_command(self, cmd: Union[str, Tuple[str, ...]], - **kwargs) -> Type[Matcher]: + def shell_command( + self, cmd: Union[str, Tuple[str, ...]], **kwargs + ) -> Type[Matcher]: """ :说明: @@ -708,8 +749,9 @@ class MatcherGroup: self.matchers.append(matcher) return matcher - def on_startswith(self, msg: Union[str, Tuple[str, ...]], - **kwargs) -> Type[Matcher]: + def on_startswith( + self, msg: Union[str, Tuple[str, ...]], **kwargs + ) -> Type[Matcher]: """ :说明: @@ -739,8 +781,7 @@ class MatcherGroup: self.matchers.append(matcher) return matcher - def on_endswith(self, msg: Union[str, Tuple[str, ...]], - **kwargs) -> Type[Matcher]: + def on_endswith(self, msg: Union[str, Tuple[str, ...]], **kwargs) -> Type[Matcher]: """ :说明: @@ -799,10 +840,12 @@ class MatcherGroup: self.matchers.append(matcher) return matcher - def on_command(self, - cmd: Union[str, Tuple[str, ...]], - aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = None, - **kwargs) -> Type[Matcher]: + def on_command( + self, + cmd: Union[str, Tuple[str, ...]], + aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = None, + **kwargs, + ) -> Type[Matcher]: """ :说明: @@ -834,12 +877,13 @@ class MatcherGroup: self.matchers.append(matcher) return matcher - def on_shell_command(self, - cmd: Union[str, Tuple[str, ...]], - aliases: Optional[Set[Union[str, Tuple[str, - ...]]]] = None, - parser: Optional[ArgumentParser] = None, - **kwargs) -> Type[Matcher]: + def on_shell_command( + self, + cmd: Union[str, Tuple[str, ...]], + aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = None, + parser: Optional[ArgumentParser] = None, + **kwargs, + ) -> Type[Matcher]: """ :说明: @@ -870,18 +914,15 @@ class MatcherGroup: final_kwargs = self.base_kwargs.copy() final_kwargs.update(kwargs) final_kwargs.pop("type", None) - matcher = on_shell_command(cmd, - aliases=aliases, - parser=parser, - **final_kwargs, - _depth=1) + matcher = on_shell_command( + cmd, aliases=aliases, parser=parser, **final_kwargs, _depth=1 + ) self.matchers.append(matcher) return matcher - def on_regex(self, - pattern: str, - flags: Union[int, re.RegexFlag] = 0, - **kwargs) -> Type[Matcher]: + def on_regex( + self, pattern: str, flags: Union[int, re.RegexFlag] = 0, **kwargs + ) -> Type[Matcher]: """ :说明: diff --git a/nonebot/plugin/on.pyi b/nonebot/plugin/on.pyi index 68e8ad62..affd285b 100644 --- a/nonebot/plugin/on.pyi +++ b/nonebot/plugin/on.pyi @@ -7,361 +7,335 @@ from nonebot.permission import Permission from nonebot.rule import Rule, ArgumentParser from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_StateFactory - -def on(type: str = "", - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - *, - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - +def on( + type: str = "", + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + permission: Optional[Permission] = ..., + *, + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., +) -> Type[Matcher]: ... def on_metaevent( - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - *, - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - -def on_message(rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - *, - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - -def on_notice(rule: Optional[Union[Rule, T_RuleChecker]] = ..., - *, - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - -def on_request(rule: Optional[Union[Rule, T_RuleChecker]] = ..., - *, - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + *, + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., +) -> Type[Matcher]: ... +def on_message( + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + permission: Optional[Permission] = ..., + *, + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., +) -> Type[Matcher]: ... +def on_notice( + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + *, + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., +) -> Type[Matcher]: ... +def on_request( + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + *, + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., +) -> Type[Matcher]: ... def on_startswith( - msg: Union[str, Tuple[str, ...]], - rule: Optional[Optional[Union[Rule, T_RuleChecker]]] = ..., - ignorecase: bool = ..., + msg: Union[str, Tuple[str, ...]], + rule: Optional[Optional[Union[Rule, T_RuleChecker]]] = ..., + ignorecase: bool = ..., + *, + permission: Optional[Permission] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., +) -> Type[Matcher]: ... +def on_endswith( + msg: Union[str, Tuple[str, ...]], + rule: Optional[Optional[Union[Rule, T_RuleChecker]]] = ..., + ignorecase: bool = ..., + *, + permission: Optional[Permission] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., +) -> Type[Matcher]: ... +def on_keyword( + keywords: Set[str], + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + *, + permission: Optional[Permission] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., +) -> Type[Matcher]: ... +def on_command( + cmd: Union[str, Tuple[str, ...]], + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = ..., + *, + permission: Optional[Permission] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., +) -> Type[Matcher]: ... +def on_shell_command( + cmd: Union[str, Tuple[str, ...]], + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = ..., + parser: Optional[ArgumentParser] = ..., + *, + permission: Optional[Permission] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., +) -> Type[Matcher]: ... +def on_regex( + pattern: str, + flags: Union[int, re.RegexFlag] = ..., + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + *, + permission: Optional[Permission] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., +) -> Type[Matcher]: ... + +class CommandGroup: + def __init__( + self, + cmd: Union[str, Tuple[str, ...]], *, + rule: Optional[Union[Rule, T_RuleChecker]] = ..., permission: Optional[Permission] = ..., handlers: Optional[List[Union[T_Handler, Handler]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - -def on_endswith(msg: Union[str, Tuple[str, ...]], - rule: Optional[Optional[Union[Rule, T_RuleChecker]]] = ..., - ignorecase: bool = ..., - *, - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - -def on_keyword(keywords: Set[str], - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - *, - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - -def on_command(cmd: Union[str, Tuple[str, ...]], - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = ..., - *, - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - -def on_shell_command( + state_factory: Optional[T_StateFactory] = ..., + ): ... + def command( + self, cmd: Union[str, Tuple[str, ...]], + *, + aliases: Optional[Set[Union[str, Tuple[str, ...]]]], rule: Optional[Union[Rule, T_RuleChecker]] = ..., + permission: Optional[Permission] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., + ) -> Type[Matcher]: ... + def shell_command( + self, + cmd: Union[str, Tuple[str, ...]], + *, + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + aliases: Optional[Set[Union[str, Tuple[str, ...]]]], + parser: Optional[ArgumentParser] = ..., + permission: Optional[Permission] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., + ) -> Type[Matcher]: ... + +class MatcherGroup: + def __init__( + self, + *, + type: str = ..., + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + permission: Optional[Permission] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., + ): ... + def on( + self, + *, + type: str = ..., + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + permission: Optional[Permission] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., + ) -> Type[Matcher]: ... + def on_metaevent( + self, + *, + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., + ) -> Type[Matcher]: ... + def on_message( + self, + *, + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + permission: Optional[Permission] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., + ) -> Type[Matcher]: ... + def on_notice( + self, + *, + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., + ) -> Type[Matcher]: ... + def on_request( + self, + *, + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., + ) -> Type[Matcher]: ... + def on_startswith( + self, + msg: Union[str, Tuple[str, ...]], + *, + ignorecase: bool = ..., + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + permission: Optional[Permission] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., + ) -> Type[Matcher]: ... + def on_endswith( + self, + msg: Union[str, Tuple[str, ...]], + *, + ignorecase: bool = ..., + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + permission: Optional[Permission] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., + ) -> Type[Matcher]: ... + def on_keyword( + self, + keywords: Set[str], + *, + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + permission: Optional[Permission] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., + ) -> Type[Matcher]: ... + def on_command( + self, + cmd: Union[str, Tuple[str, ...]], + aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = ..., + *, + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + permission: Optional[Permission] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., + ) -> Type[Matcher]: ... + def on_shell_command( + self, + cmd: Union[str, Tuple[str, ...]], aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = ..., parser: Optional[ArgumentParser] = ..., *, + rule: Optional[Union[Rule, T_RuleChecker]] = ..., permission: Optional[Permission] = ..., handlers: Optional[List[Union[T_Handler, Handler]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - -def on_regex(pattern: str, - flags: Union[int, re.RegexFlag] = ..., - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - *, - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - -class CommandGroup: - - def __init__(self, - cmd: Union[str, Tuple[str, ...]], - *, - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...): - ... - - def command(self, - cmd: Union[str, Tuple[str, ...]], - *, - aliases: Optional[Set[Union[str, Tuple[str, ...]]]], - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - def shell_command( - self, - cmd: Union[str, Tuple[str, ...]], - *, - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - aliases: Optional[Set[Union[str, Tuple[str, ...]]]], - parser: Optional[ArgumentParser] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - -class MatcherGroup: - - def __init__(self, - *, - type: str = ..., - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...): - ... - - def on(self, - *, - type: str = ..., - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - def on_metaevent( - self, - *, - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - def on_message( - self, - *, - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - def on_notice( - self, - *, - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - def on_request( - self, - *, - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - def on_startswith( - self, - msg: Union[str, Tuple[str, ...]], - *, - ignorecase: bool = ..., - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - def on_endswith( - self, - msg: Union[str, Tuple[str, ...]], - *, - ignorecase: bool = ..., - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - def on_keyword( - self, - keywords: Set[str], - *, - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - def on_command( - self, - cmd: Union[str, Tuple[str, ...]], - aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = ..., - *, - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - - def on_shell_command( - self, - cmd: Union[str, Tuple[str, ...]], - aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = ..., - parser: Optional[ArgumentParser] = ..., - *, - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... - + state_factory: Optional[T_StateFactory] = ..., + ) -> Type[Matcher]: ... def on_regex( - self, - pattern: str, - flags: Union[int, re.RegexFlag] = ..., - *, - rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., - temp: bool = ..., - priority: int = ..., - block: bool = ..., - state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ...) -> Type[Matcher]: - ... + self, + pattern: str, + flags: Union[int, re.RegexFlag] = ..., + *, + rule: Optional[Union[Rule, T_RuleChecker]] = ..., + permission: Optional[Permission] = ..., + handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + temp: bool = ..., + priority: int = ..., + block: bool = ..., + state: Optional[T_State] = ..., + state_factory: Optional[T_StateFactory] = ..., + ) -> Type[Matcher]: ... diff --git a/nonebot/plugin/plugin.py b/nonebot/plugin/plugin.py index ee5a7c51..49e95dc2 100644 --- a/nonebot/plugin/plugin.py +++ b/nonebot/plugin/plugin.py @@ -15,6 +15,7 @@ plugins: Dict[str, "Plugin"] = {} @dataclass(eq=False) class Plugin(object): """存储插件信息""" + name: str """ - **类型**: ``str`` diff --git a/nonebot/plugins/echo.py b/nonebot/plugins/echo.py index 763fd715..42e99cc3 100644 --- a/nonebot/plugins/echo.py +++ b/nonebot/plugins/echo.py @@ -3,15 +3,18 @@ from functools import reduce from nonebot.rule import to_me from nonebot.plugin import on_command from nonebot.permission import SUPERUSER -from nonebot.adapters.cqhttp import (Message, MessageEvent, MessageSegment, - unescape) +from nonebot.adapters.cqhttp import ( + Message, + MessageEvent, + MessageSegment, + unescape, +) say = on_command("say", to_me(), permission=SUPERUSER) @say.handle() async def say_unescape(event: MessageEvent): - def _unescape(message: Message, segment: MessageSegment): if segment.is_text(): return message.append(unescape(str(segment))) diff --git a/nonebot/plugins/single_session.py b/nonebot/plugins/single_session.py index 7bb4d52e..e76e1a1b 100644 --- a/nonebot/plugins/single_session.py +++ b/nonebot/plugins/single_session.py @@ -1,8 +1,11 @@ from typing import Dict from nonebot.adapters import Event -from nonebot.message import (IgnoredException, run_preprocessor, - run_postprocessor) +from nonebot.message import ( + IgnoredException, + run_preprocessor, + run_postprocessor, +) _running_matcher: Dict[str, int] = {} diff --git a/nonebot/rule.py b/nonebot/rule.py index 2059ceac..e72cc372 100644 --- a/nonebot/rule.py +++ b/nonebot/rule.py @@ -17,8 +17,18 @@ from argparse import Namespace from contextlib import AsyncExitStack from typing_extensions import TypedDict from argparse import ArgumentParser as ArgParser -from typing import (Any, Dict, List, Type, Tuple, Union, Callable, NoReturn, - Optional, Sequence) +from typing import ( + Any, + Dict, + List, + Type, + Tuple, + Union, + Callable, + NoReturn, + Optional, + Sequence, +) from pygtrie import CharTrie @@ -33,10 +43,9 @@ PREFIX_KEY = "_prefix" SUFFIX_KEY = "_suffix" CMD_KEY = "command" RAW_CMD_KEY = "raw_command" -CMD_RESULT = TypedDict("CMD_RESULT", { - "command": Optional[Tuple[str, ...]], - "raw_command": Optional[str] -}) +CMD_RESULT = TypedDict( + "CMD_RESULT", {"command": Optional[Tuple[str, ...]], "raw_command": Optional[str]} +) SHELL_ARGS = "_args" SHELL_ARGV = "_argv" @@ -61,11 +70,14 @@ class Rule: from nonebot.utils import run_sync Rule(async_function, run_sync(sync_function)) """ + __slots__ = ("checkers",) HANDLER_PARAM_TYPES = [ - params.BotParam, params.EventParam, params.StateParam, - params.DefaultParam + params.BotParam, + params.EventParam, + params.StateParam, + params.DefaultParam, ] def __init__(self, *checkers: Union[T_RuleChecker, Handler]) -> None: @@ -76,9 +88,11 @@ class Rule: """ self.checkers = set( - checker if isinstance(checker, Handler) else Handler( - checker, allow_types=self.HANDLER_PARAM_TYPES) - for checker in checkers) + checker + if isinstance(checker, Handler) + else Handler(checker, allow_types=self.HANDLER_PARAM_TYPES) + for checker in checkers + ) """ :说明: @@ -95,8 +109,8 @@ class Rule: event: Event, state: T_State, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[Dict[Callable[..., Any], - Any]] = None) -> bool: + dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, + ) -> bool: """ :说明: @@ -117,12 +131,17 @@ class Rule: if not self.checkers: return True results = await asyncio.gather( - *(checker(bot=bot, - event=event, - state=state, - _stack=stack, - _dependency_cache=dependency_cache) - for checker in self.checkers)) + *( + checker( + bot=bot, + event=event, + state=state, + _stack=stack, + _dependency_cache=dependency_cache, + ) + for checker in self.checkers + ) + ) return all(results) def __and__(self, other: Optional[Union["Rule", T_RuleChecker]]) -> "Rule": @@ -156,8 +175,9 @@ class TrieRule: cls.suffix[suffix[::-1]] = value @classmethod - def get_value(cls, bot: Bot, event: Event, - state: T_State) -> Tuple[CMD_RESULT, CMD_RESULT]: + def get_value( + cls, bot: Bot, event: Event, state: T_State + ) -> Tuple[CMD_RESULT, CMD_RESULT]: prefix = CMD_RESULT(command=None, raw_command=None) suffix = CMD_RESULT(command=None, raw_command=None) state[PREFIX_KEY] = prefix @@ -180,8 +200,7 @@ class TrieRule: return prefix, suffix -def startswith(msg: Union[str, Tuple[str, ...]], - ignorecase: bool = False) -> Rule: +def startswith(msg: Union[str, Tuple[str, ...]], ignorecase: bool = False) -> Rule: """ :说明: @@ -196,7 +215,8 @@ def startswith(msg: Union[str, Tuple[str, ...]], pattern = re.compile( f"^(?:{'|'.join(re.escape(prefix) for prefix in msg)})", - re.IGNORECASE if ignorecase else 0) + re.IGNORECASE if ignorecase else 0, + ) async def _startswith(bot: Bot, event: Event, state: T_State) -> bool: if event.get_type() != "message": @@ -207,8 +227,7 @@ def startswith(msg: Union[str, Tuple[str, ...]], return Rule(_startswith) -def endswith(msg: Union[str, Tuple[str, ...]], - ignorecase: bool = False) -> Rule: +def endswith(msg: Union[str, Tuple[str, ...]], ignorecase: bool = False) -> Rule: """ :说明: @@ -223,7 +242,8 @@ def endswith(msg: Union[str, Tuple[str, ...]], pattern = re.compile( f"(?:{'|'.join(re.escape(prefix) for prefix in msg)})$", - re.IGNORECASE if ignorecase else 0) + re.IGNORECASE if ignorecase else 0, + ) async def _endswith(bot: Bot, event: Event, state: T_State) -> bool: if event.get_type() != "message": @@ -314,19 +334,22 @@ class ArgumentParser(ArgParser): setattr(self, "message", old_message) def exit(self, status: int = 0, message: Optional[str] = None): - raise ParserExit(status=status, - message=message or getattr(self, "message", None)) + raise ParserExit( + status=status, message=message or getattr(self, "message", None) + ) - def parse_args(self, - args: Optional[Sequence[str]] = None, - namespace: Optional[Namespace] = None) -> Namespace: + def parse_args( + self, + args: Optional[Sequence[str]] = None, + namespace: Optional[Namespace] = None, + ) -> Namespace: setattr(self, "message", "") - return super().parse_args(args=args, - namespace=namespace) # type: ignore + return super().parse_args(args=args, namespace=namespace) # type: ignore -def shell_command(*cmds: Union[str, Tuple[str, ...]], - parser: Optional[ArgumentParser] = None) -> Rule: +def shell_command( + *cmds: Union[str, Tuple[str, ...]], parser: Optional[ArgumentParser] = None +) -> Rule: r""" :说明: @@ -361,8 +384,7 @@ def shell_command(*cmds: Union[str, Tuple[str, ...]], \:\:\: """ if not isinstance(parser, ArgumentParser): - raise TypeError( - "`parser` must be an instance of nonebot.rule.ArgumentParser") + raise TypeError("`parser` must be an instance of nonebot.rule.ArgumentParser") config = get_driver().config command_start = config.command_start @@ -382,8 +404,7 @@ def shell_command(*cmds: Union[str, Tuple[str, ...]], async def _shell_command(event: Event, state: T_State) -> bool: if state[PREFIX_KEY][CMD_KEY] in commands: message = str(event.get_message()) - strip_message = message[len(state[PREFIX_KEY][RAW_CMD_KEY] - ):].lstrip() + strip_message = message[len(state[PREFIX_KEY][RAW_CMD_KEY]) :].lstrip() state[SHELL_ARGV] = shlex.split(strip_message) if parser: try: diff --git a/nonebot/typing.py b/nonebot/typing.py index 3394cd6f..04632c72 100644 --- a/nonebot/typing.py +++ b/nonebot/typing.py @@ -18,8 +18,17 @@ https://docs.python.org/3/library/typing.html """ -from typing import (TYPE_CHECKING, Any, Dict, Union, TypeVar, Callable, - NoReturn, Optional, Awaitable) +from typing import ( + TYPE_CHECKING, + Any, + Dict, + Union, + TypeVar, + Callable, + NoReturn, + Optional, + Awaitable, +) if TYPE_CHECKING: from nonebot.adapters import Bot, Event @@ -29,10 +38,8 @@ T_Wrapped = TypeVar("T_Wrapped", bound=Callable) def overrides(InterfaceClass: object): - def overrider(func: T_Wrapped) -> T_Wrapped: - assert func.__name__ in dir( - InterfaceClass), f"Error method: {func.__name__}" + assert func.__name__ in dir(InterfaceClass), f"Error method: {func.__name__}" return func return overrider @@ -80,7 +87,8 @@ T_CallingAPIHook = Callable[["Bot", str, Dict[str, Any]], Awaitable[None]] ``bot.call_api`` 时执行的函数 """ T_CalledAPIHook = Callable[ - ["Bot", Optional[Exception], str, Dict[str, Any], Any], Awaitable[None]] + ["Bot", Optional[Exception], str, Dict[str, Any], Any], Awaitable[None] +] """ :类型: ``Callable[[Bot, Optional[Exception], str, Dict[str, Any], Any], Awaitable[None]]`` @@ -193,8 +201,9 @@ T_DependencyCache = Dict[T_Handler, Any] 依赖缓存, 用于存储依赖函数的返回值 """ -T_ArgsParser = Callable[["Bot", "Event", T_State], Union[Awaitable[None], - Awaitable[NoReturn]]] +T_ArgsParser = Callable[ + ["Bot", "Event", T_State], Union[Awaitable[None], Awaitable[NoReturn]] +] """ :类型: ``Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]`` @@ -210,8 +219,9 @@ T_TypeUpdater = Callable[["Bot", "Event", T_State, str], Awaitable[str]] TypeUpdater 在 Matcher.pause, Matcher.reject 时被运行，用于更新响应的事件类型。默认会更新为 ``message``。 """ -T_PermissionUpdater = Callable[["Bot", "Event", T_State, "Permission"], - Awaitable["Permission"]] +T_PermissionUpdater = Callable[ + ["Bot", "Event", T_State, "Permission"], Awaitable["Permission"] +] """ :类型: ``Callable[[Bot, Event, T_State, Permission], Awaitable[Permission]]`` diff --git a/nonebot/utils.py b/nonebot/utils.py index 32eca0db..001ee43e 100644 --- a/nonebot/utils.py +++ b/nonebot/utils.py @@ -8,8 +8,19 @@ from functools import wraps, partial from contextlib import asynccontextmanager from typing_extensions import GenericAlias # type: ignore from typing_extensions import ParamSpec, get_args, get_origin -from typing import (Any, Type, Deque, Tuple, Union, TypeVar, Callable, Optional, - Awaitable, AsyncGenerator, ContextManager) +from typing import ( + Any, + Type, + Deque, + Tuple, + Union, + TypeVar, + Callable, + Optional, + Awaitable, + AsyncGenerator, + ContextManager, +) from nonebot.log import logger from nonebot.typing import overrides @@ -37,15 +48,16 @@ def escape_tag(s: str) -> str: def generic_check_issubclass( - cls: Any, class_or_tuple: Union[Type[Any], Tuple[Type[Any], - ...]]) -> bool: + cls: Any, class_or_tuple: Union[Type[Any], Tuple[Type[Any], ...]] +) -> bool: try: return issubclass(cls, class_or_tuple) except TypeError: if get_origin(cls) is Union: for type_ in get_args(cls): if type_ is not type(None) and not generic_check_issubclass( - type_, class_or_tuple): + type_, class_or_tuple + ): return False return True elif isinstance(cls, GenericAlias): @@ -104,7 +116,8 @@ def run_sync(func: Callable[P, R]) -> Callable[P, Awaitable[R]]: @asynccontextmanager async def run_sync_ctx_manager( - cm: ContextManager[T],) -> AsyncGenerator[T, None]: + cm: ContextManager[T], +) -> AsyncGenerator[T, None]: try: yield await run_sync(cm.__enter__)() except Exception as e: @@ -122,7 +135,6 @@ def get_name(obj: Any) -> str: class CacheLock: - def __init__(self): self._waiters: Optional[Deque[asyncio.Future]] = None self._locked = False @@ -144,8 +156,9 @@ class CacheLock: return self._locked async def acquire(self): - if (not self._locked and (self._waiters is None or - all(w.cancelled() for w in self._waiters))): + if not self._locked and ( + self._waiters is None or all(w.cancelled() for w in self._waiters) + ): self._locked = True return True @@ -223,6 +236,7 @@ def logger_wrapper(logger_name: str): def log(level: str, message: str, exception: Optional[Exception] = None): return logger.opt(colors=True, exception=exception).log( - level, f"{escape_tag(logger_name)} | " + message) + level, f"{escape_tag(logger_name)} | " + message + ) return log diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.py index 554e1209..be88edce 100644 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.py +++ b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.py @@ -12,8 +12,15 @@ from nonebot.typing import overrides from nonebot.message import handle_event from nonebot.adapters import Bot as BaseBot from nonebot.utils import DataclassEncoder, escape_tag -from nonebot.drivers import (Driver, WebSocket, HTTPRequest, HTTPResponse, - ForwardDriver, HTTPConnection, WebSocketSetup) +from nonebot.drivers import ( + Driver, + WebSocket, + HTTPRequest, + HTTPResponse, + ForwardDriver, + HTTPConnection, + WebSocketSetup, +) from .utils import log, escape from .config import Config as CQHTTPConfig @@ -49,15 +56,12 @@ async def _check_reply(bot: "Bot", event: "Event"): return try: - index = list(map(lambda x: x.type == "reply", - event.message)).index(True) + index = list(map(lambda x: x.type == "reply", event.message)).index(True) except ValueError: return msg_seg = event.message[index] try: - event.reply = Reply.parse_obj(await - bot.get_msg(message_id=msg_seg.data["id"] - )) + event.reply = Reply.parse_obj(await bot.get_msg(message_id=msg_seg.data["id"])) except Exception as e: log("WARNING", f"Error when getting message reply info: {repr(e)}", e) return @@ -68,8 +72,7 @@ async def _check_reply(bot: "Bot", event: "Event"): if len(event.message) > index and event.message[index].type == "at": del event.message[index] if len(event.message) > index and event.message[index].type == "text": - event.message[index].data["text"] = event.message[index].data[ - "text"].lstrip() + event.message[index].data["text"] = event.message[index].data["text"].lstrip() if not event.message[index].data["text"]: del event.message[index] if not event.message: @@ -99,23 +102,24 @@ def _check_at_me(bot: "Bot", event: "Event"): else: def _is_at_me_seg(segment: MessageSegment): - return segment.type == "at" and str(segment.data.get( - "qq", "")) == str(event.self_id) + return segment.type == "at" and str(segment.data.get("qq", "")) == str( + event.self_id + ) # check the first segment if _is_at_me_seg(event.message[0]): event.to_me = True event.message.pop(0) if event.message and event.message[0].type == "text": - event.message[0].data["text"] = event.message[0].data[ - "text"].lstrip() + event.message[0].data["text"] = event.message[0].data["text"].lstrip() if not event.message[0].data["text"]: del event.message[0] if event.message and _is_at_me_seg(event.message[0]): event.message.pop(0) if event.message and event.message[0].type == "text": - event.message[0].data["text"] = event.message[0].data[ - "text"].lstrip() + event.message[0].data["text"] = ( + event.message[0].data["text"].lstrip() + ) if not event.message[0].data["text"]: del event.message[0] @@ -123,9 +127,11 @@ def _check_at_me(bot: "Bot", event: "Event"): # check the last segment i = -1 last_msg_seg = event.message[i] - if last_msg_seg.type == "text" and \ - not last_msg_seg.data["text"].strip() and \ - len(event.message) >= 2: + if ( + last_msg_seg.type == "text" + and not last_msg_seg.data["text"].strip() + and len(event.message) >= 2 + ): i -= 1 last_msg_seg = event.message[i] @@ -161,13 +167,12 @@ def _check_nickname(bot: "Bot", event: "Event"): if nicknames: # check if the user is calling me with my nickname nickname_regex = "|".join(nicknames) - m = re.search(rf"^({nickname_regex})([\s,，]*|$)", first_text, - re.IGNORECASE) + m = re.search(rf"^({nickname_regex})([\s,，]*|$)", first_text, re.IGNORECASE) if m: nickname = m.group(1) log("DEBUG", f"User is calling me {nickname}") event.to_me = True - first_msg_seg.data["text"] = first_text[m.end():] + first_msg_seg.data["text"] = first_text[m.end() :] def _handle_api_result(result: Optional[Dict[str, Any]]) -> Any: @@ -206,8 +211,9 @@ class ResultStore: @classmethod def add_result(cls, result: Dict[str, Any]): - if isinstance(result.get("echo"), dict) and \ - isinstance(result["echo"].get("seq"), int): + if isinstance(result.get("echo"), dict) and isinstance( + result["echo"].get("seq"), int + ): future = cls._futures.get(result["echo"]["seq"]) if future: future.set_result(result) @@ -228,6 +234,7 @@ class Bot(BaseBot): """ CQHTTP 协议 Bot 适配。继承属性参考 `BaseBot <./#class-basebot>`_ 。 """ + cqhttp_config: CQHTTPConfig @property @@ -249,22 +256,25 @@ class Bot(BaseBot): elif isinstance(driver, ForwardDriver) and cls.cqhttp_config.ws_urls: for self_id, url in cls.cqhttp_config.ws_urls.items(): try: - headers = { - "authorization": - f"Bearer {cls.cqhttp_config.access_token}" - } if cls.cqhttp_config.access_token else {} + headers = ( + {"authorization": f"Bearer {cls.cqhttp_config.access_token}"} + if cls.cqhttp_config.access_token + else {} + ) driver.setup_websocket( - WebSocketSetup("cqhttp", self_id, url, headers=headers)) + WebSocketSetup("cqhttp", self_id, url, headers=headers) + ) except Exception as e: logger.opt(colors=True, exception=e).error( f"Bad url {escape_tag(url)} for bot {escape_tag(self_id)} " - "in cqhttp forward websocket") + "in cqhttp forward websocket" + ) @classmethod @overrides(BaseBot) async def check_permission( - cls, driver: Driver, - request: HTTPConnection) -> Tuple[Optional[str], HTTPResponse]: + cls, driver: Driver, request: HTTPConnection + ) -> Tuple[Optional[str], HTTPResponse]: """ :说明: @@ -286,22 +296,26 @@ class Bot(BaseBot): if not x_signature: log("WARNING", "Missing Signature Header") return None, HTTPResponse(401, b"Missing Signature") - sig = hmac.new(secret.encode("utf-8"), request.body, - "sha1").hexdigest() + sig = hmac.new(secret.encode("utf-8"), request.body, "sha1").hexdigest() if x_signature != "sha1=" + sig: log("WARNING", "Signature Header is invalid") return None, HTTPResponse(403, b"Signature is invalid") access_token = cqhttp_config.access_token - if access_token and access_token != token and isinstance( - request, WebSocket): + if access_token and access_token != token and isinstance(request, WebSocket): log( - "WARNING", "Authorization Header is invalid" - if token else "Missing Authorization Header") + "WARNING", + "Authorization Header is invalid" + if token + else "Missing Authorization Header", + ) return None, HTTPResponse( - 403, b"Authorization Header is invalid" - if token else b"Missing Authorization Header") - return str(x_self_id), HTTPResponse(204, b'') + 403, + b"Authorization Header is invalid" + if token + else b"Missing Authorization Header", + ) + return str(x_self_id), HTTPResponse(204, b"") @overrides(BaseBot) async def handle_message(self, message: bytes): @@ -320,7 +334,7 @@ class Bot(BaseBot): return try: - post_type = data['post_type'] + post_type = data["post_type"] detail_type = data.get(f"{post_type}_type") detail_type = f".{detail_type}" if detail_type else "" sub_type = data.get("sub_type") @@ -352,17 +366,13 @@ class Bot(BaseBot): if isinstance(self.request, WebSocket): seq = ResultStore.get_seq() json_data = json.dumps( - { - "action": api, - "params": data, - "echo": { - "seq": seq - } - }, - cls=DataclassEncoder) + {"action": api, "params": data, "echo": {"seq": seq}}, + cls=DataclassEncoder, + ) await self.request.send(json_data) - return _handle_api_result(await ResultStore.fetch( - seq, self.config.api_timeout)) + return _handle_api_result( + await ResultStore.fetch(seq, self.config.api_timeout) + ) elif isinstance(self.request, HTTPRequest): api_root = self.config.api_root.get(self.self_id) @@ -373,22 +383,25 @@ class Bot(BaseBot): headers = {"Content-Type": "application/json"} if self.cqhttp_config.access_token is not None: - headers[ - "Authorization"] = "Bearer " + self.cqhttp_config.access_token + headers["Authorization"] = "Bearer " + self.cqhttp_config.access_token try: - async with httpx.AsyncClient(headers=headers, - follow_redirects=True) as client: + async with httpx.AsyncClient( + headers=headers, follow_redirects=True + ) as client: response = await client.post( api_root + api, content=json.dumps(data, cls=DataclassEncoder), - timeout=self.config.api_timeout) + timeout=self.config.api_timeout, + ) if 200 <= response.status_code < 300: result = response.json() return _handle_api_result(result) - raise NetworkError(f"HTTP request received unexpected " - f"status code: {response.status_code}") + raise NetworkError( + f"HTTP request received unexpected " + f"status code: {response.status_code}" + ) except httpx.InvalidURL: raise NetworkError("API root url invalid") except httpx.HTTPError: @@ -418,11 +431,13 @@ class Bot(BaseBot): return await super().call_api(api, **data) @overrides(BaseBot) - async def send(self, - event: Event, - message: Union[str, Message, MessageSegment], - at_sender: bool = False, - **kwargs) -> Any: + async def send( + self, + event: Event, + message: Union[str, Message, MessageSegment], + at_sender: bool = False, + **kwargs, + ) -> Any: """ :说明: @@ -445,8 +460,9 @@ class Bot(BaseBot): - ``NetworkError``: 网络错误 - ``ActionFailed``: API 调用失败 """ - message = escape(message, escape_comma=False) if isinstance( - message, str) else message + message = ( + escape(message, escape_comma=False) if isinstance(message, str) else message + ) msg = message if isinstance(message, Message) else Message(message) at_sender = at_sender and bool(getattr(event, "user_id", None)) diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.pyi b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.pyi index 8152bb6f..39ad4122 100644 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.pyi +++ b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.pyi @@ -8,7 +8,6 @@ from nonebot.drivers import Driver, WebSocket from .event import Event from .message import Message, MessageSegment - def get_auth_bearer(access_token: Optional[str] = ...) -> Optional[str]: ... diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/config.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/config.py index ee894893..12908073 100644 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/config.py +++ b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/config.py @@ -1,6 +1,6 @@ from typing import Dict, Optional -from pydantic import Field, BaseModel, AnyUrl +from pydantic import Field, AnyUrl, BaseModel # priority: alias > origin @@ -14,11 +14,10 @@ class Config(BaseModel): - ``secret`` / ``cqhttp_secret``: CQHTTP HTTP 上报数据签名口令 - ``ws_urls`` / ``cqhttp_ws_urls``: CQHTTP 正向 Websocket 连接 Bot ID、目标 URL 字典 """ - access_token: Optional[str] = Field(default=None, - alias="cqhttp_access_token") + + access_token: Optional[str] = Field(default=None, alias="cqhttp_access_token") secret: Optional[str] = Field(default=None, alias="cqhttp_secret") - ws_urls: Dict[str, AnyUrl] = Field(default_factory=set, - alias="cqhttp_ws_urls") + ws_urls: Dict[str, AnyUrl] = Field(default_factory=set, alias="cqhttp_ws_urls") class Config: extra = "ignore" diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/event.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/event.py index 690a8437..21c7b34c 100644 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/event.py +++ b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/event.py @@ -5,12 +5,13 @@ from typing import TYPE_CHECKING, List, Type, Optional from pydantic import BaseModel from pygtrie import StringTrie -from .message import Message from nonebot.typing import overrides from nonebot.utils import escape_tag -from .exception import NoLogException from nonebot.adapters import Event as BaseEvent +from .message import Message +from .exception import NoLogException + if TYPE_CHECKING: from .bot import Bot @@ -22,6 +23,7 @@ class Event(BaseEvent): .. _CQHTTP 文档: https://github.com/howmanybots/onebot/blob/master/README.md """ + __event__ = "" time: int self_id: int @@ -118,6 +120,7 @@ class Status(BaseModel): # Message Events class MessageEvent(Event): """消息事件""" + __event__ = "message" post_type: Literal["message"] sub_type: str @@ -144,8 +147,9 @@ class MessageEvent(Event): @overrides(Event) def get_event_name(self) -> str: sub_type = getattr(self, "sub_type", None) - return f"{self.post_type}.{self.message_type}" + (f".{sub_type}" - if sub_type else "") + return f"{self.post_type}.{self.message_type}" + ( + f".{sub_type}" if sub_type else "" + ) @overrides(Event) def get_message(self) -> Message: @@ -170,20 +174,29 @@ class MessageEvent(Event): class PrivateMessageEvent(MessageEvent): """私聊消息""" + __event__ = "message.private" message_type: Literal["private"] @overrides(Event) def get_event_description(self) -> str: - return (f'Message {self.message_id} from {self.user_id} "' + "".join( - map( - lambda x: escape_tag(str(x)) - if x.is_text() else f"{escape_tag(str(x))}", - self.message)) + '"') + return ( + f'Message {self.message_id} from {self.user_id} "' + + "".join( + map( + lambda x: escape_tag(str(x)) + if x.is_text() + else f"{escape_tag(str(x))}", + self.message, + ) + ) + + '"' + ) class GroupMessageEvent(MessageEvent): """群消息""" + __event__ = "message.group" message_type: Literal["group"] group_id: int @@ -196,8 +209,13 @@ class GroupMessageEvent(MessageEvent): + "".join( map( lambda x: escape_tag(str(x)) - if x.is_text() else f"{escape_tag(str(x))}", - self.message)) + '"') + if x.is_text() + else f"{escape_tag(str(x))}", + self.message, + ) + ) + + '"' + ) @overrides(MessageEvent) def get_session_id(self) -> str: @@ -207,6 +225,7 @@ class GroupMessageEvent(MessageEvent): # Notice Events class NoticeEvent(Event): """通知事件""" + __event__ = "notice" post_type: Literal["notice"] notice_type: str @@ -214,12 +233,14 @@ class NoticeEvent(Event): @overrides(Event) def get_event_name(self) -> str: sub_type = getattr(self, "sub_type", None) - return f"{self.post_type}.{self.notice_type}" + (f".{sub_type}" - if sub_type else "") + return f"{self.post_type}.{self.notice_type}" + ( + f".{sub_type}" if sub_type else "" + ) class GroupUploadNoticeEvent(NoticeEvent): """群文件上传事件""" + __event__ = "notice.group_upload" notice_type: Literal["group_upload"] user_id: int @@ -237,6 +258,7 @@ class GroupUploadNoticeEvent(NoticeEvent): class GroupAdminNoticeEvent(NoticeEvent): """群管理员变动""" + __event__ = "notice.group_admin" notice_type: Literal["group_admin"] sub_type: str @@ -258,6 +280,7 @@ class GroupAdminNoticeEvent(NoticeEvent): class GroupDecreaseNoticeEvent(NoticeEvent): """群成员减少事件""" + __event__ = "notice.group_decrease" notice_type: Literal["group_decrease"] sub_type: str @@ -280,6 +303,7 @@ class GroupDecreaseNoticeEvent(NoticeEvent): class GroupIncreaseNoticeEvent(NoticeEvent): """群成员增加事件""" + __event__ = "notice.group_increase" notice_type: Literal["group_increase"] sub_type: str @@ -302,6 +326,7 @@ class GroupIncreaseNoticeEvent(NoticeEvent): class GroupBanNoticeEvent(NoticeEvent): """群禁言事件""" + __event__ = "notice.group_ban" notice_type: Literal["group_ban"] sub_type: str @@ -325,6 +350,7 @@ class GroupBanNoticeEvent(NoticeEvent): class FriendAddNoticeEvent(NoticeEvent): """好友添加事件""" + __event__ = "notice.friend_add" notice_type: Literal["friend_add"] user_id: int @@ -340,6 +366,7 @@ class FriendAddNoticeEvent(NoticeEvent): class GroupRecallNoticeEvent(NoticeEvent): """群消息撤回事件""" + __event__ = "notice.group_recall" notice_type: Literal["group_recall"] user_id: int @@ -362,6 +389,7 @@ class GroupRecallNoticeEvent(NoticeEvent): class FriendRecallNoticeEvent(NoticeEvent): """好友消息撤回事件""" + __event__ = "notice.friend_recall" notice_type: Literal["friend_recall"] user_id: int @@ -378,6 +406,7 @@ class FriendRecallNoticeEvent(NoticeEvent): class NotifyEvent(NoticeEvent): """提醒事件""" + __event__ = "notice.notify" notice_type: Literal["notify"] sub_type: str @@ -395,6 +424,7 @@ class NotifyEvent(NoticeEvent): class PokeNotifyEvent(NotifyEvent): """戳一戳提醒事件""" + __event__ = "notice.notify.poke" sub_type: Literal["poke"] target_id: int @@ -413,6 +443,7 @@ class PokeNotifyEvent(NotifyEvent): class LuckyKingNotifyEvent(NotifyEvent): """群红包运气王提醒事件""" + __event__ = "notice.notify.lucky_king" sub_type: Literal["lucky_king"] target_id: int @@ -432,6 +463,7 @@ class LuckyKingNotifyEvent(NotifyEvent): class HonorNotifyEvent(NotifyEvent): """群荣誉变更提醒事件""" + __event__ = "notice.notify.honor" sub_type: Literal["honor"] honor_type: str @@ -444,6 +476,7 @@ class HonorNotifyEvent(NotifyEvent): # Request Events class RequestEvent(Event): """请求事件""" + __event__ = "request" post_type: Literal["request"] request_type: str @@ -451,12 +484,14 @@ class RequestEvent(Event): @overrides(Event) def get_event_name(self) -> str: sub_type = getattr(self, "sub_type", None) - return f"{self.post_type}.{self.request_type}" + (f".{sub_type}" - if sub_type else "") + return f"{self.post_type}.{self.request_type}" + ( + f".{sub_type}" if sub_type else "" + ) class FriendRequestEvent(RequestEvent): """加好友请求事件""" + __event__ = "request.friend" request_type: Literal["friend"] user_id: int @@ -472,9 +507,9 @@ class FriendRequestEvent(RequestEvent): return str(self.user_id) async def approve(self, bot: "Bot", remark: str = ""): - return await bot.set_friend_add_request(flag=self.flag, - approve=True, - remark=remark) + return await bot.set_friend_add_request( + flag=self.flag, approve=True, remark=remark + ) async def reject(self, bot: "Bot"): return await bot.set_friend_add_request(flag=self.flag, approve=False) @@ -482,6 +517,7 @@ class FriendRequestEvent(RequestEvent): class GroupRequestEvent(RequestEvent): """加群请求/邀请事件""" + __event__ = "request.group" request_type: Literal["group"] sub_type: str @@ -499,20 +535,20 @@ class GroupRequestEvent(RequestEvent): return f"group_{self.group_id}_{self.user_id}" async def approve(self, bot: "Bot"): - return await bot.set_group_add_request(flag=self.flag, - sub_type=self.sub_type, - approve=True) + return await bot.set_group_add_request( + flag=self.flag, sub_type=self.sub_type, approve=True + ) async def reject(self, bot: "Bot", reason: str = ""): - return await bot.set_group_add_request(flag=self.flag, - sub_type=self.sub_type, - approve=False, - reason=reason) + return await bot.set_group_add_request( + flag=self.flag, sub_type=self.sub_type, approve=False, reason=reason + ) # Meta Events class MetaEvent(Event): """元事件""" + __event__ = "meta_event" post_type: Literal["meta_event"] meta_event_type: str @@ -520,8 +556,9 @@ class MetaEvent(Event): @overrides(Event) def get_event_name(self) -> str: sub_type = getattr(self, "sub_type", None) - return f"{self.post_type}.{self.meta_event_type}" + (f".{sub_type}" if - sub_type else "") + return f"{self.post_type}.{self.meta_event_type}" + ( + f".{sub_type}" if sub_type else "" + ) @overrides(Event) def get_log_string(self) -> str: @@ -530,6 +567,7 @@ class MetaEvent(Event): class LifecycleMetaEvent(MetaEvent): """生命周期元事件""" + __event__ = "meta_event.lifecycle" meta_event_type: Literal["lifecycle"] sub_type: str @@ -537,6 +575,7 @@ class LifecycleMetaEvent(MetaEvent): class HeartbeatMetaEvent(MetaEvent): """心跳元事件""" + __event__ = "meta_event.heartbeat" meta_event_type: Literal["heartbeat"] status: Status @@ -567,12 +606,28 @@ def get_event_model(event_name) -> List[Type[Event]]: __all__ = [ - "Event", "MessageEvent", "PrivateMessageEvent", "GroupMessageEvent", - "NoticeEvent", "GroupUploadNoticeEvent", "GroupAdminNoticeEvent", - "GroupDecreaseNoticeEvent", "GroupIncreaseNoticeEvent", - "GroupBanNoticeEvent", "FriendAddNoticeEvent", "GroupRecallNoticeEvent", - "FriendRecallNoticeEvent", "NotifyEvent", "PokeNotifyEvent", - "LuckyKingNotifyEvent", "HonorNotifyEvent", "RequestEvent", - "FriendRequestEvent", "GroupRequestEvent", "MetaEvent", - "LifecycleMetaEvent", "HeartbeatMetaEvent", "get_event_model" + "Event", + "MessageEvent", + "PrivateMessageEvent", + "GroupMessageEvent", + "NoticeEvent", + "GroupUploadNoticeEvent", + "GroupAdminNoticeEvent", + "GroupDecreaseNoticeEvent", + "GroupIncreaseNoticeEvent", + "GroupBanNoticeEvent", + "FriendAddNoticeEvent", + "GroupRecallNoticeEvent", + "FriendRecallNoticeEvent", + "NotifyEvent", + "PokeNotifyEvent", + "LuckyKingNotifyEvent", + "HonorNotifyEvent", + "RequestEvent", + "FriendRequestEvent", + "GroupRequestEvent", + "MetaEvent", + "LifecycleMetaEvent", + "HeartbeatMetaEvent", + "get_event_model", ] diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/exception.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/exception.py index 4d3fd1e9..1ea01f80 100644 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/exception.py +++ b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/exception.py @@ -8,7 +8,6 @@ from nonebot.exception import ApiNotAvailable as BaseApiNotAvailable class CQHTTPAdapterException(AdapterException): - def __init__(self): super().__init__("cqhttp") @@ -33,8 +32,11 @@ class ActionFailed(BaseActionFailed, CQHTTPAdapterException): self.info = kwargs def __repr__(self): - return f"" + return ( + f"" + ) def __str__(self): return self.__repr__() diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py index 37db4e88..8ca6378a 100644 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py +++ b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py @@ -5,10 +5,11 @@ from base64 import b64encode from typing import Any, Type, Tuple, Union, Mapping, Iterable, Optional, cast from nonebot.typing import overrides -from .utils import log, _b2s, escape, unescape from nonebot.adapters import Message as BaseMessage from nonebot.adapters import MessageSegment as BaseMessageSegment +from .utils import log, _b2s, escape, unescape + class MessageSegment(BaseMessageSegment["Message"]): """ @@ -27,23 +28,24 @@ class MessageSegment(BaseMessageSegment["Message"]): # process special types if type_ == "text": - return escape( - data.get("text", ""), # type: ignore - escape_comma=False) + return escape(data.get("text", ""), escape_comma=False) # type: ignore params = ",".join( - [f"{k}={escape(str(v))}" for k, v in data.items() if v is not None]) + [f"{k}={escape(str(v))}" for k, v in data.items() if v is not None] + ) return f"[CQ:{type_}{',' if params else ''}{params}]" @overrides(BaseMessageSegment) def __add__(self, other) -> "Message": - return Message(self) + (MessageSegment.text(other) if isinstance( - other, str) else other) + return Message(self) + ( + MessageSegment.text(other) if isinstance(other, str) else other + ) @overrides(BaseMessageSegment) def __radd__(self, other) -> "Message": - return (MessageSegment.text(other) - if isinstance(other, str) else Message(other)) + self + return ( + MessageSegment.text(other) if isinstance(other, str) else Message(other) + ) + self @overrides(BaseMessageSegment) def is_text(self) -> bool: @@ -83,11 +85,13 @@ class MessageSegment(BaseMessageSegment["Message"]): return MessageSegment("forward", {"id": id_}) @staticmethod - def image(file: Union[str, bytes, BytesIO, Path], - type_: Optional[str] = None, - cache: bool = True, - proxy: bool = True, - timeout: Optional[int] = None) -> "MessageSegment": + def image( + file: Union[str, bytes, BytesIO, Path], + type_: Optional[str] = None, + cache: bool = True, + proxy: bool = True, + timeout: Optional[int] = None, + ) -> "MessageSegment": if isinstance(file, BytesIO): file = file.getvalue() if isinstance(file, bytes): @@ -95,74 +99,85 @@ class MessageSegment(BaseMessageSegment["Message"]): elif isinstance(file, Path): file = f"file:///{file.resolve()}" return MessageSegment( - "image", { + "image", + { "file": file, "type": type_, "cache": _b2s(cache), "proxy": _b2s(proxy), - "timeout": timeout - }) + "timeout": timeout, + }, + ) @staticmethod def json(data: str) -> "MessageSegment": return MessageSegment("json", {"data": data}) @staticmethod - def location(latitude: float, - longitude: float, - title: Optional[str] = None, - content: Optional[str] = None) -> "MessageSegment": + def location( + latitude: float, + longitude: float, + title: Optional[str] = None, + content: Optional[str] = None, + ) -> "MessageSegment": return MessageSegment( - "location", { + "location", + { "lat": str(latitude), "lon": str(longitude), "title": title, - "content": content - }) + "content": content, + }, + ) @staticmethod def music(type_: str, id_: int) -> "MessageSegment": return MessageSegment("music", {"type": type_, "id": id_}) @staticmethod - def music_custom(url: str, - audio: str, - title: str, - content: Optional[str] = None, - img_url: Optional[str] = None) -> "MessageSegment": + def music_custom( + url: str, + audio: str, + title: str, + content: Optional[str] = None, + img_url: Optional[str] = None, + ) -> "MessageSegment": return MessageSegment( - "music", { + "music", + { "type": "custom", "url": url, "audio": audio, "title": title, "content": content, - "image": img_url - }) + "image": img_url, + }, + ) @staticmethod def node(id_: int) -> "MessageSegment": return MessageSegment("node", {"id": str(id_)}) @staticmethod - def node_custom(user_id: int, nickname: str, - content: Union[str, "Message"]) -> "MessageSegment": - return MessageSegment("node", { - "user_id": str(user_id), - "nickname": nickname, - "content": content - }) + def node_custom( + user_id: int, nickname: str, content: Union[str, "Message"] + ) -> "MessageSegment": + return MessageSegment( + "node", {"user_id": str(user_id), "nickname": nickname, "content": content} + ) @staticmethod def poke(type_: str, id_: str) -> "MessageSegment": return MessageSegment("poke", {"type": type_, "id": id_}) @staticmethod - def record(file: Union[str, bytes, BytesIO, Path], - magic: Optional[bool] = None, - cache: Optional[bool] = None, - proxy: Optional[bool] = None, - timeout: Optional[int] = None) -> "MessageSegment": + def record( + file: Union[str, bytes, BytesIO, Path], + magic: Optional[bool] = None, + cache: Optional[bool] = None, + proxy: Optional[bool] = None, + timeout: Optional[int] = None, + ) -> "MessageSegment": if isinstance(file, BytesIO): file = file.getvalue() if isinstance(file, bytes): @@ -170,13 +185,15 @@ class MessageSegment(BaseMessageSegment["Message"]): elif isinstance(file, Path): file = f"file:///{file.resolve()}" return MessageSegment( - "record", { + "record", + { "file": file, "magic": _b2s(magic), "cache": _b2s(cache), "proxy": _b2s(proxy), - "timeout": timeout - }) + "timeout": timeout, + }, + ) @staticmethod def reply(id_: int) -> "MessageSegment": @@ -191,26 +208,27 @@ class MessageSegment(BaseMessageSegment["Message"]): return MessageSegment("shake", {}) @staticmethod - def share(url: str = "", - title: str = "", - content: Optional[str] = None, - image: Optional[str] = None) -> "MessageSegment": - return MessageSegment("share", { - "url": url, - "title": title, - "content": content, - "image": image - }) + def share( + url: str = "", + title: str = "", + content: Optional[str] = None, + image: Optional[str] = None, + ) -> "MessageSegment": + return MessageSegment( + "share", {"url": url, "title": title, "content": content, "image": image} + ) @staticmethod def text(text: str) -> "MessageSegment": return MessageSegment("text", {"text": text}) @staticmethod - def video(file: Union[str, bytes, BytesIO, Path], - cache: Optional[bool] = None, - proxy: Optional[bool] = None, - timeout: Optional[int] = None) -> "MessageSegment": + def video( + file: Union[str, bytes, BytesIO, Path], + cache: Optional[bool] = None, + proxy: Optional[bool] = None, + timeout: Optional[int] = None, + ) -> "MessageSegment": if isinstance(file, BytesIO): file = file.getvalue() if isinstance(file, bytes): @@ -218,12 +236,14 @@ class MessageSegment(BaseMessageSegment["Message"]): elif isinstance(file, Path): file = f"file:///{file.resolve()}" return MessageSegment( - "video", { + "video", + { "file": file, "cache": _b2s(cache), "proxy": _b2s(proxy), - "timeout": timeout - }) + "timeout": timeout, + }, + ) @staticmethod def xml(data: str) -> "MessageSegment": @@ -241,22 +261,22 @@ class Message(BaseMessage[MessageSegment]): return MessageSegment @overrides(BaseMessage) - def __add__(self, other: Union[str, Mapping, - Iterable[Mapping]]) -> "Message": + def __add__(self, other: Union[str, Mapping, Iterable[Mapping]]) -> "Message": return super(Message, self).__add__( - MessageSegment.text(other) if isinstance(other, str) else other) + MessageSegment.text(other) if isinstance(other, str) else other + ) @overrides(BaseMessage) - def __radd__(self, other: Union[str, Mapping, - Iterable[Mapping]]) -> "Message": + def __radd__(self, other: Union[str, Mapping, Iterable[Mapping]]) -> "Message": return super(Message, self).__radd__( - MessageSegment.text(other) if isinstance(other, str) else other) + MessageSegment.text(other) if isinstance(other, str) else other + ) @staticmethod @overrides(BaseMessage) def _construct( - msg: Union[str, Mapping, - Iterable[Mapping]]) -> Iterable[MessageSegment]: + msg: Union[str, Mapping, Iterable[Mapping]] + ) -> Iterable[MessageSegment]: if isinstance(msg, Mapping): msg = cast(Mapping[str, Any], msg) yield MessageSegment(msg["type"], msg.get("data") or {}) @@ -270,14 +290,15 @@ class Message(BaseMessage[MessageSegment]): def _iter_message(msg: str) -> Iterable[Tuple[str, str]]: text_begin = 0 for cqcode in re.finditer( - r"\[CQ:(?P[a-zA-Z0-9-_.]+)" - r"(?P" - r"(?:,[a-zA-Z0-9-_.]+=[^,\]]+)*" - r"),?\]", msg): - yield "text", msg[text_begin:cqcode.pos + cqcode.start()] + r"\[CQ:(?P[a-zA-Z0-9-_.]+)" + r"(?P" + r"(?:,[a-zA-Z0-9-_.]+=[^,\]]+)*" + r"),?\]", + msg, + ): + yield "text", msg[text_begin : cqcode.pos + cqcode.start()] text_begin = cqcode.pos + cqcode.end() - yield cqcode.group("type"), cqcode.group("params").lstrip( - ",") + yield cqcode.group("type"), cqcode.group("params").lstrip(",") yield "text", msg[text_begin:] for type_, data in _iter_message(msg): @@ -287,10 +308,11 @@ class Message(BaseMessage[MessageSegment]): yield MessageSegment(type_, {"text": unescape(data)}) else: data = { - k: unescape(v) for k, v in map( + k: unescape(v) + for k, v in map( lambda x: x.split("=", maxsplit=1), - filter(lambda x: x, ( - x.lstrip() for x in data.split(",")))) + filter(lambda x: x, (x.lstrip() for x in data.split(","))), + ) } yield MessageSegment(type_, data) diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/permission.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/permission.py index 09ea7b7a..2a85d6f1 100644 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/permission.py +++ b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/permission.py @@ -1,5 +1,6 @@ from nonebot.adapters import Event from nonebot.permission import Permission + from .event import GroupMessageEvent, PrivateMessageEvent @@ -42,8 +43,7 @@ async def _group(event: Event) -> bool: async def _group_member(event: Event) -> bool: - return isinstance(event, - GroupMessageEvent) and event.sender.role == "member" + return isinstance(event, GroupMessageEvent) and event.sender.role == "member" async def _group_admin(event: Event) -> bool: @@ -76,6 +76,12 @@ GROUP_OWNER = Permission(_group_owner) """ __all__ = [ - "PRIVATE", "PRIVATE_FRIEND", "PRIVATE_GROUP", "PRIVATE_OTHER", "GROUP", - "GROUP_MEMBER", "GROUP_ADMIN", "GROUP_OWNER" + "PRIVATE", + "PRIVATE_FRIEND", + "PRIVATE_GROUP", + "PRIVATE_OTHER", + "GROUP", + "GROUP_MEMBER", + "GROUP_ADMIN", + "GROUP_OWNER", ] diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/utils.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/utils.py index 747b964f..a3d2d0e4 100644 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/utils.py +++ b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/utils.py @@ -16,9 +16,7 @@ def escape(s: str, *, escape_comma: bool = True) -> str: * ``s: str``: 需要转义的字符串 * ``escape_comma: bool``: 是否转义逗号（``,``）。 """ - s = s.replace("&", "&") \ - .replace("[", "[") \ - .replace("]", "]") + s = s.replace("&", "&").replace("[", "[").replace("]", "]") if escape_comma: s = s.replace(",", ",") return s @@ -34,10 +32,12 @@ def unescape(s: str) -> str: * ``s: str``: 需要转义的字符串 """ - return s.replace(",", ",") \ - .replace("[", "[") \ - .replace("]", "]") \ + return ( + s.replace(",", ",") + .replace("[", "[") + .replace("]", "]") .replace("&", "&") + ) def _b2s(b: Optional[bool]) -> Optional[str]: diff --git a/packages/nonebot-adapter-cqhttp/pyproject.toml b/packages/nonebot-adapter-cqhttp/pyproject.toml index a500f04a..35386f9f 100644 --- a/packages/nonebot-adapter-cqhttp/pyproject.toml +++ b/packages/nonebot-adapter-cqhttp/pyproject.toml @@ -34,6 +34,21 @@ nonebot2 = { path = "../../", develop = true } # url = "https://mirrors.aliyun.com/pypi/simple/" # default = true +[tool.black] +line-length = 88 +target-version = ["py37", "py38", "py39"] +include = '\.pyi?$' +extend-exclude = ''' +''' + +[tool.isort] +profile = "black" +line_length = 80 +length_sort = true +skip_gitignore = true +force_sort_within_sections = true +extra_standard_library = ["typing_extensions"] + [build-system] requires = ["poetry-core>=1.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/packages/nonebot-adapter-ding/nonebot/adapters/ding/bot.py b/packages/nonebot-adapter-ding/nonebot/adapters/ding/bot.py index dd8663f5..df5af674 100644 --- a/packages/nonebot-adapter-ding/nonebot/adapters/ding/bot.py +++ b/packages/nonebot-adapter-ding/nonebot/adapters/ding/bot.py @@ -16,10 +16,18 @@ from nonebot.drivers import Driver, HTTPRequest, HTTPResponse, HTTPConnection from .config import Config as DingConfig from .utils import log, calc_hmac_base64 from .message import Message, MessageSegment -from .exception import (ActionFailed, NetworkError, SessionExpired, - ApiNotAvailable) -from .event import (MessageEvent, ConversationType, GroupMessageEvent, - PrivateMessageEvent) +from .exception import ( + ActionFailed, + NetworkError, + SessionExpired, + ApiNotAvailable, +) +from .event import ( + MessageEvent, + ConversationType, + GroupMessageEvent, + PrivateMessageEvent, +) if TYPE_CHECKING: from nonebot.config import Config @@ -31,6 +39,7 @@ class Bot(BaseBot): """ 钉钉 协议 Bot 适配。继承属性参考 `BaseBot <./#class-basebot>`_ 。 """ + ding_config: DingConfig @property @@ -48,8 +57,8 @@ class Bot(BaseBot): @classmethod @overrides(BaseBot) async def check_permission( - cls, driver: Driver, - request: HTTPConnection) -> Tuple[Optional[str], HTTPResponse]: + cls, driver: Driver, request: HTTPConnection + ) -> Tuple[Optional[str], HTTPResponse]: """ :说明: @@ -61,7 +70,8 @@ class Bot(BaseBot): # 检查连接方式 if not isinstance(request, HTTPRequest): return None, HTTPResponse( - 405, b"Unsupported connection type, available type: `http`") + 405, b"Unsupported connection type, available type: `http`" + ) # 检查 timestamp if not timestamp: @@ -74,13 +84,15 @@ class Bot(BaseBot): log("WARNING", "Missing Signature Header") return None, HTTPResponse(400, b"Missing `sign` Header") sign_base64 = calc_hmac_base64(str(timestamp), secret) - if sign != sign_base64.decode('utf-8'): + if sign != sign_base64.decode("utf-8"): log("WARNING", "Signature Header is invalid") return None, HTTPResponse(403, b"Signature is invalid") else: log("WARNING", "Ding signature check ignored!") - return (json.loads(request.body.decode())["chatbotUserId"], - HTTPResponse(204, b'')) + return ( + json.loads(request.body.decode())["chatbotUserId"], + HTTPResponse(204, b""), + ) @overrides(BaseBot) async def handle_message(self, message: bytes): @@ -111,10 +123,9 @@ class Bot(BaseBot): return @overrides(BaseBot) - async def _call_api(self, - api: str, - event: Optional[MessageEvent] = None, - **data) -> Any: + async def _call_api( + self, api: str, event: Optional[MessageEvent] = None, **data + ) -> Any: if not isinstance(self.request, HTTPRequest): log("ERROR", "Only support http connection.") return @@ -138,7 +149,8 @@ class Bot(BaseBot): if event: # 确保 sessionWebhook 没有过期 if int(datetime.now().timestamp()) > int( - event.sessionWebhookExpiredTime / 1000): + event.sessionWebhookExpiredTime / 1000 + ): raise SessionExpired webhook = event.sessionWebhook @@ -150,32 +162,37 @@ class Bot(BaseBot): if not message: raise ValueError("Message not found") try: - async with httpx.AsyncClient(headers=headers, - follow_redirects=True) as client: - response = await client.post(webhook, - params=params, - json=message._produce(), - timeout=self.config.api_timeout) + async with httpx.AsyncClient( + headers=headers, follow_redirects=True + ) as client: + response = await client.post( + webhook, + params=params, + json=message._produce(), + timeout=self.config.api_timeout, + ) if 200 <= response.status_code < 300: result = response.json() if isinstance(result, dict): if result.get("errcode") != 0: - raise ActionFailed(errcode=result.get("errcode"), - errmsg=result.get("errmsg")) + raise ActionFailed( + errcode=result.get("errcode"), errmsg=result.get("errmsg") + ) return result - raise NetworkError(f"HTTP request received unexpected " - f"status code: {response.status_code}") + raise NetworkError( + f"HTTP request received unexpected " + f"status code: {response.status_code}" + ) except httpx.InvalidURL: raise NetworkError("API root url invalid") except httpx.HTTPError: raise NetworkError("HTTP request failed") @overrides(BaseBot) - async def call_api(self, - api: str, - event: Optional[MessageEvent] = None, - **data) -> Any: + async def call_api( + self, api: str, event: Optional[MessageEvent] = None, **data + ) -> Any: """ :说明: @@ -199,13 +216,15 @@ class Bot(BaseBot): return await super().call_api(api, event=event, **data) @overrides(BaseBot) - async def send(self, - event: MessageEvent, - message: Union[str, "Message", "MessageSegment"], - at_sender: bool = False, - webhook: Optional[str] = None, - secret: Optional[str] = None, - **kwargs) -> Any: + async def send( + self, + event: MessageEvent, + message: Union[str, "Message", "MessageSegment"], + at_sender: bool = False, + webhook: Optional[str] = None, + secret: Optional[str] = None, + **kwargs, + ) -> Any: """ :说明: @@ -241,9 +260,11 @@ class Bot(BaseBot): params.update(kwargs) if at_sender and event.conversationType != ConversationType.private: - params[ - "message"] = f"@{event.senderId} " + msg + MessageSegment.atDingtalkIds( - event.senderId) + params["message"] = ( + f"@{event.senderId} " + + msg + + MessageSegment.atDingtalkIds(event.senderId) + ) else: params["message"] = msg diff --git a/packages/nonebot-adapter-ding/nonebot/adapters/ding/config.py b/packages/nonebot-adapter-ding/nonebot/adapters/ding/config.py index 405fb2c5..9c88b1b7 100644 --- a/packages/nonebot-adapter-ding/nonebot/adapters/ding/config.py +++ b/packages/nonebot-adapter-ding/nonebot/adapters/ding/config.py @@ -12,6 +12,7 @@ class Config(BaseModel): - ``access_token`` / ``ding_access_token``: 钉钉令牌 - ``secret`` / ``ding_secret``: 钉钉 HTTP 上报数据签名口令 """ + secret: Optional[str] = Field(default=None, alias="ding_secret") access_token: Optional[str] = Field(default=None, alias="ding_access_token") diff --git a/packages/nonebot-adapter-ding/nonebot/adapters/ding/event.py b/packages/nonebot-adapter-ding/nonebot/adapters/ding/event.py index e01588a6..ad9eb230 100644 --- a/packages/nonebot-adapter-ding/nonebot/adapters/ding/event.py +++ b/packages/nonebot-adapter-ding/nonebot/adapters/ding/event.py @@ -69,6 +69,7 @@ class ConversationType(str, Enum): class MessageEvent(Event): """消息事件""" + msgtype: str text: TextMessage msgId: str @@ -88,11 +89,10 @@ class MessageEvent(Event): def gen_message(cls, values: dict): assert "msgtype" in values, "msgtype must be specified" # 其实目前钉钉机器人只能接收到 text 类型的消息 - assert values[ - "msgtype"] in values, f"{values['msgtype']} must be specified" - content = values[values['msgtype']]['content'] + assert values["msgtype"] in values, f"{values['msgtype']} must be specified" + content = values[values["msgtype"]]["content"] # 如果是被 @，第一个字符将会为空格，移除特殊情况 - if content[0] == ' ': + if content[0] == " ": content = content[1:] values["message"] = content return values @@ -128,6 +128,7 @@ class MessageEvent(Event): class PrivateMessageEvent(MessageEvent): """私聊消息事件""" + chatbotCorpId: str senderStaffId: Optional[str] conversationType: ConversationType = ConversationType.private @@ -135,6 +136,7 @@ class PrivateMessageEvent(MessageEvent): class GroupMessageEvent(MessageEvent): """群消息事件""" + atUsers: List[AtUsersItem] conversationType: ConversationType = ConversationType.group conversationTitle: str diff --git a/packages/nonebot-adapter-ding/nonebot/adapters/ding/exception.py b/packages/nonebot-adapter-ding/nonebot/adapters/ding/exception.py index df416932..73b08b43 100644 --- a/packages/nonebot-adapter-ding/nonebot/adapters/ding/exception.py +++ b/packages/nonebot-adapter-ding/nonebot/adapters/ding/exception.py @@ -1,9 +1,9 @@ from typing import Optional -from nonebot.exception import (AdapterException, ActionFailed as - BaseActionFailed, ApiNotAvailable as - BaseApiNotAvailable, NetworkError as - BaseNetworkError) +from nonebot.exception import AdapterException +from nonebot.exception import ActionFailed as BaseActionFailed +from nonebot.exception import NetworkError as BaseNetworkError +from nonebot.exception import ApiNotAvailable as BaseApiNotAvailable class DingAdapterException(AdapterException): @@ -29,15 +29,13 @@ class ActionFailed(BaseActionFailed, DingAdapterException): * ``errmsg: Optional[str]``: 错误信息 """ - def __init__(self, - errcode: Optional[int] = None, - errmsg: Optional[str] = None): + def __init__(self, errcode: Optional[int] = None, errmsg: Optional[str] = None): super().__init__() self.errcode = errcode self.errmsg = errmsg def __repr__(self): - return f"" + return f'' def __str__(self): return self.__repr__() diff --git a/packages/nonebot-adapter-ding/nonebot/adapters/ding/message.py b/packages/nonebot-adapter-ding/nonebot/adapters/ding/message.py index 98d13f7d..ef092739 100644 --- a/packages/nonebot-adapter-ding/nonebot/adapters/ding/message.py +++ b/packages/nonebot-adapter-ding/nonebot/adapters/ding/message.py @@ -77,10 +77,9 @@ class MessageSegment(BaseMessageSegment["Message"]): def code(code_language: str, code: str) -> "Message": """发送 code 消息段""" message = MessageSegment.text(code) - message += MessageSegment.extension({ - "text_type": "code_snippet", - "code_language": code_language - }) + message += MessageSegment.extension( + {"text_type": "code_snippet", "code_language": code_language} + ) return message @staticmethod @@ -95,16 +94,19 @@ class MessageSegment(BaseMessageSegment["Message"]): ) @staticmethod - def actionCardSingleBtn(title: str, text: str, singleTitle: str, - singleURL) -> "MessageSegment": + def actionCardSingleBtn( + title: str, text: str, singleTitle: str, singleURL + ) -> "MessageSegment": """发送 ``actionCardSingleBtn`` 类型消息""" return MessageSegment( - "actionCard", { + "actionCard", + { "title": title, "text": text, "singleTitle": singleTitle, - "singleURL": singleURL - }) + "singleURL": singleURL, + }, + ) @staticmethod def actionCardMultiBtns( @@ -112,7 +114,7 @@ class MessageSegment(BaseMessageSegment["Message"]): text: str, btns: list, hideAvatar: bool = False, - btnOrientation: str = '1', + btnOrientation: str = "1", ) -> "MessageSegment": """ 发送 ``actionCardMultiBtn`` 类型消息 @@ -123,13 +125,15 @@ class MessageSegment(BaseMessageSegment["Message"]): * ``btns``: ``[{ "title": title, "actionURL": actionURL }, ...]`` """ return MessageSegment( - "actionCard", { + "actionCard", + { "title": title, "text": text, "hideAvatar": "1" if hideAvatar else "0", "btnOrientation": btnOrientation, - "btns": btns - }) + "btns": btns, + }, + ) @staticmethod def feedCard(links: list) -> "MessageSegment": @@ -144,7 +148,7 @@ class MessageSegment(BaseMessageSegment["Message"]): @staticmethod def raw(data) -> "MessageSegment": - return MessageSegment('raw', data) + return MessageSegment("raw", data) def to_dict(self) -> Dict[str, Any]: # 让用户可以直接发送原始的消息格式 @@ -171,8 +175,8 @@ class Message(BaseMessage[MessageSegment]): @staticmethod @overrides(BaseMessage) def _construct( - msg: Union[str, Mapping, - Iterable[Mapping]]) -> Iterable[MessageSegment]: + msg: Union[str, Mapping, Iterable[Mapping]] + ) -> Iterable[MessageSegment]: if isinstance(msg, Mapping): msg = cast(Mapping[str, Any], msg) yield MessageSegment(msg["type"], msg.get("data") or {}) @@ -187,10 +191,11 @@ class Message(BaseMessage[MessageSegment]): segment: MessageSegment for segment in self: # text 可以和 text 合并 - if segment.type == "text" and data.get("msgtype") == 'text': + if segment.type == "text" and data.get("msgtype") == "text": data.setdefault("text", {}) - data["text"]["content"] = data["text"].setdefault( - "content", "") + segment.data["content"] + data["text"]["content"] = ( + data["text"].setdefault("content", "") + segment.data["content"] + ) else: data.update(segment.to_dict()) return data diff --git a/packages/nonebot-adapter-ding/nonebot/adapters/ding/utils.py b/packages/nonebot-adapter-ding/nonebot/adapters/ding/utils.py index 5529d42b..cf77a552 100644 --- a/packages/nonebot-adapter-ding/nonebot/adapters/ding/utils.py +++ b/packages/nonebot-adapter-ding/nonebot/adapters/ding/utils.py @@ -8,10 +8,10 @@ log = logger_wrapper("DING") def calc_hmac_base64(timestamp: str, secret: str): - secret_enc = secret.encode('utf-8') - string_to_sign = '{}\n{}'.format(timestamp, secret) - string_to_sign_enc = string_to_sign.encode('utf-8') - hmac_code = hmac.new(secret_enc, - string_to_sign_enc, - digestmod=hashlib.sha256).digest() + secret_enc = secret.encode("utf-8") + string_to_sign = "{}\n{}".format(timestamp, secret) + string_to_sign_enc = string_to_sign.encode("utf-8") + hmac_code = hmac.new( + secret_enc, string_to_sign_enc, digestmod=hashlib.sha256 + ).digest() return base64.b64encode(hmac_code) diff --git a/packages/nonebot-adapter-ding/pyproject.toml b/packages/nonebot-adapter-ding/pyproject.toml index 755499ec..2ee57d3d 100644 --- a/packages/nonebot-adapter-ding/pyproject.toml +++ b/packages/nonebot-adapter-ding/pyproject.toml @@ -34,6 +34,21 @@ nonebot2 = { path = "../../", develop = true } # url = "https://mirrors.aliyun.com/pypi/simple/" # default = true +[tool.black] +line-length = 88 +target-version = ["py37", "py38", "py39"] +include = '\.pyi?$' +extend-exclude = ''' +''' + +[tool.isort] +profile = "black" +line_length = 80 +length_sort = true +skip_gitignore = true +force_sort_within_sections = true +extra_standard_library = ["typing_extensions"] + [build-system] requires = ["poetry-core>=1.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/__init__.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/__init__.py index 49f6e956..d9e2cdfb 100644 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/__init__.py +++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/__init__.py @@ -7,7 +7,7 @@ aiocache_logger.setLevel(logging.DEBUG) aiocache_logger.handlers.clear() aiocache_logger.addHandler(LoguruHandler()) -from .bot import Bot as Bot from .event import * +from .bot import Bot as Bot from .message import Message as Message from .message import MessageSegment as MessageSegment diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py index c3ab6cc8..6fa3756c 100644 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py +++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py @@ -1,24 +1,39 @@ import re import json -from typing import (TYPE_CHECKING, Any, Dict, Tuple, Union, Iterable, Optional, - AsyncIterable, cast) +from typing import ( + TYPE_CHECKING, + Any, + Dict, + Tuple, + Union, + Iterable, + Optional, + AsyncIterable, + cast, +) import httpx from aiocache import Cache, cached from aiocache.serializers import PickleSerializer from nonebot.log import logger -from .utils import AESCipher, log from nonebot.typing import overrides from nonebot.utils import escape_tag from nonebot.message import handle_event -from .config import Config as FeishuConfig from nonebot.adapters import Bot as BaseBot from nonebot.drivers import Driver, HTTPRequest, HTTPResponse + +from .utils import AESCipher, log +from .config import Config as FeishuConfig from .message import Message, MessageSegment, MessageSerializer from .exception import ActionFailed, NetworkError, ApiNotAvailable -from .event import (Event, MessageEvent, GroupMessageEvent, PrivateMessageEvent, - get_event_model) +from .event import ( + Event, + MessageEvent, + GroupMessageEvent, + PrivateMessageEvent, + get_event_model, +) if TYPE_CHECKING: from nonebot.config import Config @@ -47,8 +62,10 @@ def _check_at_me(bot: "Bot", event: "Event"): event.to_me = True for index, segment in enumerate(message): - if segment.type == "at" and segment.data.get( - "user_name") in bot.config.nickname: + if ( + segment.type == "at" + and segment.data.get("user_name") in bot.config.nickname + ): event.to_me = True del event.event.message.content[index] return @@ -57,7 +74,8 @@ def _check_at_me(bot: "Bot", event: "Event"): if mention["name"] in bot.config.nickname: event.to_me = True segment.data["text"] = segment.data["text"].replace( - f"@{mention['name']}", "") + f"@{mention['name']}", "" + ) segment.data["text"] = segment.data["text"].lstrip() break else: @@ -92,18 +110,18 @@ def _check_nickname(bot: "Bot", event: "Event"): if nicknames: # check if the user is calling me with my nickname nickname_regex = "|".join(nicknames) - m = re.search(rf"^({nickname_regex})([\s,，]*|$)", first_text, - re.IGNORECASE) + m = re.search(rf"^({nickname_regex})([\s,，]*|$)", first_text, re.IGNORECASE) if m: nickname = m.group(1) log("DEBUG", f"User is calling me {nickname}") event.to_me = True - first_msg_seg.data["text"] = first_text[m.end():] + first_msg_seg.data["text"] = first_text[m.end() :] def _handle_api_result( - result: Union[Optional[Dict[str, Any]], str, bytes, Iterable[bytes], - AsyncIterable[bytes]] + result: Union[ + Optional[Dict[str, Any]], str, bytes, Iterable[bytes], AsyncIterable[bytes] + ] ) -> Any: """ :说明: @@ -155,13 +173,13 @@ class Bot(BaseBot): @classmethod @overrides(BaseBot) async def check_permission( - cls, driver: Driver, request: HTTPRequest + cls, driver: Driver, request: HTTPRequest ) -> Tuple[Optional[str], Optional[HTTPResponse]]: if not isinstance(request, HTTPRequest): - log("WARNING", - "Unsupported connection type, available type: `http`") + log("WARNING", "Unsupported connection type, available type: `http`") return None, HTTPResponse( - 405, b"Unsupported connection type, available type: `http`") + 405, b"Unsupported connection type, available type: `http`" + ) encrypt_key = cls.feishu_config.encrypt_key if encrypt_key: @@ -174,16 +192,13 @@ class Bot(BaseBot): challenge = data.get("challenge") if challenge: return data.get("token"), HTTPResponse( - 200, - json.dumps({ - "challenge": challenge - }).encode()) + 200, json.dumps({"challenge": challenge}).encode() + ) schema = data.get("schema") if not schema: return None, HTTPResponse( - 400, - b"Missing `schema` in POST body, only accept event of version 2.0" + 400, b"Missing `schema` in POST body, only accept event of version 2.0" ) headers = data.get("header") @@ -196,15 +211,13 @@ class Bot(BaseBot): if not token: log("WARNING", "Missing `verification token` in POST body") - return None, HTTPResponse( - 400, b"Missing `verification token` in POST body") + return None, HTTPResponse(400, b"Missing `verification token` in POST body") else: if token != cls.feishu_config.verification_token: log("WARNING", "Verification token check failed") - return None, HTTPResponse(403, - b"Verification token check failed") + return None, HTTPResponse(403, b"Verification token check failed") - return app_id, HTTPResponse(200, b'') + return app_id, HTTPResponse(200, b"") async def handle_message(self, message: bytes): """ @@ -245,28 +258,32 @@ class Bot(BaseBot): def _construct_url(self, path: str) -> str: return self.api_root + path - @cached(ttl=60 * 60, - cache=Cache.MEMORY, - key="_feishu_tenant_access_token", - serializer=PickleSerializer()) + @cached( + ttl=60 * 60, + cache=Cache.MEMORY, + key="_feishu_tenant_access_token", + serializer=PickleSerializer(), + ) async def _fetch_tenant_access_token(self) -> str: try: async with httpx.AsyncClient(follow_redirects=True) as client: response = await client.post( - self._construct_url( - "auth/v3/tenant_access_token/internal/"), + self._construct_url("auth/v3/tenant_access_token/internal/"), json={ "app_id": self.feishu_config.app_id, - "app_secret": self.feishu_config.app_secret + "app_secret": self.feishu_config.app_secret, }, - timeout=self.config.api_timeout) + timeout=self.config.api_timeout, + ) if 200 <= response.status_code < 300: result = response.json() return result["tenant_access_token"] else: - raise NetworkError(f"HTTP request received unexpected " - f"status code: {response.status_code}") + raise NetworkError( + f"HTTP request received unexpected " + f"status code: {response.status_code}" + ) except httpx.InvalidURL: raise NetworkError("API root url invalid") except httpx.HTTPError: @@ -280,30 +297,37 @@ class Bot(BaseBot): raise ApiNotAvailable headers = {} - self.feishu_config.tenant_access_token = await self._fetch_tenant_access_token( + self.feishu_config.tenant_access_token = ( + await self._fetch_tenant_access_token() + ) + headers["Authorization"] = ( + "Bearer " + self.feishu_config.tenant_access_token ) - headers[ - "Authorization"] = "Bearer " + self.feishu_config.tenant_access_token try: - async with httpx.AsyncClient(timeout=self.config.api_timeout, - follow_redirects=True) as client: + async with httpx.AsyncClient( + timeout=self.config.api_timeout, follow_redirects=True + ) as client: response = await client.send( - httpx.Request(data["method"], - self.api_root + api, - json=data.get("body", {}), - params=data.get("query", {}), - headers=headers)) + httpx.Request( + data["method"], + self.api_root + api, + json=data.get("body", {}), + params=data.get("query", {}), + headers=headers, + ) + ) if 200 <= response.status_code < 300: - if response.headers["content-type"].startswith( - "application/json"): + if response.headers["content-type"].startswith("application/json"): result = response.json() else: result = response.content return _handle_api_result(result) - raise NetworkError(f"HTTP request received unexpected " - f"status code: {response.status_code} " - f"response body: {response.text}") + raise NetworkError( + f"HTTP request received unexpected " + f"status code: {response.status_code} " + f"response body: {response.text}" + ) except httpx.InvalidURL: raise NetworkError("API root url invalid") except httpx.HTTPError: @@ -333,11 +357,13 @@ class Bot(BaseBot): return await super().call_api(api, **data) @overrides(BaseBot) - async def send(self, - event: Event, - message: Union[str, Message, MessageSegment], - at_sender: bool = False, - **kwargs) -> Any: + async def send( + self, + event: Event, + message: Union[str, Message, MessageSegment], + at_sender: bool = False, + **kwargs, + ) -> Any: msg = message if isinstance(message, Message) else Message(message) if isinstance(event, GroupMessageEvent): @@ -346,7 +372,8 @@ class Bot(BaseBot): receive_id, receive_id_type = event.get_user_id(), "open_id" else: raise ValueError( - "Cannot guess `receive_id` and `receive_id_type` to reply!") + "Cannot guess `receive_id` and `receive_id_type` to reply!" + ) at_sender = at_sender and bool(event.get_user_id()) @@ -357,14 +384,12 @@ class Bot(BaseBot): params = { "method": "POST", - "query": { - "receive_id_type": receive_id_type - }, + "query": {"receive_id_type": receive_id_type}, "body": { "receive_id": receive_id, "content": content, - "msg_type": msg_type - } + "msg_type": msg_type, + }, } return await self.call_api(f"im/v1/messages", **params) diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py index 4d74a1de..4bc70c12 100644 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py +++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py @@ -17,13 +17,16 @@ class Config(BaseModel): - ``is_lark`` / ``feishu_is_lark``: 是否使用Lark（飞书海外版），默认为 false """ + app_id: Optional[str] = Field(default=None, alias="feishu_app_id") app_secret: Optional[str] = Field(default=None, alias="feishu_app_secret") encrypt_key: Optional[str] = Field(default=None, alias="feishu_encrypt_key") - verification_token: Optional[str] = Field(default=None, - alias="feishu_verification_token") + verification_token: Optional[str] = Field( + default=None, alias="feishu_verification_token" + ) tenant_access_token: Optional[str] = Field( - default=None, alias="feishu_tenant_access_token") + default=None, alias="feishu_tenant_access_token" + ) is_lark: Optional[str] = Field(default=False, alias="feishu_is_lark") class Config: diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/event.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/event.py index 9c35ea9e..620bbe36 100644 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/event.py +++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/event.py @@ -1,12 +1,12 @@ -import inspect import json -from typing import Any, Dict, List, Literal, Optional, Type +import inspect +from typing import Any, Dict, List, Type, Literal, Optional -from pydantic import BaseModel, Field, root_validator from pygtrie import StringTrie +from pydantic import Field, BaseModel, root_validator -from nonebot.adapters import Event as BaseEvent from nonebot.typing import overrides +from nonebot.adapters import Event as BaseEvent from .message import Message, MessageDeserializer diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/exception.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/exception.py index 38336e53..99fb562c 100644 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/exception.py +++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/exception.py @@ -1,13 +1,12 @@ from typing import Optional -from nonebot.exception import ActionFailed as BaseActionFailed from nonebot.exception import AdapterException -from nonebot.exception import ApiNotAvailable as BaseApiNotAvailable +from nonebot.exception import ActionFailed as BaseActionFailed from nonebot.exception import NetworkError as BaseNetworkError +from nonebot.exception import ApiNotAvailable as BaseApiNotAvailable class FeishuAdapterException(AdapterException): - def __init__(self): super().__init__("feishu") @@ -28,8 +27,11 @@ class ActionFailed(BaseActionFailed, FeishuAdapterException): self.info = kwargs def __repr__(self): - return f"" + return ( + f"" + ) def __str__(self): return self.__repr__() diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/message.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/message.py index d9a7e2a1..7e7eabd9 100644 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/message.py +++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/message.py @@ -1,8 +1,18 @@ import json import itertools from dataclasses import dataclass -from typing import (Any, Dict, List, Type, Tuple, Union, Mapping, Iterable, - Optional, cast) +from typing import ( + Any, + Dict, + List, + Type, + Tuple, + Union, + Mapping, + Iterable, + Optional, + cast, +) from nonebot.typing import overrides from nonebot.adapters import Message as BaseMessage @@ -34,7 +44,7 @@ class MessageSegment(BaseMessageSegment["Message"]): "share_user": "[个人名片]", "system": "[系统消息]", "location": "[位置]", - "video_chat": "[视频通话]" + "video_chat": "[视频通话]", } def __str__(self) -> str: @@ -47,24 +57,26 @@ class MessageSegment(BaseMessageSegment["Message"]): @overrides(BaseMessageSegment) def __add__(self, other) -> "Message": - return Message(self) + (MessageSegment.text(other) if isinstance( - other, str) else other) + return Message(self) + ( + MessageSegment.text(other) if isinstance(other, str) else other + ) @overrides(BaseMessageSegment) def __radd__(self, other) -> "Message": - return (MessageSegment.text(other) - if isinstance(other, str) else Message(other)) + self + return ( + MessageSegment.text(other) if isinstance(other, str) else Message(other) + ) + self @overrides(BaseMessageSegment) def is_text(self) -> bool: return self.type == "text" - #接收消息 + # 接收消息 @staticmethod def at(user_id: str) -> "MessageSegment": return MessageSegment("at", {"user_id": user_id}) - #发送消息 + # 发送消息 @staticmethod def text(text: str) -> "MessageSegment": return MessageSegment("text", {"text": text}) @@ -79,10 +91,7 @@ class MessageSegment(BaseMessageSegment["Message"]): @staticmethod def interactive(title: str, elements: list) -> "MessageSegment": - return MessageSegment("interactive", { - "title": title, - "elements": elements - }) + return MessageSegment("interactive", {"title": title, "elements": elements}) @staticmethod def share_chat(chat_id: str) -> "MessageSegment": @@ -94,28 +103,25 @@ class MessageSegment(BaseMessageSegment["Message"]): @staticmethod def audio(file_key: str, duration: int) -> "MessageSegment": - return MessageSegment("audio", { - "file_key": file_key, - "duration": duration - }) + return MessageSegment("audio", {"file_key": file_key, "duration": duration}) @staticmethod - def media(file_key: str, image_key: str, file_name: str, - duration: int) -> "MessageSegment": + def media( + file_key: str, image_key: str, file_name: str, duration: int + ) -> "MessageSegment": return MessageSegment( - "media", { + "media", + { "file_key": file_key, "image_key": image_key, "file_name": file_name, - "duration": duration - }) + "duration": duration, + }, + ) @staticmethod def file(file_key: str, file_name: str) -> "MessageSegment": - return MessageSegment("file", { - "file_key": file_key, - "file_name": file_name - }) + return MessageSegment("file", {"file_key": file_key, "file_name": file_name}) @staticmethod def sticker(file_key) -> "MessageSegment": @@ -133,22 +139,22 @@ class Message(BaseMessage[MessageSegment]): return MessageSegment @overrides(BaseMessage) - def __add__(self, other: Union[str, Mapping, - Iterable[Mapping]]) -> "Message": + def __add__(self, other: Union[str, Mapping, Iterable[Mapping]]) -> "Message": return super(Message, self).__add__( - MessageSegment.text(other) if isinstance(other, str) else other) + MessageSegment.text(other) if isinstance(other, str) else other + ) @overrides(BaseMessage) - def __radd__(self, other: Union[str, Mapping, - Iterable[Mapping]]) -> "Message": + def __radd__(self, other: Union[str, Mapping, Iterable[Mapping]]) -> "Message": return super(Message, self).__radd__( - MessageSegment.text(other) if isinstance(other, str) else other) + MessageSegment.text(other) if isinstance(other, str) else other + ) @staticmethod @overrides(BaseMessage) def _construct( - msg: Union[str, Mapping, - Iterable[Mapping]]) -> Iterable[MessageSegment]: + msg: Union[str, Mapping, Iterable[Mapping]] + ) -> Iterable[MessageSegment]: if isinstance(msg, Mapping): msg = cast(Mapping[str, Any], msg) yield MessageSegment(msg["type"], msg.get("data") or {}) @@ -169,7 +175,8 @@ class Message(BaseMessage[MessageSegment]): for i, seg in enumerate(self): if seg.type == "text" and i != 0 and msg[-1].type == "text": msg[-1] = MessageSegment( - "text", {"text": msg[-1].data["text"] + seg.data["text"]}) + "text", {"text": msg[-1].data["text"] + seg.data["text"]} + ) else: msg.append(seg) return Message(msg) @@ -184,6 +191,7 @@ class MessageSerializer: """ 飞书 协议 Message 序列化器。 """ + message: Message def serialize(self) -> Tuple[str, str]: @@ -198,10 +206,12 @@ class MessageSerializer: else: if last_segment_type == "image": msg["content"].append([]) - msg["content"][-1].append({ - "tag": segment.type if segment.type != "image" else "img", - **segment.data - }) + msg["content"][-1].append( + { + "tag": segment.type if segment.type != "image" else "img", + **segment.data, + } + ) last_segment_type = segment.type return "post", json.dumps({"zh_cn": {**msg}}) @@ -214,6 +224,7 @@ class MessageDeserializer: """ 飞书 协议 Message 反序列化器。 """ + type: str data: Dict[str, Any] mentions: Optional[List[dict]] @@ -227,14 +238,13 @@ class MessageDeserializer: if self.type == "post": msg = Message() if self.data["title"] != "": - msg += MessageSegment("text", {'text': self.data["title"]}) + msg += MessageSegment("text", {"text": self.data["title"]}) for seg in itertools.chain(*self.data["content"]): tag = seg.pop("tag") if tag == "at": seg["user_name"] = dict_mention[seg["user_id"]]["name"] - seg["user_id"] = dict_mention[ - seg["user_id"]]["id"]["open_id"] + seg["user_id"] = dict_mention[seg["user_id"]]["id"]["open_id"] msg += MessageSegment(tag if tag != "img" else "image", seg) @@ -242,7 +252,8 @@ class MessageDeserializer: elif self.type == "text": for key, mention in dict_mention.items(): self.data["text"] = self.data["text"].replace( - key, f"@{mention['name']}") + key, f"@{mention['name']}" + ) self.data["mentions"] = dict_mention return Message(MessageSegment(self.type, self.data)) diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/utils.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/utils.py index ba418356..8848e563 100644 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/utils.py +++ b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/utils.py @@ -9,27 +9,26 @@ log = logger_wrapper("FEISHU") class AESCipher(object): - def __init__(self, key): self.block_size = AES.block_size self.key = hashlib.sha256(AESCipher.str_to_bytes(key)).digest() @staticmethod def str_to_bytes(data): - u_type = type(b"".decode('utf8')) + u_type = type(b"".decode("utf8")) if isinstance(data, u_type): - return data.encode('utf8') + return data.encode("utf8") return data @staticmethod def _unpad(s): - return s[:-ord(s[len(s) - 1:])] + return s[: -ord(s[len(s) - 1 :])] def decrypt(self, enc): - iv = enc[:AES.block_size] + iv = enc[: AES.block_size] cipher = AES.new(self.key, AES.MODE_CBC, iv) - return self._unpad(cipher.decrypt(enc[AES.block_size:])) + return self._unpad(cipher.decrypt(enc[AES.block_size :])) def decrypt_string(self, enc): enc = base64.b64decode(enc) - return self.decrypt(enc).decode('utf8') + return self.decrypt(enc).decode("utf8") diff --git a/packages/nonebot-adapter-feishu/pyproject.toml b/packages/nonebot-adapter-feishu/pyproject.toml index 030852e9..c3dfd427 100644 --- a/packages/nonebot-adapter-feishu/pyproject.toml +++ b/packages/nonebot-adapter-feishu/pyproject.toml @@ -36,6 +36,21 @@ nonebot2 = { path = "../../", develop = true } # url = "https://mirrors.aliyun.com/pypi/simple/" # default = true +[tool.black] +line-length = 88 +target-version = ["py37", "py38", "py39"] +include = '\.pyi?$' +extend-exclude = ''' +''' + +[tool.isort] +profile = "black" +line_length = 80 +length_sort = true +skip_gitignore = true +force_sort_within_sections = true +extra_standard_library = ["typing_extensions"] + [build-system] requires = ["poetry-core>=1.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/bot.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/bot.py index 9e197079..8af7ad8d 100644 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/bot.py +++ b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/bot.py @@ -12,8 +12,15 @@ from nonebot.config import Config from nonebot.typing import overrides from nonebot.adapters import Bot as BaseBot from nonebot.exception import ApiNotAvailable -from nonebot.drivers import (Driver, WebSocket, HTTPResponse, ForwardDriver, - ReverseDriver, HTTPConnection, WebSocketSetup) +from nonebot.drivers import ( + Driver, + WebSocket, + HTTPResponse, + ForwardDriver, + ReverseDriver, + HTTPConnection, + WebSocketSetup, +) from .config import Config as MiraiConfig from .message import MessageChain, MessageSegment @@ -23,16 +30,14 @@ from .utils import Log, process_event, argument_validation, catch_network_error class SessionManager: """Bot会话管理器, 提供API主动调用接口""" + sessions: Dict[int, Tuple[str, httpx.AsyncClient]] = {} def __init__(self, session_key: str, client: httpx.AsyncClient): self.session_key, self.client = session_key, client @catch_network_error - async def post(self, - path: str, - *, - params: Optional[Dict[str, Any]] = None) -> Any: + async def post(self, path: str, *, params: Optional[Dict[str, Any]] = None) -> Any: """ :说明: @@ -51,7 +56,7 @@ class SessionManager: path, json={ **(params or {}), - 'sessionKey': self.session_key, + "sessionKey": self.session_key, }, timeout=3, ) @@ -59,10 +64,9 @@ class SessionManager: return response.json() @catch_network_error - async def request(self, - path: str, - *, - params: Optional[Dict[str, Any]] = None) -> Any: + async def request( + self, path: str, *, params: Optional[Dict[str, Any]] = None + ) -> Any: """ :说明: @@ -77,7 +81,7 @@ class SessionManager: path, params={ **(params or {}), - 'sessionKey': self.session_key, + "sessionKey": self.session_key, }, timeout=3, ) @@ -98,7 +102,7 @@ class SessionManager: """ files = {k: v for k, v in params.items() if isinstance(v, BytesIO)} form = {k: v for k, v in params.items() if k not in files} - form['sessionKey'] = self.session_key + form["sessionKey"] = self.session_key response = await self.client.post( path, data=form, @@ -109,25 +113,25 @@ class SessionManager: return response.json() @classmethod - async def new(cls, self_id: int, *, host: IPv4Address, port: int, - auth_key: str) -> "SessionManager": + async def new( + cls, self_id: int, *, host: IPv4Address, port: int, auth_key: str + ) -> "SessionManager": session = cls.get(self_id) if session is not None: return session - client = httpx.AsyncClient(base_url=f'http://{host}:{port}', - follow_redirects=True) - response = await client.post('/auth', json={'authKey': auth_key}) + client = httpx.AsyncClient( + base_url=f"http://{host}:{port}", follow_redirects=True + ) + response = await client.post("/auth", json={"authKey": auth_key}) response.raise_for_status() auth = response.json() - assert auth['code'] == 0 - session_key = auth['session'] - response = await client.post('/verify', - json={ - 'sessionKey': session_key, - 'qq': self_id - }) - assert response.json()['code'] == 0 + assert auth["code"] == 0 + session_key = auth["session"] + response = await client.post( + "/verify", json={"sessionKey": session_key, "qq": self_id} + ) + assert response.json()["code"] == 0 cls.sessions[self_id] = session_key, client return cls(session_key, client) @@ -152,7 +156,7 @@ class Bot(BaseBot): """ - _type = 'mirai' + _type = "mirai" @property @overrides(BaseBot) @@ -166,37 +170,42 @@ class Bot(BaseBot): if api is None: if isinstance(self.request, WebSocket): asyncio.create_task(self.request.close(1000)) - assert api is not None, 'SessionManager has not been initialized' + assert api is not None, "SessionManager has not been initialized" return api @classmethod @overrides(BaseBot) async def check_permission( - cls, driver: Driver, - request: HTTPConnection) -> Tuple[Optional[str], HTTPResponse]: + cls, driver: Driver, request: HTTPConnection + ) -> Tuple[Optional[str], HTTPResponse]: if isinstance(request, WebSocket): - return None, HTTPResponse( - 501, b'Websocket connection is not implemented') - self_id: Optional[str] = request.headers.get('bot') + return None, HTTPResponse(501, b"Websocket connection is not implemented") + self_id: Optional[str] = request.headers.get("bot") if self_id is None: - return None, HTTPResponse(400, b'Header `Bot` is required.') + return None, HTTPResponse(400, b"Header `Bot` is required.") self_id = str(self_id).strip() await SessionManager.new( int(self_id), host=cls.mirai_config.host, # type: ignore - port=cls.mirai_config.port, #type: ignore - auth_key=cls.mirai_config.auth_key) # type: ignore - return self_id, HTTPResponse(204, b'') + port=cls.mirai_config.port, # type: ignore + auth_key=cls.mirai_config.auth_key, # type: ignore + ) + return self_id, HTTPResponse(204, b"") @classmethod @overrides(BaseBot) - def register(cls, - driver: Driver, - config: "Config", - qq: Optional[Union[int, List[int]]] = None): + def register( + cls, + driver: Driver, + config: "Config", + qq: Optional[Union[int, List[int]]] = None, + ): cls.mirai_config = MiraiConfig(**config.dict()) - if (cls.mirai_config.auth_key and cls.mirai_config.host and - cls.mirai_config.port) is None: + if ( + cls.mirai_config.auth_key + and cls.mirai_config.host + and cls.mirai_config.port + ) is None: raise ApiNotAvailable(cls._type) super().register(driver, config) @@ -209,17 +218,25 @@ class Bot(BaseBot): self_ids = [qq] if isinstance(qq, int) else qq async def url_factory(qq: int): - assert cls.mirai_config.host and cls.mirai_config.port and cls.mirai_config.auth_key + assert ( + cls.mirai_config.host + and cls.mirai_config.port + and cls.mirai_config.auth_key + ) session = await SessionManager.new( qq, host=cls.mirai_config.host, port=cls.mirai_config.port, - auth_key=cls.mirai_config.auth_key) + auth_key=cls.mirai_config.auth_key, + ) return WebSocketSetup( adapter=cls._type, self_id=str(qq), - url=(f'ws://{cls.mirai_config.host}:{cls.mirai_config.port}' - f'/all?sessionKey={session.session_key}')) + url=( + f"ws://{cls.mirai_config.host}:{cls.mirai_config.port}" + f"/all?sessionKey={session.session_key}" + ), + ) for self_id in self_ids: driver.setup_websocket(partial(url_factory, qq=self_id)) @@ -234,13 +251,15 @@ class Bot(BaseBot): try: await process_event( bot=self, - event=Event.new({ - **json.loads(message), - 'self_id': self.self_id, - }), + event=Event.new( + { + **json.loads(message), + "self_id": self.self_id, + } + ), ) except Exception as e: - Log.error(f'Failed to handle message: {message}', e) + Log.error(f"Failed to handle message: {message}", e) @overrides(BaseBot) async def _call_api(self, api: str, **data) -> NoReturn: @@ -266,10 +285,12 @@ class Bot(BaseBot): @overrides(BaseBot) @argument_validation - async def send(self, - event: Event, - message: Union[MessageChain, MessageSegment, str], - at_sender: bool = False): + async def send( + self, + event: Event, + message: Union[MessageChain, MessageSegment, str], + at_sender: bool = False, + ): """ :说明: @@ -284,23 +305,24 @@ class Bot(BaseBot): if not isinstance(message, MessageChain): message = MessageChain(message) if isinstance(event, FriendMessage): - return await self.send_friend_message(target=event.sender.id, - message_chain=message) + return await self.send_friend_message( + target=event.sender.id, message_chain=message + ) elif isinstance(event, GroupMessage): if at_sender: message = MessageSegment.at(event.sender.id) + message - return await self.send_group_message(group=event.sender.group.id, - message_chain=message) + return await self.send_group_message( + group=event.sender.group.id, message_chain=message + ) elif isinstance(event, TempMessage): - return await self.send_temp_message(qq=event.sender.id, - group=event.sender.group.id, - message_chain=message) + return await self.send_temp_message( + qq=event.sender.id, group=event.sender.group.id, message_chain=message + ) else: - raise ValueError(f'Unsupported event type {event!r}.') + raise ValueError(f"Unsupported event type {event!r}.") @argument_validation - async def send_friend_message(self, target: int, - message_chain: MessageChain): + async def send_friend_message(self, target: int, message_chain: MessageChain): """ :说明: @@ -311,15 +333,13 @@ class Bot(BaseBot): * ``target: int``: 发送消息目标好友的 QQ 号 * ``message_chain: MessageChain``: 消息链，是一个消息对象构成的数组 """ - return await self.api.post('sendFriendMessage', - params={ - 'target': target, - 'messageChain': message_chain.export() - }) + return await self.api.post( + "sendFriendMessage", + params={"target": target, "messageChain": message_chain.export()}, + ) @argument_validation - async def send_temp_message(self, qq: int, group: int, - message_chain: MessageChain): + async def send_temp_message(self, qq: int, group: int, message_chain: MessageChain): """ :说明: @@ -331,18 +351,15 @@ class Bot(BaseBot): * ``group: int``: 临时会话群号 * ``message_chain: MessageChain``: 消息链，是一个消息对象构成的数组 """ - return await self.api.post('sendTempMessage', - params={ - 'qq': qq, - 'group': group, - 'messageChain': message_chain.export() - }) + return await self.api.post( + "sendTempMessage", + params={"qq": qq, "group": group, "messageChain": message_chain.export()}, + ) @argument_validation - async def send_group_message(self, - group: int, - message_chain: MessageChain, - quote: Optional[int] = None): + async def send_group_message( + self, group: int, message_chain: MessageChain, quote: Optional[int] = None + ): """ :说明: @@ -354,12 +371,14 @@ class Bot(BaseBot): * ``message_chain: MessageChain``: 消息链，是一个消息对象构成的数组 * ``quote: Optional[int]``: 引用一条消息的 message_id 进行回复 """ - return await self.api.post('sendGroupMessage', - params={ - 'group': group, - 'messageChain': message_chain.export(), - 'quote': quote - }) + return await self.api.post( + "sendGroupMessage", + params={ + "group": group, + "messageChain": message_chain.export(), + "quote": quote, + }, + ) @argument_validation async def recall(self, target: int): @@ -372,11 +391,12 @@ class Bot(BaseBot): * ``target: int``: 需要撤回的消息的message_id """ - return await self.api.post('recall', params={'target': target}) + return await self.api.post("recall", params={"target": target}) @argument_validation - async def send_image_message(self, target: int, qq: int, group: int, - urls: List[str]) -> List[str]: + async def send_image_message( + self, target: int, qq: int, group: int, urls: List[str] + ) -> List[str]: """ :说明: @@ -396,13 +416,10 @@ class Bot(BaseBot): - ``List[str]``: 一个包含图片imageId的数组 """ - return await self.api.post('sendImageMessage', - params={ - 'target': target, - 'qq': qq, - 'group': group, - 'urls': urls - }) + return await self.api.post( + "sendImageMessage", + params={"target": target, "qq": qq, "group": group, "urls": urls}, + ) @argument_validation async def upload_image(self, type: str, img: BytesIO): @@ -416,11 +433,7 @@ class Bot(BaseBot): * ``type: str``: "friend" 或 "group" 或 "temp" * ``img: BytesIO``: 图片的BytesIO对象 """ - return await self.api.upload('uploadImage', - params={ - 'type': type, - 'img': img - }) + return await self.api.upload("uploadImage", params={"type": type, "img": img}) @argument_validation async def upload_voice(self, type: str, voice: BytesIO): @@ -434,11 +447,9 @@ class Bot(BaseBot): * ``type: str``: 当前仅支持 "group" * ``voice: BytesIO``: 语音的BytesIO对象 """ - return await self.api.upload('uploadVoice', - params={ - 'type': type, - 'voice': voice - }) + return await self.api.upload( + "uploadVoice", params={"type": type, "voice": voice} + ) @argument_validation async def fetch_message(self, count: int = 10): @@ -452,7 +463,7 @@ class Bot(BaseBot): * ``count: int``: 获取消息和事件的数量 """ - return await self.api.request('fetchMessage', params={'count': count}) + return await self.api.request("fetchMessage", params={"count": count}) @argument_validation async def fetch_latest_message(self, count: int = 10): @@ -466,8 +477,7 @@ class Bot(BaseBot): * ``count: int``: 获取消息和事件的数量 """ - return await self.api.request('fetchLatestMessage', - params={'count': count}) + return await self.api.request("fetchLatestMessage", params={"count": count}) @argument_validation async def peek_message(self, count: int = 10): @@ -481,7 +491,7 @@ class Bot(BaseBot): * ``count: int``: 获取消息和事件的数量 """ - return await self.api.request('peekMessage', params={'count': count}) + return await self.api.request("peekMessage", params={"count": count}) @argument_validation async def peek_latest_message(self, count: int = 10): @@ -495,8 +505,7 @@ class Bot(BaseBot): * ``count: int``: 获取消息和事件的数量 """ - return await self.api.request('peekLatestMessage', - params={'count': count}) + return await self.api.request("peekLatestMessage", params={"count": count}) @argument_validation async def messsage_from_id(self, id: int): @@ -510,7 +519,7 @@ class Bot(BaseBot): * ``id: int``: 获取消息的message_id """ - return await self.api.request('messageFromId', params={'id': id}) + return await self.api.request("messageFromId", params={"id": id}) @argument_validation async def count_message(self): @@ -519,7 +528,7 @@ class Bot(BaseBot): 使用此方法获取bot接收并缓存的消息总数，注意不包含被删除的 """ - return await self.api.request('countMessage') + return await self.api.request("countMessage") @argument_validation async def friend_list(self) -> List[Dict[str, Any]]: @@ -532,7 +541,7 @@ class Bot(BaseBot): - ``List[Dict[str, Any]]``: 返回的好友列表数据 """ - return await self.api.request('friendList') + return await self.api.request("friendList") @argument_validation async def group_list(self) -> List[Dict[str, Any]]: @@ -545,7 +554,7 @@ class Bot(BaseBot): - ``List[Dict[str, Any]]``: 返回的群列表数据 """ - return await self.api.request('groupList') + return await self.api.request("groupList") @argument_validation async def member_list(self, target: int) -> List[Dict[str, Any]]: @@ -562,7 +571,7 @@ class Bot(BaseBot): - ``List[Dict[str, Any]]``: 返回的群成员列表数据 """ - return await self.api.request('memberList', params={'target': target}) + return await self.api.request("memberList", params={"target": target}) @argument_validation async def mute(self, target: int, member_id: int, time: int): @@ -577,12 +586,9 @@ class Bot(BaseBot): * ``member_id: int``: 指定群员QQ号 * ``time: int``: 禁言时长，单位为秒，最多30天 """ - return await self.api.post('mute', - params={ - 'target': target, - 'memberId': member_id, - 'time': time - }) + return await self.api.post( + "mute", params={"target": target, "memberId": member_id, "time": time} + ) @argument_validation async def unmute(self, target: int, member_id: int): @@ -596,11 +602,9 @@ class Bot(BaseBot): * ``target: int``: 指定群的群号 * ``member_id: int``: 指定群员QQ号 """ - return await self.api.post('unmute', - params={ - 'target': target, - 'memberId': member_id - }) + return await self.api.post( + "unmute", params={"target": target, "memberId": member_id} + ) @argument_validation async def kick(self, target: int, member_id: int, msg: str): @@ -615,12 +619,9 @@ class Bot(BaseBot): * ``member_id: int``: 指定群员QQ号 * ``msg: str``: 信息 """ - return await self.api.post('kick', - params={ - 'target': target, - 'memberId': member_id, - 'msg': msg - }) + return await self.api.post( + "kick", params={"target": target, "memberId": member_id, "msg": msg} + ) @argument_validation async def quit(self, target: int): @@ -633,7 +634,7 @@ class Bot(BaseBot): * ``target: int``: 退出的群号 """ - return await self.api.post('quit', params={'target': target}) + return await self.api.post("quit", params={"target": target}) @argument_validation async def mute_all(self, target: int): @@ -646,7 +647,7 @@ class Bot(BaseBot): * ``target: int``: 指定群的群号 """ - return await self.api.post('muteAll', params={'target': target}) + return await self.api.post("muteAll", params={"target": target}) @argument_validation async def unmute_all(self, target: int): @@ -659,7 +660,7 @@ class Bot(BaseBot): * ``target: int``: 指定群的群号 """ - return await self.api.post('unmuteAll', params={'target': target}) + return await self.api.post("unmuteAll", params={"target": target}) @argument_validation async def group_config(self, target: int): @@ -685,7 +686,7 @@ class Bot(BaseBot): "anonymousChat": true } """ - return await self.api.request('groupConfig', params={'target': target}) + return await self.api.request("groupConfig", params={"target": target}) @argument_validation async def modify_group_config(self, target: int, config: Dict[str, Any]): @@ -699,11 +700,9 @@ class Bot(BaseBot): * ``target: int``: 指定群的群号 * ``config: Dict[str, Any]``: 群设置, 格式见 ``group_config`` 的返回值 """ - return await self.api.post('groupConfig', - params={ - 'target': target, - 'config': config - }) + return await self.api.post( + "groupConfig", params={"target": target, "config": config} + ) @argument_validation async def member_info(self, target: int, member_id: int): @@ -726,15 +725,14 @@ class Bot(BaseBot): "specialTitle": "群头衔" } """ - return await self.api.request('memberInfo', - params={ - 'target': target, - 'memberId': member_id - }) + return await self.api.request( + "memberInfo", params={"target": target, "memberId": member_id} + ) @argument_validation - async def modify_member_info(self, target: int, member_id: int, - info: Dict[str, Any]): + async def modify_member_info( + self, target: int, member_id: int, info: Dict[str, Any] + ): """ :说明: @@ -746,9 +744,6 @@ class Bot(BaseBot): * ``member_id: int``: 群员QQ号 * ``info: Dict[str, Any]``: 群员资料, 格式见 ``member_info`` 的返回值 """ - return await self.api.post('memberInfo', - params={ - 'target': target, - 'memberId': member_id, - 'info': info - }) + return await self.api.post( + "memberInfo", params={"target": target, "memberId": member_id, "info": info} + ) diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/config.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/config.py index 6783259f..241af2a3 100644 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/config.py +++ b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/config.py @@ -1,7 +1,7 @@ -from ipaddress import IPv4Address from typing import Optional +from ipaddress import IPv4Address -from pydantic import BaseModel, Extra, Field +from pydantic import Extra, Field, BaseModel class Config(BaseModel): @@ -14,9 +14,10 @@ class Config(BaseModel): - ``mirai_host``: mirai-api-http 的地址 - ``mirai_port``: mirai-api-http 的端口 """ - auth_key: Optional[str] = Field(None, alias='mirai_auth_key') - host: Optional[IPv4Address] = Field(None, alias='mirai_host') - port: Optional[int] = Field(None, alias='mirai_port') + + auth_key: Optional[str] = Field(None, alias="mirai_auth_key") + host: Optional[IPv4Address] = Field(None, alias="mirai_host") + port: Optional[int] = Field(None, alias="mirai_port") class Config: extra = Extra.ignore diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/__init__.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/__init__.py index 78e5cba4..14e21c74 100644 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/__init__.py +++ b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/__init__.py @@ -5,25 +5,56 @@ r""" 部分字段可能与文档在符号上不一致 \:\:\: """ -from .base import (Event, GroupChatInfo, GroupInfo, PrivateChatInfo, - UserPermission) -from .message import * from .notice import * +from .message import * from .request import * +from .base import ( + Event, + GroupInfo, + GroupChatInfo, + UserPermission, + PrivateChatInfo, +) __all__ = [ - 'Event', 'GroupChatInfo', 'GroupInfo', 'PrivateChatInfo', 'UserPermission', - 'MessageSource', 'MessageEvent', 'GroupMessage', 'FriendMessage', - 'TempMessage', 'NoticeEvent', 'MuteEvent', 'BotMuteEvent', 'BotUnmuteEvent', - 'MemberMuteEvent', 'MemberUnmuteEvent', 'BotJoinGroupEvent', - 'BotLeaveEventActive', 'BotLeaveEventKick', 'MemberJoinEvent', - 'MemberLeaveEventKick', 'MemberLeaveEventQuit', 'FriendRecallEvent', - 'GroupRecallEvent', 'GroupStateChangeEvent', 'GroupNameChangeEvent', - 'GroupEntranceAnnouncementChangeEvent', 'GroupMuteAllEvent', - 'GroupAllowAnonymousChatEvent', 'GroupAllowConfessTalkEvent', - 'GroupAllowMemberInviteEvent', 'MemberStateChangeEvent', - 'MemberCardChangeEvent', 'MemberSpecialTitleChangeEvent', - 'BotGroupPermissionChangeEvent', 'MemberPermissionChangeEvent', - 'RequestEvent', 'NewFriendRequestEvent', 'MemberJoinRequestEvent', - 'BotInvitedJoinGroupRequestEvent' + "Event", + "GroupChatInfo", + "GroupInfo", + "PrivateChatInfo", + "UserPermission", + "MessageSource", + "MessageEvent", + "GroupMessage", + "FriendMessage", + "TempMessage", + "NoticeEvent", + "MuteEvent", + "BotMuteEvent", + "BotUnmuteEvent", + "MemberMuteEvent", + "MemberUnmuteEvent", + "BotJoinGroupEvent", + "BotLeaveEventActive", + "BotLeaveEventKick", + "MemberJoinEvent", + "MemberLeaveEventKick", + "MemberLeaveEventQuit", + "FriendRecallEvent", + "GroupRecallEvent", + "GroupStateChangeEvent", + "GroupNameChangeEvent", + "GroupEntranceAnnouncementChangeEvent", + "GroupMuteAllEvent", + "GroupAllowAnonymousChatEvent", + "GroupAllowConfessTalkEvent", + "GroupAllowMemberInviteEvent", + "MemberStateChangeEvent", + "MemberCardChangeEvent", + "MemberSpecialTitleChangeEvent", + "BotGroupPermissionChangeEvent", + "MemberPermissionChangeEvent", + "RequestEvent", + "NewFriendRequestEvent", + "MemberJoinRequestEvent", + "BotInvitedJoinGroupRequestEvent", ] diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/base.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/base.py index fd95f4e8..93b7863b 100644 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/base.py +++ b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/base.py @@ -22,9 +22,10 @@ class UserPermission(str, Enum): * ``ADMINISTRATOR``: 群管理 * ``MEMBER``: 普通群成员 """ - OWNER = 'OWNER' - ADMINISTRATOR = 'ADMINISTRATOR' - MEMBER = 'MEMBER' + + OWNER = "OWNER" + ADMINISTRATOR = "ADMINISTRATOR" + MEMBER = "MEMBER" class NudgeSubjectKind(str, Enum): @@ -36,8 +37,9 @@ class NudgeSubjectKind(str, Enum): * ``Group``: 群 * ``Friend``: 好友 """ - Group = 'Group' - Friend = 'Friend' + + Group = "Group" + Friend = "Friend" class GroupInfo(BaseModel): @@ -48,7 +50,7 @@ class GroupInfo(BaseModel): class GroupChatInfo(BaseModel): id: int - name: str = Field(alias='memberName') + name: str = Field(alias="memberName") permission: UserPermission group: GroupInfo @@ -71,6 +73,7 @@ class Event(BaseEvent): .. _mirai-api-http 事件类型: https://github.com/project-mirai/mirai-api-http/blob/master/docs/EventType.md """ + self_id: int type: str @@ -79,11 +82,12 @@ class Event(BaseEvent): """ 此事件类的工厂函数, 能够通过事件数据选择合适的子类进行序列化 """ - type = data['type'] + type = data["type"] def all_subclasses(cls: Type[Event]): return set(cls.__subclasses__()).union( - [s for c in cls.__subclasses__() for s in all_subclasses(c)]) + [s for c in cls.__subclasses__() for s in all_subclasses(c)] + ) event_class: Optional[Type[Event]] = None for subclass in all_subclasses(cls): @@ -99,23 +103,25 @@ class Event(BaseEvent): return event_class.parse_obj(data) except ValidationError as e: logger.info( - f'Failed to parse {data} to class {event_class.__name__}: ' - f'{e.errors()!r}. Fallback to parent class.') + f"Failed to parse {data} to class {event_class.__name__}: " + f"{e.errors()!r}. Fallback to parent class." + ) event_class = event_class.__base__ # type: ignore - raise ValueError(f'Failed to serialize {data}.') + raise ValueError(f"Failed to serialize {data}.") @overrides(BaseEvent) def get_type(self) -> Literal["message", "notice", "request", "meta_event"]: from . import meta, notice, message, request + if isinstance(self, message.MessageEvent): - return 'message' + return "message" elif isinstance(self, notice.NoticeEvent): - return 'notice' + return "notice" elif isinstance(self, request.RequestEvent): - return 'request' + return "request" else: - return 'meta_event' + return "meta_event" @overrides(BaseEvent) def get_event_name(self) -> str: diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/message.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/message.py index 5dda0857..74896eee 100644 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/message.py +++ b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/message.py @@ -1,7 +1,7 @@ from datetime import datetime from typing import Any, Optional -from pydantic import BaseModel, Field +from pydantic import Field, BaseModel from nonebot.typing import overrides @@ -16,7 +16,8 @@ class MessageSource(BaseModel): class MessageEvent(Event): """消息事件基类""" - message_chain: MessageChain = Field(alias='messageChain') + + message_chain: MessageChain = Field(alias="messageChain") source: Optional[MessageSource] = None sender: Any @@ -39,12 +40,13 @@ class MessageEvent(Event): class GroupMessage(MessageEvent): """群消息事件""" + sender: GroupChatInfo to_me: bool = False @overrides(MessageEvent) def get_session_id(self) -> str: - return f'group_{self.sender.group.id}_' + self.get_user_id() + return f"group_{self.sender.group.id}_" + self.get_user_id() @overrides(MessageEvent) def get_user_id(self) -> str: @@ -57,6 +59,7 @@ class GroupMessage(MessageEvent): class FriendMessage(MessageEvent): """好友消息事件""" + sender: PrivateChatInfo @overrides(MessageEvent) @@ -65,7 +68,7 @@ class FriendMessage(MessageEvent): @overrides(MessageEvent) def get_session_id(self) -> str: - return 'friend_' + self.get_user_id() + return "friend_" + self.get_user_id() @overrides(MessageEvent) def is_tome(self) -> bool: @@ -74,11 +77,12 @@ class FriendMessage(MessageEvent): class TempMessage(MessageEvent): """临时会话消息事件""" + sender: GroupChatInfo @overrides(MessageEvent) def get_session_id(self) -> str: - return f'temp_{self.sender.group.id}_' + self.get_user_id() + return f"temp_{self.sender.group.id}_" + self.get_user_id() @overrides(MessageEvent) def is_tome(self) -> bool: diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/meta.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/meta.py index e42baf72..c0fa7a29 100644 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/meta.py +++ b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/meta.py @@ -3,29 +3,35 @@ from .base import Event class MetaEvent(Event): """元事件基类""" + qq: int class BotOnlineEvent(MetaEvent): """Bot登录成功""" + pass class BotOfflineEventActive(MetaEvent): """Bot主动离线""" + pass class BotOfflineEventForce(MetaEvent): """Bot被挤下线""" + pass class BotOfflineEventDropped(MetaEvent): """Bot被服务器断开或因网络问题而掉线""" + pass class BotReloginEvent(MetaEvent): """Bot主动重新登录""" - pass \ No newline at end of file + + pass diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/notice.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/notice.py index 8726d58e..0fa30dda 100644 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/notice.py +++ b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/notice.py @@ -2,88 +2,103 @@ from typing import Any, Optional from pydantic import Field -from .base import Event, GroupChatInfo, GroupInfo, NudgeSubject, UserPermission +from .base import Event, GroupInfo, NudgeSubject, GroupChatInfo, UserPermission class NoticeEvent(Event): """通知事件基类""" + pass class MuteEvent(NoticeEvent): """禁言类事件基类""" + operator: GroupChatInfo class BotMuteEvent(MuteEvent): """Bot被禁言""" + pass class BotUnmuteEvent(MuteEvent): """Bot被取消禁言""" + pass class MemberMuteEvent(MuteEvent): """群成员被禁言事件（该成员不是Bot）""" - duration_seconds: int = Field(alias='durationSeconds') + + duration_seconds: int = Field(alias="durationSeconds") member: GroupChatInfo operator: Optional[GroupChatInfo] = None class MemberUnmuteEvent(MuteEvent): """群成员被取消禁言事件（该成员不是Bot）""" + member: GroupChatInfo operator: Optional[GroupChatInfo] = None class BotJoinGroupEvent(NoticeEvent): """Bot加入了一个新群""" + group: GroupInfo class BotLeaveEventActive(BotJoinGroupEvent): """Bot主动退出一个群""" + pass class BotLeaveEventKick(BotJoinGroupEvent): """Bot被踢出一个群""" + pass class MemberJoinEvent(NoticeEvent): """新人入群的事件""" + member: GroupChatInfo class MemberLeaveEventKick(MemberJoinEvent): """成员被踢出群（该成员不是Bot）""" + operator: Optional[GroupChatInfo] = None class MemberLeaveEventQuit(MemberJoinEvent): """成员主动离群（该成员不是Bot）""" + pass class FriendRecallEvent(NoticeEvent): """好友消息撤回""" - author_id: int = Field(alias='authorId') - message_id: int = Field(alias='messageId') + + author_id: int = Field(alias="authorId") + message_id: int = Field(alias="messageId") time: int operator: int class GroupRecallEvent(FriendRecallEvent): """群消息撤回""" + group: GroupInfo operator: Optional[GroupChatInfo] = None class GroupStateChangeEvent(NoticeEvent): """群变化事件基类""" + origin: Any current: Any group: GroupInfo @@ -92,73 +107,85 @@ class GroupStateChangeEvent(NoticeEvent): class GroupNameChangeEvent(GroupStateChangeEvent): """某个群名改变""" + origin: str current: str class GroupEntranceAnnouncementChangeEvent(GroupStateChangeEvent): """某群入群公告改变""" + origin: str current: str class GroupMuteAllEvent(GroupStateChangeEvent): """全员禁言""" + origin: bool current: bool class GroupAllowAnonymousChatEvent(GroupStateChangeEvent): """匿名聊天""" + origin: bool current: bool class GroupAllowConfessTalkEvent(GroupStateChangeEvent): """坦白说""" + origin: bool current: bool class GroupAllowMemberInviteEvent(GroupStateChangeEvent): """允许群员邀请好友加群""" + origin: bool current: bool class MemberStateChangeEvent(NoticeEvent): """群成员变化事件基类""" + member: GroupChatInfo operator: Optional[GroupChatInfo] = None class MemberCardChangeEvent(MemberStateChangeEvent): """群名片改动""" + origin: str current: str class MemberSpecialTitleChangeEvent(MemberStateChangeEvent): """群头衔改动（只有群主有操作限权）""" + origin: str current: str class BotGroupPermissionChangeEvent(MemberStateChangeEvent): """Bot在群里的权限被改变""" + origin: UserPermission current: UserPermission class MemberPermissionChangeEvent(MemberStateChangeEvent): """成员权限改变的事件（该成员不是Bot）""" + origin: UserPermission current: UserPermission class NudgeEvent(NoticeEvent): """戳一戳触发事件""" - from_id: int = Field(alias='fromId') + + from_id: int = Field(alias="fromId") target: int subject: NudgeSubject action: str diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/request.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/request.py index d57af767..42f33e97 100644 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/request.py +++ b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/request.py @@ -1,7 +1,7 @@ from typing import TYPE_CHECKING +from typing_extensions import Literal from pydantic import Field -from typing_extensions import Literal from .base import Event @@ -11,15 +11,17 @@ if TYPE_CHECKING: class RequestEvent(Event): """请求事件基类""" - event_id: int = Field(alias='eventId') + + event_id: int = Field(alias="eventId") message: str nick: str class NewFriendRequestEvent(RequestEvent): """添加好友申请""" - from_id: int = Field(alias='fromId') - group_id: int = Field(0, alias='groupId') + + from_id: int = Field(alias="fromId") + group_id: int = Field(0, alias="groupId") async def approve(self, bot: "Bot"): """ @@ -31,19 +33,18 @@ class NewFriendRequestEvent(RequestEvent): * ``bot: Bot``: 当前的 ``Bot`` 对象 """ - return await bot.api.post('/resp/newFriendRequestEvent', - params={ - 'eventId': self.event_id, - 'groupId': self.group_id, - 'fromId': self.from_id, - 'operate': 0, - 'message': '' - }) + return await bot.api.post( + "/resp/newFriendRequestEvent", + params={ + "eventId": self.event_id, + "groupId": self.group_id, + "fromId": self.from_id, + "operate": 0, + "message": "", + }, + ) - async def reject(self, - bot: "Bot", - operate: Literal[1, 2] = 1, - message: str = ''): + async def reject(self, bot: "Bot", operate: Literal[1, 2] = 1, message: str = ""): """ :说明: @@ -60,21 +61,24 @@ class NewFriendRequestEvent(RequestEvent): * ``message: str``: 回复的信息 """ assert operate > 0 - return await bot.api.post('/resp/newFriendRequestEvent', - params={ - 'eventId': self.event_id, - 'groupId': self.group_id, - 'fromId': self.from_id, - 'operate': operate, - 'message': message - }) + return await bot.api.post( + "/resp/newFriendRequestEvent", + params={ + "eventId": self.event_id, + "groupId": self.group_id, + "fromId": self.from_id, + "operate": operate, + "message": message, + }, + ) class MemberJoinRequestEvent(RequestEvent): """用户入群申请（Bot需要有管理员权限）""" - from_id: int = Field(alias='fromId') - group_id: int = Field(alias='groupId') - group_name: str = Field(alias='groupName') + + from_id: int = Field(alias="fromId") + group_id: int = Field(alias="groupId") + group_name: str = Field(alias="groupName") async def approve(self, bot: "Bot"): """ @@ -86,19 +90,20 @@ class MemberJoinRequestEvent(RequestEvent): * ``bot: Bot``: 当前的 ``Bot`` 对象 """ - return await bot.api.post('/resp/memberJoinRequestEvent', - params={ - 'eventId': self.event_id, - 'groupId': self.group_id, - 'fromId': self.from_id, - 'operate': 0, - 'message': '' - }) + return await bot.api.post( + "/resp/memberJoinRequestEvent", + params={ + "eventId": self.event_id, + "groupId": self.group_id, + "fromId": self.from_id, + "operate": 0, + "message": "", + }, + ) - async def reject(self, - bot: "Bot", - operate: Literal[1, 2, 3, 4] = 1, - message: str = ''): + async def reject( + self, bot: "Bot", operate: Literal[1, 2, 3, 4] = 1, message: str = "" + ): """ :说明: @@ -117,21 +122,24 @@ class MemberJoinRequestEvent(RequestEvent): * ``message: str``: 回复的信息 """ assert operate > 0 - return await bot.api.post('/resp/memberJoinRequestEvent', - params={ - 'eventId': self.event_id, - 'groupId': self.group_id, - 'fromId': self.from_id, - 'operate': operate, - 'message': message - }) + return await bot.api.post( + "/resp/memberJoinRequestEvent", + params={ + "eventId": self.event_id, + "groupId": self.group_id, + "fromId": self.from_id, + "operate": operate, + "message": message, + }, + ) class BotInvitedJoinGroupRequestEvent(RequestEvent): """Bot被邀请入群申请""" - from_id: int = Field(alias='fromId') - group_id: int = Field(alias='groupId') - group_name: str = Field(alias='groupName') + + from_id: int = Field(alias="fromId") + group_id: int = Field(alias="groupId") + group_name: str = Field(alias="groupName") async def approve(self, bot: "Bot"): """ @@ -143,14 +151,16 @@ class BotInvitedJoinGroupRequestEvent(RequestEvent): * ``bot: Bot``: 当前的 ``Bot`` 对象 """ - return await bot.api.post('/resp/botInvitedJoinGroupRequestEvent', - params={ - 'eventId': self.event_id, - 'groupId': self.group_id, - 'fromId': self.from_id, - 'operate': 0, - 'message': '' - }) + return await bot.api.post( + "/resp/botInvitedJoinGroupRequestEvent", + params={ + "eventId": self.event_id, + "groupId": self.group_id, + "fromId": self.from_id, + "operate": 0, + "message": "", + }, + ) async def reject(self, bot: "Bot", message: str = ""): """ @@ -163,11 +173,13 @@ class BotInvitedJoinGroupRequestEvent(RequestEvent): * ``bot: Bot``: 当前的 ``Bot`` 对象 * ``message: str``: 邀请消息 """ - return await bot.api.post('/resp/botInvitedJoinGroupRequestEvent', - params={ - 'eventId': self.event_id, - 'groupId': self.group_id, - 'fromId': self.from_id, - 'operate': 1, - 'message': message - }) + return await bot.api.post( + "/resp/botInvitedJoinGroupRequestEvent", + params={ + "eventId": self.event_id, + "groupId": self.group_id, + "fromId": self.from_id, + "operate": 1, + "message": message, + }, + ) diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/message.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/message.py index 14d6f9e8..2f74b197 100644 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/message.py +++ b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/message.py @@ -1,28 +1,29 @@ from enum import Enum -from typing import Any, List, Dict, Type, Iterable, Optional, Union +from typing import Any, Dict, List, Type, Union, Iterable, Optional from pydantic import validate_arguments +from nonebot.typing import overrides from nonebot.adapters import Message as BaseMessage from nonebot.adapters import MessageSegment as BaseMessageSegment -from nonebot.typing import overrides class MessageType(str, Enum): """消息类型枚举类""" - SOURCE = 'Source' - QUOTE = 'Quote' - AT = 'At' - AT_ALL = 'AtAll' - FACE = 'Face' - PLAIN = 'Plain' - IMAGE = 'Image' - FLASH_IMAGE = 'FlashImage' - VOICE = 'Voice' - XML = 'Xml' - JSON = 'Json' - APP = 'App' - POKE = 'Poke' + + SOURCE = "Source" + QUOTE = "Quote" + AT = "At" + AT_ALL = "AtAll" + FACE = "Face" + PLAIN = "Plain" + IMAGE = "Image" + FLASH_IMAGE = "FlashImage" + VOICE = "Voice" + XML = "Xml" + JSON = "Json" + APP = "App" + POKE = "Poke" class MessageSegment(BaseMessageSegment["MessageChain"]): @@ -43,21 +44,24 @@ class MessageSegment(BaseMessageSegment["MessageChain"]): @validate_arguments @overrides(BaseMessageSegment) def __init__(self, type: MessageType, **data: Any): - super().__init__(type=type, - data={k: v for k, v in data.items() if v is not None}) + super().__init__( + type=type, data={k: v for k, v in data.items() if v is not None} + ) @overrides(BaseMessageSegment) def __str__(self) -> str: - return self.data['text'] if self.is_text() else repr(self) + return self.data["text"] if self.is_text() else repr(self) def __repr__(self) -> str: - return '[mirai:%s]' % ','.join([ - self.type.value, - *map( - lambda s: '%s=%r' % s, - self.data.items(), - ), - ]) + return "[mirai:%s]" % ",".join( + [ + self.type.value, + *map( + lambda s: "%s=%r" % s, + self.data.items(), + ), + ] + ) @overrides(BaseMessageSegment) def is_text(self) -> bool: @@ -65,15 +69,21 @@ class MessageSegment(BaseMessageSegment["MessageChain"]): def as_dict(self) -> Dict[str, Any]: """导出可以被正常json序列化的结构体""" - return {'type': self.type.value, **self.data} + return {"type": self.type.value, **self.data} @classmethod def source(cls, id: int, time: int): return cls(type=MessageType.SOURCE, id=id, time=time) @classmethod - def quote(cls, id: int, group_id: int, sender_id: int, target_id: int, - origin: "MessageChain"): + def quote( + cls, + id: int, + group_id: int, + sender_id: int, + target_id: int, + origin: "MessageChain", + ): """ :说明: @@ -87,12 +97,14 @@ class MessageSegment(BaseMessageSegment["MessageChain"]): * ``target_id: int``: 被引用回复的原消息的接收者者的QQ号（或群号） * ``origin: MessageChain``: 被引用回复的原消息的消息链对象 """ - return cls(type=MessageType.QUOTE, - id=id, - groupId=group_id, - senderId=sender_id, - targetId=target_id, - origin=origin.export()) + return cls( + type=MessageType.QUOTE, + id=id, + groupId=group_id, + senderId=sender_id, + targetId=target_id, + origin=origin.export(), + ) @classmethod def at(cls, target: int): @@ -144,10 +156,12 @@ class MessageSegment(BaseMessageSegment["MessageChain"]): return cls(type=MessageType.PLAIN, text=text) @classmethod - def image(cls, - image_id: Optional[str] = None, - url: Optional[str] = None, - path: Optional[str] = None): + def image( + cls, + image_id: Optional[str] = None, + url: Optional[str] = None, + path: Optional[str] = None, + ): """ :说明: @@ -162,10 +176,12 @@ class MessageSegment(BaseMessageSegment["MessageChain"]): return cls(type=MessageType.IMAGE, imageId=image_id, url=url, path=path) @classmethod - def flash_image(cls, - image_id: Optional[str] = None, - url: Optional[str] = None, - path: Optional[str] = None): + def flash_image( + cls, + image_id: Optional[str] = None, + url: Optional[str] = None, + path: Optional[str] = None, + ): """ :说明: @@ -175,16 +191,15 @@ class MessageSegment(BaseMessageSegment["MessageChain"]): 同 ``image`` """ - return cls(type=MessageType.FLASH_IMAGE, - imageId=image_id, - url=url, - path=path) + return cls(type=MessageType.FLASH_IMAGE, imageId=image_id, url=url, path=path) @classmethod - def voice(cls, - voice_id: Optional[str] = None, - url: Optional[str] = None, - path: Optional[str] = None): + def voice( + cls, + voice_id: Optional[str] = None, + url: Optional[str] = None, + path: Optional[str] = None, + ): """ :说明: @@ -196,10 +211,7 @@ class MessageSegment(BaseMessageSegment["MessageChain"]): * ``url: Optional[str]``: 语音的URL，发送时可作网络语音的链接 * ``path: Optional[str]``: 语音的路径，发送本地语音 """ - return cls(type=MessageType.FLASH_IMAGE, - imageId=voice_id, - url=url, - path=path) + return cls(type=MessageType.FLASH_IMAGE, imageId=voice_id, url=url, path=path) @classmethod def xml(cls, xml: str): @@ -282,16 +294,14 @@ class MessageChain(BaseMessage[MessageSegment]): return [MessageSegment.plain(text=message)] return [ *map( - lambda x: x - if isinstance(x, MessageSegment) else MessageSegment(**x), - message) + lambda x: x if isinstance(x, MessageSegment) else MessageSegment(**x), + message, + ) ] def export(self) -> List[Dict[str, Any]]: """导出为可以被正常json序列化的数组""" - return [ - *map(lambda segment: segment.as_dict(), self.copy()) # type: ignore - ] + return [*map(lambda segment: segment.as_dict(), self.copy())] # type: ignore def extract_first(self, *type: MessageType) -> Optional[MessageSegment]: """ @@ -311,4 +321,4 @@ class MessageChain(BaseMessage[MessageSegment]): return None def __repr__(self) -> str: - return f'<{self.__class__.__name__} {[*self.copy()]}>' + return f"<{self.__class__.__name__} {[*self.copy()]}>" diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/utils.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/utils.py index 200f0197..6a403990 100644 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/utils.py +++ b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/utils.py @@ -1,17 +1,17 @@ import re from functools import wraps -from typing import TYPE_CHECKING, Any, Callable, Coroutine, Optional, TypeVar +from typing import TYPE_CHECKING, Any, TypeVar, Callable, Optional, Coroutine import httpx from pydantic import Extra, ValidationError, validate_arguments -import nonebot.exception as exception from nonebot.log import logger +import nonebot.exception as exception from nonebot.message import handle_event from nonebot.utils import escape_tag, logger_wrapper -from .event import Event, GroupMessage, MessageEvent, MessageSource from .message import MessageType, MessageSegment +from .event import Event, GroupMessage, MessageEvent, MessageSource if TYPE_CHECKING: from .bot import Bot @@ -21,28 +21,27 @@ _AnyCallable = TypeVar("_AnyCallable", bound=Callable) class Log: - @staticmethod def log(level: str, message: str, exception: Optional[Exception] = None): - logger = logger_wrapper('MIRAI') - message = '' + escape_tag(message) + '' + logger = logger_wrapper("MIRAI") + message = "" + escape_tag(message) + "" logger(level=level.upper(), message=message, exception=exception) @classmethod def info(cls, message: Any): - cls.log('INFO', str(message)) + cls.log("INFO", str(message)) @classmethod def debug(cls, message: Any): - cls.log('DEBUG', str(message)) + cls.log("DEBUG", str(message)) @classmethod def warn(cls, message: Any): - cls.log('WARNING', str(message)) + cls.log("WARNING", str(message)) @classmethod def error(cls, message: Any, exception: Optional[Exception] = None): - cls.log('ERROR', str(message), exception=exception) + cls.log("ERROR", str(message), exception=exception) class ActionFailed(exception.ActionFailed): @@ -53,12 +52,13 @@ class ActionFailed(exception.ActionFailed): """ def __init__(self, **kwargs): - super().__init__('mirai') + super().__init__("mirai") self.data = kwargs.copy() def __repr__(self): - return self.__class__.__name__ + '(%s)' % ', '.join( - map(lambda m: '%s=%r' % m, self.data.items())) + return self.__class__.__name__ + "(%s)" % ", ".join( + map(lambda m: "%s=%r" % m, self.data.items()) + ) class InvalidArgument(exception.AdapterException): @@ -69,7 +69,7 @@ class InvalidArgument(exception.AdapterException): """ def __init__(self, **kwargs): - super().__init__('mirai') + super().__init__("mirai") def catch_network_error(function: _AsyncCallable) -> _AsyncCallable: @@ -90,11 +90,12 @@ def catch_network_error(function: _AsyncCallable) -> _AsyncCallable: try: data = await function(*args, **kwargs) except httpx.HTTPError: - raise exception.NetworkError('mirai') - logger.opt(colors=True).debug('Mirai API returned data: ' - f'{escape_tag(str(data))}') + raise exception.NetworkError("mirai") + logger.opt(colors=True).debug( + "Mirai API returned data: " f"{escape_tag(str(data))}" + ) if isinstance(data, dict): - if data.get('code', 0) != 0: + if data.get("code", 0) != 0: raise ActionFailed(**data) return data @@ -109,10 +110,9 @@ def argument_validation(function: _AnyCallable) -> _AnyCallable: 会在参数出错时释放 ``InvalidArgument`` 异常 """ - function = validate_arguments(config={ - 'arbitrary_types_allowed': True, - 'extra': Extra.forbid - })(function) + function = validate_arguments( + config={"arbitrary_types_allowed": True, "extra": Extra.forbid} + )(function) @wraps(function) def wrapper(*args, **kwargs): @@ -134,12 +134,12 @@ def process_source(bot: "Bot", event: MessageEvent) -> MessageEvent: def process_at(bot: "Bot", event: GroupMessage) -> GroupMessage: at = event.message_chain.extract_first(MessageType.AT) if at is not None: - if at.data['target'] == event.self_id: + if at.data["target"] == event.self_id: event.to_me = True else: event.message_chain.insert(0, at) if not event.message_chain: - event.message_chain.append(MessageSegment.plain('')) + event.message_chain.append(MessageSegment.plain("")) return event @@ -147,13 +147,13 @@ def process_nick(bot: "Bot", event: GroupMessage) -> GroupMessage: plain = event.message_chain.extract_first(MessageType.PLAIN) if plain is not None: text = str(plain) - nick_regex = '|'.join(filter(lambda x: x, bot.config.nickname)) + nick_regex = "|".join(filter(lambda x: x, bot.config.nickname)) matched = re.search(rf"^({nick_regex})([\s,，]*|$)", text, re.IGNORECASE) if matched is not None: event.to_me = True nickname = matched.group(1) - Log.info(f'User is calling me {nickname}') - plain.data['text'] = text[matched.end():] + Log.info(f"User is calling me {nickname}") + plain.data["text"] = text[matched.end() :] event.message_chain.insert(0, plain) return event @@ -161,7 +161,7 @@ def process_nick(bot: "Bot", event: GroupMessage) -> GroupMessage: def process_reply(bot: "Bot", event: GroupMessage) -> GroupMessage: reply = event.message_chain.extract_first(MessageType.QUOTE) if reply is not None: - if reply.data['senderId'] == event.self_id: + if reply.data["senderId"] == event.self_id: event.to_me = True else: event.message_chain.insert(0, reply) diff --git a/packages/nonebot-adapter-mirai/pyproject.toml b/packages/nonebot-adapter-mirai/pyproject.toml index 7340cd75..7f3c5380 100644 --- a/packages/nonebot-adapter-mirai/pyproject.toml +++ b/packages/nonebot-adapter-mirai/pyproject.toml @@ -34,6 +34,21 @@ nonebot2 = { path = "../../", develop = true } # url = "https://mirrors.aliyun.com/pypi/simple/" # default = true +[tool.black] +line-length = 88 +target-version = ["py37", "py38", "py39"] +include = '\.pyi?$' +extend-exclude = ''' +''' + +[tool.isort] +profile = "black" +line_length = 80 +length_sort = true +skip_gitignore = true +force_sort_within_sections = true +extra_standard_library = ["typing_extensions"] + [build-system] requires = ["poetry-core>=1.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/packages/nonebot-plugin-docs/nonebot_plugin_docs/__init__.py b/packages/nonebot-plugin-docs/nonebot_plugin_docs/__init__.py index 161cd626..98a40f8c 100644 --- a/packages/nonebot-plugin-docs/nonebot_plugin_docs/__init__.py +++ b/packages/nonebot-plugin-docs/nonebot_plugin_docs/__init__.py @@ -7,8 +7,7 @@ from nonebot.log import logger def init(): driver = nonebot.get_driver() try: - _module = importlib.import_module( - f"nonebot_plugin_docs.drivers.{driver.type}") + _module = importlib.import_module(f"nonebot_plugin_docs.drivers.{driver.type}") except ImportError: logger.warning(f"Driver {driver.type} not supported") return @@ -18,8 +17,9 @@ def init(): port = driver.config.port if host in ["0.0.0.0", "127.0.0.1"]: host = "localhost" - logger.opt(colors=True).info(f"Nonebot docs will be running at: " - f"http://{host}:{port}/docs/") + logger.opt(colors=True).info( + f"Nonebot docs will be running at: " f"http://{host}:{port}/docs/" + ) init() diff --git a/packages/nonebot-plugin-docs/nonebot_plugin_docs/drivers/fastapi.py b/packages/nonebot-plugin-docs/nonebot_plugin_docs/drivers/fastapi.py index da598d19..c01cbd09 100644 --- a/packages/nonebot-plugin-docs/nonebot_plugin_docs/drivers/fastapi.py +++ b/packages/nonebot-plugin-docs/nonebot_plugin_docs/drivers/fastapi.py @@ -9,6 +9,4 @@ def register_route(driver: Driver): static_path = str((Path(__file__).parent / ".." / "dist").resolve()) - app.mount("/docs", - StaticFiles(directory=static_path, html=True), - name="docs") + app.mount("/docs", StaticFiles(directory=static_path, html=True), name="docs") diff --git a/packages/nonebot-plugin-docs/pyproject.toml b/packages/nonebot-plugin-docs/pyproject.toml index ce5c9d18..8ee81dc6 100644 --- a/packages/nonebot-plugin-docs/pyproject.toml +++ b/packages/nonebot-plugin-docs/pyproject.toml @@ -18,6 +18,21 @@ nonebot2 = "^2.0.0-alpha.1" [tool.poetry.dev-dependencies] +[tool.black] +line-length = 88 +target-version = ["py37", "py38", "py39"] +include = '\.pyi?$' +extend-exclude = ''' +''' + +[tool.isort] +profile = "black" +line_length = 80 +length_sort = true +skip_gitignore = true +force_sort_within_sections = true +extra_standard_library = ["typing_extensions"] + [build-system] requires = ["poetry-core>=1.0.0"] build-backend = "poetry.core.masonry.api" diff --git a/poetry.lock b/poetry.lock index b3568e16..56535b06 100644 --- a/poetry.lock +++ b/poetry.lock @@ -151,6 +151,34 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [package.dependencies] pytz = ">=2015.7" +[[package]] +name = "black" +version = "21.11b1" +description = "The uncompromising code formatter." +category = "dev" +optional = false +python-versions = ">=3.6.2" + +[package.dependencies] +click = ">=7.1.2" +mypy-extensions = ">=0.4.3" +pathspec = ">=0.9.0,<1" +platformdirs = ">=2" +regex = ">=2021.4.4" +tomli = ">=0.2.6,<2.0.0" +typed-ast = {version = ">=1.4.2", markers = "python_version < \"3.8\" and implementation_name == \"cpython\""} +typing-extensions = [ + {version = ">=3.10.0.0", markers = "python_version < \"3.10\""}, + {version = "!=3.10.0.1", markers = "python_version >= \"3.10\""}, +] + +[package.extras] +colorama = ["colorama (>=0.4.3)"] +d = ["aiohttp (>=3.7.4)"] +jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] +python2 = ["typed-ast (>=1.4.3)"] +uvloop = ["uvloop (>=0.15.2)"] + [[package]] name = "blinker" version = "1.4" @@ -297,7 +325,7 @@ python-versions = ">=3.5" [[package]] name = "httpcore" -version = "0.14.2" +version = "0.14.3" description = "A minimal low-level HTTP client." category = "main" optional = false @@ -406,6 +434,20 @@ docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] perf = ["ipython"] testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"] +[[package]] +name = "isort" +version = "5.10.1" +description = "A Python utility / library to sort Python imports." +category = "dev" +optional = false +python-versions = ">=3.6.1,<4.0" + +[package.extras] +pipfile_deprecated_finder = ["pipreqs", "requirementslib"] +requirements_deprecated_finder = ["pipreqs", "pip-api"] +colors = ["colorama (>=0.4.3,<0.5.0)"] +plugins = ["setuptools"] + [[package]] name = "itsdangerous" version = "2.0.1" @@ -459,6 +501,14 @@ category = "main" optional = true python-versions = ">=3.6" +[[package]] +name = "mypy-extensions" +version = "0.4.3" +description = "Experimental type system extensions for programs checked with the mypy typechecker." +category = "dev" +optional = false +python-versions = "*" + [[package]] name = "nonebot-adapter-cqhttp" version = "2.0.0-alpha.16" @@ -544,14 +594,34 @@ python-socketio = ">=4.6.1,<5.0.0" [[package]] name = "packaging" -version = "21.2" +version = "21.3" description = "Core utilities for Python packages" category = "dev" optional = false python-versions = ">=3.6" [package.dependencies] -pyparsing = ">=2.0.2,<3" +pyparsing = ">=2.0.2,<3.0.5 || >3.0.5" + +[[package]] +name = "pathspec" +version = "0.9.0" +description = "Utility library for gitignore style pattern matching of file paths." +category = "dev" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" + +[[package]] +name = "platformdirs" +version = "2.4.0" +description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.extras] +docs = ["Sphinx (>=4)", "furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)"] +test = ["appdirs (==1.4.4)", "pytest (>=6)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)"] [[package]] name = "priority" @@ -636,11 +706,14 @@ python-versions = "*" [[package]] name = "pyparsing" -version = "2.4.7" +version = "3.0.6" description = "Python parsing module" category = "dev" optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" +python-versions = ">=3.6" + +[package.extras] +diagrams = ["jinja2", "railroad-diagrams"] [[package]] name = "python-dotenv" @@ -722,6 +795,14 @@ werkzeug = ">=2.0.0" [package.extras] dotenv = ["python-dotenv"] +[[package]] +name = "regex" +version = "2021.11.10" +description = "Alternative regular expression module, to replace re." +category = "dev" +optional = false +python-versions = "*" + [[package]] name = "requests" version = "2.26.0" @@ -925,6 +1006,14 @@ category = "main" optional = true python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" +[[package]] +name = "tomli" +version = "1.2.2" +description = "A lil' TOML parser" +category = "dev" +optional = false +python-versions = ">=3.6" + [[package]] name = "tomlkit" version = "0.7.2" @@ -933,6 +1022,14 @@ category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +[[package]] +name = "typed-ast" +version = "1.5.0" +description = "a fork of Python 2 and 3 ast modules with type comment support" +category = "dev" +optional = false +python-versions = ">=3.6" + [[package]] name = "typing-extensions" version = "4.0.0" @@ -1100,7 +1197,7 @@ quart = ["Quart"] [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "537c91f98fd6598dbce8c2942530f18dee0858a896b6f393a684252a77dc76c6" +content-hash = "9a64b2ba25ea3367e1636545241122d5b4d454ab3042865416193f84bf358fc3" [metadata.files] aiocache = [ @@ -1221,6 +1318,10 @@ babel = [ {file = "Babel-2.9.1-py2.py3-none-any.whl", hash = "sha256:ab49e12b91d937cd11f0b67cb259a57ab4ad2b59ac7a3b41d6c06c0ac5b0def9"}, {file = "Babel-2.9.1.tar.gz", hash = "sha256:bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0"}, ] +black = [ + {file = "black-21.11b1-py3-none-any.whl", hash = "sha256:802c6c30b637b28645b7fde282ed2569c0cd777dbe493a41b6a03c1d903f99ac"}, + {file = "black-21.11b1.tar.gz", hash = "sha256:a042adbb18b3262faad5aff4e834ff186bb893f95ba3a8013f09de1e5569def2"}, +] blinker = [ {file = "blinker-1.4.tar.gz", hash = "sha256:471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6"}, ] @@ -1471,8 +1572,8 @@ html2text = [ {file = "html2text-2020.1.16.tar.gz", hash = "sha256:e296318e16b059ddb97f7a8a1d6a5c1d7af4544049a01e261731d2d5cc277bbb"}, ] httpcore = [ - {file = "httpcore-0.14.2-py3-none-any.whl", hash = "sha256:47d7c8f755719d4a57be0b6e022897e9e963bf9ce4b15b9cc006a38a1cfa2932"}, - {file = "httpcore-0.14.2.tar.gz", hash = "sha256:ff8f8b9434ec4823f95a30596fbe78039913e706d3e598b0b8955b1e1828e093"}, + {file = "httpcore-0.14.3-py3-none-any.whl", hash = "sha256:9a98d2416b78976fc5396ff1f6b26ae9885efbb3105d24eed490f20ab4c95ec1"}, + {file = "httpcore-0.14.3.tar.gz", hash = "sha256:d10162a63265a0228d5807964bd964478cbdb5178f9a2eedfebb2faba27eef5d"}, ] httptools = [ {file = "httptools-0.2.0-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:79dbc21f3612a78b28384e989b21872e2e3cf3968532601544696e4ed0007ce5"}, @@ -1515,6 +1616,10 @@ importlib-metadata = [ {file = "importlib_metadata-4.8.2-py3-none-any.whl", hash = "sha256:53ccfd5c134223e497627b9815d5030edf77d2ed573922f7a0b8f8bb81a1c100"}, {file = "importlib_metadata-4.8.2.tar.gz", hash = "sha256:75bdec14c397f528724c1bfd9709d660b33a4d2e77387a3358f20b848bb5e5fb"}, ] +isort = [ + {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"}, + {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"}, +] itsdangerous = [ {file = "itsdangerous-2.0.1-py3-none-any.whl", hash = "sha256:5174094b9637652bdb841a3029700391451bd092ba3db90600dea710ba28e97c"}, {file = "itsdangerous-2.0.1.tar.gz", hash = "sha256:9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0"}, @@ -1672,6 +1777,10 @@ multidict = [ {file = "multidict-5.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:c9631c642e08b9fff1c6255487e62971d8b8e821808ddd013d8ac058087591ac"}, {file = "multidict-5.2.0.tar.gz", hash = "sha256:0dd1c93edb444b33ba2274b66f63def8a327d607c6c790772f448a53b6ea59ce"}, ] +mypy-extensions = [ + {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, + {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, +] nonebot-adapter-cqhttp = [] nonebot-adapter-ding = [] nonebot-adapter-feishu = [] @@ -1681,8 +1790,16 @@ nonebot-plugin-test = [ {file = "nonebot_plugin_test-0.3.0-py3-none-any.whl", hash = "sha256:edb880340436323ccd0a13b31d48975136b6bdc71daa178601c4b05b068cc73e"}, ] packaging = [ - {file = "packaging-21.2-py3-none-any.whl", hash = "sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0"}, - {file = "packaging-21.2.tar.gz", hash = "sha256:096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966"}, + {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"}, + {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"}, +] +pathspec = [ + {file = "pathspec-0.9.0-py2.py3-none-any.whl", hash = "sha256:7d15c4ddb0b5c802d161efc417ec1a2558ea2653c2e8ad9c19098201dc1c993a"}, + {file = "pathspec-0.9.0.tar.gz", hash = "sha256:e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"}, +] +platformdirs = [ + {file = "platformdirs-2.4.0-py3-none-any.whl", hash = "sha256:8868bbe3c3c80d42f20156f22e7131d2fb321f5bc86a2a345375c6481a67021d"}, + {file = "platformdirs-2.4.0.tar.gz", hash = "sha256:367a5e80b3d04d2428ffa76d33f124cf11e8fff2acdaa9b43d545f5c7d661ef2"}, ] priority = [ {file = "priority-2.0.0-py3-none-any.whl", hash = "sha256:6f8eefce5f3ad59baf2c080a664037bb4725cd0a790d53d59ab4059288faf6aa"}, @@ -1793,8 +1910,8 @@ pygtrie = [ {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, ] pyparsing = [ - {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"}, - {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"}, + {file = "pyparsing-3.0.6-py3-none-any.whl", hash = "sha256:04ff808a5b90911829c55c4e26f75fa5ca8a2f5f36aa3a51f68e27033341d3e4"}, + {file = "pyparsing-3.0.6.tar.gz", hash = "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"}, ] python-dotenv = [ {file = "python-dotenv-0.19.2.tar.gz", hash = "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"}, @@ -1851,6 +1968,57 @@ quart = [ {file = "Quart-0.15.1-py3-none-any.whl", hash = "sha256:f35134fb1d81af61624e6d89bca33cd611dcedce2dc4e291f527ab04395f4e1a"}, {file = "Quart-0.15.1.tar.gz", hash = "sha256:f80c91d1e0588662483e22dd9c368a5778886b62e128c5399d2cc1b1898482cf"}, ] +regex = [ + {file = "regex-2021.11.10-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9345b6f7ee578bad8e475129ed40123d265464c4cfead6c261fd60fc9de00bcf"}, + {file = "regex-2021.11.10-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:416c5f1a188c91e3eb41e9c8787288e707f7d2ebe66e0a6563af280d9b68478f"}, + {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e0538c43565ee6e703d3a7c3bdfe4037a5209250e8502c98f20fea6f5fdf2965"}, + {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ee1227cf08b6716c85504aebc49ac827eb88fcc6e51564f010f11a406c0a667"}, + {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6650f16365f1924d6014d2ea770bde8555b4a39dc9576abb95e3cd1ff0263b36"}, + {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:30ab804ea73972049b7a2a5c62d97687d69b5a60a67adca07eb73a0ddbc9e29f"}, + {file = "regex-2021.11.10-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:68a067c11463de2a37157930d8b153005085e42bcb7ad9ca562d77ba7d1404e0"}, + {file = "regex-2021.11.10-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:162abfd74e88001d20cb73ceaffbfe601469923e875caf9118333b1a4aaafdc4"}, + {file = "regex-2021.11.10-cp310-cp310-win32.whl", hash = "sha256:98ba568e8ae26beb726aeea2273053c717641933836568c2a0278a84987b2a1a"}, + {file = "regex-2021.11.10-cp310-cp310-win_amd64.whl", hash = "sha256:780b48456a0f0ba4d390e8b5f7c661fdd218934388cde1a974010a965e200e12"}, + {file = "regex-2021.11.10-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:dba70f30fd81f8ce6d32ddeef37d91c8948e5d5a4c63242d16a2b2df8143aafc"}, + {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e1f54b9b4b6c53369f40028d2dd07a8c374583417ee6ec0ea304e710a20f80a0"}, + {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fbb9dc00e39f3e6c0ef48edee202f9520dafb233e8b51b06b8428cfcb92abd30"}, + {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:666abff54e474d28ff42756d94544cdfd42e2ee97065857413b72e8a2d6a6345"}, + {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5537f71b6d646f7f5f340562ec4c77b6e1c915f8baae822ea0b7e46c1f09b733"}, + {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ed2e07c6a26ed4bea91b897ee2b0835c21716d9a469a96c3e878dc5f8c55bb23"}, + {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ca5f18a75e1256ce07494e245cdb146f5a9267d3c702ebf9b65c7f8bd843431e"}, + {file = "regex-2021.11.10-cp36-cp36m-win32.whl", hash = "sha256:93a5051fcf5fad72de73b96f07d30bc29665697fb8ecdfbc474f3452c78adcf4"}, + {file = "regex-2021.11.10-cp36-cp36m-win_amd64.whl", hash = "sha256:b483c9d00a565633c87abd0aaf27eb5016de23fed952e054ecc19ce32f6a9e7e"}, + {file = "regex-2021.11.10-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fff55f3ce50a3ff63ec8e2a8d3dd924f1941b250b0aac3d3d42b687eeff07a8e"}, + {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e32d2a2b02ccbef10145df9135751abea1f9f076e67a4e261b05f24b94219e36"}, + {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:53db2c6be8a2710b359bfd3d3aa17ba38f8aa72a82309a12ae99d3c0c3dcd74d"}, + {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2207ae4f64ad3af399e2d30dde66f0b36ae5c3129b52885f1bffc2f05ec505c8"}, + {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5ca078bb666c4a9d1287a379fe617a6dccd18c3e8a7e6c7e1eb8974330c626a"}, + {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dd33eb9bdcfbabab3459c9ee651d94c842bc8a05fabc95edf4ee0c15a072495e"}, + {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:05b7d6d7e64efe309972adab77fc2af8907bb93217ec60aa9fe12a0dad35874f"}, + {file = "regex-2021.11.10-cp37-cp37m-win32.whl", hash = "sha256:e71255ba42567d34a13c03968736c5d39bb4a97ce98188fafb27ce981115beec"}, + {file = "regex-2021.11.10-cp37-cp37m-win_amd64.whl", hash = "sha256:07856afef5ffcc052e7eccf3213317fbb94e4a5cd8177a2caa69c980657b3cb4"}, + {file = "regex-2021.11.10-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba05430e819e58544e840a68b03b28b6d328aff2e41579037e8bab7653b37d83"}, + {file = "regex-2021.11.10-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7f301b11b9d214f83ddaf689181051e7f48905568b0c7017c04c06dfd065e244"}, + {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4aaa4e0705ef2b73dd8e36eeb4c868f80f8393f5f4d855e94025ce7ad8525f50"}, + {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:788aef3549f1924d5c38263104dae7395bf020a42776d5ec5ea2b0d3d85d6646"}, + {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f8af619e3be812a2059b212064ea7a640aff0568d972cd1b9e920837469eb3cb"}, + {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85bfa6a5413be0ee6c5c4a663668a2cad2cbecdee367630d097d7823041bdeec"}, + {file = "regex-2021.11.10-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f23222527b307970e383433daec128d769ff778d9b29343fb3496472dc20dabe"}, + {file = "regex-2021.11.10-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:da1a90c1ddb7531b1d5ff1e171b4ee61f6345119be7351104b67ff413843fe94"}, + {file = "regex-2021.11.10-cp38-cp38-win32.whl", hash = "sha256:0617383e2fe465732af4509e61648b77cbe3aee68b6ac8c0b6fe934db90be5cc"}, + {file = "regex-2021.11.10-cp38-cp38-win_amd64.whl", hash = "sha256:a3feefd5e95871872673b08636f96b61ebef62971eab044f5124fb4dea39919d"}, + {file = "regex-2021.11.10-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f7f325be2804246a75a4f45c72d4ce80d2443ab815063cdf70ee8fb2ca59ee1b"}, + {file = "regex-2021.11.10-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:537ca6a3586931b16a85ac38c08cc48f10fc870a5b25e51794c74df843e9966d"}, + {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eef2afb0fd1747f33f1ee3e209bce1ed582d1896b240ccc5e2697e3275f037c7"}, + {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:432bd15d40ed835a51617521d60d0125867f7b88acf653e4ed994a1f8e4995dc"}, + {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b43c2b8a330a490daaef5a47ab114935002b13b3f9dc5da56d5322ff218eeadb"}, + {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:962b9a917dd7ceacbe5cd424556914cb0d636001e393b43dc886ba31d2a1e449"}, + {file = "regex-2021.11.10-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fa8c626d6441e2d04b6ee703ef2d1e17608ad44c7cb75258c09dd42bacdfc64b"}, + {file = "regex-2021.11.10-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3c5fb32cc6077abad3bbf0323067636d93307c9fa93e072771cf9a64d1c0f3ef"}, + {file = "regex-2021.11.10-cp39-cp39-win32.whl", hash = "sha256:3b5df18db1fccd66de15aa59c41e4f853b5df7550723d26aa6cb7f40e5d9da5a"}, + {file = "regex-2021.11.10-cp39-cp39-win_amd64.whl", hash = "sha256:83ee89483672b11f8952b158640d0c0ff02dc43d9cb1b70c1564b49abe92ce29"}, + {file = "regex-2021.11.10.tar.gz", hash = "sha256:f341ee2df0999bfdf7a95e448075effe0db212a59387de1a70690e4acb03d4c6"}, +] requests = [ {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, @@ -1908,10 +2076,35 @@ toml = [ {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, ] +tomli = [ + {file = "tomli-1.2.2-py3-none-any.whl", hash = "sha256:f04066f68f5554911363063a30b108d2b5a5b1a010aa8b6132af78489fe3aade"}, + {file = "tomli-1.2.2.tar.gz", hash = "sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee"}, +] tomlkit = [ {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"}, {file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"}, ] +typed-ast = [ + {file = "typed_ast-1.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7b310a207ee9fde3f46ba327989e6cba4195bc0c8c70a158456e7b10233e6bed"}, + {file = "typed_ast-1.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:52ca2b2b524d770bed7a393371a38e91943f9160a190141e0df911586066ecda"}, + {file = "typed_ast-1.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:14fed8820114a389a2b7e91624db5f85f3f6682fda09fe0268a59aabd28fe5f5"}, + {file = "typed_ast-1.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:65c81abbabda7d760df7304d843cc9dbe7ef5d485504ca59a46ae2d1731d2428"}, + {file = "typed_ast-1.5.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:37ba2ab65a0028b1a4f2b61a8fe77f12d242731977d274a03d68ebb751271508"}, + {file = "typed_ast-1.5.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:49af5b8f6f03ed1eb89ee06c1d7c2e7c8e743d720c3746a5857609a1abc94c94"}, + {file = "typed_ast-1.5.0-cp36-cp36m-win_amd64.whl", hash = "sha256:e4374a76e61399a173137e7984a1d7e356038cf844f24fd8aea46c8029a2f712"}, + {file = "typed_ast-1.5.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:ea517c2bb11c5e4ba7a83a91482a2837041181d57d3ed0749a6c382a2b6b7086"}, + {file = "typed_ast-1.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:51040bf45aacefa44fa67fb9ebcd1f2bec73182b99a532c2394eea7dabd18e24"}, + {file = "typed_ast-1.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:806e0c7346b9b4af8c62d9a29053f484599921a4448c37fbbcbbf15c25138570"}, + {file = "typed_ast-1.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a67fd5914603e2165e075f1b12f5a8356bfb9557e8bfb74511108cfbab0f51ed"}, + {file = "typed_ast-1.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:224afecb8b39739f5c9562794a7c98325cb9d972712e1a98b6989a4720219541"}, + {file = "typed_ast-1.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:155b74b078be842d2eb630dd30a280025eca0a5383c7d45853c27afee65f278f"}, + {file = "typed_ast-1.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:361b9e5d27bd8e3ccb6ea6ad6c4f3c0be322a1a0f8177db6d56264fa0ae40410"}, + {file = "typed_ast-1.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:618912cbc7e17b4aeba86ffe071698c6e2d292acbd6d1d5ec1ee724b8c4ae450"}, + {file = "typed_ast-1.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:7e6731044f748340ef68dcadb5172a4b1f40847a2983fe3983b2a66445fbc8e6"}, + {file = "typed_ast-1.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e8a9b9c87801cecaad3b4c2b8876387115d1a14caa602c1618cedbb0cb2a14e6"}, + {file = "typed_ast-1.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:ec184dfb5d3d11e82841dbb973e7092b75f306b625fad7b2e665b64c5d60ab3f"}, + {file = "typed_ast-1.5.0.tar.gz", hash = "sha256:ff4ad88271aa7a55f19b6a161ed44e088c393846d954729549e3cde8257747bb"}, +] typing-extensions = [ {file = "typing_extensions-4.0.0-py3-none-any.whl", hash = "sha256:829704698b22e13ec9eaf959122315eabb370b0884400e9818334d8b677023d9"}, {file = "typing_extensions-4.0.0.tar.gz", hash = "sha256:2cdf80e4e04866a9b3689a51869016d36db0814d84b8d8a568d22781d45d27ed"}, diff --git a/pyproject.toml b/pyproject.toml index 404eb0ac..1b00e887 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,8 +36,9 @@ uvicorn = { version = "^0.15.0", extras = ["standard"] } aiohttp = { version = "^3.7.4", extras = ["speedups"], optional = true } [tool.poetry.dev-dependencies] -yapf = "^0.31.0" sphinx = "^4.1.1" +isort = "^5.10.1" +black = "^21.11b1" nonebot-plugin-test = "^0.3.0" nonebot-adapter-cqhttp = { path = "./packages/nonebot-adapter-cqhttp", develop = true } nonebot-adapter-ding = { path = "./packages/nonebot-adapter-ding", develop = true } @@ -55,13 +56,21 @@ all = ["quart", "aiohttp"] # url = "https://mirrors.aliyun.com/pypi/simple/" # default = true +[tool.black] +line-length = 88 +target-version = ["py37", "py38", "py39", "py310"] +include = '\.pyi?$' +extend-exclude = ''' +''' + [tool.isort] +profile = "black" line_length = 80 length_sort = true skip_gitignore = true force_sort_within_sections = true -known_local_folder = "nonebot" -extra_standard_library = "typing_extensions" +known_local_folder = ["nonebot"] +extra_standard_library = ["typing_extensions"] [build-system] requires = ["poetry_core>=1.0.0"] diff --git a/tests/bot.py b/tests/bot.py index ef719db0..739078b2 100644 --- a/tests/bot.py +++ b/tests/bot.py @@ -11,11 +11,9 @@ from nonebot.adapters.mirai import Bot as MiraiBot from nonebot.adapters.feishu import Bot as FeishuBot # test custom log -logger.add("error.log", - rotation="00:00", - diagnose=False, - level="ERROR", - format=default_format) +logger.add( + "error.log", rotation="00:00", diagnose=False, level="ERROR", format=default_format +) nonebot.init(custom_config2="config on init") app = nonebot.get_asgi() diff --git a/tests/test_plugins/test_ding.py b/tests/test_plugins/test_ding.py index ad9b8d4c..234d07fe 100644 --- a/tests/test_plugins/test_ding.py +++ b/tests/test_plugins/test_ding.py @@ -1,7 +1,8 @@ -from nonebot.adapters.ding.event import GroupMessageEvent, PrivateMessageEvent from nonebot.rule import to_me from nonebot.plugin import on_command -from nonebot.adapters.ding import Bot as DingBot, MessageSegment, MessageEvent +from nonebot.adapters.ding import Bot as DingBot +from nonebot.adapters.ding import MessageEvent, MessageSegment +from nonebot.adapters.ding.event import GroupMessageEvent, PrivateMessageEvent helper = on_command("ding_helper", to_me()) @@ -34,7 +35,7 @@ markdown = on_command("markdown", to_me()) async def markdown_handler(bot: DingBot): message = MessageSegment.markdown( "Hello, This is NoneBot", - "#### NoneBot \n> Nonebot 是一款高性能的 Python 机器人框架\n> ![screenshot](https://v2.nonebot.dev/logo.png)\n> [GitHub 仓库地址](https://github.com/nonebot/nonebot2) \n" + "#### NoneBot \n> Nonebot 是一款高性能的 Python 机器人框架\n> ![screenshot](https://v2.nonebot.dev/logo.png)\n> [GitHub 仓库地址](https://github.com/nonebot/nonebot2) \n", ) await markdown.finish(message) @@ -46,10 +47,10 @@ actionCardSingleBtn = on_command("actionCardSingleBtn", to_me()) async def actionCardSingleBtn_handler(bot: DingBot): message = MessageSegment.actionCardSingleBtn( title="打造一间咖啡厅", - text= - "![screenshot](https://img.alicdn.com/tfs/TB1NwmBEL9TBuNjy1zbXXXpepXa-2400-1218.png) \n #### 乔布斯 20 年前想打造的苹果咖啡厅 \n\n Apple Store 的设计正从原来满满的科技感走向生活化，而其生活化的走向其实可以追溯到 20 年前苹果一个建立咖啡馆的计划", + text="![screenshot](https://img.alicdn.com/tfs/TB1NwmBEL9TBuNjy1zbXXXpepXa-2400-1218.png) \n #### 乔布斯 20 年前想打造的苹果咖啡厅 \n\n Apple Store 的设计正从原来满满的科技感走向生活化，而其生活化的走向其实可以追溯到 20 年前苹果一个建立咖啡馆的计划", singleTitle="阅读全文", - singleURL="https://www.dingtalk.com/") + singleURL="https://www.dingtalk.com/", + ) await actionCardSingleBtn.finish(message) @@ -58,26 +59,21 @@ actionCard = on_command("actionCard", to_me()) @actionCard.handle() async def actionCard_handler(bot: DingBot): - message = MessageSegment.raw({ - "msgtype": "actionCard", - "actionCard": { - "title": - "乔布斯 20 年前想打造一间苹果咖啡厅，而它正是 Apple Store 的前身", - "text": - "![screenshot](https://img.alicdn.com/tfs/TB1NwmBEL9TBuNjy1zbXXXpepXa-2400-1218.png) \n\n #### 乔布斯 20 年前想打造的苹果咖啡厅 \n\n Apple Store 的设计正从原来满满的科技感走向生活化，而其生活化的走向其实可以追溯到 20 年前苹果一个建立咖啡馆的计划", - "hideAvatar": - "0", - "btnOrientation": - "0", - "btns": [{ - "title": "内容不错", - "actionURL": "https://www.dingtalk.com/" - }, { - "title": "不感兴趣", - "actionURL": "https://www.dingtalk.com/" - }] + message = MessageSegment.raw( + { + "msgtype": "actionCard", + "actionCard": { + "title": "乔布斯 20 年前想打造一间苹果咖啡厅，而它正是 Apple Store 的前身", + "text": "![screenshot](https://img.alicdn.com/tfs/TB1NwmBEL9TBuNjy1zbXXXpepXa-2400-1218.png) \n\n #### 乔布斯 20 年前想打造的苹果咖啡厅 \n\n Apple Store 的设计正从原来满满的科技感走向生活化，而其生活化的走向其实可以追溯到 20 年前苹果一个建立咖啡馆的计划", + "hideAvatar": "0", + "btnOrientation": "0", + "btns": [ + {"title": "内容不错", "actionURL": "https://www.dingtalk.com/"}, + {"title": "不感兴趣", "actionURL": "https://www.dingtalk.com/"}, + ], + }, } - }) + ) await actionCard.finish(message, at_sender=True) @@ -86,26 +82,25 @@ feedCard = on_command("feedCard", to_me()) @feedCard.handle() async def feedCard_handler(bot: DingBot): - message = MessageSegment.raw({ - "msgtype": "feedCard", - "feedCard": { - "links": [{ - "title": - "时代的火车向前开1", - "messageURL": - "https://www.dingtalk.com/", - "picURL": - "https://img.alicdn.com/tfs/TB1NwmBEL9TBuNjy1zbXXXpepXa-2400-1218.png" - }, { - "title": - "时代的火车向前开2", - "messageURL": - "https://www.dingtalk.com/", - "picURL": - "https://img.alicdn.com/tfs/TB1NwmBEL9TBuNjy1zbXXXpepXa-2400-1218.png" - }] + message = MessageSegment.raw( + { + "msgtype": "feedCard", + "feedCard": { + "links": [ + { + "title": "时代的火车向前开1", + "messageURL": "https://www.dingtalk.com/", + "picURL": "https://img.alicdn.com/tfs/TB1NwmBEL9TBuNjy1zbXXXpepXa-2400-1218.png", + }, + { + "title": "时代的火车向前开2", + "messageURL": "https://www.dingtalk.com/", + "picURL": "https://img.alicdn.com/tfs/TB1NwmBEL9TBuNjy1zbXXXpepXa-2400-1218.png", + }, + ] + }, } - }) + ) await feedCard.finish(message) @@ -115,7 +110,8 @@ atme = on_command("atme", to_me()) @atme.handle() async def atme_handler(bot: DingBot, event: MessageEvent): message = f"@{event.senderId} manually at you" + MessageSegment.atDingtalkIds( - event.senderId) + event.senderId + ) await atme.send("matcher send auto at you", at_sender=True) await bot.send(event, "bot send auto at you", at_sender=True) await atme.finish(message) @@ -143,12 +139,12 @@ async def textAdd_handler(bot: DingBot, event: MessageEvent): message = message + MessageSegment.text("第二段消息\n") await textAdd.send(message) - message = message + MessageSegment.text( - "\n第三段消息\n") + "adfkasfkhsdkfahskdjasdashdkjasdf" - message = message + MessageSegment.extension({ - "text_type": "code_snippet", - "code_language": "C#" - }) + message = ( + message + MessageSegment.text("\n第三段消息\n") + "adfkasfkhsdkfahskdjasdashdkjasdf" + ) + message = message + MessageSegment.extension( + {"text_type": "code_snippet", "code_language": "C#"} + ) await textAdd.send(message) @@ -159,7 +155,8 @@ code = on_command("code", to_me()) async def code_handler(bot: DingBot, event: MessageEvent): raw = MessageSegment.code("Python", 'print("hello world")') await code.send(raw) - message = MessageSegment.text("""using System; + message = MessageSegment.text( + """using System; namespace HelloWorld { @@ -170,11 +167,11 @@ namespace HelloWorld Console.WriteLine("Hello World!"); } } -}""") - message += MessageSegment.extension({ - "text_type": "code_snippet", - "code_language": "C#" - }) +}""" + ) + message += MessageSegment.extension( + {"text_type": "code_snippet", "code_language": "C#"} + ) await code.finish(message) @@ -196,12 +193,12 @@ hello = on_command("hello", to_me()) @hello.handle() async def hello_handler(bot: DingBot, event: MessageEvent): - message = MessageSegment.raw({ - "msgtype": "text", - "text": { - "content": 'hello ' - }, - }) + message = MessageSegment.raw( + { + "msgtype": "text", + "text": {"content": "hello "}, + } + ) message += MessageSegment.atDingtalkIds(event.senderId) await hello.send(message) @@ -216,22 +213,21 @@ hello = on_command("webhook", to_me()) @hello.handle() async def webhook_handler(bot: DingBot, event: MessageEvent): print(event) - message = MessageSegment.raw({ - "msgtype": "text", - "text": { - "content": 'hello from webhook,一定要注意安全方式的鉴权哦，否则可能发送失败的' - }, - }) + message = MessageSegment.raw( + { + "msgtype": "text", + "text": {"content": "hello from webhook,一定要注意安全方式的鉴权哦，否则可能发送失败的"}, + } + ) message += MessageSegment.atDingtalkIds(event.senderId) await hello.send( message, - webhook= - "https://oapi.dingtalk.com/robot/send?access_token=XXXXXXXXXXXXXX", - secret="SECXXXXXXXXXXXXXXXXXXXXXXXXX") + webhook="https://oapi.dingtalk.com/robot/send?access_token=XXXXXXXXXXXXXX", + secret="SECXXXXXXXXXXXXXXXXXXXXXXXXX", + ) message = MessageSegment.text("TEST 123123 S") await hello.send( message, - webhook= - "https://oapi.dingtalk.com/robot/send?access_token=XXXXXXXXXXXXXX", + webhook="https://oapi.dingtalk.com/robot/send?access_token=XXXXXXXXXXXXXX", ) diff --git a/tests/test_plugins/test_feishu.py b/tests/test_plugins/test_feishu.py index 960ae377..5d8726eb 100644 --- a/tests/test_plugins/test_feishu.py +++ b/tests/test_plugins/test_feishu.py @@ -1,6 +1,7 @@ -from nonebot.plugin import on_command from nonebot.typing import T_State -from nonebot.adapters.feishu import Bot as FeishuBot, MessageEvent +from nonebot.plugin import on_command +from nonebot.adapters.feishu import MessageEvent +from nonebot.adapters.feishu import Bot as FeishuBot helper = on_command("say") diff --git a/tests/test_plugins/test_get_export.py b/tests/test_plugins/test_get_export.py index ec4437d1..1bf06602 100644 --- a/tests/test_plugins/test_get_export.py +++ b/tests/test_plugins/test_get_export.py @@ -1,5 +1,4 @@ import nonebot - from .test_export import export print(export, nonebot.require("test_export")) diff --git a/tests/test_plugins/test_group/__init__.py b/tests/test_plugins/test_group/__init__.py index 9d1d04a7..cd081381 100644 --- a/tests/test_plugins/test_group/__init__.py +++ b/tests/test_plugins/test_group/__init__.py @@ -4,4 +4,4 @@ from nonebot import CommandGroup, MatcherGroup cmd = CommandGroup("test", rule=to_me()) match = MatcherGroup(priority=2) -from . import commands, matches +from . import matches, commands diff --git a/tests/test_plugins/test_group/commands.py b/tests/test_plugins/test_group/commands.py index 4d0898b9..71968351 100644 --- a/tests/test_plugins/test_group/commands.py +++ b/tests/test_plugins/test_group/commands.py @@ -1,6 +1,5 @@ -from nonebot.adapters import Bot, Event - from . import cmd +from nonebot.adapters import Bot, Event test_1 = cmd.command("1", aliases={"test"}) diff --git a/tests/test_plugins/test_group/matches.py b/tests/test_plugins/test_group/matches.py index d33d8dc7..595fd6a4 100644 --- a/tests/test_plugins/test_group/matches.py +++ b/tests/test_plugins/test_group/matches.py @@ -1,9 +1,8 @@ +from . import match from nonebot.typing import T_State from nonebot.adapters import Bot, Event from nonebot.adapters.cqhttp import HeartbeatMetaEvent -from . import match - async def heartbeat(bot: Bot, event: Event, state: T_State) -> bool: return isinstance(event, HeartbeatMetaEvent) diff --git a/tests/test_plugins/test_metaevent.py b/tests/test_plugins/test_metaevent.py index e2a160e2..98f76f78 100644 --- a/tests/test_plugins/test_metaevent.py +++ b/tests/test_plugins/test_metaevent.py @@ -1,6 +1,6 @@ from nonebot.typing import T_State -from nonebot.plugin import on_metaevent from nonebot.adapters import Bot, Event +from nonebot.plugin import on_metaevent from nonebot.adapters.cqhttp import HeartbeatMetaEvent diff --git a/tests/test_plugins/test_mirai.py b/tests/test_plugins/test_mirai.py index c518290a..08b23e34 100644 --- a/tests/test_plugins/test_mirai.py +++ b/tests/test_plugins/test_mirai.py @@ -1,8 +1,8 @@ -from nonebot.plugin import on_keyword, on_command from nonebot.rule import to_me +from nonebot.plugin import on_command, on_keyword from nonebot.adapters.mirai import Bot, MessageEvent -message_test = on_keyword({'reply'}, rule=to_me()) +message_test = on_keyword({"reply"}, rule=to_me()) @message_test.handle() @@ -11,10 +11,10 @@ async def _message(bot: Bot, event: MessageEvent): await bot.send(event, text, at_sender=True) -command_test = on_command('miecho') +command_test = on_command("miecho") @command_test.handle() async def _echo(bot: Bot, event: MessageEvent): text = event.get_plaintext() - await bot.send(event, text, at_sender=True) \ No newline at end of file + await bot.send(event, text, at_sender=True) diff --git a/tests/test_plugins/test_overload.py b/tests/test_plugins/test_overload.py index 06712779..4e9074e5 100644 --- a/tests/test_plugins/test_overload.py +++ b/tests/test_plugins/test_overload.py @@ -1,5 +1,5 @@ from nonebot import on_command -from nonebot.adapters.cqhttp import Bot, PrivateMessageEvent, GroupMessageEvent +from nonebot.adapters.cqhttp import Bot, GroupMessageEvent, PrivateMessageEvent overload = on_command("overload") diff --git a/tests/test_plugins/test_permission.py b/tests/test_plugins/test_permission.py index 1f8b71d6..51e2f7cd 100644 --- a/tests/test_plugins/test_permission.py +++ b/tests/test_plugins/test_permission.py @@ -1,7 +1,7 @@ from nonebot.rule import to_me from nonebot.typing import T_State -from nonebot.plugin import on_startswith from nonebot.permission import SUPERUSER +from nonebot.plugin import on_startswith from nonebot.adapters.ding import Bot as DingBot from nonebot.adapters.cqhttp import Bot as CQHTTPBot diff --git a/tests/test_plugins/test_shell.py b/tests/test_plugins/test_shell.py index 63719b42..3428406c 100644 --- a/tests/test_plugins/test_shell.py +++ b/tests/test_plugins/test_shell.py @@ -1,7 +1,7 @@ from nonebot.adapters import Bot from nonebot.typing import T_State from nonebot import on_shell_command -from nonebot.rule import to_me, ArgumentParser +from nonebot.rule import ArgumentParser, to_me parser = ArgumentParser() parser.add_argument("-a", action="store_true") From db5d4d7acf48b95b9b7b6492fa730d0da3438506 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 22 Nov 2021 23:31:03 +0800 Subject: [PATCH 042/174] :construction_worker: update ci --- .github/workflows/build_docs.yml | 2 +- .github/workflows/nonebot_plugin_docs.yml | 6 ++---- pages/changelog.md | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index ed960d53..2c47090a 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/cache@v1 with: path: ~/.cache/pypoetry/virtualenvs - key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }} + key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }} - name: Set up dependencies run: | diff --git a/.github/workflows/nonebot_plugin_docs.yml b/.github/workflows/nonebot_plugin_docs.yml index 757ef41a..032d4ad5 100644 --- a/.github/workflows/nonebot_plugin_docs.yml +++ b/.github/workflows/nonebot_plugin_docs.yml @@ -26,10 +26,8 @@ jobs: with: python-version: 3.8 architecture: "x64" - - name: Install Poetry - run: | - python -m pip install --upgrade pip - pip install poetry + + - uses: Gr1N/setup-poetry@v4 - name: Publish Package run: | diff --git a/pages/changelog.md b/pages/changelog.md index a8565f0c..d110e62e 100644 --- a/pages/changelog.md +++ b/pages/changelog.md @@ -9,7 +9,7 @@ sidebar: auto - 新增 `MessageTemplate` 对于 `str` 普通模板的支持 - 移除插件加载的 `NameSpace` 模式 - 修改 toml 加载插件时的键名为 `tool.nonebot` 以符合规范 -- 新增 Handler 依赖注入支持 +- 新增 Handler 依赖注入支持，同步/异步支持 - 统一 `Processor`, `Rule`, `Permission` 使用 `Handler` ## v2.0.0a16 From 286729f7038fa6d5d960517f95aca791a361cf36 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 23 Nov 2021 16:21:21 +0800 Subject: [PATCH 043/174] :fire: remove cqhttp files --- docs/api/adapters/cqhttp.md | 686 ----------------- docs_build/adapters/cqhttp.rst | 60 -- nonebot/plugins/echo.py | 26 +- packages/nonebot-adapter-cqhttp/README.md | 11 - .../nonebot/__init__.py | 0 .../nonebot/adapters/__init__.py | 0 .../nonebot/adapters/cqhttp/__init__.py | 24 - .../nonebot/adapters/cqhttp/bot.py | 489 ------------ .../nonebot/adapters/cqhttp/bot.pyi | 726 ------------------ .../nonebot/adapters/cqhttp/config.py | 24 - .../nonebot/adapters/cqhttp/event.py | 633 --------------- .../nonebot/adapters/cqhttp/exception.py | 68 -- .../nonebot/adapters/cqhttp/message.py | 321 -------- .../nonebot/adapters/cqhttp/permission.py | 87 --- .../nonebot/adapters/cqhttp/utils.py | 45 -- packages/nonebot-adapter-cqhttp/poetry.lock | 649 ---------------- .../nonebot-adapter-cqhttp/pyproject.toml | 54 -- poetry.lock | 28 +- pyproject.toml | 1 - tests/bot.py | 2 - tests/test_plugins/test_group/__init__.py | 2 +- tests/test_plugins/test_group/matches.py | 16 - tests/test_plugins/test_metaevent.py | 21 - tests/test_plugins/test_overload.py | 19 - tests/test_plugins/test_permission.py | 18 - tests/test_plugins/test_template.py | 14 - 26 files changed, 8 insertions(+), 4016 deletions(-) delete mode 100644 docs/api/adapters/cqhttp.md delete mode 100644 docs_build/adapters/cqhttp.rst delete mode 100644 packages/nonebot-adapter-cqhttp/README.md delete mode 100644 packages/nonebot-adapter-cqhttp/nonebot/__init__.py delete mode 100644 packages/nonebot-adapter-cqhttp/nonebot/adapters/__init__.py delete mode 100644 packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/__init__.py delete mode 100644 packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.py delete mode 100644 packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.pyi delete mode 100644 packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/config.py delete mode 100644 packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/event.py delete mode 100644 packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/exception.py delete mode 100644 packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py delete mode 100644 packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/permission.py delete mode 100644 packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/utils.py delete mode 100644 packages/nonebot-adapter-cqhttp/poetry.lock delete mode 100644 packages/nonebot-adapter-cqhttp/pyproject.toml delete mode 100644 tests/test_plugins/test_group/matches.py delete mode 100644 tests/test_plugins/test_metaevent.py delete mode 100644 tests/test_plugins/test_overload.py delete mode 100644 tests/test_plugins/test_permission.py delete mode 100644 tests/test_plugins/test_template.py diff --git a/docs/api/adapters/cqhttp.md b/docs/api/adapters/cqhttp.md deleted file mode 100644 index 7c73f1a7..00000000 --- a/docs/api/adapters/cqhttp.md +++ /dev/null @@ -1,686 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.adapters.cqhttp 模块 - -## CQHTTP (OneBot) v11 协议适配 - -协议详情请看: [CQHTTP](https://github.com/howmanybots/onebot/blob/master/README.md) | [OneBot](https://github.com/howmanybots/onebot/blob/master/README.md) - -# NoneBot.adapters.cqhttp.config 模块 - - -## _class_ `Config` - -CQHTTP 配置类 - - -* **配置项** - - - * `access_token` / `cqhttp_access_token`: CQHTTP 协议授权令牌 - - - * `secret` / `cqhttp_secret`: CQHTTP HTTP 上报数据签名口令 - - - * `ws_urls` / `cqhttp_ws_urls`: CQHTTP 正向 Websocket 连接 Bot ID、目标 URL 字典 - - -# NoneBot.adapters.cqhttp.utils 模块 - - -## `escape(s, *, escape_comma=True)` - - -* **说明** - - 对字符串进行 CQ 码转义。 - - - -* **参数** - - - * `s: str`: 需要转义的字符串 - - - * `escape_comma: bool`: 是否转义逗号（`,`）。 - - - -## `unescape(s)` - - -* **说明** - - 对字符串进行 CQ 码去转义。 - - - -* **参数** - - - * `s: str`: 需要转义的字符串 - - -# NoneBot.adapters.cqhttp.exception 模块 - - -## _exception_ `ActionFailed` - -基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed), `nonebot.adapters.cqhttp.exception.CQHTTPAdapterException` - - -* **说明** - - API 请求返回错误信息。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - - -## _exception_ `NetworkError` - -基类：[`nonebot.exception.NetworkError`](../exception.md#nonebot.exception.NetworkError), `nonebot.adapters.cqhttp.exception.CQHTTPAdapterException` - - -* **说明** - - 网络错误。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - -# NoneBot.adapters.cqhttp.bot 模块 - - -## _async_ `_check_reply(bot, event)` - - -* **说明** - - 检查消息中存在的回复，去除并赋值 `event.reply`, `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_check_at_me(bot, event)` - - -* **说明** - - 检查消息开头或结尾是否存在 @机器人，去除并赋值 `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_check_nickname(bot, event)` - - -* **说明** - - 检查消息开头是否存在昵称，去除并赋值 `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_handle_api_result(result)` - - -* **说明** - - 处理 API 请求返回值。 - - - -* **参数** - - - * `result: Optional[Dict[str, Any]]`: API 返回数据 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `ActionFailed`: API 调用失败 - - - -## _class_ `Bot` - -基类：[`nonebot.adapters._bot.Bot`](README.md#nonebot.adapters._bot.Bot) - -CQHTTP 协议 Bot 适配。继承属性参考 [BaseBot](./#class-basebot) 。 - - -### _property_ `type` - - -* 返回: `"cqhttp"` - - -### _async classmethod_ `check_permission(driver, request)` - - -* **说明** - - CQHTTP (OneBot) 协议鉴权。参考 [鉴权](https://github.com/howmanybots/onebot/blob/master/v11/specs/communication/authorization.md) - - - -### _async_ `handle_message(message)` - - -* **说明** - - 调用 [_check_reply](#async-check-reply-bot-event), [_check_at_me](#check-at-me-bot-event), [_check_nickname](#check-nickname-bot-event) 处理事件并转换为 [Event](#class-event) - - - -### _async_ `call_api(api, **data)` - - -* **说明** - - 调用 CQHTTP 协议 API - - - -* **参数** - - - * `api: str`: API 名称 - - - * `**data: Any`: API 参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - - -### _async_ `send(event, message, at_sender=False, **kwargs)` - - -* **说明** - - 根据 `event` 向触发事件的主体发送消息。 - - - -* **参数** - - - * `event: Event`: Event 对象 - - - * `message: Union[str, Message, MessageSegment]`: 要发送的消息 - - - * `at_sender: bool`: 是否 @ 事件主体 - - - * `**kwargs`: 覆盖默认参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `ValueError`: 缺少 `user_id`, `group_id` - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - -# NoneBot.adapters.cqhttp.message 模块 - - -## _class_ `MessageSegment` - -基类：[`nonebot.adapters._message.MessageSegment`](README.md#nonebot.adapters._message.MessageSegment)[`Message`] - -CQHTTP 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 - - -### _classmethod_ `get_message_class()` - - -### `is_text()` - - -### _static_ `anonymous(ignore_failure=None)` - - -### _static_ `at(user_id)` - - -### _static_ `contact(type_, id)` - - -### _static_ `contact_group(group_id)` - - -### _static_ `contact_user(user_id)` - - -### _static_ `dice()` - - -### _static_ `face(id_)` - - -### _static_ `forward(id_)` - - -### _static_ `image(file, type_=None, cache=True, proxy=True, timeout=None)` - - -### _static_ `json(data)` - - -### _static_ `location(latitude, longitude, title=None, content=None)` - - -### _static_ `music(type_, id_)` - - -### _static_ `music_custom(url, audio, title, content=None, img_url=None)` - - -### _static_ `node(id_)` - - -### _static_ `node_custom(user_id, nickname, content)` - - -### _static_ `poke(type_, id_)` - - -### _static_ `record(file, magic=None, cache=None, proxy=None, timeout=None)` - - -### _static_ `reply(id_)` - - -### _static_ `rps()` - - -### _static_ `shake()` - - -### _static_ `share(url='', title='', content=None, image=None)` - - -### _static_ `text(text)` - - -### _static_ `video(file, cache=None, proxy=None, timeout=None)` - - -### _static_ `xml(data)` - - -### `type` - - -* 类型: `str` - - -* 说明: 消息段类型 - - -### `data` - - -* 类型: `Dict[str, Union[str, list]]` - - -* 说明: 消息段数据 - - -## _class_ `Message` - -基类：[`nonebot.adapters._message.Message`](README.md#nonebot.adapters._message.Message)[`nonebot.adapters.cqhttp.message.MessageSegment`] - -CQHTTP 协议 Message 适配。 - - -### _classmethod_ `get_segment_class()` - - -### `extract_plain_text()` - -# NoneBot.adapters.cqhttp.permission 模块 - - -## `PRIVATE` - - -* **说明**: 匹配任意私聊消息类型事件 - - -## `PRIVATE_FRIEND` - - -* **说明**: 匹配任意好友私聊消息类型事件 - - -## `PRIVATE_GROUP` - - -* **说明**: 匹配任意群临时私聊消息类型事件 - - -## `PRIVATE_OTHER` - - -* **说明**: 匹配任意其他私聊消息类型事件 - - -## `GROUP` - - -* **说明**: 匹配任意群聊消息类型事件 - - -## `GROUP_MEMBER` - - -* **说明**: 匹配任意群员群聊消息类型事件 - -:::warning 警告 -该权限通过 event.sender 进行判断且不包含管理员以及群主！ -::: - - -## `GROUP_ADMIN` - - -* **说明**: 匹配任意群管理员群聊消息类型事件 - - -## `GROUP_OWNER` - - -* **说明**: 匹配任意群主群聊消息类型事件 - -# NoneBot.adapters.cqhttp.event 模块 - - -## _class_ `Event` - -基类：[`nonebot.adapters._event.Event`](README.md#nonebot.adapters._event.Event) - -CQHTTP 协议事件，字段与 CQHTTP 一致。各事件字段参考 [CQHTTP 文档](https://github.com/howmanybots/onebot/blob/master/README.md) - - -## _class_ `MessageEvent` - -基类：`nonebot.adapters.cqhttp.event.Event` - -消息事件 - - -### `to_me` - - -* **说明** - - 消息是否与机器人有关 - - - -* **类型** - - `bool` - - - -### `reply` - - -* **说明** - - 消息中提取的回复消息，内容为 `get_msg` API 返回结果 - - - -* **类型** - - `Optional[Reply]` - - - -## _class_ `PrivateMessageEvent` - -基类：`nonebot.adapters.cqhttp.event.MessageEvent` - -私聊消息 - - -## _class_ `GroupMessageEvent` - -基类：`nonebot.adapters.cqhttp.event.MessageEvent` - -群消息 - - -## _class_ `NoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.Event` - -通知事件 - - -## _class_ `GroupUploadNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群文件上传事件 - - -## _class_ `GroupAdminNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群管理员变动 - - -## _class_ `GroupDecreaseNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群成员减少事件 - - -## _class_ `GroupIncreaseNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群成员增加事件 - - -## _class_ `GroupBanNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群禁言事件 - - -## _class_ `FriendAddNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -好友添加事件 - - -## _class_ `GroupRecallNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群消息撤回事件 - - -## _class_ `FriendRecallNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -好友消息撤回事件 - - -## _class_ `NotifyEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -提醒事件 - - -## _class_ `PokeNotifyEvent` - -基类：`nonebot.adapters.cqhttp.event.NotifyEvent` - -戳一戳提醒事件 - - -## _class_ `LuckyKingNotifyEvent` - -基类：`nonebot.adapters.cqhttp.event.NotifyEvent` - -群红包运气王提醒事件 - - -## _class_ `HonorNotifyEvent` - -基类：`nonebot.adapters.cqhttp.event.NotifyEvent` - -群荣誉变更提醒事件 - - -## _class_ `RequestEvent` - -基类：`nonebot.adapters.cqhttp.event.Event` - -请求事件 - - -## _class_ `FriendRequestEvent` - -基类：`nonebot.adapters.cqhttp.event.RequestEvent` - -加好友请求事件 - - -## _class_ `GroupRequestEvent` - -基类：`nonebot.adapters.cqhttp.event.RequestEvent` - -加群请求/邀请事件 - - -## _class_ `MetaEvent` - -基类：`nonebot.adapters.cqhttp.event.Event` - -元事件 - - -## _class_ `LifecycleMetaEvent` - -基类：`nonebot.adapters.cqhttp.event.MetaEvent` - -生命周期元事件 - - -## _class_ `HeartbeatMetaEvent` - -基类：`nonebot.adapters.cqhttp.event.MetaEvent` - -心跳元事件 - - -## `get_event_model(event_name)` - - -* **说明** - - 根据事件名获取对应 `Event Model` 及 `FallBack Event Model` 列表 - - - -* **返回** - - - * `List[Type[Event]]` diff --git a/docs_build/adapters/cqhttp.rst b/docs_build/adapters/cqhttp.rst deleted file mode 100644 index d49c5c66..00000000 --- a/docs_build/adapters/cqhttp.rst +++ /dev/null @@ -1,60 +0,0 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- - -NoneBot.adapters.cqhttp 模块 -============================= - -.. automodule:: nonebot.adapters.cqhttp - -NoneBot.adapters.cqhttp.config 模块 -=================================== - -.. automodule:: nonebot.adapters.cqhttp.config - :members: - -NoneBot.adapters.cqhttp.utils 模块 -=================================== - -.. automodule:: nonebot.adapters.cqhttp.utils - :members: - :show-inheritance: - -NoneBot.adapters.cqhttp.exception 模块 -======================================= - -.. automodule:: nonebot.adapters.cqhttp.exception - :members: - :show-inheritance: - -NoneBot.adapters.cqhttp.bot 模块 -================================= - -.. automodule:: nonebot.adapters.cqhttp.bot - :members: - :private-members: - :show-inheritance: - -NoneBot.adapters.cqhttp.message 模块 -===================================== - -.. automodule:: nonebot.adapters.cqhttp.message - :members: - :undoc-members: - :show-inheritance: - -NoneBot.adapters.cqhttp.permission 模块 -======================================== - -.. automodule:: nonebot.adapters.cqhttp.permission - :members: - :show-inheritance: - -NoneBot.adapters.cqhttp.event 模块 -=================================== - -.. automodule:: nonebot.adapters.cqhttp.event - :members: - :private-members: - :show-inheritance: diff --git a/nonebot/plugins/echo.py b/nonebot/plugins/echo.py index 42e99cc3..a070fc11 100644 --- a/nonebot/plugins/echo.py +++ b/nonebot/plugins/echo.py @@ -1,32 +1,10 @@ -from functools import reduce - from nonebot.rule import to_me +from nonebot.adapters import Event from nonebot.plugin import on_command -from nonebot.permission import SUPERUSER -from nonebot.adapters.cqhttp import ( - Message, - MessageEvent, - MessageSegment, - unescape, -) - -say = on_command("say", to_me(), permission=SUPERUSER) - - -@say.handle() -async def say_unescape(event: MessageEvent): - def _unescape(message: Message, segment: MessageSegment): - if segment.is_text(): - return message.append(unescape(str(segment))) - return message.append(segment) - - message = reduce(_unescape, event.get_message(), Message()) # type: ignore - await say.send(message=message) - echo = on_command("echo", to_me()) @echo.handle() -async def echo_escape(event: MessageEvent): +async def echo_escape(event: Event): await echo.send(message=event.get_message()) diff --git a/packages/nonebot-adapter-cqhttp/README.md b/packages/nonebot-adapter-cqhttp/README.md deleted file mode 100644 index 5191dcbb..00000000 --- a/packages/nonebot-adapter-cqhttp/README.md +++ /dev/null @@ -1,11 +0,0 @@ -

- nonebot -

- -
- -# NoneBot-Adapter-CQHTTP - -_✨ OneBot(CQHTTP) 协议适配 ✨_ - -
diff --git a/packages/nonebot-adapter-cqhttp/nonebot/__init__.py b/packages/nonebot-adapter-cqhttp/nonebot/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/__init__.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/__init__.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/__init__.py deleted file mode 100644 index 74ac3c47..00000000 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/__init__.py +++ /dev/null @@ -1,24 +0,0 @@ -""" -CQHTTP (OneBot) v11 协议适配 -============================ - -协议详情请看: `CQHTTP`_ | `OneBot`_ - -.. _CQHTTP: - https://github.com/howmanybots/onebot/blob/master/README.md -.. _OneBot: - https://github.com/howmanybots/onebot/blob/master/README.md -""" - -from .event import * -from .permission import * -from .bot import Bot as Bot -from .utils import log as log -from .utils import escape as escape -from .message import Message as Message -from .utils import unescape as unescape -from .exception import ActionFailed as ActionFailed -from .exception import NetworkError as NetworkError -from .message import MessageSegment as MessageSegment -from .exception import ApiNotAvailable as ApiNotAvailable -from .exception import CQHTTPAdapterException as CQHTTPAdapterException diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.py deleted file mode 100644 index be88edce..00000000 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.py +++ /dev/null @@ -1,489 +0,0 @@ -import re -import sys -import hmac -import json -import asyncio -from typing import TYPE_CHECKING, Any, Dict, Tuple, Union, Optional - -import httpx - -from nonebot.log import logger -from nonebot.typing import overrides -from nonebot.message import handle_event -from nonebot.adapters import Bot as BaseBot -from nonebot.utils import DataclassEncoder, escape_tag -from nonebot.drivers import ( - Driver, - WebSocket, - HTTPRequest, - HTTPResponse, - ForwardDriver, - HTTPConnection, - WebSocketSetup, -) - -from .utils import log, escape -from .config import Config as CQHTTPConfig -from .message import Message, MessageSegment -from .event import Event, Reply, MessageEvent, get_event_model -from .exception import ActionFailed, NetworkError, ApiNotAvailable - -if TYPE_CHECKING: - from nonebot.config import Config - - -def get_auth_bearer(access_token: Optional[str] = None) -> Optional[str]: - if not access_token: - return None - scheme, _, param = access_token.partition(" ") - if scheme.lower() not in ["bearer", "token"]: - return None - return param - - -async def _check_reply(bot: "Bot", event: "Event"): - """ - :说明: - - 检查消息中存在的回复，去除并赋值 ``event.reply``, ``event.to_me`` - - :参数: - - * ``bot: Bot``: Bot 对象 - * ``event: Event``: Event 对象 - """ - if not isinstance(event, MessageEvent): - return - - try: - index = list(map(lambda x: x.type == "reply", event.message)).index(True) - except ValueError: - return - msg_seg = event.message[index] - try: - event.reply = Reply.parse_obj(await bot.get_msg(message_id=msg_seg.data["id"])) - except Exception as e: - log("WARNING", f"Error when getting message reply info: {repr(e)}", e) - return - # ensure string comparation - if str(event.reply.sender.user_id) == str(event.self_id): - event.to_me = True - del event.message[index] - if len(event.message) > index and event.message[index].type == "at": - del event.message[index] - if len(event.message) > index and event.message[index].type == "text": - event.message[index].data["text"] = event.message[index].data["text"].lstrip() - if not event.message[index].data["text"]: - del event.message[index] - if not event.message: - event.message.append(MessageSegment.text("")) - - -def _check_at_me(bot: "Bot", event: "Event"): - """ - :说明: - - 检查消息开头或结尾是否存在 @机器人，去除并赋值 ``event.to_me`` - - :参数: - - * ``bot: Bot``: Bot 对象 - * ``event: Event``: Event 对象 - """ - if not isinstance(event, MessageEvent): - return - - # ensure message not empty - if not event.message: - event.message.append(MessageSegment.text("")) - - if event.message_type == "private": - event.to_me = True - else: - - def _is_at_me_seg(segment: MessageSegment): - return segment.type == "at" and str(segment.data.get("qq", "")) == str( - event.self_id - ) - - # check the first segment - if _is_at_me_seg(event.message[0]): - event.to_me = True - event.message.pop(0) - if event.message and event.message[0].type == "text": - event.message[0].data["text"] = event.message[0].data["text"].lstrip() - if not event.message[0].data["text"]: - del event.message[0] - if event.message and _is_at_me_seg(event.message[0]): - event.message.pop(0) - if event.message and event.message[0].type == "text": - event.message[0].data["text"] = ( - event.message[0].data["text"].lstrip() - ) - if not event.message[0].data["text"]: - del event.message[0] - - if not event.to_me: - # check the last segment - i = -1 - last_msg_seg = event.message[i] - if ( - last_msg_seg.type == "text" - and not last_msg_seg.data["text"].strip() - and len(event.message) >= 2 - ): - i -= 1 - last_msg_seg = event.message[i] - - if _is_at_me_seg(last_msg_seg): - event.to_me = True - del event.message[i:] - - if not event.message: - event.message.append(MessageSegment.text("")) - - -def _check_nickname(bot: "Bot", event: "Event"): - """ - :说明: - - 检查消息开头是否存在昵称，去除并赋值 ``event.to_me`` - - :参数: - - * ``bot: Bot``: Bot 对象 - * ``event: Event``: Event 对象 - """ - if not isinstance(event, MessageEvent): - return - - first_msg_seg = event.message[0] - if first_msg_seg.type != "text": - return - - first_text = first_msg_seg.data["text"] - - nicknames = set(filter(lambda n: n, bot.config.nickname)) - if nicknames: - # check if the user is calling me with my nickname - nickname_regex = "|".join(nicknames) - m = re.search(rf"^({nickname_regex})([\s,，]*|$)", first_text, re.IGNORECASE) - if m: - nickname = m.group(1) - log("DEBUG", f"User is calling me {nickname}") - event.to_me = True - first_msg_seg.data["text"] = first_text[m.end() :] - - -def _handle_api_result(result: Optional[Dict[str, Any]]) -> Any: - """ - :说明: - - 处理 API 请求返回值。 - - :参数: - - * ``result: Optional[Dict[str, Any]]``: API 返回数据 - - :返回: - - - ``Any``: API 调用返回数据 - - :异常: - - - ``ActionFailed``: API 调用失败 - """ - if isinstance(result, dict): - if result.get("status") == "failed": - raise ActionFailed(**result) - return result.get("data") - - -class ResultStore: - _seq = 1 - _futures: Dict[int, asyncio.Future] = {} - - @classmethod - def get_seq(cls) -> int: - s = cls._seq - cls._seq = (cls._seq + 1) % sys.maxsize - return s - - @classmethod - def add_result(cls, result: Dict[str, Any]): - if isinstance(result.get("echo"), dict) and isinstance( - result["echo"].get("seq"), int - ): - future = cls._futures.get(result["echo"]["seq"]) - if future: - future.set_result(result) - - @classmethod - async def fetch(cls, seq: int, timeout: Optional[float]) -> Dict[str, Any]: - future = asyncio.get_event_loop().create_future() - cls._futures[seq] = future - try: - return await asyncio.wait_for(future, timeout) - except asyncio.TimeoutError: - raise NetworkError("WebSocket API call timeout") from None - finally: - del cls._futures[seq] - - -class Bot(BaseBot): - """ - CQHTTP 协议 Bot 适配。继承属性参考 `BaseBot <./#class-basebot>`_ 。 - """ - - cqhttp_config: CQHTTPConfig - - @property - @overrides(BaseBot) - def type(self) -> str: - """ - - 返回: ``"cqhttp"`` - """ - return "cqhttp" - - @classmethod - def register(cls, driver: Driver, config: "Config"): - super().register(driver, config) - cls.cqhttp_config = CQHTTPConfig(**config.dict()) - if not isinstance(driver, ForwardDriver) and cls.cqhttp_config.ws_urls: - logger.warning( - f"Current driver {cls.config.driver} don't support forward connections" - ) - elif isinstance(driver, ForwardDriver) and cls.cqhttp_config.ws_urls: - for self_id, url in cls.cqhttp_config.ws_urls.items(): - try: - headers = ( - {"authorization": f"Bearer {cls.cqhttp_config.access_token}"} - if cls.cqhttp_config.access_token - else {} - ) - driver.setup_websocket( - WebSocketSetup("cqhttp", self_id, url, headers=headers) - ) - except Exception as e: - logger.opt(colors=True, exception=e).error( - f"Bad url {escape_tag(url)} for bot {escape_tag(self_id)} " - "in cqhttp forward websocket" - ) - - @classmethod - @overrides(BaseBot) - async def check_permission( - cls, driver: Driver, request: HTTPConnection - ) -> Tuple[Optional[str], HTTPResponse]: - """ - :说明: - - CQHTTP (OneBot) 协议鉴权。参考 `鉴权 `_ - """ - x_self_id = request.headers.get("x-self-id") - x_signature = request.headers.get("x-signature") - token = get_auth_bearer(request.headers.get("authorization")) - cqhttp_config = CQHTTPConfig(**driver.config.dict()) - - # 检查self_id - if not x_self_id: - log("WARNING", "Missing X-Self-ID Header") - return None, HTTPResponse(400, b"Missing X-Self-ID Header") - - # 检查签名 - secret = cqhttp_config.secret - if secret and isinstance(request, HTTPRequest): - if not x_signature: - log("WARNING", "Missing Signature Header") - return None, HTTPResponse(401, b"Missing Signature") - sig = hmac.new(secret.encode("utf-8"), request.body, "sha1").hexdigest() - if x_signature != "sha1=" + sig: - log("WARNING", "Signature Header is invalid") - return None, HTTPResponse(403, b"Signature is invalid") - - access_token = cqhttp_config.access_token - if access_token and access_token != token and isinstance(request, WebSocket): - log( - "WARNING", - "Authorization Header is invalid" - if token - else "Missing Authorization Header", - ) - return None, HTTPResponse( - 403, - b"Authorization Header is invalid" - if token - else b"Missing Authorization Header", - ) - return str(x_self_id), HTTPResponse(204, b"") - - @overrides(BaseBot) - async def handle_message(self, message: bytes): - """ - :说明: - - 调用 `_check_reply <#async-check-reply-bot-event>`_, `_check_at_me <#check-at-me-bot-event>`_, `_check_nickname <#check-nickname-bot-event>`_ 处理事件并转换为 `Event <#class-event>`_ - """ - data: dict = json.loads(message) - - if not data: - return - - if "post_type" not in data: - ResultStore.add_result(data) - return - - try: - post_type = data["post_type"] - detail_type = data.get(f"{post_type}_type") - detail_type = f".{detail_type}" if detail_type else "" - sub_type = data.get("sub_type") - sub_type = f".{sub_type}" if sub_type else "" - models = get_event_model(post_type + detail_type + sub_type) - for model in models: - try: - event = model.parse_obj(data) - break - except Exception as e: - log("DEBUG", "Event Parser Error", e) - else: - event = Event.parse_obj(data) - - # Check whether user is calling me - await _check_reply(self, event) - _check_at_me(self, event) - _check_nickname(self, event) - - await handle_event(self, event) - except Exception as e: - logger.opt(colors=True, exception=e).error( - f"Failed to handle event. Raw: {escape_tag(str(data))}" - ) - - @overrides(BaseBot) - async def _call_api(self, api: str, **data) -> Any: - log("DEBUG", f"Calling API {api}") - if isinstance(self.request, WebSocket): - seq = ResultStore.get_seq() - json_data = json.dumps( - {"action": api, "params": data, "echo": {"seq": seq}}, - cls=DataclassEncoder, - ) - await self.request.send(json_data) - return _handle_api_result( - await ResultStore.fetch(seq, self.config.api_timeout) - ) - - elif isinstance(self.request, HTTPRequest): - api_root = self.config.api_root.get(self.self_id) - if not api_root: - raise ApiNotAvailable - elif not api_root.endswith("/"): - api_root += "/" - - headers = {"Content-Type": "application/json"} - if self.cqhttp_config.access_token is not None: - headers["Authorization"] = "Bearer " + self.cqhttp_config.access_token - - try: - async with httpx.AsyncClient( - headers=headers, follow_redirects=True - ) as client: - response = await client.post( - api_root + api, - content=json.dumps(data, cls=DataclassEncoder), - timeout=self.config.api_timeout, - ) - - if 200 <= response.status_code < 300: - result = response.json() - return _handle_api_result(result) - raise NetworkError( - f"HTTP request received unexpected " - f"status code: {response.status_code}" - ) - except httpx.InvalidURL: - raise NetworkError("API root url invalid") - except httpx.HTTPError: - raise NetworkError("HTTP request failed") - - @overrides(BaseBot) - async def call_api(self, api: str, **data) -> Any: - """ - :说明: - - 调用 CQHTTP 协议 API - - :参数: - - * ``api: str``: API 名称 - * ``**data: Any``: API 参数 - - :返回: - - - ``Any``: API 调用返回数据 - - :异常: - - - ``NetworkError``: 网络错误 - - ``ActionFailed``: API 调用失败 - """ - return await super().call_api(api, **data) - - @overrides(BaseBot) - async def send( - self, - event: Event, - message: Union[str, Message, MessageSegment], - at_sender: bool = False, - **kwargs, - ) -> Any: - """ - :说明: - - 根据 ``event`` 向触发事件的主体发送消息。 - - :参数: - - * ``event: Event``: Event 对象 - * ``message: Union[str, Message, MessageSegment]``: 要发送的消息 - * ``at_sender: bool``: 是否 @ 事件主体 - * ``**kwargs``: 覆盖默认参数 - - :返回: - - - ``Any``: API 调用返回数据 - - :异常: - - - ``ValueError``: 缺少 ``user_id``, ``group_id`` - - ``NetworkError``: 网络错误 - - ``ActionFailed``: API 调用失败 - """ - message = ( - escape(message, escape_comma=False) if isinstance(message, str) else message - ) - msg = message if isinstance(message, Message) else Message(message) - - at_sender = at_sender and bool(getattr(event, "user_id", None)) - - params = {} - if getattr(event, "user_id", None): - params["user_id"] = getattr(event, "user_id") - if getattr(event, "group_id", None): - params["group_id"] = getattr(event, "group_id") - params.update(kwargs) - - if "message_type" not in params: - if params.get("group_id", None): - params["message_type"] = "group" - elif params.get("user_id", None): - params["message_type"] = "private" - else: - raise ValueError("Cannot guess message type to reply!") - - if at_sender and params["message_type"] != "private": - params["message"] = MessageSegment.at(params["user_id"]) + " " + msg - else: - params["message"] = msg - return await self.send_msg(**params) diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.pyi b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.pyi deleted file mode 100644 index 39ad4122..00000000 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/bot.pyi +++ /dev/null @@ -1,726 +0,0 @@ -import asyncio -from typing import Any, Dict, List, Union, Optional - -from nonebot.config import Config -from nonebot.adapters import Bot as BaseBot -from nonebot.drivers import Driver, WebSocket - -from .event import Event -from .message import Message, MessageSegment - -def get_auth_bearer(access_token: Optional[str] = ...) -> Optional[str]: - ... - - -async def _check_reply(bot: "Bot", event: Event): - ... - - -def _check_at_me(bot: "Bot", event: Event): - ... - - -def _check_nickname(bot: "Bot", event: Event): - ... - - -def _handle_api_result(result: Optional[Dict[str, Any]]) -> Any: - ... - - -class ResultStore: - _seq: int = ... - _futures: Dict[int, asyncio.Future] = ... - - @classmethod - def get_seq(cls) -> int: - ... - - @classmethod - def add_result(cls, result: Dict[str, Any]): - ... - - @classmethod - async def fetch(cls, seq: int, timeout: Optional[float]) -> Dict[str, Any]: - ... - - -class Bot(BaseBot): - - def __init__(self, - driver: Driver, - connection_type: str, - config: Config, - self_id: str, - *, - websocket: WebSocket = None): - ... - - def type(self) -> str: - ... - - @classmethod - async def check_permission(cls, driver: Driver, connection_type: str, - headers: dict, body: Optional[dict]) -> str: - ... - - async def handle_message(self, message: dict): - ... - - async def call_api(self, api: str, *, **data) -> Any: - ... - - async def send(self, event: Event, message: Union[str, Message, - MessageSegment], - **kwargs) -> Any: - ... - - async def send_private_msg( - self, - *, - user_id: int, - message: Union[str, Message], - auto_escape: bool = ..., - ) -> Dict[str, Any]: - """ - :说明: - - 发送私聊消息。 - - :参数: - - * ``user_id``: 对方 QQ 号 - * ``message``: 要发送的内容 - * ``auto_escape``: 消息内容是否作为纯文本发送（即不解析 CQ 码），只在 ``message`` 字段是字符串时有效 - - """ - ... - - async def send_group_msg( - self, - *, - group_id: int, - message: Union[str, Message], - auto_escape: bool = ..., - ) -> Dict[str, Any]: - """ - :说明: - - 发送群消息。 - - :参数: - - * ``group_id``: 群号 - * ``message``: 要发送的内容 - * ``auto_escape``: 消息内容是否作为纯文本发送（即不解析 CQ 码），只在 ``message`` 字段是字符串时有效 - - """ - ... - - async def send_msg( - self, - *, - message_type: Optional[str] = ..., - user_id: Optional[int] = ..., - group_id: Optional[int] = ..., - message: Union[str, Message], - auto_escape: bool = ..., - ) -> Dict[str, Any]: - """ - :说明: - - 发送消息。 - - :参数: - - * ``message_type``: 消息类型，支持 ``private``、``group``，分别对应私聊、群组、讨论组，如不传入，则根据传入的 ``*_id`` 参数判断 - * ``user_id``: 对方 QQ 号（消息类型为 ``private`` 时需要） - * ``group_id``: 群号（消息类型为 ``group`` 时需要） - * ``message``: 要发送的内容 - * ``auto_escape``: 消息内容是否作为纯文本发送（即不解析 CQ 码），只在 ``message`` 字段是字符串时有效 - - """ - ... - - async def delete_msg( - self, - *, - message_id: int, - ) -> None: - """ - :说明: - - 撤回消息。 - - :参数: - - * ``message_id``: 消息 ID - - """ - ... - - async def get_msg( - self, - *, - message_id: int, - ) -> Dict[str, Any]: - """ - :说明: - - 获取消息。 - - :参数: - - * ``message_id``: 消息 ID - - """ - ... - - async def get_forward_msg( - self, - *, - id: str, - ) -> None: - """ - :说明: - - 获取合并转发消息。 - - :参数: - - * ``id``: 合并转发 ID - - """ - ... - - async def send_like( - self, - *, - user_id: int, - times: int = ..., - ) -> None: - """ - :说明: - - 发送好友赞。 - - :参数: - - * ``user_id``: 对方 QQ 号 - * ``times``: 赞的次数，每个好友每天最多 10 次 - - """ - ... - - async def set_group_kick( - self, - *, - group_id: int, - user_id: int, - reject_add_request: bool = ..., - ) -> None: - """ - :说明: - - 群组踢人。 - - :参数: - - * ``group_id``: 群号 - * ``user_id``: 要踢的 QQ 号 - * ``reject_add_request``: 拒绝此人的加群请求 - - """ - ... - - async def set_group_ban( - self, - *, - group_id: int, - user_id: int, - duration: int = ..., - ) -> None: - """ - :说明: - - 群组单人禁言。 - - :参数: - - * ``group_id``: 群号 - * ``user_id``: 要禁言的 QQ 号 - * ``duration``: 禁言时长，单位秒，``0`` 表示取消禁言 - - """ - ... - - async def set_group_anonymous_ban( - self, - *, - group_id: int, - anonymous: Optional[Dict[str, Any]] = ..., - anonymous_flag: Optional[str] = ..., - duration: int = ..., - ) -> None: - """ - :说明: - - 群组匿名用户禁言。 - - :参数: - - * ``group_id``: 群号 - * ``anonymous``: 可选，要禁言的匿名用户对象（群消息上报的 ``anonymous`` 字段） - * ``anonymous_flag``: 可选，要禁言的匿名用户的 flag（需从群消息上报的数据中获得） - * ``duration``: 禁言时长，单位秒，无法取消匿名用户禁言 - - """ - ... - - async def set_group_whole_ban( - self, - *, - group_id: int, - enable: bool = ..., - ) -> None: - """ - :说明: - - 群组全员禁言。 - - :参数: - - * ``group_id``: 群号 - * ``enable``: 是否禁言 - - """ - ... - - async def set_group_admin( - self, - *, - group_id: int, - user_id: int, - enable: bool = ..., - ) -> None: - """ - :说明: - - 群组设置管理员。 - - :参数: - - * ``group_id``: 群号 - * ``user_id``: 要设置管理员的 QQ 号 - * ``enable``: ``True`` 为设置，``False`` 为取消 - - """ - ... - - async def set_group_anonymous( - self, - *, - group_id: int, - enable: bool = ..., - ) -> None: - """ - :说明: - - 群组匿名。 - - :参数: - - * ``group_id``: 群号 - * ``enable``: 是否允许匿名聊天 - - """ - ... - - async def set_group_card( - self, - *, - group_id: int, - user_id: int, - card: str = ..., - ) -> None: - """ - :说明: - - 设置群名片（群备注）。 - - :参数: - - * ``group_id``: 群号 - * ``user_id``: 要设置的 QQ 号 - * ``card``: 群名片内容，不填或空字符串表示删除群名片 - - """ - ... - - async def set_group_name( - self, - *, - group_id: int, - group_name: str, - ) -> None: - """ - :说明: - - 设置群名。 - - :参数: - - * ``group_id``: 群号 - * ``group_name``: 新群名 - - """ - ... - - async def set_group_leave( - self, - *, - group_id: int, - is_dismiss: bool = ..., - ) -> None: - """ - :说明: - - 退出群组。 - - :参数: - - * ``group_id``: 群号 - * ``is_dismiss``: 是否解散，如果登录号是群主，则仅在此项为 True 时能够解散 - - """ - ... - - async def set_group_special_title( - self, - *, - group_id: int, - user_id: int, - special_title: str = ..., - duration: int = ..., - ) -> None: - """ - :说明: - - 设置群组专属头衔。 - - :参数: - - * ``group_id``: 群号 - * ``user_id``: 要设置的 QQ 号 - * ``special_title``: 专属头衔，不填或空字符串表示删除专属头衔 - * ``duration``: 专属头衔有效期，单位秒，-1 表示永久，不过此项似乎没有效果，可能是只有某些特殊的时间长度有效，有待测试 - - """ - ... - - async def set_friend_add_request( - self, - *, - flag: str, - approve: bool = ..., - remark: str = ..., - ) -> None: - """ - :说明: - - 处理加好友请求。 - - :参数: - - * ``flag``: 加好友请求的 flag（需从上报的数据中获得） - * ``approve``: 是否同意请求 - * ``remark``: 添加后的好友备注（仅在同意时有效） - - """ - ... - - async def set_group_add_request( - self, - *, - flag: str, - sub_type: str, - approve: bool = ..., - reason: str = ..., - ) -> None: - """ - :说明: - - 处理加群请求／邀请。 - - :参数: - - * ``flag``: 加群请求的 flag（需从上报的数据中获得） - * ``sub_type``: ``add`` 或 ``invite``，请求类型（需要和上报消息中的 ``sub_type`` 字段相符） - * ``approve``: 是否同意请求／邀请 - * ``reason``: 拒绝理由（仅在拒绝时有效） - - """ - ... - - async def get_login_info(self) -> Dict[str, Any]: - """ - :说明: - - 获取登录号信息。 - - """ - ... - - async def get_stranger_info( - self, - *, - user_id: int, - no_cache: bool = ..., - ) -> Dict[str, Any]: - """ - :说明: - - 获取陌生人信息。 - - :参数: - - * ``user_id``: QQ 号 - * ``no_cache``: 是否不使用缓存（使用缓存可能更新不及时，但响应更快） - - """ - ... - - async def get_friend_list(self) -> List[Dict[str, Any]]: - """ - :说明: - - 获取好友列表。 - - """ - ... - - async def get_group_info( - self, - *, - group_id: int, - no_cache: bool = ..., - ) -> Dict[str, Any]: - """ - :说明: - - 获取群信息。 - - :参数: - - * ``group_id``: 群号 - * ``no_cache``: 是否不使用缓存（使用缓存可能更新不及时，但响应更快） - - """ - ... - - async def get_group_list(self) -> List[Dict[str, Any]]: - """ - :说明: - - 获取群列表。 - - """ - ... - - async def get_group_member_info( - self, - *, - group_id: int, - user_id: int, - no_cache: bool = ..., - ) -> Dict[str, Any]: - """ - :说明: - - 获取群成员信息。 - - :参数: - - * ``group_id``: 群号 - * ``user_id``: QQ 号 - * ``no_cache``: 是否不使用缓存（使用缓存可能更新不及时，但响应更快） - - """ - ... - - async def get_group_member_list( - self, - *, - group_id: int, - ) -> List[Dict[str, Any]]: - """ - :说明: - - 获取群成员列表。 - - :参数: - - * ``group_id``: 群号 - - """ - ... - - async def get_group_honor_info( - self, - *, - group_id: int, - type: str = ..., - ) -> Dict[str, Any]: - """ - :说明: - - 获取群荣誉信息。 - - :参数: - - * ``group_id``: 群号 - * ``type``: 要获取的群荣誉类型，可传入 ``talkative`` ``performer`` ``legend`` ``strong_newbie`` ``emotion`` 以分别获取单个类型的群荣誉数据，或传入 ``all`` 获取所有数据 - - """ - ... - - async def get_cookies( - self, - *, - domain: str = ..., - ) -> Dict[str, Any]: - """ - :说明: - - 获取 Cookies。 - - :参数: - - * ``domain``: 需要获取 cookies 的域名 - - """ - ... - - async def get_csrf_token(self) -> Dict[str, Any]: - """ - :说明: - - 获取 CSRF Token。 - - """ - ... - - async def get_credentials( - self, - *, - domain: str = ..., - ) -> Dict[str, Any]: - """ - :说明: - - 获取 QQ 相关接口凭证。 - - :参数: - - * ``domain``: 需要获取 cookies 的域名 - - """ - ... - - async def get_record( - self, - *, - file: str, - out_format: str, - ) -> Dict[str, Any]: - """ - :说明: - - 获取语音。 - - :参数: - - * ``file``: 收到的语音文件名（CQ 码的 ``file`` 参数），如 ``0B38145AA44505000B38145AA4450500.silk`` - * ``out_format``: 要转换到的格式，目前支持 ``mp3``、``amr``、``wma``、``m4a``、``spx``、``ogg``、``wav``、``flac`` - - """ - ... - - async def get_image( - self, - *, - file: str, - ) -> Dict[str, Any]: - """ - :说明: - - 获取图片。 - - :参数: - - * ``file``: 收到的图片文件名（CQ 码的 ``file`` 参数），如 ``6B4DE3DFD1BD271E3297859D41C530F5.jpg`` - - """ - ... - - async def can_send_image(self) -> Dict[str, Any]: - """ - :说明: - - 检查是否可以发送图片。 - - """ - ... - - async def can_send_record(self) -> Dict[str, Any]: - """ - :说明: - - 检查是否可以发送语音。 - - """ - ... - - async def get_status(self) -> Dict[str, Any]: - """ - :说明: - - 获取插件运行状态。 - - """ - ... - - async def get_version_info(self) -> Dict[str, Any]: - """ - :说明: - - 获取版本信息。 - - """ - ... - - async def set_restart( - self, - *, - delay: int = ..., - ) -> None: - """ - :说明: - - 重启 OneBot 实现。 - - :参数: - - * ``delay``: 要延迟的毫秒数，如果默认情况下无法重启，可以尝试设置延迟为 2000 左右 - - """ - ... - - async def clean_cache(self) -> None: - """ - :说明: - - 清理数据目录。 - - """ - ... diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/config.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/config.py deleted file mode 100644 index 12908073..00000000 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/config.py +++ /dev/null @@ -1,24 +0,0 @@ -from typing import Dict, Optional - -from pydantic import Field, AnyUrl, BaseModel - - -# priority: alias > origin -class Config(BaseModel): - """ - CQHTTP 配置类 - - :配置项: - - - ``access_token`` / ``cqhttp_access_token``: CQHTTP 协议授权令牌 - - ``secret`` / ``cqhttp_secret``: CQHTTP HTTP 上报数据签名口令 - - ``ws_urls`` / ``cqhttp_ws_urls``: CQHTTP 正向 Websocket 连接 Bot ID、目标 URL 字典 - """ - - access_token: Optional[str] = Field(default=None, alias="cqhttp_access_token") - secret: Optional[str] = Field(default=None, alias="cqhttp_secret") - ws_urls: Dict[str, AnyUrl] = Field(default_factory=set, alias="cqhttp_ws_urls") - - class Config: - extra = "ignore" - allow_population_by_field_name = True diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/event.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/event.py deleted file mode 100644 index 21c7b34c..00000000 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/event.py +++ /dev/null @@ -1,633 +0,0 @@ -import inspect -from typing_extensions import Literal -from typing import TYPE_CHECKING, List, Type, Optional - -from pydantic import BaseModel -from pygtrie import StringTrie - -from nonebot.typing import overrides -from nonebot.utils import escape_tag -from nonebot.adapters import Event as BaseEvent - -from .message import Message -from .exception import NoLogException - -if TYPE_CHECKING: - from .bot import Bot - - -class Event(BaseEvent): - """ - CQHTTP 协议事件，字段与 CQHTTP 一致。各事件字段参考 `CQHTTP 文档`_ - - .. _CQHTTP 文档: - https://github.com/howmanybots/onebot/blob/master/README.md - """ - - __event__ = "" - time: int - self_id: int - post_type: str - - @overrides(BaseEvent) - def get_type(self) -> str: - return self.post_type - - @overrides(BaseEvent) - def get_event_name(self) -> str: - return self.post_type - - @overrides(BaseEvent) - def get_event_description(self) -> str: - return escape_tag(str(self.dict())) - - @overrides(BaseEvent) - def get_message(self) -> Message: - raise ValueError("Event has no message!") - - @overrides(BaseEvent) - def get_plaintext(self) -> str: - raise ValueError("Event has no message!") - - @overrides(BaseEvent) - def get_user_id(self) -> str: - raise ValueError("Event has no message!") - - @overrides(BaseEvent) - def get_session_id(self) -> str: - raise ValueError("Event has no message!") - - @overrides(BaseEvent) - def is_tome(self) -> bool: - return False - - -# Models -class Sender(BaseModel): - user_id: Optional[int] = None - nickname: Optional[str] = None - sex: Optional[str] = None - age: Optional[int] = None - card: Optional[str] = None - area: Optional[str] = None - level: Optional[str] = None - role: Optional[str] = None - title: Optional[str] = None - - class Config: - extra = "allow" - - -class Reply(BaseModel): - time: int - message_type: str - message_id: int - real_id: int - sender: Sender - message: Message - - class Config: - extra = "allow" - - -class Anonymous(BaseModel): - id: int - name: str - flag: str - - class Config: - extra = "allow" - - -class File(BaseModel): - id: str - name: str - size: int - busid: int - - class Config: - extra = "allow" - - -class Status(BaseModel): - online: bool - good: bool - - class Config: - extra = "allow" - - -# Message Events -class MessageEvent(Event): - """消息事件""" - - __event__ = "message" - post_type: Literal["message"] - sub_type: str - user_id: int - message_type: str - message_id: int - message: Message - raw_message: str - font: int - sender: Sender - to_me: bool = False - """ - :说明: 消息是否与机器人有关 - - :类型: ``bool`` - """ - reply: Optional[Reply] = None - """ - :说明: 消息中提取的回复消息，内容为 ``get_msg`` API 返回结果 - - :类型: ``Optional[Reply]`` - """ - - @overrides(Event) - def get_event_name(self) -> str: - sub_type = getattr(self, "sub_type", None) - return f"{self.post_type}.{self.message_type}" + ( - f".{sub_type}" if sub_type else "" - ) - - @overrides(Event) - def get_message(self) -> Message: - return self.message - - @overrides(Event) - def get_plaintext(self) -> str: - return self.message.extract_plain_text() - - @overrides(Event) - def get_user_id(self) -> str: - return str(self.user_id) - - @overrides(Event) - def get_session_id(self) -> str: - return str(self.user_id) - - @overrides(Event) - def is_tome(self) -> bool: - return self.to_me - - -class PrivateMessageEvent(MessageEvent): - """私聊消息""" - - __event__ = "message.private" - message_type: Literal["private"] - - @overrides(Event) - def get_event_description(self) -> str: - return ( - f'Message {self.message_id} from {self.user_id} "' - + "".join( - map( - lambda x: escape_tag(str(x)) - if x.is_text() - else f"{escape_tag(str(x))}", - self.message, - ) - ) - + '"' - ) - - -class GroupMessageEvent(MessageEvent): - """群消息""" - - __event__ = "message.group" - message_type: Literal["group"] - group_id: int - anonymous: Optional[Anonymous] = None - - @overrides(Event) - def get_event_description(self) -> str: - return ( - f'Message {self.message_id} from {self.user_id}@[群:{self.group_id}] "' - + "".join( - map( - lambda x: escape_tag(str(x)) - if x.is_text() - else f"{escape_tag(str(x))}", - self.message, - ) - ) - + '"' - ) - - @overrides(MessageEvent) - def get_session_id(self) -> str: - return f"group_{self.group_id}_{self.user_id}" - - -# Notice Events -class NoticeEvent(Event): - """通知事件""" - - __event__ = "notice" - post_type: Literal["notice"] - notice_type: str - - @overrides(Event) - def get_event_name(self) -> str: - sub_type = getattr(self, "sub_type", None) - return f"{self.post_type}.{self.notice_type}" + ( - f".{sub_type}" if sub_type else "" - ) - - -class GroupUploadNoticeEvent(NoticeEvent): - """群文件上传事件""" - - __event__ = "notice.group_upload" - notice_type: Literal["group_upload"] - user_id: int - group_id: int - file: File - - @overrides(NoticeEvent) - def get_user_id(self) -> str: - return str(self.user_id) - - @overrides(NoticeEvent) - def get_session_id(self) -> str: - return f"group_{self.group_id}_{self.user_id}" - - -class GroupAdminNoticeEvent(NoticeEvent): - """群管理员变动""" - - __event__ = "notice.group_admin" - notice_type: Literal["group_admin"] - sub_type: str - user_id: int - group_id: int - - @overrides(NoticeEvent) - def is_tome(self) -> bool: - return self.user_id == self.self_id - - @overrides(NoticeEvent) - def get_user_id(self) -> str: - return str(self.user_id) - - @overrides(NoticeEvent) - def get_session_id(self) -> str: - return f"group_{self.group_id}_{self.user_id}" - - -class GroupDecreaseNoticeEvent(NoticeEvent): - """群成员减少事件""" - - __event__ = "notice.group_decrease" - notice_type: Literal["group_decrease"] - sub_type: str - user_id: int - group_id: int - operator_id: int - - @overrides(NoticeEvent) - def is_tome(self) -> bool: - return self.user_id == self.self_id - - @overrides(NoticeEvent) - def get_user_id(self) -> str: - return str(self.user_id) - - @overrides(NoticeEvent) - def get_session_id(self) -> str: - return f"group_{self.group_id}_{self.user_id}" - - -class GroupIncreaseNoticeEvent(NoticeEvent): - """群成员增加事件""" - - __event__ = "notice.group_increase" - notice_type: Literal["group_increase"] - sub_type: str - user_id: int - group_id: int - operator_id: int - - @overrides(NoticeEvent) - def is_tome(self) -> bool: - return self.user_id == self.self_id - - @overrides(NoticeEvent) - def get_user_id(self) -> str: - return str(self.user_id) - - @overrides(NoticeEvent) - def get_session_id(self) -> str: - return f"group_{self.group_id}_{self.user_id}" - - -class GroupBanNoticeEvent(NoticeEvent): - """群禁言事件""" - - __event__ = "notice.group_ban" - notice_type: Literal["group_ban"] - sub_type: str - user_id: int - group_id: int - operator_id: int - duration: int - - @overrides(NoticeEvent) - def is_tome(self) -> bool: - return self.user_id == self.self_id - - @overrides(NoticeEvent) - def get_user_id(self) -> str: - return str(self.user_id) - - @overrides(NoticeEvent) - def get_session_id(self) -> str: - return f"group_{self.group_id}_{self.user_id}" - - -class FriendAddNoticeEvent(NoticeEvent): - """好友添加事件""" - - __event__ = "notice.friend_add" - notice_type: Literal["friend_add"] - user_id: int - - @overrides(NoticeEvent) - def get_user_id(self) -> str: - return str(self.user_id) - - @overrides(NoticeEvent) - def get_session_id(self) -> str: - return str(self.user_id) - - -class GroupRecallNoticeEvent(NoticeEvent): - """群消息撤回事件""" - - __event__ = "notice.group_recall" - notice_type: Literal["group_recall"] - user_id: int - group_id: int - operator_id: int - message_id: int - - @overrides(Event) - def is_tome(self) -> bool: - return self.user_id == self.self_id - - @overrides(NoticeEvent) - def get_user_id(self) -> str: - return str(self.user_id) - - @overrides(NoticeEvent) - def get_session_id(self) -> str: - return f"group_{self.group_id}_{self.user_id}" - - -class FriendRecallNoticeEvent(NoticeEvent): - """好友消息撤回事件""" - - __event__ = "notice.friend_recall" - notice_type: Literal["friend_recall"] - user_id: int - message_id: int - - @overrides(NoticeEvent) - def get_user_id(self) -> str: - return str(self.user_id) - - @overrides(NoticeEvent) - def get_session_id(self) -> str: - return str(self.user_id) - - -class NotifyEvent(NoticeEvent): - """提醒事件""" - - __event__ = "notice.notify" - notice_type: Literal["notify"] - sub_type: str - user_id: int - group_id: int - - @overrides(NoticeEvent) - def get_user_id(self) -> str: - return str(self.user_id) - - @overrides(NoticeEvent) - def get_session_id(self) -> str: - return f"group_{self.group_id}_{self.user_id}" - - -class PokeNotifyEvent(NotifyEvent): - """戳一戳提醒事件""" - - __event__ = "notice.notify.poke" - sub_type: Literal["poke"] - target_id: int - group_id: Optional[int] = None - - @overrides(Event) - def is_tome(self) -> bool: - return self.target_id == self.self_id - - @overrides(NotifyEvent) - def get_session_id(self) -> str: - if not self.group_id: - return str(self.user_id) - return super().get_session_id() - - -class LuckyKingNotifyEvent(NotifyEvent): - """群红包运气王提醒事件""" - - __event__ = "notice.notify.lucky_king" - sub_type: Literal["lucky_king"] - target_id: int - - @overrides(Event) - def is_tome(self) -> bool: - return self.target_id == self.self_id - - @overrides(NotifyEvent) - def get_user_id(self) -> str: - return str(self.target_id) - - @overrides(NotifyEvent) - def get_session_id(self) -> str: - return f"group_{self.group_id}_{self.target_id}" - - -class HonorNotifyEvent(NotifyEvent): - """群荣誉变更提醒事件""" - - __event__ = "notice.notify.honor" - sub_type: Literal["honor"] - honor_type: str - - @overrides(Event) - def is_tome(self) -> bool: - return self.user_id == self.self_id - - -# Request Events -class RequestEvent(Event): - """请求事件""" - - __event__ = "request" - post_type: Literal["request"] - request_type: str - - @overrides(Event) - def get_event_name(self) -> str: - sub_type = getattr(self, "sub_type", None) - return f"{self.post_type}.{self.request_type}" + ( - f".{sub_type}" if sub_type else "" - ) - - -class FriendRequestEvent(RequestEvent): - """加好友请求事件""" - - __event__ = "request.friend" - request_type: Literal["friend"] - user_id: int - comment: str - flag: str - - @overrides(RequestEvent) - def get_user_id(self) -> str: - return str(self.user_id) - - @overrides(RequestEvent) - def get_session_id(self) -> str: - return str(self.user_id) - - async def approve(self, bot: "Bot", remark: str = ""): - return await bot.set_friend_add_request( - flag=self.flag, approve=True, remark=remark - ) - - async def reject(self, bot: "Bot"): - return await bot.set_friend_add_request(flag=self.flag, approve=False) - - -class GroupRequestEvent(RequestEvent): - """加群请求/邀请事件""" - - __event__ = "request.group" - request_type: Literal["group"] - sub_type: str - group_id: int - user_id: int - comment: str - flag: str - - @overrides(RequestEvent) - def get_user_id(self) -> str: - return str(self.user_id) - - @overrides(RequestEvent) - def get_session_id(self) -> str: - return f"group_{self.group_id}_{self.user_id}" - - async def approve(self, bot: "Bot"): - return await bot.set_group_add_request( - flag=self.flag, sub_type=self.sub_type, approve=True - ) - - async def reject(self, bot: "Bot", reason: str = ""): - return await bot.set_group_add_request( - flag=self.flag, sub_type=self.sub_type, approve=False, reason=reason - ) - - -# Meta Events -class MetaEvent(Event): - """元事件""" - - __event__ = "meta_event" - post_type: Literal["meta_event"] - meta_event_type: str - - @overrides(Event) - def get_event_name(self) -> str: - sub_type = getattr(self, "sub_type", None) - return f"{self.post_type}.{self.meta_event_type}" + ( - f".{sub_type}" if sub_type else "" - ) - - @overrides(Event) - def get_log_string(self) -> str: - raise NoLogException - - -class LifecycleMetaEvent(MetaEvent): - """生命周期元事件""" - - __event__ = "meta_event.lifecycle" - meta_event_type: Literal["lifecycle"] - sub_type: str - - -class HeartbeatMetaEvent(MetaEvent): - """心跳元事件""" - - __event__ = "meta_event.heartbeat" - meta_event_type: Literal["heartbeat"] - status: Status - interval: int - - -_t = StringTrie(separator=".") - -# define `model` first to avoid globals changing while `for` -model = None -for model in globals().values(): - if not inspect.isclass(model) or not issubclass(model, Event): - continue - _t["." + model.__event__] = model - - -def get_event_model(event_name) -> List[Type[Event]]: - """ - :说明: - - 根据事件名获取对应 ``Event Model`` 及 ``FallBack Event Model`` 列表 - - :返回: - - - ``List[Type[Event]]`` - """ - return [model.value for model in _t.prefixes("." + event_name)][::-1] - - -__all__ = [ - "Event", - "MessageEvent", - "PrivateMessageEvent", - "GroupMessageEvent", - "NoticeEvent", - "GroupUploadNoticeEvent", - "GroupAdminNoticeEvent", - "GroupDecreaseNoticeEvent", - "GroupIncreaseNoticeEvent", - "GroupBanNoticeEvent", - "FriendAddNoticeEvent", - "GroupRecallNoticeEvent", - "FriendRecallNoticeEvent", - "NotifyEvent", - "PokeNotifyEvent", - "LuckyKingNotifyEvent", - "HonorNotifyEvent", - "RequestEvent", - "FriendRequestEvent", - "GroupRequestEvent", - "MetaEvent", - "LifecycleMetaEvent", - "HeartbeatMetaEvent", - "get_event_model", -] diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/exception.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/exception.py deleted file mode 100644 index 1ea01f80..00000000 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/exception.py +++ /dev/null @@ -1,68 +0,0 @@ -from typing import Optional - -from nonebot.exception import AdapterException -from nonebot.exception import ActionFailed as BaseActionFailed -from nonebot.exception import NetworkError as BaseNetworkError -from nonebot.exception import NoLogException as BaseNoLogException -from nonebot.exception import ApiNotAvailable as BaseApiNotAvailable - - -class CQHTTPAdapterException(AdapterException): - def __init__(self): - super().__init__("cqhttp") - - -class NoLogException(BaseNoLogException, CQHTTPAdapterException): - pass - - -class ActionFailed(BaseActionFailed, CQHTTPAdapterException): - """ - :说明: - - API 请求返回错误信息。 - - :参数: - - * ``retcode: Optional[int]``: 错误码 - """ - - def __init__(self, **kwargs): - super().__init__() - self.info = kwargs - - def __repr__(self): - return ( - f"" - ) - - def __str__(self): - return self.__repr__() - - -class NetworkError(BaseNetworkError, CQHTTPAdapterException): - """ - :说明: - - 网络错误。 - - :参数: - - * ``retcode: Optional[int]``: 错误码 - """ - - def __init__(self, msg: Optional[str] = None): - super().__init__() - self.msg = msg - - def __repr__(self): - return f"" - - def __str__(self): - return self.__repr__() - - -class ApiNotAvailable(BaseApiNotAvailable, CQHTTPAdapterException): - pass diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py deleted file mode 100644 index 8ca6378a..00000000 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/message.py +++ /dev/null @@ -1,321 +0,0 @@ -import re -from io import BytesIO -from pathlib import Path -from base64 import b64encode -from typing import Any, Type, Tuple, Union, Mapping, Iterable, Optional, cast - -from nonebot.typing import overrides -from nonebot.adapters import Message as BaseMessage -from nonebot.adapters import MessageSegment as BaseMessageSegment - -from .utils import log, _b2s, escape, unescape - - -class MessageSegment(BaseMessageSegment["Message"]): - """ - CQHTTP 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 - """ - - @classmethod - @overrides(BaseMessageSegment) - def get_message_class(cls) -> Type["Message"]: - return Message - - @overrides(BaseMessageSegment) - def __str__(self) -> str: - type_ = self.type - data = self.data.copy() - - # process special types - if type_ == "text": - return escape(data.get("text", ""), escape_comma=False) # type: ignore - - params = ",".join( - [f"{k}={escape(str(v))}" for k, v in data.items() if v is not None] - ) - return f"[CQ:{type_}{',' if params else ''}{params}]" - - @overrides(BaseMessageSegment) - def __add__(self, other) -> "Message": - return Message(self) + ( - MessageSegment.text(other) if isinstance(other, str) else other - ) - - @overrides(BaseMessageSegment) - def __radd__(self, other) -> "Message": - return ( - MessageSegment.text(other) if isinstance(other, str) else Message(other) - ) + self - - @overrides(BaseMessageSegment) - def is_text(self) -> bool: - return self.type == "text" - - @staticmethod - def anonymous(ignore_failure: Optional[bool] = None) -> "MessageSegment": - return MessageSegment("anonymous", {"ignore": _b2s(ignore_failure)}) - - @staticmethod - def at(user_id: Union[int, str]) -> "MessageSegment": - return MessageSegment("at", {"qq": str(user_id)}) - - @staticmethod - def contact(type_: str, id: int) -> "MessageSegment": - return MessageSegment("contact", {"type": type_, "id": str(id)}) - - @staticmethod - def contact_group(group_id: int) -> "MessageSegment": - return MessageSegment("contact", {"type": "group", "id": str(group_id)}) - - @staticmethod - def contact_user(user_id: int) -> "MessageSegment": - return MessageSegment("contact", {"type": "qq", "id": str(user_id)}) - - @staticmethod - def dice() -> "MessageSegment": - return MessageSegment("dice", {}) - - @staticmethod - def face(id_: int) -> "MessageSegment": - return MessageSegment("face", {"id": str(id_)}) - - @staticmethod - def forward(id_: str) -> "MessageSegment": - log("WARNING", "Forward Message only can be received!") - return MessageSegment("forward", {"id": id_}) - - @staticmethod - def image( - file: Union[str, bytes, BytesIO, Path], - type_: Optional[str] = None, - cache: bool = True, - proxy: bool = True, - timeout: Optional[int] = None, - ) -> "MessageSegment": - if isinstance(file, BytesIO): - file = file.getvalue() - if isinstance(file, bytes): - file = f"base64://{b64encode(file).decode()}" - elif isinstance(file, Path): - file = f"file:///{file.resolve()}" - return MessageSegment( - "image", - { - "file": file, - "type": type_, - "cache": _b2s(cache), - "proxy": _b2s(proxy), - "timeout": timeout, - }, - ) - - @staticmethod - def json(data: str) -> "MessageSegment": - return MessageSegment("json", {"data": data}) - - @staticmethod - def location( - latitude: float, - longitude: float, - title: Optional[str] = None, - content: Optional[str] = None, - ) -> "MessageSegment": - return MessageSegment( - "location", - { - "lat": str(latitude), - "lon": str(longitude), - "title": title, - "content": content, - }, - ) - - @staticmethod - def music(type_: str, id_: int) -> "MessageSegment": - return MessageSegment("music", {"type": type_, "id": id_}) - - @staticmethod - def music_custom( - url: str, - audio: str, - title: str, - content: Optional[str] = None, - img_url: Optional[str] = None, - ) -> "MessageSegment": - return MessageSegment( - "music", - { - "type": "custom", - "url": url, - "audio": audio, - "title": title, - "content": content, - "image": img_url, - }, - ) - - @staticmethod - def node(id_: int) -> "MessageSegment": - return MessageSegment("node", {"id": str(id_)}) - - @staticmethod - def node_custom( - user_id: int, nickname: str, content: Union[str, "Message"] - ) -> "MessageSegment": - return MessageSegment( - "node", {"user_id": str(user_id), "nickname": nickname, "content": content} - ) - - @staticmethod - def poke(type_: str, id_: str) -> "MessageSegment": - return MessageSegment("poke", {"type": type_, "id": id_}) - - @staticmethod - def record( - file: Union[str, bytes, BytesIO, Path], - magic: Optional[bool] = None, - cache: Optional[bool] = None, - proxy: Optional[bool] = None, - timeout: Optional[int] = None, - ) -> "MessageSegment": - if isinstance(file, BytesIO): - file = file.getvalue() - if isinstance(file, bytes): - file = f"base64://{b64encode(file).decode()}" - elif isinstance(file, Path): - file = f"file:///{file.resolve()}" - return MessageSegment( - "record", - { - "file": file, - "magic": _b2s(magic), - "cache": _b2s(cache), - "proxy": _b2s(proxy), - "timeout": timeout, - }, - ) - - @staticmethod - def reply(id_: int) -> "MessageSegment": - return MessageSegment("reply", {"id": str(id_)}) - - @staticmethod - def rps() -> "MessageSegment": - return MessageSegment("rps", {}) - - @staticmethod - def shake() -> "MessageSegment": - return MessageSegment("shake", {}) - - @staticmethod - def share( - url: str = "", - title: str = "", - content: Optional[str] = None, - image: Optional[str] = None, - ) -> "MessageSegment": - return MessageSegment( - "share", {"url": url, "title": title, "content": content, "image": image} - ) - - @staticmethod - def text(text: str) -> "MessageSegment": - return MessageSegment("text", {"text": text}) - - @staticmethod - def video( - file: Union[str, bytes, BytesIO, Path], - cache: Optional[bool] = None, - proxy: Optional[bool] = None, - timeout: Optional[int] = None, - ) -> "MessageSegment": - if isinstance(file, BytesIO): - file = file.getvalue() - if isinstance(file, bytes): - file = f"base64://{b64encode(file).decode()}" - elif isinstance(file, Path): - file = f"file:///{file.resolve()}" - return MessageSegment( - "video", - { - "file": file, - "cache": _b2s(cache), - "proxy": _b2s(proxy), - "timeout": timeout, - }, - ) - - @staticmethod - def xml(data: str) -> "MessageSegment": - return MessageSegment("xml", {"data": data}) - - -class Message(BaseMessage[MessageSegment]): - """ - CQHTTP 协议 Message 适配。 - """ - - @classmethod - @overrides(BaseMessage) - def get_segment_class(cls) -> Type[MessageSegment]: - return MessageSegment - - @overrides(BaseMessage) - def __add__(self, other: Union[str, Mapping, Iterable[Mapping]]) -> "Message": - return super(Message, self).__add__( - MessageSegment.text(other) if isinstance(other, str) else other - ) - - @overrides(BaseMessage) - def __radd__(self, other: Union[str, Mapping, Iterable[Mapping]]) -> "Message": - return super(Message, self).__radd__( - MessageSegment.text(other) if isinstance(other, str) else other - ) - - @staticmethod - @overrides(BaseMessage) - def _construct( - msg: Union[str, Mapping, Iterable[Mapping]] - ) -> Iterable[MessageSegment]: - if isinstance(msg, Mapping): - msg = cast(Mapping[str, Any], msg) - yield MessageSegment(msg["type"], msg.get("data") or {}) - return - elif isinstance(msg, Iterable) and not isinstance(msg, str): - for seg in msg: - yield MessageSegment(seg["type"], seg.get("data") or {}) - return - elif isinstance(msg, str): - - def _iter_message(msg: str) -> Iterable[Tuple[str, str]]: - text_begin = 0 - for cqcode in re.finditer( - r"\[CQ:(?P[a-zA-Z0-9-_.]+)" - r"(?P" - r"(?:,[a-zA-Z0-9-_.]+=[^,\]]+)*" - r"),?\]", - msg, - ): - yield "text", msg[text_begin : cqcode.pos + cqcode.start()] - text_begin = cqcode.pos + cqcode.end() - yield cqcode.group("type"), cqcode.group("params").lstrip(",") - yield "text", msg[text_begin:] - - for type_, data in _iter_message(msg): - if type_ == "text": - if data: - # only yield non-empty text segment - yield MessageSegment(type_, {"text": unescape(data)}) - else: - data = { - k: unescape(v) - for k, v in map( - lambda x: x.split("=", maxsplit=1), - filter(lambda x: x, (x.lstrip() for x in data.split(","))), - ) - } - yield MessageSegment(type_, data) - - @overrides(BaseMessage) - def extract_plain_text(self) -> str: - return "".join(seg.data["text"] for seg in self if seg.is_text()) diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/permission.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/permission.py deleted file mode 100644 index 2a85d6f1..00000000 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/permission.py +++ /dev/null @@ -1,87 +0,0 @@ -from nonebot.adapters import Event -from nonebot.permission import Permission - -from .event import GroupMessageEvent, PrivateMessageEvent - - -async def _private(event: Event) -> bool: - return isinstance(event, PrivateMessageEvent) - - -async def _private_friend(event: Event) -> bool: - return isinstance(event, PrivateMessageEvent) and event.sub_type == "friend" - - -async def _private_group(event: Event) -> bool: - return isinstance(event, PrivateMessageEvent) and event.sub_type == "group" - - -async def _private_other(event: Event) -> bool: - return isinstance(event, PrivateMessageEvent) and event.sub_type == "other" - - -PRIVATE = Permission(_private) -""" -- **说明**: 匹配任意私聊消息类型事件 -""" -PRIVATE_FRIEND = Permission(_private_friend) -""" -- **说明**: 匹配任意好友私聊消息类型事件 -""" -PRIVATE_GROUP = Permission(_private_group) -""" -- **说明**: 匹配任意群临时私聊消息类型事件 -""" -PRIVATE_OTHER = Permission(_private_other) -""" -- **说明**: 匹配任意其他私聊消息类型事件 -""" - - -async def _group(event: Event) -> bool: - return isinstance(event, GroupMessageEvent) - - -async def _group_member(event: Event) -> bool: - return isinstance(event, GroupMessageEvent) and event.sender.role == "member" - - -async def _group_admin(event: Event) -> bool: - return isinstance(event, GroupMessageEvent) and event.sender.role == "admin" - - -async def _group_owner(event: Event) -> bool: - return isinstance(event, GroupMessageEvent) and event.sender.role == "owner" - - -GROUP = Permission(_group) -""" -- **说明**: 匹配任意群聊消息类型事件 -""" -GROUP_MEMBER = Permission(_group_member) -r""" -- **说明**: 匹配任意群员群聊消息类型事件 - -\:\:\:warning 警告 -该权限通过 event.sender 进行判断且不包含管理员以及群主！ -\:\:\: -""" -GROUP_ADMIN = Permission(_group_admin) -""" -- **说明**: 匹配任意群管理员群聊消息类型事件 -""" -GROUP_OWNER = Permission(_group_owner) -""" -- **说明**: 匹配任意群主群聊消息类型事件 -""" - -__all__ = [ - "PRIVATE", - "PRIVATE_FRIEND", - "PRIVATE_GROUP", - "PRIVATE_OTHER", - "GROUP", - "GROUP_MEMBER", - "GROUP_ADMIN", - "GROUP_OWNER", -] diff --git a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/utils.py b/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/utils.py deleted file mode 100644 index a3d2d0e4..00000000 --- a/packages/nonebot-adapter-cqhttp/nonebot/adapters/cqhttp/utils.py +++ /dev/null @@ -1,45 +0,0 @@ -from typing import Optional - -from nonebot.utils import logger_wrapper - -log = logger_wrapper("CQHTTP") - - -def escape(s: str, *, escape_comma: bool = True) -> str: - """ - :说明: - - 对字符串进行 CQ 码转义。 - - :参数: - - * ``s: str``: 需要转义的字符串 - * ``escape_comma: bool``: 是否转义逗号（``,``）。 - """ - s = s.replace("&", "&").replace("[", "[").replace("]", "]") - if escape_comma: - s = s.replace(",", ",") - return s - - -def unescape(s: str) -> str: - """ - :说明: - - 对字符串进行 CQ 码去转义。 - - :参数: - - * ``s: str``: 需要转义的字符串 - """ - return ( - s.replace(",", ",") - .replace("[", "[") - .replace("]", "]") - .replace("&", "&") - ) - - -def _b2s(b: Optional[bool]) -> Optional[str]: - """转换布尔值为字符串。""" - return b if b is None else str(b).lower() diff --git a/packages/nonebot-adapter-cqhttp/poetry.lock b/packages/nonebot-adapter-cqhttp/poetry.lock deleted file mode 100644 index 9945f985..00000000 --- a/packages/nonebot-adapter-cqhttp/poetry.lock +++ /dev/null @@ -1,649 +0,0 @@ -[[package]] -name = "anyio" -version = "3.3.4" -description = "High level compatibility layer for multiple asynchronous event loop implementations" -category = "main" -optional = false -python-versions = ">=3.6.2" - -[package.dependencies] -idna = ">=2.8" -sniffio = ">=1.1" -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] -test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (<0.15)", "mock (>=4)", "uvloop (>=0.15)"] -trio = ["trio (>=0.16)"] - -[[package]] -name = "asgiref" -version = "3.4.1" -description = "ASGI specs, helper code, and adapters" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] - -[[package]] -name = "certifi" -version = "2021.10.8" -description = "Python package for providing Mozilla's CA Bundle." -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "charset-normalizer" -version = "2.0.7" -description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -category = "main" -optional = false -python-versions = ">=3.5.0" - -[package.extras] -unicode_backport = ["unicodedata2"] - -[[package]] -name = "click" -version = "8.0.3" -description = "Composable command line interface toolkit" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -colorama = {version = "*", markers = "platform_system == \"Windows\""} -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} - -[[package]] -name = "colorama" -version = "0.4.4" -description = "Cross-platform colored terminal text." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[[package]] -name = "fastapi" -version = "0.70.0" -description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[package.dependencies] -pydantic = ">=1.6.2,<1.7 || >1.7,<1.7.1 || >1.7.1,<1.7.2 || >1.7.2,<1.7.3 || >1.7.3,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0" -starlette = "0.16.0" - -[package.extras] -all = ["requests (>=2.24.0,<3.0.0)", "jinja2 (>=2.11.2,<4.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<3.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] -dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.4.0,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] -doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"] -test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<4.0.0)", "mypy (==0.910)", "flake8 (>=3.8.3,<4.0.0)", "black (==21.9b0)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.19.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.5.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.6.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "flask (>=1.1.2,<3.0.0)", "anyio[trio] (>=3.2.1,<4.0.0)", "types-ujson (==0.1.1)", "types-orjson (==3.6.0)", "types-dataclasses (==0.1.7)"] - -[[package]] -name = "h11" -version = "0.12.0" -description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" -category = "main" -optional = false -python-versions = ">=3.6" - -[[package]] -name = "h2" -version = "4.1.0" -description = "HTTP/2 State-Machine based protocol implementation" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[package.dependencies] -hpack = ">=4.0,<5" -hyperframe = ">=6.0,<7" - -[[package]] -name = "hpack" -version = "4.0.0" -description = "Pure-Python HPACK header compression" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[[package]] -name = "httpcore" -version = "0.13.7" -description = "A minimal low-level HTTP client." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -anyio = ">=3.0.0,<4.0.0" -h11 = ">=0.11,<0.13" -sniffio = ">=1.0.0,<2.0.0" - -[package.extras] -http2 = ["h2 (>=3,<5)"] - -[[package]] -name = "httptools" -version = "0.2.0" -description = "A collection of framework independent HTTP protocol utils." -category = "main" -optional = false -python-versions = "*" - -[package.extras] -test = ["Cython (==0.29.22)"] - -[[package]] -name = "httpx" -version = "0.20.0" -description = "The next generation HTTP client." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -certifi = "*" -charset-normalizer = "*" -h2 = {version = ">=3,<5", optional = true, markers = "extra == \"http2\""} -httpcore = ">=0.13.3,<0.14.0" -rfc3986 = {version = ">=1.3,<2", extras = ["idna2008"]} -sniffio = "*" - -[package.extras] -brotli = ["brotlicffi", "brotli"] -cli = ["click (>=8.0.0,<9.0.0)", "rich (>=10.0.0,<11.0.0)", "pygments (>=2.0.0,<3.0.0)"] -http2 = ["h2 (>=3,<5)"] - -[[package]] -name = "hyperframe" -version = "6.0.1" -description = "HTTP/2 framing layer for Python" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[[package]] -name = "idna" -version = "3.3" -description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "importlib-metadata" -version = "4.8.1" -description = "Read metadata from Python packages" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} -zipp = ">=0.5" - -[package.extras] -docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -perf = ["ipython"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"] - -[[package]] -name = "loguru" -version = "0.5.3" -description = "Python logging made (stupidly) simple" -category = "main" -optional = false -python-versions = ">=3.5" - -[package.dependencies] -colorama = {version = ">=0.3.4", markers = "sys_platform == \"win32\""} -win32-setctime = {version = ">=1.0.0", markers = "sys_platform == \"win32\""} - -[package.extras] -dev = ["codecov (>=2.0.15)", "colorama (>=0.3.4)", "flake8 (>=3.7.7)", "tox (>=3.9.0)", "tox-travis (>=0.12)", "pytest (>=4.6.2)", "pytest-cov (>=2.7.1)", "Sphinx (>=2.2.1)", "sphinx-autobuild (>=0.7.1)", "sphinx-rtd-theme (>=0.4.3)", "black (>=19.10b0)", "isort (>=5.1.1)"] - -[[package]] -name = "nonebot2" -version = "2.0.0-alpha.16" -description = "An asynchronous python bot framework." -category = "main" -optional = false -python-versions = "^3.7.3" -develop = true - -[package.dependencies] -fastapi = "^0.70.0" -httpx = {version = ">=0.20.0, <1.0.0", extras = ["http2"]} -loguru = "^0.5.1" -pydantic = {version = "~1.8.0", extras = ["dotenv"]} -pygtrie = "^2.4.1" -tomlkit = "^0.7.0" -uvicorn = {version = "^0.15.0", extras = ["standard"]} -websockets = ">=9.1" - -[package.extras] -quart = ["Quart (>=0.15.0,<0.16.0)"] -aiohttp = ["aiohttp[speedups] (>=3.7.4,<4.0.0)"] -all = ["Quart (>=0.15.0,<0.16.0)", "aiohttp[speedups] (>=3.7.4,<4.0.0)"] - -[package.source] -type = "directory" -url = "../.." - -[[package]] -name = "pydantic" -version = "1.8.2" -description = "Data validation and settings management using python 3.6 type hinting" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[package.dependencies] -python-dotenv = {version = ">=0.10.4", optional = true, markers = "extra == \"dotenv\""} -typing-extensions = ">=3.7.4.3" - -[package.extras] -dotenv = ["python-dotenv (>=0.10.4)"] -email = ["email-validator (>=1.0.3)"] - -[[package]] -name = "pygtrie" -version = "2.4.2" -description = "A pure Python trie data structure implementation." -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "python-dotenv" -version = "0.19.1" -description = "Read key-value pairs from a .env file and set them as environment variables" -category = "main" -optional = false -python-versions = ">=3.5" - -[package.extras] -cli = ["click (>=5.0)"] - -[[package]] -name = "pyyaml" -version = "6.0" -description = "YAML parser and emitter for Python" -category = "main" -optional = false -python-versions = ">=3.6" - -[[package]] -name = "rfc3986" -version = "1.5.0" -description = "Validating URI References per RFC 3986" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -idna = {version = "*", optional = true, markers = "extra == \"idna2008\""} - -[package.extras] -idna2008 = ["idna"] - -[[package]] -name = "sniffio" -version = "1.2.0" -description = "Sniff out which async library your code is running under" -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "starlette" -version = "0.16.0" -description = "The little ASGI library that shines." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -anyio = ">=3.0.0,<4" -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "graphene"] - -[[package]] -name = "tomlkit" -version = "0.7.2" -description = "Style preserving TOML library" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[[package]] -name = "typing-extensions" -version = "3.10.0.2" -description = "Backported and Experimental Type Hints for Python 3.5+" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "uvicorn" -version = "0.15.0" -description = "The lightning-fast ASGI server." -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -asgiref = ">=3.4.0" -click = ">=7.0" -colorama = {version = ">=0.4", optional = true, markers = "sys_platform == \"win32\" and extra == \"standard\""} -h11 = ">=0.8" -httptools = {version = ">=0.2.0,<0.3.0", optional = true, markers = "extra == \"standard\""} -python-dotenv = {version = ">=0.13", optional = true, markers = "extra == \"standard\""} -PyYAML = {version = ">=5.1", optional = true, markers = "extra == \"standard\""} -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} -uvloop = {version = ">=0.14.0,<0.15.0 || >0.15.0,<0.15.1 || >0.15.1", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} -watchgod = {version = ">=0.6", optional = true, markers = "extra == \"standard\""} -websockets = {version = ">=9.1", optional = true, markers = "extra == \"standard\""} - -[package.extras] -standard = ["websockets (>=9.1)", "httptools (>=0.2.0,<0.3.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"] - -[[package]] -name = "uvloop" -version = "0.16.0" -description = "Fast implementation of asyncio event loop on top of libuv" -category = "main" -optional = false -python-versions = ">=3.7" - -[package.extras] -dev = ["Cython (>=0.29.24,<0.30.0)", "pytest (>=3.6.0)", "Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)", "aiohttp", "flake8 (>=3.9.2,<3.10.0)", "psutil", "pycodestyle (>=2.7.0,<2.8.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] -docs = ["Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)"] -test = ["aiohttp", "flake8 (>=3.9.2,<3.10.0)", "psutil", "pycodestyle (>=2.7.0,<2.8.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] - -[[package]] -name = "watchgod" -version = "0.7" -description = "Simple, modern file watching and code reload in python." -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "websockets" -version = "10.0" -description = "An implementation of the WebSocket Protocol (RFC 6455 & 7692)" -category = "main" -optional = false -python-versions = ">=3.7" - -[[package]] -name = "win32-setctime" -version = "1.0.3" -description = "A small Python utility to set file creation time on Windows" -category = "main" -optional = false -python-versions = ">=3.5" - -[package.extras] -dev = ["pytest (>=4.6.2)", "black (>=19.3b0)"] - -[[package]] -name = "zipp" -version = "3.6.0" -description = "Backport of pathlib-compatible object wrapper for zip files" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.extras] -docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] - -[metadata] -lock-version = "1.1" -python-versions = "^3.7.3" -content-hash = "0cc9df471eb39cfb9b3225370913296535c45171158adc19753cebb7fe791ae3" - -[metadata.files] -anyio = [ - {file = "anyio-3.3.4-py3-none-any.whl", hash = "sha256:4fd09a25ab7fa01d34512b7249e366cd10358cdafc95022c7ff8c8f8a5026d66"}, - {file = "anyio-3.3.4.tar.gz", hash = "sha256:67da67b5b21f96b9d3d65daa6ea99f5d5282cb09f50eb4456f8fb51dffefc3ff"}, -] -asgiref = [ - {file = "asgiref-3.4.1-py3-none-any.whl", hash = "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"}, - {file = "asgiref-3.4.1.tar.gz", hash = "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9"}, -] -certifi = [ - {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, - {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, -] -charset-normalizer = [ - {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"}, - {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"}, -] -click = [ - {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"}, - {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"}, -] -colorama = [ - {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, - {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, -] -fastapi = [ - {file = "fastapi-0.70.0-py3-none-any.whl", hash = "sha256:a36d5f2fad931aa3575c07a3472c784e81f3e664e3bb5c8b9c88d0ec1104f59c"}, - {file = "fastapi-0.70.0.tar.gz", hash = "sha256:66da43cfe5185ea1df99552acffd201f1832c6b364e0f4136c0a99f933466ced"}, -] -h11 = [ - {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, - {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, -] -h2 = [ - {file = "h2-4.1.0-py3-none-any.whl", hash = "sha256:03a46bcf682256c95b5fd9e9a99c1323584c3eec6440d379b9903d709476bc6d"}, - {file = "h2-4.1.0.tar.gz", hash = "sha256:a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb"}, -] -hpack = [ - {file = "hpack-4.0.0-py3-none-any.whl", hash = "sha256:84a076fad3dc9a9f8063ccb8041ef100867b1878b25ef0ee63847a5d53818a6c"}, - {file = "hpack-4.0.0.tar.gz", hash = "sha256:fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095"}, -] -httpcore = [ - {file = "httpcore-0.13.7-py3-none-any.whl", hash = "sha256:369aa481b014cf046f7067fddd67d00560f2f00426e79569d99cb11245134af0"}, - {file = "httpcore-0.13.7.tar.gz", hash = "sha256:036f960468759e633574d7c121afba48af6419615d36ab8ede979f1ad6276fa3"}, -] -httptools = [ - {file = "httptools-0.2.0-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:79dbc21f3612a78b28384e989b21872e2e3cf3968532601544696e4ed0007ce5"}, - {file = "httptools-0.2.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:78d03dd39b09c99ec917d50189e6743adbfd18c15d5944392d2eabda688bf149"}, - {file = "httptools-0.2.0-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:a23166e5ae2775709cf4f7ad4c2048755ebfb272767d244e1a96d55ac775cca7"}, - {file = "httptools-0.2.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:3ab1f390d8867f74b3b5ee2a7ecc9b8d7f53750bd45714bf1cb72a953d7dfa77"}, - {file = "httptools-0.2.0-cp36-cp36m-win_amd64.whl", hash = "sha256:a7594f9a010cdf1e16a58b3bf26c9da39bbf663e3b8d46d39176999d71816658"}, - {file = "httptools-0.2.0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:01b392a166adcc8bc2f526a939a8aabf89fe079243e1543fd0e7dc1b58d737cb"}, - {file = "httptools-0.2.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:80ffa04fe8c8dfacf6e4cef8277347d35b0442c581f5814f3b0cf41b65c43c6e"}, - {file = "httptools-0.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d5682eeb10cca0606c4a8286a3391d4c3c5a36f0c448e71b8bd05be4e1694bfb"}, - {file = "httptools-0.2.0-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:a289c27ccae399a70eacf32df9a44059ca2ba4ac444604b00a19a6c1f0809943"}, - {file = "httptools-0.2.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:813871f961edea6cb2fe312f2d9b27d12a51ba92545380126f80d0de1917ea15"}, - {file = "httptools-0.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:cc9be041e428c10f8b6ab358c6b393648f9457094e1dcc11b4906026d43cd380"}, - {file = "httptools-0.2.0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:b08d00d889a118f68f37f3c43e359aab24ee29eb2e3fe96d64c6a2ba8b9d6557"}, - {file = "httptools-0.2.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:fd3b8905e21431ad306eeaf56644a68fdd621bf8f3097eff54d0f6bdf7262065"}, - {file = "httptools-0.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:200fc1cdf733a9ff554c0bb97a4047785cfaad9875307d6087001db3eb2b417f"}, - {file = "httptools-0.2.0.tar.gz", hash = "sha256:94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"}, -] -httpx = [ - {file = "httpx-0.20.0-py3-none-any.whl", hash = "sha256:33af5aad9bdc82ef1fc89219c1e36f5693bf9cd0ebe330884df563445682c0f8"}, - {file = "httpx-0.20.0.tar.gz", hash = "sha256:09606d630f070d07f9ff28104fbcea429ea0014c1e89ac90b4d8de8286c40e7b"}, -] -hyperframe = [ - {file = "hyperframe-6.0.1-py3-none-any.whl", hash = "sha256:0ec6bafd80d8ad2195c4f03aacba3a8265e57bc4cff261e802bf39970ed02a15"}, - {file = "hyperframe-6.0.1.tar.gz", hash = "sha256:ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914"}, -] -idna = [ - {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, - {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, -] -importlib-metadata = [ - {file = "importlib_metadata-4.8.1-py3-none-any.whl", hash = "sha256:b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15"}, - {file = "importlib_metadata-4.8.1.tar.gz", hash = "sha256:f284b3e11256ad1e5d03ab86bb2ccd6f5339688ff17a4d797a0fe7df326f23b1"}, -] -loguru = [ - {file = "loguru-0.5.3-py3-none-any.whl", hash = "sha256:f8087ac396b5ee5f67c963b495d615ebbceac2796379599820e324419d53667c"}, - {file = "loguru-0.5.3.tar.gz", hash = "sha256:b28e72ac7a98be3d28ad28570299a393dfcd32e5e3f6a353dec94675767b6319"}, -] -nonebot2 = [] -pydantic = [ - {file = "pydantic-1.8.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:05ddfd37c1720c392f4e0d43c484217b7521558302e7069ce8d318438d297739"}, - {file = "pydantic-1.8.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a7c6002203fe2c5a1b5cbb141bb85060cbff88c2d78eccbc72d97eb7022c43e4"}, - {file = "pydantic-1.8.2-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:589eb6cd6361e8ac341db97602eb7f354551482368a37f4fd086c0733548308e"}, - {file = "pydantic-1.8.2-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:10e5622224245941efc193ad1d159887872776df7a8fd592ed746aa25d071840"}, - {file = "pydantic-1.8.2-cp36-cp36m-win_amd64.whl", hash = "sha256:99a9fc39470010c45c161a1dc584997f1feb13f689ecf645f59bb4ba623e586b"}, - {file = "pydantic-1.8.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a83db7205f60c6a86f2c44a61791d993dff4b73135df1973ecd9eed5ea0bda20"}, - {file = "pydantic-1.8.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:41b542c0b3c42dc17da70554bc6f38cbc30d7066d2c2815a94499b5684582ecb"}, - {file = "pydantic-1.8.2-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:ea5cb40a3b23b3265f6325727ddfc45141b08ed665458be8c6285e7b85bd73a1"}, - {file = "pydantic-1.8.2-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:18b5ea242dd3e62dbf89b2b0ec9ba6c7b5abaf6af85b95a97b00279f65845a23"}, - {file = "pydantic-1.8.2-cp37-cp37m-win_amd64.whl", hash = "sha256:234a6c19f1c14e25e362cb05c68afb7f183eb931dd3cd4605eafff055ebbf287"}, - {file = "pydantic-1.8.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:021ea0e4133e8c824775a0cfe098677acf6fa5a3cbf9206a376eed3fc09302cd"}, - {file = "pydantic-1.8.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:e710876437bc07bd414ff453ac8ec63d219e7690128d925c6e82889d674bb505"}, - {file = "pydantic-1.8.2-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:ac8eed4ca3bd3aadc58a13c2aa93cd8a884bcf21cb019f8cfecaae3b6ce3746e"}, - {file = "pydantic-1.8.2-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:4a03cbbe743e9c7247ceae6f0d8898f7a64bb65800a45cbdc52d65e370570820"}, - {file = "pydantic-1.8.2-cp38-cp38-win_amd64.whl", hash = "sha256:8621559dcf5afacf0069ed194278f35c255dc1a1385c28b32dd6c110fd6531b3"}, - {file = "pydantic-1.8.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8b223557f9510cf0bfd8b01316bf6dd281cf41826607eada99662f5e4963f316"}, - {file = "pydantic-1.8.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:244ad78eeb388a43b0c927e74d3af78008e944074b7d0f4f696ddd5b2af43c62"}, - {file = "pydantic-1.8.2-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:05ef5246a7ffd2ce12a619cbb29f3307b7c4509307b1b49f456657b43529dc6f"}, - {file = "pydantic-1.8.2-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:54cd5121383f4a461ff7644c7ca20c0419d58052db70d8791eacbbe31528916b"}, - {file = "pydantic-1.8.2-cp39-cp39-win_amd64.whl", hash = "sha256:4be75bebf676a5f0f87937c6ddb061fa39cbea067240d98e298508c1bda6f3f3"}, - {file = "pydantic-1.8.2-py3-none-any.whl", hash = "sha256:fec866a0b59f372b7e776f2d7308511784dace622e0992a0b59ea3ccee0ae833"}, - {file = "pydantic-1.8.2.tar.gz", hash = "sha256:26464e57ccaafe72b7ad156fdaa4e9b9ef051f69e175dbbb463283000c05ab7b"}, -] -pygtrie = [ - {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, -] -python-dotenv = [ - {file = "python-dotenv-0.19.1.tar.gz", hash = "sha256:14f8185cc8d494662683e6914addcb7e95374771e707601dfc70166946b4c4b8"}, - {file = "python_dotenv-0.19.1-py2.py3-none-any.whl", hash = "sha256:bbd3da593fc49c249397cbfbcc449cf36cb02e75afc8157fcc6a81df6fb7750a"}, -] -pyyaml = [ - {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, - {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, - {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, - {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, - {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, - {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, - {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, - {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, - {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, - {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, - {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, - {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, - {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, - {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, - {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, - {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, -] -rfc3986 = [ - {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"}, - {file = "rfc3986-1.5.0.tar.gz", hash = "sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"}, -] -sniffio = [ - {file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"}, - {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, -] -starlette = [ - {file = "starlette-0.16.0-py3-none-any.whl", hash = "sha256:38eb24bf705a2c317e15868e384c1b8a12ca396e5a3c3a003db7e667c43f939f"}, - {file = "starlette-0.16.0.tar.gz", hash = "sha256:e1904b5d0007aee24bdd3c43994be9b3b729f4f58e740200de1d623f8c3a8870"}, -] -tomlkit = [ - {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"}, - {file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"}, -] -typing-extensions = [ - {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, - {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"}, - {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, -] -uvicorn = [ - {file = "uvicorn-0.15.0-py3-none-any.whl", hash = "sha256:17f898c64c71a2640514d4089da2689e5db1ce5d4086c2d53699bf99513421c1"}, - {file = "uvicorn-0.15.0.tar.gz", hash = "sha256:d9a3c0dd1ca86728d3e235182683b4cf94cd53a867c288eaeca80ee781b2caff"}, -] -uvloop = [ - {file = "uvloop-0.16.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:6224f1401025b748ffecb7a6e2652b17768f30b1a6a3f7b44660e5b5b690b12d"}, - {file = "uvloop-0.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:30ba9dcbd0965f5c812b7c2112a1ddf60cf904c1c160f398e7eed3a6b82dcd9c"}, - {file = "uvloop-0.16.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bd53f7f5db562f37cd64a3af5012df8cac2c464c97e732ed556800129505bd64"}, - {file = "uvloop-0.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:772206116b9b57cd625c8a88f2413df2fcfd0b496eb188b82a43bed7af2c2ec9"}, - {file = "uvloop-0.16.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b572256409f194521a9895aef274cea88731d14732343da3ecdb175228881638"}, - {file = "uvloop-0.16.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:04ff57aa137230d8cc968f03481176041ae789308b4d5079118331ab01112450"}, - {file = "uvloop-0.16.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a19828c4f15687675ea912cc28bbcb48e9bb907c801873bd1519b96b04fb805"}, - {file = "uvloop-0.16.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e814ac2c6f9daf4c36eb8e85266859f42174a4ff0d71b99405ed559257750382"}, - {file = "uvloop-0.16.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bd8f42ea1ea8f4e84d265769089964ddda95eb2bb38b5cbe26712b0616c3edee"}, - {file = "uvloop-0.16.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:647e481940379eebd314c00440314c81ea547aa636056f554d491e40503c8464"}, - {file = "uvloop-0.16.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e0d26fa5875d43ddbb0d9d79a447d2ace4180d9e3239788208527c4784f7cab"}, - {file = "uvloop-0.16.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:6ccd57ae8db17d677e9e06192e9c9ec4bd2066b77790f9aa7dede2cc4008ee8f"}, - {file = "uvloop-0.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:089b4834fd299d82d83a25e3335372f12117a7d38525217c2258e9b9f4578897"}, - {file = "uvloop-0.16.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98d117332cc9e5ea8dfdc2b28b0a23f60370d02e1395f88f40d1effd2cb86c4f"}, - {file = "uvloop-0.16.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e5f2e2ff51aefe6c19ee98af12b4ae61f5be456cd24396953244a30880ad861"}, - {file = "uvloop-0.16.0.tar.gz", hash = "sha256:f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228"}, -] -watchgod = [ - {file = "watchgod-0.7-py3-none-any.whl", hash = "sha256:d6c1ea21df37847ac0537ca0d6c2f4cdf513562e95f77bb93abbcf05573407b7"}, - {file = "watchgod-0.7.tar.gz", hash = "sha256:48140d62b0ebe9dd9cf8381337f06351e1f2e70b2203fa9c6eff4e572ca84f29"}, -] -websockets = [ - {file = "websockets-10.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:cd8c6f2ec24aedace251017bc7a414525171d4e6578f914acab9349362def4da"}, - {file = "websockets-10.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:1f6b814cff6aadc4288297cb3a248614829c6e4ff5556593c44a115e9dd49939"}, - {file = "websockets-10.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:01db0ecd1a0ca6702d02a5ed40413e18b7d22f94afb3bbe0d323bac86c42c1c8"}, - {file = "websockets-10.0-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:82b17524b1ce6ae7f7dd93e4d18e9b9474071e28b65dbf1dfe9b5767778db379"}, - {file = "websockets-10.0-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:8bbf8660c3f833ddc8b1afab90213f2e672a9ddac6eecb3cde968e6b2807c1c7"}, - {file = "websockets-10.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b8176deb6be540a46695960a765a77c28ac8b2e3ef2ec95d50a4f5df901edb1c"}, - {file = "websockets-10.0-cp37-cp37m-win32.whl", hash = "sha256:706e200fc7f03bed99ad0574cd1ea8b0951477dd18cc978ccb190683c69dba76"}, - {file = "websockets-10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:5b2600e01c7ca6f840c42c747ffbe0254f319594ed108db847eb3d75f4aacb80"}, - {file = "websockets-10.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:085bb8a6e780d30eaa1ba48ac7f3a6707f925edea787cfb761ce5a39e77ac09b"}, - {file = "websockets-10.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:9a4d889162bd48588e80950e07fa5e039eee9deb76a58092e8c3ece96d7ef537"}, - {file = "websockets-10.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:b4ade7569b6fd17912452f9c3757d96f8e4044016b6d22b3b8391e641ca50456"}, - {file = "websockets-10.0-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:2a43072e434c041a99f2e1eb9b692df0232a38c37c61d00e9f24db79474329e4"}, - {file = "websockets-10.0-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:7f79f02c7f9a8320aff7d3321cd1c7e3a7dbc15d922ac996cca827301ee75238"}, - {file = "websockets-10.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:1ac35426fe3e7d3d0fac3d63c8965c76ed67a8fd713937be072bf0ce22808539"}, - {file = "websockets-10.0-cp38-cp38-win32.whl", hash = "sha256:ff59c6bdb87b31f7e2d596f09353d5a38c8c8ff571b0e2238e8ee2d55ad68465"}, - {file = "websockets-10.0-cp38-cp38-win_amd64.whl", hash = "sha256:d67646ddd17a86117ae21c27005d83c1895c0cef5d7be548b7549646372f868a"}, - {file = "websockets-10.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:82bd921885231f4a30d9bc550552495b3fc36b1235add6d374e7c65c3babd805"}, - {file = "websockets-10.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:7d2e12e4f901f1bc062dfdf91831712c4106ed18a9a4cdb65e2e5f502124ca37"}, - {file = "websockets-10.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:71358c7816e2762f3e4af3adf0040f268e219f5a38cb3487a9d0fc2e554fef6a"}, - {file = "websockets-10.0-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:fe83b3ec9ef34063d86dfe1029160a85f24a5a94271036e5714a57acfdd089a1"}, - {file = "websockets-10.0-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:eb282127e9c136f860c6068a4fba5756eb25e755baffb5940b6f1eae071928b2"}, - {file = "websockets-10.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:62160772314920397f9d219147f958b33fa27a12c662d4455c9ccbba9a07e474"}, - {file = "websockets-10.0-cp39-cp39-win32.whl", hash = "sha256:e42a1f1e03437b017af341e9bbfdc09252cd48ef32a8c3c3ead769eab3b17368"}, - {file = "websockets-10.0-cp39-cp39-win_amd64.whl", hash = "sha256:c5880442f5fc268f1ef6d37b2c152c114deccca73f48e3a8c48004d2f16f4567"}, - {file = "websockets-10.0.tar.gz", hash = "sha256:c4fc9a1d242317892590abe5b61a9127f1a61740477bfb121743f290b8054002"}, -] -win32-setctime = [ - {file = "win32_setctime-1.0.3-py3-none-any.whl", hash = "sha256:dc925662de0a6eb987f0b01f599c01a8236cb8c62831c22d9cada09ad958243e"}, - {file = "win32_setctime-1.0.3.tar.gz", hash = "sha256:4e88556c32fdf47f64165a2180ba4552f8bb32c1103a2fafd05723a0bd42bd4b"}, -] -zipp = [ - {file = "zipp-3.6.0-py3-none-any.whl", hash = "sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc"}, - {file = "zipp-3.6.0.tar.gz", hash = "sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832"}, -] diff --git a/packages/nonebot-adapter-cqhttp/pyproject.toml b/packages/nonebot-adapter-cqhttp/pyproject.toml deleted file mode 100644 index 35386f9f..00000000 --- a/packages/nonebot-adapter-cqhttp/pyproject.toml +++ /dev/null @@ -1,54 +0,0 @@ -[tool.poetry] -name = "nonebot-adapter-cqhttp" -version = "2.0.0-alpha.16" -description = "OneBot(CQHTTP) adapter for nonebot2" -authors = ["yanyongyu "] -license = "MIT" -readme = "README.md" -homepage = "https://v2.nonebot.dev/" -repository = "https://github.com/nonebot/nonebot2" -documentation = "https://v2.nonebot.dev/" -keywords = ["bot", "qq", "qqbot", "coolq", "cqhttp"] -classifiers = [ - "Development Status :: 5 - Production/Stable", - "Framework :: Robot Framework", - "Framework :: Robot Framework :: Library", - "Operating System :: OS Independent", - "Programming Language :: Python :: 3" -] -packages = [ - { include = "nonebot" } -] -exclude = ["nonebot/__init__.py", "nonebot/adapters/__init__.py"] - -[tool.poetry.dependencies] -python = "^3.7.3" -httpx = ">=0.20.0, <1.0.0" -nonebot2 = "^2.0.0-alpha.14" - -[tool.poetry.dev-dependencies] -nonebot2 = { path = "../../", develop = true } - -# [[tool.poetry.source]] -# name = "aliyun" -# url = "https://mirrors.aliyun.com/pypi/simple/" -# default = true - -[tool.black] -line-length = 88 -target-version = ["py37", "py38", "py39"] -include = '\.pyi?$' -extend-exclude = ''' -''' - -[tool.isort] -profile = "black" -line_length = 80 -length_sort = true -skip_gitignore = true -force_sort_within_sections = true -extra_standard_library = ["typing_extensions"] - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" diff --git a/poetry.lock b/poetry.lock index 56535b06..c8bf9923 100644 --- a/poetry.lock +++ b/poetry.lock @@ -77,7 +77,7 @@ python-versions = "*" [[package]] name = "anyio" -version = "3.3.4" +version = "3.4.0" description = "High level compatibility layer for multiple asynchronous event loop implementations" category = "main" optional = false @@ -90,7 +90,7 @@ typing-extensions = {version = "*", markers = "python_version < \"3.8\""} [package.extras] doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] -test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (<0.15)", "mock (>=4)", "uvloop (>=0.15)"] +test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "pytest-mock (>=3.6.1)", "trustme", "contextlib2", "uvloop (<0.15)", "mock (>=4)", "uvloop (>=0.15)"] trio = ["trio (>=0.16)"] [[package]] @@ -509,23 +509,6 @@ category = "dev" optional = false python-versions = "*" -[[package]] -name = "nonebot-adapter-cqhttp" -version = "2.0.0-alpha.16" -description = "OneBot(CQHTTP) adapter for nonebot2" -category = "dev" -optional = false -python-versions = "^3.7.3" -develop = true - -[package.dependencies] -httpx = ">=0.20.0, <1.0.0" -nonebot2 = "^2.0.0-alpha.14" - -[package.source] -type = "directory" -url = "packages/nonebot-adapter-cqhttp" - [[package]] name = "nonebot-adapter-ding" version = "2.0.0-alpha.16" @@ -1197,7 +1180,7 @@ quart = ["Quart"] [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "9a64b2ba25ea3367e1636545241122d5b4d454ab3042865416193f84bf358fc3" +content-hash = "9c7bf3b0936f4084baf0184046f4443a37c60dadb289c2baaa4360c8d85e3ae8" [metadata.files] aiocache = [ @@ -1295,8 +1278,8 @@ alabaster = [ {file = "alabaster-0.7.12.tar.gz", hash = "sha256:a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02"}, ] anyio = [ - {file = "anyio-3.3.4-py3-none-any.whl", hash = "sha256:4fd09a25ab7fa01d34512b7249e366cd10358cdafc95022c7ff8c8f8a5026d66"}, - {file = "anyio-3.3.4.tar.gz", hash = "sha256:67da67b5b21f96b9d3d65daa6ea99f5d5282cb09f50eb4456f8fb51dffefc3ff"}, + {file = "anyio-3.4.0-py3-none-any.whl", hash = "sha256:2855a9423524abcdd652d942f8932fda1735210f77a6b392eafd9ff34d3fe020"}, + {file = "anyio-3.4.0.tar.gz", hash = "sha256:24adc69309fb5779bc1e06158e143e0b6d2c56b302a3ac3de3083c705a6ed39d"}, ] asgiref = [ {file = "asgiref-3.4.1-py3-none-any.whl", hash = "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"}, @@ -1781,7 +1764,6 @@ mypy-extensions = [ {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, ] -nonebot-adapter-cqhttp = [] nonebot-adapter-ding = [] nonebot-adapter-feishu = [] nonebot-adapter-mirai = [] diff --git a/pyproject.toml b/pyproject.toml index 1b00e887..79c2faf3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,7 +40,6 @@ sphinx = "^4.1.1" isort = "^5.10.1" black = "^21.11b1" nonebot-plugin-test = "^0.3.0" -nonebot-adapter-cqhttp = { path = "./packages/nonebot-adapter-cqhttp", develop = true } nonebot-adapter-ding = { path = "./packages/nonebot-adapter-ding", develop = true } nonebot-adapter-mirai = { path = "./packages/nonebot-adapter-mirai", develop = true } nonebot-adapter-feishu = { path = "./packages/nonebot-adapter-feishu", develop = true } diff --git a/tests/bot.py b/tests/bot.py index 739078b2..695857b3 100644 --- a/tests/bot.py +++ b/tests/bot.py @@ -4,7 +4,6 @@ import sys sys.path.insert(0, os.path.abspath("..")) import nonebot -from nonebot.adapters.cqhttp import Bot from nonebot.log import logger, default_format from nonebot.adapters.ding import Bot as DingBot from nonebot.adapters.mirai import Bot as MiraiBot @@ -18,7 +17,6 @@ logger.add( nonebot.init(custom_config2="config on init") app = nonebot.get_asgi() driver = nonebot.get_driver() -driver.register_adapter("cqhttp", Bot) driver.register_adapter("ding", DingBot) driver.register_adapter("mirai", MiraiBot) driver.register_adapter("feishu", FeishuBot) diff --git a/tests/test_plugins/test_group/__init__.py b/tests/test_plugins/test_group/__init__.py index cd081381..0de0241f 100644 --- a/tests/test_plugins/test_group/__init__.py +++ b/tests/test_plugins/test_group/__init__.py @@ -4,4 +4,4 @@ from nonebot import CommandGroup, MatcherGroup cmd = CommandGroup("test", rule=to_me()) match = MatcherGroup(priority=2) -from . import matches, commands +from . import commands diff --git a/tests/test_plugins/test_group/matches.py b/tests/test_plugins/test_group/matches.py deleted file mode 100644 index 595fd6a4..00000000 --- a/tests/test_plugins/test_group/matches.py +++ /dev/null @@ -1,16 +0,0 @@ -from . import match -from nonebot.typing import T_State -from nonebot.adapters import Bot, Event -from nonebot.adapters.cqhttp import HeartbeatMetaEvent - - -async def heartbeat(bot: Bot, event: Event, state: T_State) -> bool: - return isinstance(event, HeartbeatMetaEvent) - - -test = match.on_metaevent(rule=heartbeat) - - -@test.receive() -async def handle_heartbeat(bot: Bot): - print("[i] Heartbeat") diff --git a/tests/test_plugins/test_metaevent.py b/tests/test_plugins/test_metaevent.py deleted file mode 100644 index 98f76f78..00000000 --- a/tests/test_plugins/test_metaevent.py +++ /dev/null @@ -1,21 +0,0 @@ -from nonebot.typing import T_State -from nonebot.adapters import Bot, Event -from nonebot.plugin import on_metaevent -from nonebot.adapters.cqhttp import HeartbeatMetaEvent - - -async def heartbeat(bot: Bot, event: Event, state: T_State) -> bool: - return isinstance(event, HeartbeatMetaEvent) - - -async def factory(bot: Bot, event: Event) -> T_State: - return {"factory": True} - - -test_matcher = on_metaevent(heartbeat, state_factory=factory) - - -@test_matcher.receive() -async def handle_heartbeat(bot: Bot, event: Event, state: T_State): - print(state) - print("[i] Heartbeat") diff --git a/tests/test_plugins/test_overload.py b/tests/test_plugins/test_overload.py deleted file mode 100644 index 4e9074e5..00000000 --- a/tests/test_plugins/test_overload.py +++ /dev/null @@ -1,19 +0,0 @@ -from nonebot import on_command -from nonebot.adapters.cqhttp import Bot, GroupMessageEvent, PrivateMessageEvent - -overload = on_command("overload") - - -@overload.handle() -async def handle_first_receive(bot: Bot): - return - - -@overload.got("message", prompt="群？") -async def handle_group(bot: Bot, event: GroupMessageEvent): - return - - -@overload.got("message", prompt="私？") -async def handle_private(bot: Bot, event: PrivateMessageEvent): - return diff --git a/tests/test_plugins/test_permission.py b/tests/test_plugins/test_permission.py deleted file mode 100644 index 51e2f7cd..00000000 --- a/tests/test_plugins/test_permission.py +++ /dev/null @@ -1,18 +0,0 @@ -from nonebot.rule import to_me -from nonebot.typing import T_State -from nonebot.permission import SUPERUSER -from nonebot.plugin import on_startswith -from nonebot.adapters.ding import Bot as DingBot -from nonebot.adapters.cqhttp import Bot as CQHTTPBot - -test_command = on_startswith("hello", to_me(), permission=SUPERUSER) - - -@test_command.handle() -async def test_handler1(bot: CQHTTPBot): - await test_command.finish("cqhttp hello") - - -@test_command.handle() -async def test_handler2(bot: DingBot): - await test_command.finish("ding hello") diff --git a/tests/test_plugins/test_template.py b/tests/test_plugins/test_template.py deleted file mode 100644 index 6ca02081..00000000 --- a/tests/test_plugins/test_template.py +++ /dev/null @@ -1,14 +0,0 @@ -from nonebot import on_command -from nonebot.typing import T_State -from nonebot.adapters.cqhttp import Bot, MessageSegment, GroupMessageEvent - -template = on_command("template") - - -@template.handle() -async def _(bot: Bot, event: GroupMessageEvent, state: T_State): - state["at"] = MessageSegment.at(event.get_user_id()) - state["test"] = "test" - # message: /template {at} hello {test}! - ft = event.message.template(event.message) - await template.send(ft) From 29f14a20ce35b4b865627b14a8ee240bc84ae78b Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 23 Nov 2021 16:59:48 +0800 Subject: [PATCH 044/174] :memo: update readme --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ef96c3fc..3c3c7c19 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ _✨ 跨平台 Python 异步机器人框架 ✨_ pypi python
- + cqhttp @@ -79,7 +79,7 @@ NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义 目前 NoneBot2 官方维护的协议适配： -- [OneBot(CQHTTP) 协议](https://github.com/howmanybots/onebot/blob/master/README.md) (QQ 等) +- [OneBot 协议](https://onebot.dev/) (QQ 等) - [Mirai-API-HTTP 协议](https://github.com/project-mirai/mirai-api-http) - [钉钉](https://ding-doc.dingtalk.com/document#/org-dev-guide/elzz1p) - [Telegram](https://core.telegram.org/bots/api) @@ -91,7 +91,7 @@ NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义 ~~完整~~文档可以在 [这里](https://v2.nonebot.dev/) 查看。 -懒得看文档？下面是快速安装指南：~~这是坏文明~~ +懒得看文档？下面是快速安装指南： 1. (可选)使用你喜欢的 Python 环境管理工具创建新的虚拟环境。 2. 使用 `pip` (或其他) 安装 NoneBot 脚手架。 @@ -137,7 +137,7 @@ NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义 如果你在使用过程中发现任何问题，可以 [提交 issue](https://github.com/nonebot/nonebot2/issues/new) 或自行 fork 修改后提交 pull request。 -如果你要提交 pull request，请确保你的代码风格和项目已有的代码保持一致，遵循 [PEP 8](https://www.python.org/dev/peps/pep-0008/)，变量命名清晰，有适当的注释。 +如果你要提交 pull request，请确保你的代码风格和项目已有的代码保持一致，遵循 [PEP 8](https://www.python.org/dev/peps/pep-0008/) [PEP 484](https://www.python.org/dev/peps/pep-0484/)，变量命名清晰，有适当的注释。 ## 许可证 From 030237fe222e62cae16e0fb8787946bf7400c237 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 25 Nov 2021 20:42:48 +0800 Subject: [PATCH 045/174] :bug: fix receive reject --- nonebot/matcher.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 6f42dcf2..449be730 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -431,6 +431,7 @@ class Matcher(metaclass=MatcherMeta): if state.get(_receive): return state[_receive] = True + del state["_current_key"] raise RejectedException def _decorator(func: T_Handler) -> T_Handler: From 37f55652d9cb369b0638e5690177b65f4f715154 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sat, 27 Nov 2021 12:16:31 +0800 Subject: [PATCH 046/174] :recycle: separate fastapi driver --- docs/api/drivers/fastapi.md | 34 +++++++-- nonebot/dependencies/__init__.py | 2 +- nonebot/drivers/fastapi.py | 118 ++++++++++++++++++------------- tests/.env.dev | 2 +- 4 files changed, 99 insertions(+), 57 deletions(-) diff --git a/docs/api/drivers/fastapi.md b/docs/api/drivers/fastapi.md index 7bc06ae1..ac7cc77b 100644 --- a/docs/api/drivers/fastapi.md +++ b/docs/api/drivers/fastapi.md @@ -141,9 +141,9 @@ FastAPI 驱动框架设置，详情参考 FastAPI 文档 ## _class_ `Driver` -基类：[`nonebot.drivers.ReverseDriver`](README.md#nonebot.drivers.ReverseDriver), [`nonebot.drivers.ForwardDriver`](README.md#nonebot.drivers.ForwardDriver) +基类：[`nonebot.drivers.ReverseDriver`](README.md#nonebot.drivers.ReverseDriver) -FastAPI 驱动框架 +FastAPI 驱动框架。包含反向 Server 功能。 * **上报地址** @@ -192,6 +192,31 @@ fastapi 使用的 logger 参考文档: [Events](https://fastapi.tiangolo.com/advanced/events/#startup-event) +### `run(host=None, port=None, *, app=None, **kwargs)` + +使用 `uvicorn` 启动 FastAPI + + +## _class_ `FullDriver` + +基类：[`nonebot.drivers.ForwardDriver`](README.md#nonebot.drivers.ForwardDriver), `nonebot.drivers.fastapi.Driver` + +完整的 FastAPI 驱动框架，包含正向 Client 支持和反向 Server 支持。 + + +* **使用方法** + + +```dotenv +DRIVER=nonebot.drivers.fastapi:FullDriver +``` + + +### _property_ `type` + +驱动名称: `fastapi_full` + + ### `setup_http_polling(setup)` @@ -224,11 +249,6 @@ fastapi 使用的 logger -### `run(host=None, port=None, *, app=None, **kwargs)` - -使用 `uvicorn` 启动 FastAPI - - ## _class_ `WebSocket` 基类：[`nonebot.drivers.WebSocket`](README.md#nonebot.drivers.WebSocket) diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index c32a9ffe..80db9840 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -1,6 +1,6 @@ """ 依赖注入处理模块 -=============== +================ 该模块实现了依赖注入的定义与处理。 """ diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index db9abf41..2afb082a 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -134,9 +134,9 @@ class Config(BaseSettings): extra = "ignore" -class Driver(ReverseDriver, ForwardDriver): +class Driver(ReverseDriver): """ - FastAPI 驱动框架 + FastAPI 驱动框架。包含反向 Server 功能。 :上报地址: @@ -147,13 +147,9 @@ class Driver(ReverseDriver, ForwardDriver): """ def __init__(self, env: Env, config: NoneBotConfig): - super().__init__(env, config) + super(Driver, self).__init__(env, config) self.fastapi_config: Config = Config(**config.dict()) - self.http_pollings: List[HTTPPOLLING_SETUP] = [] - self.websockets: List[WEBSOCKET_SETUP] = [] - self.shutdown: asyncio.Event = asyncio.Event() - self.connections: List[asyncio.Task] = [] self._server_app = FastAPI( debug=config.debug, @@ -167,9 +163,6 @@ class Driver(ReverseDriver, ForwardDriver): self._server_app.websocket("/{adapter}/ws")(self._handle_ws_reverse) self._server_app.websocket("/{adapter}/ws/")(self._handle_ws_reverse) - self.on_startup(self._run_forward) - self.on_shutdown(self._shutdown_forward) - @property @overrides(ReverseDriver) def type(self) -> str: @@ -204,32 +197,6 @@ class Driver(ReverseDriver, ForwardDriver): """参考文档: `Events `_""" return self.server_app.on_event("shutdown")(func) - @overrides(ForwardDriver) - def setup_http_polling(self, setup: HTTPPOLLING_SETUP) -> None: - """ - :说明: - - 注册一个 HTTP 轮询连接，如果传入一个函数，则该函数会在每次连接时被调用 - - :参数: - - * ``setup: Union[HTTPPollingSetup, Callable[[], Awaitable[HTTPPollingSetup]]]`` - """ - self.http_pollings.append(setup) - - @overrides(ForwardDriver) - def setup_websocket(self, setup: WEBSOCKET_SETUP) -> None: - """ - :说明: - - 注册一个 WebSocket 连接，如果传入一个函数，则该函数会在每次重连时被调用 - - :参数: - - * ``setup: Union[WebSocketSetup, Callable[[], Awaitable[WebSocketSetup]]]`` - """ - self.websockets.append(setup) - @overrides(ReverseDriver) def run( self, @@ -273,18 +240,6 @@ class Driver(ReverseDriver, ForwardDriver): **kwargs, ) - def _run_forward(self): - for setup in self.http_pollings: - self.connections.append(asyncio.create_task(self._http_loop(setup))) - for setup in self.websockets: - self.connections.append(asyncio.create_task(self._ws_loop(setup))) - - def _shutdown_forward(self): - self.shutdown.set() - for task in self.connections: - if not task.done(): - task.cancel() - async def _handle_http(self, adapter: str, request: Request): data = await request.body() @@ -386,6 +341,73 @@ class Driver(ReverseDriver, ForwardDriver): finally: self._bot_disconnect(bot) + +class FullDriver(ForwardDriver, Driver): + """ + 完整的 FastAPI 驱动框架，包含正向 Client 支持和反向 Server 支持。 + + :使用方法: + + .. code-block:: dotenv + + DRIVER=nonebot.drivers.fastapi:FullDriver + """ + + def __init__(self, env: Env, config: NoneBotConfig): + super(FullDriver, self).__init__(env, config) + + self.http_pollings: List[HTTPPOLLING_SETUP] = [] + self.websockets: List[WEBSOCKET_SETUP] = [] + self.shutdown: asyncio.Event = asyncio.Event() + self.connections: List[asyncio.Task] = [] + + self.on_startup(self._run_forward) + self.on_shutdown(self._shutdown_forward) + + @property + @overrides(ForwardDriver) + def type(self) -> str: + """驱动名称: ``fastapi_full``""" + return "fastapi_full" + + @overrides(ForwardDriver) + def setup_http_polling(self, setup: HTTPPOLLING_SETUP) -> None: + """ + :说明: + + 注册一个 HTTP 轮询连接，如果传入一个函数，则该函数会在每次连接时被调用 + + :参数: + + * ``setup: Union[HTTPPollingSetup, Callable[[], Awaitable[HTTPPollingSetup]]]`` + """ + self.http_pollings.append(setup) + + @overrides(ForwardDriver) + def setup_websocket(self, setup: WEBSOCKET_SETUP) -> None: + """ + :说明: + + 注册一个 WebSocket 连接，如果传入一个函数，则该函数会在每次重连时被调用 + + :参数: + + * ``setup: Union[WebSocketSetup, Callable[[], Awaitable[WebSocketSetup]]]`` + """ + self.websockets.append(setup) + + def _run_forward(self): + for setup in self.http_pollings: + self.connections.append(asyncio.create_task(self._http_loop(setup))) + for setup in self.websockets: + self.connections.append(asyncio.create_task(self._ws_loop(setup))) + + def _shutdown_forward(self): + self.shutdown.set() + for task in self.connections: + if not task.done(): + task.cancel() + async def _http_loop(self, setup: HTTPPOLLING_SETUP): async def _build_request(setup: HTTPPollingSetup) -> Optional[HTTPRequest]: url = httpx.URL(setup.url) diff --git a/tests/.env.dev b/tests/.env.dev index d0aa5fd9..c55b1a3a 100644 --- a/tests/.env.dev +++ b/tests/.env.dev @@ -1,4 +1,4 @@ -DRIVER=nonebot.drivers.fastapi:Driver +DRIVER=nonebot.drivers.fastapi:FullDriver HOST=0.0.0.0 PORT=2333 DEBUG=true From a6112fdf641aa41263f808f372e3ef52d89a2c72 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 28 Nov 2021 02:29:23 +0800 Subject: [PATCH 047/174] :sparkles: support for mock api result (resolve #605) --- docs/api/exception.md | 33 +++++++++++++++++++++++++++++++-- nonebot/adapters/_bot.py | 29 ++++++++++++++++++++++------- nonebot/exception.py | 35 ++++++++++++++++++++++++++++++++--- 3 files changed, 85 insertions(+), 12 deletions(-) diff --git a/docs/api/exception.md b/docs/api/exception.md index bf281b11..984aa80c 100644 --- a/docs/api/exception.md +++ b/docs/api/exception.md @@ -43,11 +43,22 @@ sidebarDepth: 0 -## _exception_ `IgnoredException` +## _exception_ `ProcessException` 基类：`nonebot.exception.NoneBotException` +* **说明** + + 事件处理过程中发生的异常基类。 + + + +## _exception_ `IgnoredException` + +基类：`nonebot.exception.ProcessException` + + * **说明** 指示 NoneBot 应该忽略该事件。可由 PreProcessor 抛出。 @@ -61,9 +72,27 @@ sidebarDepth: 0 +## _exception_ `MockApiException` + +基类：`nonebot.exception.ProcessException` + + +* **说明** + + 指示 NoneBot 阻止本次 API 调用或修改本次调用返回值，并返回自定义内容。可由 api hook 抛出。 + + + +* **参数** + + + * `result`: 返回的内容 + + + ## _exception_ `StopPropagation` -基类：`nonebot.exception.NoneBotException` +基类：`nonebot.exception.ProcessException` * **说明** diff --git a/nonebot/adapters/_bot.py b/nonebot/adapters/_bot.py index 6ed7b2b2..5e3aec7f 100644 --- a/nonebot/adapters/_bot.py +++ b/nonebot/adapters/_bot.py @@ -6,6 +6,7 @@ from typing import TYPE_CHECKING, Any, Set, Tuple, Union, Optional from nonebot.log import logger from nonebot.config import Config +from nonebot.exception import MockApiException from nonebot.typing import T_CalledAPIHook, T_CallingAPIHook from nonebot.drivers import Driver, HTTPResponse, HTTPConnection @@ -137,24 +138,33 @@ class Bot(abc.ABC): await bot.call_api("send_msg", message="hello world") await bot.send_msg(message="hello world") """ + + result: Any = None + skip_calling_api: bool = False + exception: Optional[Exception] = None + coros = list(map(lambda x: x(self, api, data), self._calling_api_hook)) if coros: try: logger.debug("Running CallingAPI hooks...") await asyncio.gather(*coros) + except MockApiException as e: + skip_calling_api = True + result = e.result + logger.debug( + f"Calling API {api} is cancelled. Return {result} instead." + ) except Exception as e: logger.opt(colors=True, exception=e).error( "Error when running CallingAPI hook. " "Running cancelled!" ) - exception = None - result = None - - try: - result = await self._call_api(api, **data) - except Exception as e: - exception = e + if not skip_calling_api: + try: + result = await self._call_api(api, **data) + except Exception as e: + exception = e coros = list( map(lambda x: x(self, exception, api, data, result), self._called_api_hook) @@ -163,6 +173,11 @@ class Bot(abc.ABC): try: logger.debug("Running CalledAPI hooks...") await asyncio.gather(*coros) + except MockApiException as e: + result = e.result + logger.debug( + f"Calling API {api} result is mocked. Return {result} instead." + ) except Exception as e: logger.opt(colors=True, exception=e).error( "Error when running CalledAPI hook. " diff --git a/nonebot/exception.py b/nonebot/exception.py index e602ee93..193023b7 100644 --- a/nonebot/exception.py +++ b/nonebot/exception.py @@ -6,7 +6,7 @@ 这些异常并非所有需要用户处理，在 NoneBot 内部运行时被捕获，并进行对应操作。 """ -from typing import Optional +from typing import Any, Optional class NoneBotException(Exception): @@ -42,7 +42,15 @@ class ParserExit(NoneBotException): # Processor Exception -class IgnoredException(NoneBotException): +class ProcessException(NoneBotException): + """ + :说明: + + 事件处理过程中发生的异常基类。 + """ + + +class IgnoredException(ProcessException): """ :说明: @@ -63,7 +71,28 @@ class IgnoredException(NoneBotException): return self.__repr__() -class StopPropagation(NoneBotException): +class MockApiException(ProcessException): + """ + :说明: + + 指示 NoneBot 阻止本次 API 调用或修改本次调用返回值，并返回自定义内容。可由 api hook 抛出。 + + :参数: + + * ``result``: 返回的内容 + """ + + def __init__(self, result: Any): + self.result = result + + def __repr__(self): + return f"" + + def __str__(self): + return self.__repr__() + + +class StopPropagation(ProcessException): """ :说明: From b92c1a0b332a7e018c4a24865b4cffb7d5d2ec14 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 30 Nov 2021 12:24:09 +0800 Subject: [PATCH 048/174] :alembic: add option for ws reconnect --- nonebot/drivers/__init__.py | 2 ++ nonebot/drivers/aiohttp.py | 6 ++++++ nonebot/drivers/fastapi.py | 8 +++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py index 4add8a19..f5e87fca 100644 --- a/nonebot/drivers/__init__.py +++ b/nonebot/drivers/__init__.py @@ -430,5 +430,7 @@ class WebSocketSetup: """URL""" headers: Dict[str, str] = field(default_factory=dict) """HTTP headers""" + reconnect: bool = True + """WebSocket 是否重连""" reconnect_interval: float = 3.0 """WebSocket 重连间隔""" diff --git a/nonebot/drivers/aiohttp.py b/nonebot/drivers/aiohttp.py index 40879d62..fbbf673d 100644 --- a/nonebot/drivers/aiohttp.py +++ b/nonebot/drivers/aiohttp.py @@ -407,6 +407,12 @@ class Driver(ForwardDriver): if bot: self._bot_disconnect(bot) bot = None + + if not setup_.reconnect: + logger.info( + f"WebSocket reconnect disabled for bot {setup_.self_id}" + ) + break await asyncio.sleep(setup_.reconnect_interval) except asyncio.CancelledError: diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index 2afb082a..ec579f51 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -555,7 +555,7 @@ class FullDriver(ForwardDriver, Driver): asyncio.create_task(bot.handle_message(msg)) except ConnectionClosed: logger.opt(colors=True).error( - "WebSocket connection closed by peer. " + "WebSocket connection closed. " "Try to reconnect..." ) break @@ -568,6 +568,12 @@ class FullDriver(ForwardDriver, Driver): if bot: self._bot_disconnect(bot) bot = None + + if not setup_.reconnect: + logger.info( + f"WebSocket reconnect disabled for bot {setup_.self_id}" + ) + break await asyncio.sleep(setup_.reconnect_interval) except asyncio.CancelledError: From a414406039e17cadfecf2f9fcc3a096bc66d55e7 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 1 Dec 2021 16:28:55 +0800 Subject: [PATCH 049/174] :building_construction: change doc theme --- .gitignore | 441 +- docs/.vuepress/config.js | 286 - docs/.vuepress/enhanceApp.js | 42 - docs/.vuepress/styles/index.styl | 8 - docs/.vuepress/styles/palette.styl | 10 - docs/.vuepress/versions.json | 5 - docs/api/README.md | 67 - docs_build/README.rst | 5 + docs_build/adapters/README.rst | 5 +- docs_build/adapters/ding.rst | 5 +- docs_build/adapters/feishu.rst | 5 +- docs_build/adapters/mirai.rst | 5 +- docs_build/config.rst | 5 +- docs_build/dependencies.rst | 5 +- docs_build/drivers/README.rst | 5 +- docs_build/drivers/aiohttp.rst | 5 +- docs_build/drivers/fastapi.rst | 5 +- docs_build/drivers/quart.rst | 5 +- docs_build/exception.rst | 5 +- docs_build/handler.rst | 5 +- docs_build/log.rst | 5 +- docs_build/matcher.rst | 5 +- docs_build/message.rst | 5 +- docs_build/nonebot.rst | 5 +- docs_build/permission.rst | 5 +- docs_build/plugin.rst | 5 +- docs_build/rule.rst | 5 +- docs_build/typing.rst | 5 +- docs_build/utils.rst | 5 +- package-lock.json | 11243 ---------------- package.json | 37 - pages/store.md | 6 - website/README.md | 33 + website/babel.config.js | 3 + {docs => website/docs}/README.md | 0 {docs => website/docs}/advanced/README.md | 11 + .../docs/advanced/developer/_category_.json | 4 + .../images/plugin_store_publish.png | Bin .../images/plugin_store_publish_2.png | Bin .../advanced/developer}/publish-plugin.md | 9 + .../docs}/advanced/export-and-require.md | 9 + .../docs}/advanced/overloaded-handlers.md | 9 + {docs => website/docs}/advanced/permission.md | 9 + .../docs}/advanced/runtime-hook.md | 9 + {docs => website/docs}/advanced/scheduler.md | 9 + website/docs/api/README.md | 50 + {docs => website/docs}/api/adapters/README.md | 5 - {docs => website/docs}/api/adapters/ding.md | 5 - {docs => website/docs}/api/adapters/feishu.md | 5 - {docs => website/docs}/api/adapters/mirai.md | 5 - {docs => website/docs}/api/config.md | 5 - {docs => website/docs}/api/dependencies.md | 5 - {docs => website/docs}/api/drivers/README.md | 10 +- {docs => website/docs}/api/drivers/aiohttp.md | 5 - {docs => website/docs}/api/drivers/fastapi.md | 5 - {docs => website/docs}/api/drivers/quart.md | 5 - {docs => website/docs}/api/exception.md | 5 - {docs => website/docs}/api/handler.md | 5 - {docs => website/docs}/api/log.md | 5 - {docs => website/docs}/api/matcher.md | 5 - {docs => website/docs}/api/message.md | 5 - {docs => website/docs}/api/nonebot.md | 5 - {docs => website/docs}/api/permission.md | 5 - {docs => website/docs}/api/plugin.md | 5 - {docs => website/docs}/api/rule.md | 5 - {docs => website/docs}/api/typing.md | 5 - {docs => website/docs}/api/utils.md | 5 - website/docs/guide/coding/_category_.json | 4 + .../docs/guide/coding}/creating-a-handler.md | 9 + .../docs/guide/coding}/creating-a-matcher.md | 31 +- .../docs/guide/coding}/creating-a-plugin.md | 9 + .../docs/guide/coding}/end-or-start.md | 4 + .../docs/guide/coding}/loading-a-plugin.md | 13 +- {docs => website/docs}/guide/cqhttp-guide.md | 4 +- {docs => website/docs}/guide/ding-guide.md | 0 {docs => website/docs}/guide/feishu-guide.md | 0 .../docs}/guide/images/Handle-Event.png | Bin .../docs}/guide/images/ding/jiaqian.png | Bin .../docs}/guide/images/ding/test_webhook.png | Bin .../docs}/guide/images/ding/webhook.png | Bin {docs => website/docs}/guide/mirai-guide.md | 0 .../docs/guide/start}/README.md | 11 + website/docs/guide/start/_category_.json | 4 + .../docs/guide/start}/basic-configuration.md | 9 + .../docs/guide/start}/creating-a-project.md | 9 + .../docs/guide/start}/getting-started.md | 9 + .../docs/guide/start}/installation.md | 9 + website/docusaurus.config.js | 147 + website/package.json | 53 + website/sidebars.js | 33 + website/src/css/custom.css | 0 {pages => website/src/pages}/changelog.md | 4 - website/src/pages/index.module.css | 3 + website/src/pages/index.tsx | 30 + website/src/pages/store.md | 1 + .../public => website/static}/adapters.json | 0 .../public => website/static}/bots.json | 12 + .../static}/icons/android-chrome-192x192.png | Bin .../static}/icons/android-chrome-384x384.png | Bin .../icons/apple-touch-icon-180x180.png | Bin .../static}/icons/favicon-16x16.png | Bin .../static}/icons/favicon-32x32.png | Bin .../static}/icons/favicon.ico | Bin .../static}/icons/mstile-150x150.png | Bin .../static}/icons/safari-pinned-tab.svg | 0 .../public => website/static}/logo.png | Bin .../public => website/static}/manifest.json | 0 .../public => website/static}/plugins.json | 132 +- website/tailwind.config.js | 1 + website/tsconfig.json | 12 + website/yarn.lock | 7812 +++++++++++ 111 files changed, 8887 insertions(+), 11998 deletions(-) delete mode 100644 docs/.vuepress/config.js delete mode 100644 docs/.vuepress/enhanceApp.js delete mode 100644 docs/.vuepress/styles/index.styl delete mode 100644 docs/.vuepress/styles/palette.styl delete mode 100644 docs/.vuepress/versions.json delete mode 100644 docs/api/README.md delete mode 100644 package-lock.json delete mode 100644 package.json delete mode 100644 pages/store.md create mode 100644 website/README.md create mode 100644 website/babel.config.js rename {docs => website/docs}/README.md (100%) rename {docs => website/docs}/advanced/README.md (98%) create mode 100644 website/docs/advanced/developer/_category_.json rename {docs/advanced => website/docs/advanced/developer}/images/plugin_store_publish.png (100%) rename {docs/advanced => website/docs/advanced/developer}/images/plugin_store_publish_2.png (100%) rename {docs/advanced => website/docs/advanced/developer}/publish-plugin.md (97%) rename {docs => website/docs}/advanced/export-and-require.md (97%) rename {docs => website/docs}/advanced/overloaded-handlers.md (96%) rename {docs => website/docs}/advanced/permission.md (97%) rename {docs => website/docs}/advanced/runtime-hook.md (97%) rename {docs => website/docs}/advanced/scheduler.md (98%) create mode 100644 website/docs/api/README.md rename {docs => website/docs}/api/adapters/README.md (99%) rename {docs => website/docs}/api/adapters/ding.md (99%) rename {docs => website/docs}/api/adapters/feishu.md (98%) rename {docs => website/docs}/api/adapters/mirai.md (99%) rename {docs => website/docs}/api/config.md (98%) rename {docs => website/docs}/api/dependencies.md (93%) rename {docs => website/docs}/api/drivers/README.md (99%) rename {docs => website/docs}/api/drivers/aiohttp.md (96%) rename {docs => website/docs}/api/drivers/fastapi.md (98%) rename {docs => website/docs}/api/drivers/quart.md (97%) rename {docs => website/docs}/api/exception.md (98%) rename {docs => website/docs}/api/handler.md (95%) rename {docs => website/docs}/api/log.md (91%) rename {docs => website/docs}/api/matcher.md (99%) rename {docs => website/docs}/api/message.md (95%) rename {docs => website/docs}/api/nonebot.md (98%) rename {docs => website/docs}/api/permission.md (97%) rename {docs => website/docs}/api/plugin.md (99%) rename {docs => website/docs}/api/rule.md (98%) rename {docs => website/docs}/api/typing.md (98%) rename {docs => website/docs}/api/utils.md (95%) create mode 100644 website/docs/guide/coding/_category_.json rename {docs/guide => website/docs/guide/coding}/creating-a-handler.md (98%) rename {docs/guide => website/docs/guide/coding}/creating-a-matcher.md (87%) rename {docs/guide => website/docs/guide/coding}/creating-a-plugin.md (97%) rename {docs/guide => website/docs/guide/coding}/end-or-start.md (91%) rename {docs/guide => website/docs/guide/coding}/loading-a-plugin.md (96%) rename {docs => website/docs}/guide/cqhttp-guide.md (99%) rename {docs => website/docs}/guide/ding-guide.md (100%) rename {docs => website/docs}/guide/feishu-guide.md (100%) rename {docs => website/docs}/guide/images/Handle-Event.png (100%) rename {docs => website/docs}/guide/images/ding/jiaqian.png (100%) rename {docs => website/docs}/guide/images/ding/test_webhook.png (100%) rename {docs => website/docs}/guide/images/ding/webhook.png (100%) rename {docs => website/docs}/guide/mirai-guide.md (100%) rename {docs/guide => website/docs/guide/start}/README.md (94%) create mode 100644 website/docs/guide/start/_category_.json rename {docs/guide => website/docs/guide/start}/basic-configuration.md (97%) rename {docs/guide => website/docs/guide/start}/creating-a-project.md (94%) rename {docs/guide => website/docs/guide/start}/getting-started.md (97%) rename {docs/guide => website/docs/guide/start}/installation.md (97%) create mode 100644 website/docusaurus.config.js create mode 100644 website/package.json create mode 100644 website/sidebars.js create mode 100644 website/src/css/custom.css rename {pages => website/src/pages}/changelog.md (99%) create mode 100644 website/src/pages/index.module.css create mode 100644 website/src/pages/index.tsx create mode 100644 website/src/pages/store.md rename {docs/.vuepress/public => website/static}/adapters.json (100%) rename {docs/.vuepress/public => website/static}/bots.json (81%) rename {docs/.vuepress/public => website/static}/icons/android-chrome-192x192.png (100%) rename {docs/.vuepress/public => website/static}/icons/android-chrome-384x384.png (100%) rename {docs/.vuepress/public => website/static}/icons/apple-touch-icon-180x180.png (100%) rename {docs/.vuepress/public => website/static}/icons/favicon-16x16.png (100%) rename {docs/.vuepress/public => website/static}/icons/favicon-32x32.png (100%) rename {docs/.vuepress/public => website/static}/icons/favicon.ico (100%) rename {docs/.vuepress/public => website/static}/icons/mstile-150x150.png (100%) rename {docs/.vuepress/public => website/static}/icons/safari-pinned-tab.svg (100%) rename {docs/.vuepress/public => website/static}/logo.png (100%) rename {docs/.vuepress/public => website/static}/manifest.json (100%) rename {docs/.vuepress/public => website/static}/plugins.json (76%) create mode 100644 website/tailwind.config.js create mode 100644 website/tsconfig.json create mode 100644 website/yarn.lock diff --git a/.gitignore b/.gitignore index 81d69c97..1a98e4e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,295 @@ -# ----- Python ----- +# ----- Project ----- +.idea +.vscode +dev +docs_build/_build +!tests/.env +.docusaurus + +# Created by https://www.toptal.com/developers/gitignore/api/python,node,visualstudiocode,jetbrains,macos,windows,linux +# Edit at https://www.toptal.com/developers/gitignore?templates=python,node,visualstudiocode,jetbrains,macos,windows,linux + +### JetBrains ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### JetBrains Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +# https://plugins.jetbrains.com/plugin/7973-sonarlint +.idea/**/sonarlint/ + +# SonarQube Plugin +# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator-enh.xml +.idea/**/markdown-navigator/ + +# Cache file creation bug +# See https://youtrack.jetbrains.com/issue/JBR-2257 +.idea/$CACHE_FILE$ + +# CodeStream plugin +# https://plugins.jetbrains.com/plugin/12206-codestream +.idea/codestream.xml + +### Linux ### +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### macOS ### +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### Node ### +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* +lerna-debug.log* +.pnpm-debug.log* + +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Snowpack dependency directory (https://snowpack.dev/) +web_modules/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Microbundle cache +.rpt2_cache/ +.rts2_cache_cjs/ +.rts2_cache_es/ +.rts2_cache_umd/ + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env +.env.test +.env.production + +# parcel-bundler cache (https://parceljs.org/) +.cache +.parcel-cache + +# Next.js build output +.next +out + +# Nuxt.js build / generate output +.nuxt +dist + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and not Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port + +# Stores VSCode versions used for testing VSCode extensions +.vscode-test + +# yarn v2 +.yarn/cache +.yarn/unplugged +.yarn/build-state.yml +.yarn/install-state.gz +.pnp.* + +### Node Patch ### +# Serverless Webpack directories +.webpack/ + +# Optional stylelint cache +.stylelintcache + +# SvelteKit build / generate output +.svelte-kit + +### Python ### # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] @@ -22,6 +312,7 @@ parts/ sdist/ var/ wheels/ +share/python-wheels/ *.egg-info/ .installed.cfg *.egg @@ -40,23 +331,25 @@ pip-delete-this-directory.txt # Unit test / coverage reports htmlcov/ .tox/ +.nox/ .coverage .coverage.* -.cache nosetests.xml coverage.xml *.cover +*.py,cover .hypothesis/ .pytest_cache/ +cover/ # Translations *.mo *.pot # Django stuff: -*.log local_settings.py db.sqlite3 +db.sqlite3-journal # Flask stuff: instance/ @@ -69,22 +362,39 @@ instance/ docs/_build/ # PyBuilder +.pybuilder/ target/ # Jupyter Notebook .ipynb_checkpoints -# pyenv -.python-version +# IPython +profile_default/ +ipython_config.py -# celery beat schedule file +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow +__pypackages__/ + +# Celery stuff celerybeat-schedule +celerybeat.pid # SageMath parsed files *.sage.py # Environments -.env .venv env/ venv/ @@ -104,90 +414,61 @@ venv.bak/ # mypy .mypy_cache/ +.dmypy.json +dmypy.json -# ----- Node ----- +# Pyre type checker +.pyre/ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* +# pytype static type analyzer +.pytype/ -# Runtime data -pids -*.pid -*.seed -*.pid.lock +# Cython debug symbols +cython_debug/ -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov +### VisualStudioCode ### +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace -# Coverage directory used by tools like istanbul -coverage +# Local History for Visual Studio Code +.history/ -# nyc test coverage -.nyc_output +### VisualStudioCode Patch ### +# Ignore all local history of files +.history +.ionide -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt +# Support for Project snippet scope +!.vscode/*.code-snippets -# Bower dependency directory (https://bower.io/) -bower_components +### Windows ### +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db -# node-waf configuration -.lock-wscript +# Dump file +*.stackdump -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release +# Folder config file +[Dd]esktop.ini -# Dependency directories -node_modules/ -jspm_packages/ +# Recycle Bin used on file shares +$RECYCLE.BIN/ -# TypeScript v1 declaration files -typings/ +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp -# Optional npm cache directory -.npm +# Windows shortcuts +*.lnk -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# next.js build output -.next - -# nuxt.js build output -.nuxt - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless - -# ----- Project ----- - -.idea -.vscode -dev -docs_build/_build -!tests/.env -*.xmind -yarn.lock -.DS_Store +# End of https://www.toptal.com/developers/gitignore/api/python,node,visualstudiocode,jetbrains,macos,windows,linux diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js deleted file mode 100644 index 4aef42b7..00000000 --- a/docs/.vuepress/config.js +++ /dev/null @@ -1,286 +0,0 @@ -const path = require("path"); - -module.exports = (context) => ({ - base: process.env.VUEPRESS_BASE || "/", - title: "NoneBot", - description: "跨平台 Python 异步 QQ 机器人框架", - markdown: { - lineNumbers: true, - }, - /** - * Extra tags to be injected to the page HTML `` - * - * ref：https://v1.vuepress.vuejs.org/config/#head - */ - head: [ - ["link", { rel: "icon", href: "/logo.png" }], - ["link", { rel: "manifest", href: "/manifest.json" }], - ["meta", { name: "theme-color", content: "#ea5252" }], - ["meta", { name: "application-name", content: "NoneBot" }], - ["meta", { name: "apple-mobile-web-app-title", content: "NoneBot" }], - ["meta", { name: "apple-mobile-web-app-capable", content: "yes" }], - [ - "meta", - { name: "apple-mobile-web-app-status-bar-style", content: "black" }, - ], - [ - "link", - { rel: "apple-touch-icon", href: "/icons/apple-touch-icon-180x180.png" }, - ], - [ - "link", - { - rel: "mask-icon", - href: "/icons/safari-pinned-tab.svg", - color: "#ea5252", - }, - ], - [ - "meta", - { - name: "msapplication-TileImage", - content: "/icons/mstile-150x150.png", - }, - ], - ["meta", { name: "msapplication-TileColor", content: "#ea5252" }], - [ - "link", - { - rel: "stylesheet", - href: - "https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5/css/all.min.css", - }, - ], - ], - locales: { - "/": { - lang: "zh-CN", - title: "NoneBot", - description: "跨平台 Python 异步 QQ 机器人框架", - }, - }, - - theme: "nonebot", - themeConfig: { - logo: "/logo.png", - repo: "nonebot/nonebot2", - docsDir: "docs", - docsBranch: "dev", - docsDirVersioned: "archive", - docsDirPages: "pages", - editLinks: true, - smoothScroll: true, - - algolia: { - apiKey: "ef449608d0ad6e81b9efd05db6367040", - indexName: "nonebot", - algoliaOptions: { - facetFilters: ["lang:zh-CN"], - }, - }, - - locales: { - "/": { - label: "简体中文", - selectText: "Languages", - editLinkText: "在 GitHub 上编辑此页", - lastUpdated: "上次更新", - nav: [ - { text: "主页", link: "/" }, - { text: "指南", link: "/guide/" }, - { text: "进阶", link: "/advanced/" }, - { text: "API", link: "/api/" }, - { text: "商店", link: "/store" }, - { text: "更新日志", link: "/changelog" }, - ], - sidebarDepth: 2, - sidebar: { - "/guide/": [ - { - title: "开始", - collapsable: false, - sidebar: "auto", - children: [ - "", - "installation", - "getting-started", - "creating-a-project", - "basic-configuration", - ], - }, - { - title: "编写插件", - collapsable: false, - sidebar: "auto", - children: [ - "loading-a-plugin", - "creating-a-plugin", - "creating-a-matcher", - "creating-a-handler", - "end-or-start", - ], - }, - { - title: "协议适配", - collapsable: false, - sidebar: "auto", - children: [ - "cqhttp-guide", - "ding-guide", - "mirai-guide", - "feishu-guide", - ], - }, - ], - "/advanced/": [ - { - title: "进阶", - collapsable: false, - sidebar: "auto", - children: [ - "", - "scheduler", - "permission", - "runtime-hook", - "export-and-require", - "overloaded-handlers", - ], - }, - { - title: "发布", - collapsable: false, - sidebar: "auto", - children: ["publish-plugin"], - }, - ], - "/api/": [ - { - title: "NoneBot Api Reference", - path: "", - collapsable: false, - children: [ - { - title: "nonebot 模块", - path: "nonebot", - }, - { - title: "nonebot.config 模块", - path: "config", - }, - { - title: "nonebot.plugin 模块", - path: "plugin", - }, - { - title: "nonebot.message 模块", - path: "message", - }, - { - title: "nonebot.matcher 模块", - path: "matcher", - }, - { - title: "nonebot.handler 模块", - path: "handler", - }, - { - title: "nonebot.rule 模块", - path: "rule", - }, - { - title: "nonebot.permission 模块", - path: "permission", - }, - { - title: "nonebot.log 模块", - path: "log", - }, - { - title: "nonebot.utils 模块", - path: "utils", - }, - { - title: "nonebot.typing 模块", - path: "typing", - }, - { - title: "nonebot.exception 模块", - path: "exception", - }, - { - title: "nonebot.drivers 模块", - path: "drivers/", - }, - { - title: "nonebot.drivers.fastapi 模块", - path: "drivers/fastapi", - }, - { - title: "nonebot.drivers.quart 模块", - path: "drivers/quart", - }, - { - title: "nonebot.drivers.aiohttp 模块", - path: "drivers/aiohttp", - }, - { - title: "nonebot.adapters 模块", - path: "adapters/", - }, - { - title: "nonebot.adapters.cqhttp 模块", - path: "adapters/cqhttp", - }, - { - title: "nonebot.adapters.ding 模块", - path: "adapters/ding", - }, - { - title: "nonebot.adapters.mirai 模块", - path: "adapters/mirai", - }, - { - title: "nonebot.adapters.feishu 模块", - path: "adapters/feishu", - }, - ], - }, - ], - }, - }, - }, - }, - - plugins: [ - "@vuepress/plugin-back-to-top", - "@vuepress/plugin-medium-zoom", - [ - "@vuepress/pwa", - { - serviceWorker: true, - updatePopup: { - message: "发现新内容", - buttonText: "刷新", - }, - }, - ], - [ - "versioning", - { - versionedSourceDir: path.resolve(context.sourceDir, "..", "archive"), - pagesSourceDir: path.resolve(context.sourceDir, "..", "pages"), - onNewVersion(version, versionDestPath) { - console.log(`Created version ${version} in ${versionDestPath}`); - }, - }, - ], - [ - "container", - { - type: "vue", - before: '
',
-        after: "
", - }, - ], - ], -}); diff --git a/docs/.vuepress/enhanceApp.js b/docs/.vuepress/enhanceApp.js deleted file mode 100644 index 1c8cfd7a..00000000 --- a/docs/.vuepress/enhanceApp.js +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Client app enhancement file. - * - * https://v1.vuepress.vuejs.org/guide/basic-config.html#app-level-enhancements - */ - -import Vuetify from "vuetify"; -import "vuetify/dist/vuetify.min.css"; - -export default ({ - Vue, // the version of Vue being used in the VuePress app - options, // the options for the root Vue instance - router, // the router instance for the app - siteData // site metadata -}) => { - Vue.use(Vuetify); - options.vuetify = new Vuetify({ - icons: { - iconfont: "fa", - values: { - // - } - } - }); - - if (typeof process === "undefined" || process.env.VUE_ENV !== "server") { - router.onReady(() => { - const { app } = router; - app.$once("hook:mounted", () => { - // temporary fix for https://github.com/vuejs/vuepress/issues/2428 - setTimeout(() => { - const { hash } = document.location; - if (hash.length > 1) { - const id = decodeURI(hash.substring(1)); - const element = document.getElementById(id); - if (element) element.scrollIntoView(); - } - }, 500); - }); - }); - } -}; diff --git a/docs/.vuepress/styles/index.styl b/docs/.vuepress/styles/index.styl deleted file mode 100644 index 420feb93..00000000 --- a/docs/.vuepress/styles/index.styl +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Custom Styles here. - * - * ref：https://v1.vuepress.vuejs.org/config/#index-styl - */ - -.home .hero img - max-width 450px!important diff --git a/docs/.vuepress/styles/palette.styl b/docs/.vuepress/styles/palette.styl deleted file mode 100644 index 92cce343..00000000 --- a/docs/.vuepress/styles/palette.styl +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Custom palette here. - * - * ref：https://v1.vuepress.vuejs.org/zh/config/#palette-styl - */ - -$accentColor = #ea5252 -$textColor = #2c3e50 -$borderColor = #eaecef -$codeBgColor = #282c34 diff --git a/docs/.vuepress/versions.json b/docs/.vuepress/versions.json deleted file mode 100644 index dc5f4eb5..00000000 --- a/docs/.vuepress/versions.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - "2.0.0a16", - "2.0.0a15", - "2.0.0a13.post1" -] \ No newline at end of file diff --git a/docs/api/README.md b/docs/api/README.md deleted file mode 100644 index 38fac915..00000000 --- a/docs/api/README.md +++ /dev/null @@ -1,67 +0,0 @@ -# NoneBot Api Reference - - -* **模块索引** - - - * [nonebot](nonebot.html) - - - * [nonebot.config](config.html) - - - * [nonebot.plugin](plugin.html) - - - * [nonebot.message](message.html) - - - * [nonebot.matcher](matcher.html) - - - * [nonebot.handler](handler.html) - - - * [nonebot.rule](rule.html) - - - * [nonebot.permission](permission.html) - - - * [nonebot.log](log.html) - - - * [nonebot.utils](utils.html) - - - * [nonebot.typing](typing.html) - - - * [nonebot.exception](exception.html) - - - * [nonebot.drivers](drivers/) - - - * [nonebot.drivers.fastapi](drivers/fastapi.html) - - - * [nonebot.drivers.quart](drivers/quart.html) - - - * [nonebot.drivers.aiohttp](drivers/aiohttp.html) - - - * [nonebot.adapters](adapters/) - - - * [nonebot.adapters.cqhttp](adapters/cqhttp.html) - - - * [nonebot.adapters.ding](adapters/ding.html) - - - * [nonebot.adapters.mirai](adapters/mirai.html) - - - * [nonebot.adapters.feishu](adapters/feishu.html) diff --git a/docs_build/README.rst b/docs_build/README.rst index 5d5fc86d..8046fd08 100644 --- a/docs_build/README.rst +++ b/docs_build/README.rst @@ -1,3 +1,8 @@ +\-\-\- +id: index +slug: /api/ +\-\-\- + NoneBot Api Reference ===================== diff --git a/docs_build/adapters/README.rst b/docs_build/adapters/README.rst index 1591f0fe..e570e2c2 100644 --- a/docs_build/adapters/README.rst +++ b/docs_build/adapters/README.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.adapters 模块 ===================== diff --git a/docs_build/adapters/ding.rst b/docs_build/adapters/ding.rst index 974c73ef..77dd90f8 100644 --- a/docs_build/adapters/ding.rst +++ b/docs_build/adapters/ding.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.adapters.ding 模块 =========================== diff --git a/docs_build/adapters/feishu.rst b/docs_build/adapters/feishu.rst index 5f71704f..09de1078 100644 --- a/docs_build/adapters/feishu.rst +++ b/docs_build/adapters/feishu.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.adapters.feishu 模块 ============================ diff --git a/docs_build/adapters/mirai.rst b/docs_build/adapters/mirai.rst index 1cb260eb..e7270f7f 100644 --- a/docs_build/adapters/mirai.rst +++ b/docs_build/adapters/mirai.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.adapters.mirai 模块 =========================== diff --git a/docs_build/config.rst b/docs_build/config.rst index fda56368..be976ded 100644 --- a/docs_build/config.rst +++ b/docs_build/config.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.config 模块 =================== diff --git a/docs_build/dependencies.rst b/docs_build/dependencies.rst index 4db2e19a..23252c0d 100644 --- a/docs_build/dependencies.rst +++ b/docs_build/dependencies.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.handler 模块 ==================== diff --git a/docs_build/drivers/README.rst b/docs_build/drivers/README.rst index f8bbf4e5..397e2d65 100644 --- a/docs_build/drivers/README.rst +++ b/docs_build/drivers/README.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.drivers 模块 ===================== diff --git a/docs_build/drivers/aiohttp.rst b/docs_build/drivers/aiohttp.rst index 077da6c5..f49e2b60 100644 --- a/docs_build/drivers/aiohttp.rst +++ b/docs_build/drivers/aiohttp.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.drivers.aiohttp 模块 ============================= diff --git a/docs_build/drivers/fastapi.rst b/docs_build/drivers/fastapi.rst index 098975ae..49150f39 100644 --- a/docs_build/drivers/fastapi.rst +++ b/docs_build/drivers/fastapi.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.drivers.fastapi 模块 ============================= diff --git a/docs_build/drivers/quart.rst b/docs_build/drivers/quart.rst index f27a5797..acab2732 100644 --- a/docs_build/drivers/quart.rst +++ b/docs_build/drivers/quart.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.drivers.quart 模块 ========================== diff --git a/docs_build/exception.rst b/docs_build/exception.rst index 1f999802..c112b951 100644 --- a/docs_build/exception.rst +++ b/docs_build/exception.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.exception 模块 ====================== diff --git a/docs_build/handler.rst b/docs_build/handler.rst index 413ff50b..79152d5b 100644 --- a/docs_build/handler.rst +++ b/docs_build/handler.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.handler 模块 ==================== diff --git a/docs_build/log.rst b/docs_build/log.rst index 749a8089..80a16ead 100644 --- a/docs_build/log.rst +++ b/docs_build/log.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.log 模块 ================= diff --git a/docs_build/matcher.rst b/docs_build/matcher.rst index 5963bd28..0551e757 100644 --- a/docs_build/matcher.rst +++ b/docs_build/matcher.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.matcher 模块 ==================== diff --git a/docs_build/message.rst b/docs_build/message.rst index 0a878d73..086023b3 100644 --- a/docs_build/message.rst +++ b/docs_build/message.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.message 模块 ====================== diff --git a/docs_build/nonebot.rst b/docs_build/nonebot.rst index d954fcdd..4c7ef92b 100644 --- a/docs_build/nonebot.rst +++ b/docs_build/nonebot.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot 模块 =============== diff --git a/docs_build/permission.rst b/docs_build/permission.rst index 3cae2186..77fca180 100644 --- a/docs_build/permission.rst +++ b/docs_build/permission.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.permission 模块 ======================= diff --git a/docs_build/plugin.rst b/docs_build/plugin.rst index 1456f15f..550b6795 100644 --- a/docs_build/plugin.rst +++ b/docs_build/plugin.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.plugin 模块 ==================== diff --git a/docs_build/rule.rst b/docs_build/rule.rst index c2657409..9d6c72e2 100644 --- a/docs_build/rule.rst +++ b/docs_build/rule.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.rule 模块 ==================== diff --git a/docs_build/typing.rst b/docs_build/typing.rst index ae174593..315963bc 100644 --- a/docs_build/typing.rst +++ b/docs_build/typing.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.typing 模块 =================== diff --git a/docs_build/utils.rst b/docs_build/utils.rst index 533341cb..0e7f1ab9 100644 --- a/docs_build/utils.rst +++ b/docs_build/utils.rst @@ -1,7 +1,4 @@ -\-\-\- -contentSidebar: true -sidebarDepth: 0 -\-\-\- + NoneBot.utils 模块 ================== diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 34a6742d..00000000 --- a/package-lock.json +++ /dev/null @@ -1,11243 +0,0 @@ -{ - "name": "nonebot", - "version": "2.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@babel/code-frame": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", - "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", - "dev": true, - "requires": { - "@babel/highlight": "^7.10.4" - } - }, - "@babel/compat-data": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz", - "integrity": "sha512-725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ==", - "dev": true - }, - "@babel/core": { - "version": "7.12.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz", - "integrity": "sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.12.1", - "@babel/helper-module-transforms": "^7.12.1", - "@babel/helpers": "^7.12.1", - "@babel/parser": "^7.12.3", - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.12.1", - "@babel/types": "^7.12.1", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", - "json5": "^2.1.2", - "lodash": "^4.17.19", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" - } - }, - "@babel/generator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz", - "integrity": "sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==", - "dev": true, - "requires": { - "@babel/types": "^7.12.1", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" - } - }, - "@babel/helper-annotate-as-pure": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz", - "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==", - "dev": true, - "requires": { - "@babel/types": "^7.10.4" - } - }, - "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz", - "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==", - "dev": true, - "requires": { - "@babel/helper-explode-assignable-expression": "^7.10.4", - "@babel/types": "^7.10.4" - } - }, - "@babel/helper-compilation-targets": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz", - "integrity": "sha512-jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.12.1", - "@babel/helper-validator-option": "^7.12.1", - "browserslist": "^4.12.0", - "semver": "^5.5.0" - } - }, - "@babel/helper-create-class-features-plugin": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz", - "integrity": "sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==", - "dev": true, - "requires": { - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-member-expression-to-functions": "^7.12.1", - "@babel/helper-optimise-call-expression": "^7.10.4", - "@babel/helper-replace-supers": "^7.12.1", - "@babel/helper-split-export-declaration": "^7.10.4" - } - }, - "@babel/helper-create-regexp-features-plugin": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz", - "integrity": "sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-regex": "^7.10.4", - "regexpu-core": "^4.7.1" - } - }, - "@babel/helper-define-map": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz", - "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==", - "dev": true, - "requires": { - "@babel/helper-function-name": "^7.10.4", - "@babel/types": "^7.10.5", - "lodash": "^4.17.19" - } - }, - "@babel/helper-explode-assignable-expression": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz", - "integrity": "sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==", - "dev": true, - "requires": { - "@babel/types": "^7.12.1" - } - }, - "@babel/helper-function-name": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", - "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/types": "^7.10.4" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz", - "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", - "dev": true, - "requires": { - "@babel/types": "^7.10.4" - } - }, - "@babel/helper-hoist-variables": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz", - "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==", - "dev": true, - "requires": { - "@babel/types": "^7.10.4" - } - }, - "@babel/helper-member-expression-to-functions": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz", - "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==", - "dev": true, - "requires": { - "@babel/types": "^7.12.1" - } - }, - "@babel/helper-module-imports": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz", - "integrity": "sha512-ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA==", - "dev": true, - "requires": { - "@babel/types": "^7.12.1" - } - }, - "@babel/helper-module-transforms": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz", - "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.12.1", - "@babel/helper-replace-supers": "^7.12.1", - "@babel/helper-simple-access": "^7.12.1", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/helper-validator-identifier": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.12.1", - "@babel/types": "^7.12.1", - "lodash": "^4.17.19" - } - }, - "@babel/helper-optimise-call-expression": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz", - "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==", - "dev": true, - "requires": { - "@babel/types": "^7.10.4" - } - }, - "@babel/helper-plugin-utils": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", - "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", - "dev": true - }, - "@babel/helper-regex": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz", - "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==", - "dev": true, - "requires": { - "lodash": "^4.17.19" - } - }, - "@babel/helper-remap-async-to-generator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz", - "integrity": "sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-wrap-function": "^7.10.4", - "@babel/types": "^7.12.1" - } - }, - "@babel/helper-replace-supers": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz", - "integrity": "sha512-zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw==", - "dev": true, - "requires": { - "@babel/helper-member-expression-to-functions": "^7.12.1", - "@babel/helper-optimise-call-expression": "^7.10.4", - "@babel/traverse": "^7.12.1", - "@babel/types": "^7.12.1" - } - }, - "@babel/helper-simple-access": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz", - "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==", - "dev": true, - "requires": { - "@babel/types": "^7.12.1" - } - }, - "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz", - "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==", - "dev": true, - "requires": { - "@babel/types": "^7.12.1" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz", - "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", - "dev": true, - "requires": { - "@babel/types": "^7.11.0" - } - }, - "@babel/helper-validator-identifier": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", - "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", - "dev": true - }, - "@babel/helper-validator-option": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz", - "integrity": "sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==", - "dev": true - }, - "@babel/helper-wrap-function": { - "version": "7.12.3", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz", - "integrity": "sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==", - "dev": true, - "requires": { - "@babel/helper-function-name": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.10.4", - "@babel/types": "^7.10.4" - } - }, - "@babel/helpers": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz", - "integrity": "sha512-9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g==", - "dev": true, - "requires": { - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.12.1", - "@babel/types": "^7.12.1" - } - }, - "@babel/highlight": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", - "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.12.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz", - "integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==", - "dev": true - }, - "@babel/plugin-proposal-async-generator-functions": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz", - "integrity": "sha512-d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-remap-async-to-generator": "^7.12.1", - "@babel/plugin-syntax-async-generators": "^7.8.0" - } - }, - "@babel/plugin-proposal-class-properties": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz", - "integrity": "sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==", - "dev": true, - "requires": { - "@babel/helper-create-class-features-plugin": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-proposal-decorators": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.1.tgz", - "integrity": "sha512-knNIuusychgYN8fGJHONL0RbFxLGawhXOJNLBk75TniTsZZeA+wdkDuv6wp4lGwzQEKjZi6/WYtnb3udNPmQmQ==", - "dev": true, - "requires": { - "@babel/helper-create-class-features-plugin": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-decorators": "^7.12.1" - } - }, - "@babel/plugin-proposal-dynamic-import": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz", - "integrity": "sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-dynamic-import": "^7.8.0" - } - }, - "@babel/plugin-proposal-export-namespace-from": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz", - "integrity": "sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" - } - }, - "@babel/plugin-proposal-json-strings": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz", - "integrity": "sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-json-strings": "^7.8.0" - } - }, - "@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz", - "integrity": "sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" - } - }, - "@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz", - "integrity": "sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0" - } - }, - "@babel/plugin-proposal-numeric-separator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz", - "integrity": "sha512-MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" - } - }, - "@babel/plugin-proposal-object-rest-spread": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz", - "integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-transform-parameters": "^7.12.1" - } - }, - "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz", - "integrity": "sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.0" - } - }, - "@babel/plugin-proposal-optional-chaining": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz", - "integrity": "sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1", - "@babel/plugin-syntax-optional-chaining": "^7.8.0" - } - }, - "@babel/plugin-proposal-private-methods": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz", - "integrity": "sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==", - "dev": true, - "requires": { - "@babel/helper-create-class-features-plugin": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz", - "integrity": "sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==", - "dev": true, - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-async-generators": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-class-properties": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz", - "integrity": "sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-decorators": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz", - "integrity": "sha512-ir9YW5daRrTYiy9UJ2TzdNIJEZu8KclVzDcfSt4iEmOtwQ4llPtWInNKJyKnVXp1vE4bbVd5S31M/im3mYMO1w==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", - "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-export-namespace-from": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", - "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-syntax-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-jsx": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz", - "integrity": "sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-logical-assignment-operators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.0" - } - }, - "@babel/plugin-syntax-top-level-await": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz", - "integrity": "sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-arrow-functions": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz", - "integrity": "sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-async-to-generator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz", - "integrity": "sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-remap-async-to-generator": "^7.12.1" - } - }, - "@babel/plugin-transform-block-scoped-functions": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz", - "integrity": "sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-block-scoping": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz", - "integrity": "sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-classes": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz", - "integrity": "sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-define-map": "^7.10.4", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-optimise-call-expression": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-replace-supers": "^7.12.1", - "@babel/helper-split-export-declaration": "^7.10.4", - "globals": "^11.1.0" - } - }, - "@babel/plugin-transform-computed-properties": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz", - "integrity": "sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-destructuring": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz", - "integrity": "sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-dotall-regex": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz", - "integrity": "sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==", - "dev": true, - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-duplicate-keys": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz", - "integrity": "sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-exponentiation-operator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz", - "integrity": "sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==", - "dev": true, - "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-for-of": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz", - "integrity": "sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-function-name": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz", - "integrity": "sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==", - "dev": true, - "requires": { - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-literals": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz", - "integrity": "sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-member-expression-literals": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz", - "integrity": "sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-modules-amd": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz", - "integrity": "sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==", - "dev": true, - "requires": { - "@babel/helper-module-transforms": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4", - "babel-plugin-dynamic-import-node": "^2.3.3" - } - }, - "@babel/plugin-transform-modules-commonjs": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz", - "integrity": "sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==", - "dev": true, - "requires": { - "@babel/helper-module-transforms": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-simple-access": "^7.12.1", - "babel-plugin-dynamic-import-node": "^2.3.3" - } - }, - "@babel/plugin-transform-modules-systemjs": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz", - "integrity": "sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==", - "dev": true, - "requires": { - "@babel/helper-hoist-variables": "^7.10.4", - "@babel/helper-module-transforms": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-validator-identifier": "^7.10.4", - "babel-plugin-dynamic-import-node": "^2.3.3" - } - }, - "@babel/plugin-transform-modules-umd": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz", - "integrity": "sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==", - "dev": true, - "requires": { - "@babel/helper-module-transforms": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz", - "integrity": "sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==", - "dev": true, - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.12.1" - } - }, - "@babel/plugin-transform-new-target": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz", - "integrity": "sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-object-super": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz", - "integrity": "sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-replace-supers": "^7.12.1" - } - }, - "@babel/plugin-transform-parameters": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz", - "integrity": "sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-property-literals": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz", - "integrity": "sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-regenerator": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz", - "integrity": "sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==", - "dev": true, - "requires": { - "regenerator-transform": "^0.14.2" - } - }, - "@babel/plugin-transform-reserved-words": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz", - "integrity": "sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-runtime": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz", - "integrity": "sha512-Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4", - "resolve": "^1.8.1", - "semver": "^5.5.1" - } - }, - "@babel/plugin-transform-shorthand-properties": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz", - "integrity": "sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-spread": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz", - "integrity": "sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1" - } - }, - "@babel/plugin-transform-sticky-regex": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz", - "integrity": "sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-regex": "^7.10.4" - } - }, - "@babel/plugin-transform-template-literals": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz", - "integrity": "sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-typeof-symbol": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz", - "integrity": "sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-unicode-escapes": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz", - "integrity": "sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/plugin-transform-unicode-regex": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz", - "integrity": "sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==", - "dev": true, - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4" - } - }, - "@babel/preset-env": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz", - "integrity": "sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.12.1", - "@babel/helper-compilation-targets": "^7.12.1", - "@babel/helper-module-imports": "^7.12.1", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-validator-option": "^7.12.1", - "@babel/plugin-proposal-async-generator-functions": "^7.12.1", - "@babel/plugin-proposal-class-properties": "^7.12.1", - "@babel/plugin-proposal-dynamic-import": "^7.12.1", - "@babel/plugin-proposal-export-namespace-from": "^7.12.1", - "@babel/plugin-proposal-json-strings": "^7.12.1", - "@babel/plugin-proposal-logical-assignment-operators": "^7.12.1", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1", - "@babel/plugin-proposal-numeric-separator": "^7.12.1", - "@babel/plugin-proposal-object-rest-spread": "^7.12.1", - "@babel/plugin-proposal-optional-catch-binding": "^7.12.1", - "@babel/plugin-proposal-optional-chaining": "^7.12.1", - "@babel/plugin-proposal-private-methods": "^7.12.1", - "@babel/plugin-proposal-unicode-property-regex": "^7.12.1", - "@babel/plugin-syntax-async-generators": "^7.8.0", - "@babel/plugin-syntax-class-properties": "^7.12.1", - "@babel/plugin-syntax-dynamic-import": "^7.8.0", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.0", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.0", - "@babel/plugin-syntax-top-level-await": "^7.12.1", - "@babel/plugin-transform-arrow-functions": "^7.12.1", - "@babel/plugin-transform-async-to-generator": "^7.12.1", - "@babel/plugin-transform-block-scoped-functions": "^7.12.1", - "@babel/plugin-transform-block-scoping": "^7.12.1", - "@babel/plugin-transform-classes": "^7.12.1", - "@babel/plugin-transform-computed-properties": "^7.12.1", - "@babel/plugin-transform-destructuring": "^7.12.1", - "@babel/plugin-transform-dotall-regex": "^7.12.1", - "@babel/plugin-transform-duplicate-keys": "^7.12.1", - "@babel/plugin-transform-exponentiation-operator": "^7.12.1", - "@babel/plugin-transform-for-of": "^7.12.1", - "@babel/plugin-transform-function-name": "^7.12.1", - "@babel/plugin-transform-literals": "^7.12.1", - "@babel/plugin-transform-member-expression-literals": "^7.12.1", - "@babel/plugin-transform-modules-amd": "^7.12.1", - "@babel/plugin-transform-modules-commonjs": "^7.12.1", - "@babel/plugin-transform-modules-systemjs": "^7.12.1", - "@babel/plugin-transform-modules-umd": "^7.12.1", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.1", - "@babel/plugin-transform-new-target": "^7.12.1", - "@babel/plugin-transform-object-super": "^7.12.1", - "@babel/plugin-transform-parameters": "^7.12.1", - "@babel/plugin-transform-property-literals": "^7.12.1", - "@babel/plugin-transform-regenerator": "^7.12.1", - "@babel/plugin-transform-reserved-words": "^7.12.1", - "@babel/plugin-transform-shorthand-properties": "^7.12.1", - "@babel/plugin-transform-spread": "^7.12.1", - "@babel/plugin-transform-sticky-regex": "^7.12.1", - "@babel/plugin-transform-template-literals": "^7.12.1", - "@babel/plugin-transform-typeof-symbol": "^7.12.1", - "@babel/plugin-transform-unicode-escapes": "^7.12.1", - "@babel/plugin-transform-unicode-regex": "^7.12.1", - "@babel/preset-modules": "^0.1.3", - "@babel/types": "^7.12.1", - "core-js-compat": "^3.6.2", - "semver": "^5.5.0" - } - }, - "@babel/preset-modules": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz", - "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==", - "dev": true, - "requires": { - "@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/runtime": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz", - "integrity": "sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==", - "dev": true, - "requires": { - "regenerator-runtime": "^0.13.4" - } - }, - "@babel/template": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz", - "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/parser": "^7.10.4", - "@babel/types": "^7.10.4" - } - }, - "@babel/traverse": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz", - "integrity": "sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.12.1", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.12.1", - "@babel/types": "^7.12.1", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.19" - } - }, - "@babel/types": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz", - "integrity": "sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "lodash": "^4.17.19", - "to-fast-properties": "^2.0.0" - } - }, - "@hapi/address": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz", - "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==", - "dev": true - }, - "@hapi/bourne": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz", - "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==", - "dev": true - }, - "@hapi/hoek": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz", - "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==", - "dev": true - }, - "@hapi/joi": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz", - "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==", - "dev": true, - "requires": { - "@hapi/address": "2.x.x", - "@hapi/bourne": "1.x.x", - "@hapi/hoek": "8.x.x", - "@hapi/topo": "3.x.x" - } - }, - "@hapi/topo": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz", - "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==", - "dev": true, - "requires": { - "@hapi/hoek": "^8.3.0" - } - }, - "@mrmlnc/readdir-enhanced": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", - "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", - "dev": true, - "requires": { - "call-me-maybe": "^1.0.1", - "glob-to-regexp": "^0.3.0" - } - }, - "@nodelib/fs.stat": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz", - "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==", - "dev": true - }, - "@sindresorhus/is": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", - "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", - "dev": true - }, - "@szmarczak/http-timer": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", - "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", - "dev": true, - "requires": { - "defer-to-connect": "^1.0.1" - } - }, - "@types/glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", - "dev": true, - "requires": { - "@types/minimatch": "*", - "@types/node": "*" - } - }, - "@types/json-schema": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz", - "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==", - "dev": true - }, - "@types/minimatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", - "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", - "dev": true - }, - "@types/node": { - "version": "14.11.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.10.tgz", - "integrity": "sha512-yV1nWZPlMFpoXyoknm4S56y2nlTAuFYaJuQtYRAOU7xA/FJ9RY0Xm7QOkaYMMmr8ESdHIuUb6oQgR/0+2NqlyA==", - "dev": true - }, - "@types/q": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz", - "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==", - "dev": true - }, - "@vue/babel-helper-vue-jsx-merge-props": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz", - "integrity": "sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA==", - "dev": true - }, - "@vue/babel-helper-vue-transform-on": { - "version": "1.0.0-rc.2", - "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.0-rc.2.tgz", - "integrity": "sha512-1+7CwjQ0Kasml6rHoNQUmbISwqLNNfFVBUcZl6QBremUl296ZmLrVQPqJP5pyAAWjZke5bpI1hlj+LVVuT7Jcg==", - "dev": true - }, - "@vue/babel-plugin-jsx": { - "version": "1.0.0-rc.3", - "resolved": "https://registry.npmjs.org/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.0.0-rc.3.tgz", - "integrity": "sha512-/Ibq0hoKsidnHWPhgRpjcjYhYcHpqEm2fiKVAPO88OXZNHGwaGgS4yXkC6TDEvlZep4mBDo+2S5T81wpbVh90Q==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.0.0", - "@babel/plugin-syntax-jsx": "^7.0.0", - "@babel/traverse": "^7.0.0", - "@babel/types": "^7.0.0", - "@vue/babel-helper-vue-transform-on": "^1.0.0-rc.2", - "camelcase": "^6.0.0", - "html-tags": "^3.1.0", - "svg-tags": "^1.0.0" - } - }, - "@vue/babel-plugin-transform-vue-jsx": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.2.1.tgz", - "integrity": "sha512-HJuqwACYehQwh1fNT8f4kyzqlNMpBuUK4rSiSES5D4QsYncv5fxFsLyrxFPG2ksO7t5WP+Vgix6tt6yKClwPzA==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.0.0", - "@babel/plugin-syntax-jsx": "^7.2.0", - "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1", - "html-tags": "^2.0.0", - "lodash.kebabcase": "^4.1.1", - "svg-tags": "^1.0.0" - }, - "dependencies": { - "html-tags": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz", - "integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=", - "dev": true - } - } - }, - "@vue/babel-preset-app": { - "version": "4.5.7", - "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-4.5.7.tgz", - "integrity": "sha512-A9ujqmvR9wb8nWiMnEYZW/8QfGZbqxC/etzbKIDrUdsqJ27jx106leMHJc8nmAn58RqGd6iww6uZ3Sx7aYiG3A==", - "dev": true, - "requires": { - "@babel/core": "^7.11.0", - "@babel/helper-compilation-targets": "^7.9.6", - "@babel/helper-module-imports": "^7.8.3", - "@babel/plugin-proposal-class-properties": "^7.8.3", - "@babel/plugin-proposal-decorators": "^7.8.3", - "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-syntax-jsx": "^7.8.3", - "@babel/plugin-transform-runtime": "^7.11.0", - "@babel/preset-env": "^7.11.0", - "@babel/runtime": "^7.11.0", - "@vue/babel-plugin-jsx": "^1.0.0-0", - "@vue/babel-preset-jsx": "^1.1.2", - "babel-plugin-dynamic-import-node": "^2.3.3", - "core-js": "^3.6.5", - "core-js-compat": "^3.6.5", - "semver": "^6.1.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "@vue/babel-preset-jsx": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.2.2.tgz", - "integrity": "sha512-+PQKZwoh98oHnRnifT5XD4Ybkwe0McDGkcZcFQRfynL1SFg5zfGRscntZ8Lt4QmYs5NiYc2WOQbyrolUlLZedQ==", - "dev": true, - "requires": { - "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1", - "@vue/babel-plugin-transform-vue-jsx": "^1.2.1", - "@vue/babel-sugar-composition-api-inject-h": "^1.2.1", - "@vue/babel-sugar-composition-api-render-instance": "^1.2.1", - "@vue/babel-sugar-functional-vue": "^1.2.2", - "@vue/babel-sugar-inject-h": "^1.2.2", - "@vue/babel-sugar-v-model": "^1.2.1", - "@vue/babel-sugar-v-on": "^1.2.1" - } - }, - "@vue/babel-sugar-composition-api-inject-h": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.2.1.tgz", - "integrity": "sha512-4B3L5Z2G+7s+9Bwbf+zPIifkFNcKth7fQwekVbnOA3cr3Pq71q71goWr97sk4/yyzH8phfe5ODVzEjX7HU7ItQ==", - "dev": true, - "requires": { - "@babel/plugin-syntax-jsx": "^7.2.0" - } - }, - "@vue/babel-sugar-composition-api-render-instance": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.2.1.tgz", - "integrity": "sha512-F2gQbEMOUPyapqc85/O1Tbw0qBuvgXC/qBcBsjMKqC7KWJ4hK1eJUvU3iLHHTbre6V7zzIjrqEe0SoE1lR4mfw==", - "dev": true, - "requires": { - "@babel/plugin-syntax-jsx": "^7.2.0" - } - }, - "@vue/babel-sugar-functional-vue": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.2.2.tgz", - "integrity": "sha512-JvbgGn1bjCLByIAU1VOoepHQ1vFsroSA/QkzdiSs657V79q6OwEWLCQtQnEXD/rLTA8rRit4rMOhFpbjRFm82w==", - "dev": true, - "requires": { - "@babel/plugin-syntax-jsx": "^7.2.0" - } - }, - "@vue/babel-sugar-inject-h": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.2.2.tgz", - "integrity": "sha512-y8vTo00oRkzQTgufeotjCLPAvlhnpSkcHFEp60+LJUwygGcd5Chrpn5480AQp/thrxVm8m2ifAk0LyFel9oCnw==", - "dev": true, - "requires": { - "@babel/plugin-syntax-jsx": "^7.2.0" - } - }, - "@vue/babel-sugar-v-model": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.2.1.tgz", - "integrity": "sha512-6kTx+hZVJ6dclAwWXSvfnv4XlkzCzKthQ/xlnypFW8+9uhy3E5ehNiAaHfr83R8+7d3DlvbZrQ9xgbZc1quuJg==", - "dev": true, - "requires": { - "@babel/plugin-syntax-jsx": "^7.2.0", - "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1", - "@vue/babel-plugin-transform-vue-jsx": "^1.2.1", - "camelcase": "^5.0.0", - "html-tags": "^2.0.0", - "svg-tags": "^1.0.0" - }, - "dependencies": { - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "html-tags": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz", - "integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=", - "dev": true - } - } - }, - "@vue/babel-sugar-v-on": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.2.1.tgz", - "integrity": "sha512-rQhM52dC/vWxgMmi8ZY5MwudOb9sWrqN4gffbPDV44TNqyd2j1+PmW2qLR0QfcDsAccR5U+gcguHc3qhLSrXNw==", - "dev": true, - "requires": { - "@babel/plugin-syntax-jsx": "^7.2.0", - "@vue/babel-plugin-transform-vue-jsx": "^1.2.1", - "camelcase": "^5.0.0" - }, - "dependencies": { - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - } - } - }, - "@vue/component-compiler-utils": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.2.0.tgz", - "integrity": "sha512-lejBLa7xAMsfiZfNp7Kv51zOzifnb29FwdnMLa96z26kXErPFioSf9BMcePVIQ6/Gc6/mC0UrPpxAWIHyae0vw==", - "dev": true, - "requires": { - "consolidate": "^0.15.1", - "hash-sum": "^1.0.2", - "lru-cache": "^4.1.2", - "merge-source-map": "^1.1.0", - "postcss": "^7.0.14", - "postcss-selector-parser": "^6.0.2", - "prettier": "^1.18.2", - "source-map": "~0.6.1", - "vue-template-es2015-compiler": "^1.9.0" - }, - "dependencies": { - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - } - } - }, - "@vuepress/core": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@vuepress/core/-/core-1.7.1.tgz", - "integrity": "sha512-M5sxZq30Ke1vXa4ZZjk6185fwtpiJOqzXNnzcIe0GxtvtaF8Yij6b+KqQKlUJnnUXm+CKxiLCr8PTzDY26N7yw==", - "dev": true, - "requires": { - "@babel/core": "^7.8.4", - "@vue/babel-preset-app": "^4.1.2", - "@vuepress/markdown": "1.7.1", - "@vuepress/markdown-loader": "1.7.1", - "@vuepress/plugin-last-updated": "1.7.1", - "@vuepress/plugin-register-components": "1.7.1", - "@vuepress/shared-utils": "1.7.1", - "autoprefixer": "^9.5.1", - "babel-loader": "^8.0.4", - "cache-loader": "^3.0.0", - "chokidar": "^2.0.3", - "connect-history-api-fallback": "^1.5.0", - "copy-webpack-plugin": "^5.0.2", - "core-js": "^3.6.4", - "cross-spawn": "^6.0.5", - "css-loader": "^2.1.1", - "file-loader": "^3.0.1", - "js-yaml": "^3.13.1", - "lru-cache": "^5.1.1", - "mini-css-extract-plugin": "0.6.0", - "optimize-css-assets-webpack-plugin": "^5.0.1", - "portfinder": "^1.0.13", - "postcss-loader": "^3.0.0", - "postcss-safe-parser": "^4.0.1", - "toml": "^3.0.0", - "url-loader": "^1.0.1", - "vue": "^2.6.10", - "vue-loader": "^15.7.1", - "vue-router": "^3.4.5", - "vue-server-renderer": "^2.6.10", - "vue-template-compiler": "^2.6.10", - "vuepress-html-webpack-plugin": "^3.2.0", - "vuepress-plugin-container": "^2.0.2", - "webpack": "^4.8.1", - "webpack-chain": "^6.0.0", - "webpack-dev-server": "^3.5.1", - "webpack-merge": "^4.1.2", - "webpackbar": "3.2.0" - } - }, - "@vuepress/markdown": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@vuepress/markdown/-/markdown-1.7.1.tgz", - "integrity": "sha512-Ava9vJECHG1+RC53ut1dXSze35IH5tc3qesC06Ny37WS93iDSQy09j8y+a0Lugy12j1369+QQeRFWa40tdHczA==", - "dev": true, - "requires": { - "@vuepress/shared-utils": "1.7.1", - "markdown-it": "^8.4.1", - "markdown-it-anchor": "^5.0.2", - "markdown-it-chain": "^1.3.0", - "markdown-it-emoji": "^1.4.0", - "markdown-it-table-of-contents": "^0.4.0", - "prismjs": "^1.13.0" - } - }, - "@vuepress/markdown-loader": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@vuepress/markdown-loader/-/markdown-loader-1.7.1.tgz", - "integrity": "sha512-GM1F/tRhP9qZydTC89FXJPlLH+BmZijMKom5BYLAMEXsU20A9kABTRoatPjOUbZuKT+gn03JgG97qVd8xa/ETw==", - "dev": true, - "requires": { - "@vuepress/markdown": "1.7.1", - "loader-utils": "^1.1.0", - "lru-cache": "^5.1.1" - } - }, - "@vuepress/plugin-active-header-links": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@vuepress/plugin-active-header-links/-/plugin-active-header-links-1.7.1.tgz", - "integrity": "sha512-Wgf/oB9oPZLnYoLjQ/xbQc4Qa3RU5tXAo2dB4Xl/7bUL6SqBxO866kX3wPxKdSOIL58tq8iH9XbUe3Sxi8/ISQ==", - "dev": true, - "requires": { - "lodash.debounce": "^4.0.8" - } - }, - "@vuepress/plugin-back-to-top": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@vuepress/plugin-back-to-top/-/plugin-back-to-top-1.7.1.tgz", - "integrity": "sha512-Hw/5kQjqtkHEstifcq4gpdVwS38C3ecruLCUibq3YEES6DJUYZ8tN1oo3FTugYgpXsyn3HxWftyalozcZ2IutA==", - "dev": true, - "requires": { - "lodash.debounce": "^4.0.8" - } - }, - "@vuepress/plugin-last-updated": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@vuepress/plugin-last-updated/-/plugin-last-updated-1.7.1.tgz", - "integrity": "sha512-VW5jhBuO0WRHDsBmFsKC6QtEyBLCgyhuH9nQ65aairCn3tdoJPz0uQ4g3lr/boVbgsPexO677Sn3dRPgYqnMug==", - "dev": true, - "requires": { - "cross-spawn": "^6.0.5" - } - }, - "@vuepress/plugin-medium-zoom": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@vuepress/plugin-medium-zoom/-/plugin-medium-zoom-1.7.1.tgz", - "integrity": "sha512-pYI6myr4bi9SYzvR6D4r7+YpjpXgudCbontXKZIARS7hJ+kVBapVYnetrbeNFKq+7a/QGOkAuAK2j39dQLaMXQ==", - "dev": true, - "requires": { - "medium-zoom": "^1.0.4" - } - }, - "@vuepress/plugin-nprogress": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@vuepress/plugin-nprogress/-/plugin-nprogress-1.7.1.tgz", - "integrity": "sha512-KtqfI3RitbsEbm22EhbooTvhjfMf6zttKlbND7LcyJwP3MEPVYyzQJuET03hk9z4SgCfNV2r/W3sYyejzzTMog==", - "dev": true, - "requires": { - "nprogress": "^0.2.0" - } - }, - "@vuepress/plugin-pwa": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@vuepress/plugin-pwa/-/plugin-pwa-1.7.1.tgz", - "integrity": "sha512-c3oozxPPGpraU+UnY3gp3sWnKYO3mOLcexQWXaYABWnUC3yFbHx4e8wIF8LGqp7Z75bjQuUoI+LcHqpQXyYNag==", - "dev": true, - "requires": { - "@vuepress/shared-utils": "1.7.1", - "register-service-worker": "^1.7.0", - "workbox-build": "^4.3.1" - } - }, - "@vuepress/plugin-register-components": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@vuepress/plugin-register-components/-/plugin-register-components-1.7.1.tgz", - "integrity": "sha512-MlFdH6l3rTCJlGMvyssXVG998cq5LSMzxCuQLYcRdtHQT4HbikIcV4HSPGarWInD1mP12+qX/PvKUawGwp1eVg==", - "dev": true, - "requires": { - "@vuepress/shared-utils": "1.7.1" - } - }, - "@vuepress/plugin-search": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@vuepress/plugin-search/-/plugin-search-1.7.1.tgz", - "integrity": "sha512-OmiGM5eYg9c+uC50b6/cSxAhqxfD7AIui6JEztFGeECrlP33RLHmteXK9YBBZjp5wTNmoYs+NXI/cWggYUPW8Q==", - "dev": true - }, - "@vuepress/shared-utils": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@vuepress/shared-utils/-/shared-utils-1.7.1.tgz", - "integrity": "sha512-ydB2ZKsFZE6hFRb9FWqzZksxAPIMJjtBawk50RP6F+YX5HbID/HlyYYZM9aDSbk6RTkjgB5UzJjggA2xM8POlw==", - "dev": true, - "requires": { - "chalk": "^2.3.2", - "escape-html": "^1.0.3", - "fs-extra": "^7.0.1", - "globby": "^9.2.0", - "gray-matter": "^4.0.1", - "hash-sum": "^1.0.2", - "semver": "^6.0.0", - "toml": "^3.0.0", - "upath": "^1.1.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "@vuepress/theme-default": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@vuepress/theme-default/-/theme-default-1.7.1.tgz", - "integrity": "sha512-a9HeTrlcWQj3ONHiABmlN2z9TyIxKfQtLsA8AL+WgjN3PikhFuZFIJGzfr+NLt67Y9oiI+S9ZfiaVyvWM+7bWQ==", - "dev": true, - "requires": { - "@vuepress/plugin-active-header-links": "1.7.1", - "@vuepress/plugin-nprogress": "1.7.1", - "@vuepress/plugin-search": "1.7.1", - "docsearch.js": "^2.5.2", - "lodash": "^4.17.15", - "stylus": "^0.54.8", - "stylus-loader": "^3.0.2", - "vuepress-plugin-container": "^2.0.2", - "vuepress-plugin-smooth-scroll": "^0.0.3" - } - }, - "@webassemblyjs/ast": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", - "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==", - "dev": true, - "requires": { - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/wast-parser": "1.9.0" - } - }, - "@webassemblyjs/floating-point-hex-parser": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz", - "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==", - "dev": true - }, - "@webassemblyjs/helper-api-error": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz", - "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==", - "dev": true - }, - "@webassemblyjs/helper-buffer": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz", - "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==", - "dev": true - }, - "@webassemblyjs/helper-code-frame": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz", - "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==", - "dev": true, - "requires": { - "@webassemblyjs/wast-printer": "1.9.0" - } - }, - "@webassemblyjs/helper-fsm": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz", - "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==", - "dev": true - }, - "@webassemblyjs/helper-module-context": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz", - "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.9.0" - } - }, - "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz", - "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==", - "dev": true - }, - "@webassemblyjs/helper-wasm-section": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz", - "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-buffer": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/wasm-gen": "1.9.0" - } - }, - "@webassemblyjs/ieee754": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz", - "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==", - "dev": true, - "requires": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "@webassemblyjs/leb128": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz", - "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==", - "dev": true, - "requires": { - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/utf8": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz", - "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==", - "dev": true - }, - "@webassemblyjs/wasm-edit": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz", - "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-buffer": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/helper-wasm-section": "1.9.0", - "@webassemblyjs/wasm-gen": "1.9.0", - "@webassemblyjs/wasm-opt": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "@webassemblyjs/wast-printer": "1.9.0" - } - }, - "@webassemblyjs/wasm-gen": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz", - "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/ieee754": "1.9.0", - "@webassemblyjs/leb128": "1.9.0", - "@webassemblyjs/utf8": "1.9.0" - } - }, - "@webassemblyjs/wasm-opt": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz", - "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-buffer": "1.9.0", - "@webassemblyjs/wasm-gen": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0" - } - }, - "@webassemblyjs/wasm-parser": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz", - "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-api-error": "1.9.0", - "@webassemblyjs/helper-wasm-bytecode": "1.9.0", - "@webassemblyjs/ieee754": "1.9.0", - "@webassemblyjs/leb128": "1.9.0", - "@webassemblyjs/utf8": "1.9.0" - } - }, - "@webassemblyjs/wast-parser": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz", - "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/floating-point-hex-parser": "1.9.0", - "@webassemblyjs/helper-api-error": "1.9.0", - "@webassemblyjs/helper-code-frame": "1.9.0", - "@webassemblyjs/helper-fsm": "1.9.0", - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/wast-printer": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz", - "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/wast-parser": "1.9.0", - "@xtuc/long": "4.2.2" - } - }, - "@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true - }, - "@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true - }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true - }, - "accepts": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", - "dev": true, - "requires": { - "mime-types": "~2.1.24", - "negotiator": "0.6.2" - } - }, - "acorn": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", - "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", - "dev": true - }, - "agentkeepalive": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-2.2.0.tgz", - "integrity": "sha1-xdG9SxKQCPEWPyNvhuX66iAm4u8=", - "dev": true - }, - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ajv-errors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", - "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", - "dev": true - }, - "ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true - }, - "algoliasearch": { - "version": "3.35.1", - "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-3.35.1.tgz", - "integrity": "sha512-K4yKVhaHkXfJ/xcUnil04xiSrB8B8yHZoFEhWNpXg23eiCnqvTZw1tn/SqvdsANlYHLJlKl0qi3I/Q2Sqo7LwQ==", - "dev": true, - "requires": { - "agentkeepalive": "^2.2.0", - "debug": "^2.6.9", - "envify": "^4.0.0", - "es6-promise": "^4.1.0", - "events": "^1.1.0", - "foreach": "^2.0.5", - "global": "^4.3.2", - "inherits": "^2.0.1", - "isarray": "^2.0.1", - "load-script": "^1.0.0", - "object-keys": "^1.0.11", - "querystring-es3": "^0.2.1", - "reduce": "^1.0.1", - "semver": "^5.1.0", - "tunnel-agent": "^0.6.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "events": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", - "dev": true - }, - "isarray": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "alphanum-sort": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", - "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", - "dev": true - }, - "animate.css": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz", - "integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ==" - }, - "ansi-align": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", - "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==", - "dev": true, - "requires": { - "string-width": "^3.0.0" - } - }, - "ansi-colors": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", - "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==", - "dev": true - }, - "ansi-escapes": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", - "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", - "dev": true, - "requires": { - "type-fest": "^0.11.0" - } - }, - "ansi-html": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", - "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=", - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "dev": true, - "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" - }, - "dependencies": { - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } - } - } - }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "dev": true - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true - }, - "arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", - "dev": true - }, - "array-flatten": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", - "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", - "dev": true - }, - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "requires": { - "array-uniq": "^1.0.1" - } - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true - }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "dev": true, - "requires": { - "safer-buffer": "~2.1.0" - } - }, - "asn1.js": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", - "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", - "dev": true, - "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "safer-buffer": "^2.1.0" - }, - "dependencies": { - "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==", - "dev": true - } - } - }, - "assert": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", - "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", - "dev": true, - "requires": { - "object-assign": "^4.1.1", - "util": "0.10.3" - }, - "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", - "dev": true - }, - "util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "dev": true, - "requires": { - "inherits": "2.0.1" - } - } - } - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - }, - "assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", - "dev": true - }, - "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", - "dev": true, - "requires": { - "lodash": "^4.17.14" - } - }, - "async-each": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", - "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", - "dev": true - }, - "async-limiter": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", - "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", - "dev": true - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, - "atob": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", - "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", - "dev": true - }, - "autocomplete.js": { - "version": "0.36.0", - "resolved": "https://registry.npmjs.org/autocomplete.js/-/autocomplete.js-0.36.0.tgz", - "integrity": "sha512-jEwUXnVMeCHHutUt10i/8ZiRaCb0Wo+ZyKxeGsYwBDtw6EJHqEeDrq4UwZRD8YBSvp3g6klP678il2eeiVXN2Q==", - "dev": true, - "requires": { - "immediate": "^3.2.3" - } - }, - "autoprefixer": { - "version": "9.8.6", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz", - "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==", - "dev": true, - "requires": { - "browserslist": "^4.12.0", - "caniuse-lite": "^1.0.30001109", - "colorette": "^1.2.1", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^7.0.32", - "postcss-value-parser": "^4.1.0" - } - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true - }, - "aws4": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz", - "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==", - "dev": true - }, - "babel-extract-comments": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz", - "integrity": "sha512-qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ==", - "dev": true, - "requires": { - "babylon": "^6.18.0" - } - }, - "babel-loader": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz", - "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==", - "dev": true, - "requires": { - "find-cache-dir": "^2.1.0", - "loader-utils": "^1.4.0", - "mkdirp": "^0.5.3", - "pify": "^4.0.1", - "schema-utils": "^2.6.5" - } - }, - "babel-plugin-dynamic-import-node": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", - "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", - "dev": true, - "requires": { - "object.assign": "^4.1.0" - } - }, - "babel-plugin-syntax-object-rest-spread": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", - "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", - "dev": true - }, - "babel-plugin-transform-object-rest-spread": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz", - "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=", - "dev": true, - "requires": { - "babel-plugin-syntax-object-rest-spread": "^6.8.0", - "babel-runtime": "^6.26.0" - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - }, - "dependencies": { - "core-js": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", - "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==", - "dev": true - }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true - } - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "base": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "dev": true, - "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, - "base64-js": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==", - "dev": true - }, - "batch": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", - "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", - "dev": true - }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, - "big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true - }, - "binary-extensions": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", - "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", - "dev": true - }, - "bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", - "dev": true, - "optional": true, - "requires": { - "file-uri-to-path": "1.0.0" - } - }, - "bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "dev": true - }, - "bn.js": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz", - "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==", - "dev": true - }, - "body-parser": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", - "dev": true, - "requires": { - "bytes": "3.1.0", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.7.0", - "raw-body": "2.4.0", - "type-is": "~1.6.17" - }, - "dependencies": { - "bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", - "dev": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "bonjour": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", - "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", - "dev": true, - "requires": { - "array-flatten": "^2.1.0", - "deep-equal": "^1.0.1", - "dns-equal": "^1.0.0", - "dns-txt": "^2.0.2", - "multicast-dns": "^6.0.1", - "multicast-dns-service-types": "^1.1.0" - } - }, - "boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", - "dev": true - }, - "boxen": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz", - "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==", - "dev": true, - "requires": { - "ansi-align": "^3.0.0", - "camelcase": "^5.3.1", - "chalk": "^3.0.0", - "cli-boxes": "^2.2.0", - "string-width": "^4.1.0", - "term-size": "^2.1.0", - "type-fest": "^0.8.1", - "widest-line": "^3.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true - } - } - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", - "dev": true - }, - "browserify-aes": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", - "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", - "dev": true, - "requires": { - "buffer-xor": "^1.0.3", - "cipher-base": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.3", - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "browserify-cipher": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", - "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", - "dev": true, - "requires": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" - } - }, - "browserify-des": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", - "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", - "dev": true, - "requires": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "browserify-rsa": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", - "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "randombytes": "^2.0.1" - }, - "dependencies": { - "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==", - "dev": true - } - } - }, - "browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", - "dev": true, - "requires": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", - "create-hash": "^1.2.0", - "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", - "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - } - } - }, - "browserify-zlib": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", - "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", - "dev": true, - "requires": { - "pako": "~1.0.5" - } - }, - "browserslist": { - "version": "4.14.5", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz", - "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30001135", - "electron-to-chromium": "^1.3.571", - "escalade": "^3.1.0", - "node-releases": "^1.1.61" - } - }, - "buffer": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", - "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", - "dev": true, - "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" - } - }, - "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", - "dev": true - }, - "buffer-indexof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", - "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", - "dev": true - }, - "buffer-json": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/buffer-json/-/buffer-json-2.0.0.tgz", - "integrity": "sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw==", - "dev": true - }, - "buffer-xor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", - "dev": true - }, - "builtin-status-codes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", - "dev": true - }, - "bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", - "dev": true - }, - "cac": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/cac/-/cac-6.6.1.tgz", - "integrity": "sha512-uhki4T3Ax68hw7Dufi0bATVAF8ayBSwOKUEJHjObPrUN4tlQ8Lf7oljpTje/mArLxYN0D743c2zJt4C1bVTCqg==", - "dev": true - }, - "cacache": { - "version": "12.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", - "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", - "dev": true, - "requires": { - "bluebird": "^3.5.5", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.4", - "graceful-fs": "^4.1.15", - "infer-owner": "^1.0.3", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" - } - }, - "cache-base": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "dev": true, - "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" - } - }, - "cache-loader": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-3.0.1.tgz", - "integrity": "sha512-HzJIvGiGqYsFUrMjAJNDbVZoG7qQA+vy9AIoKs7s9DscNfki0I589mf2w6/tW+kkFH3zyiknoWV5Jdynu6b/zw==", - "dev": true, - "requires": { - "buffer-json": "^2.0.0", - "find-cache-dir": "^2.1.0", - "loader-utils": "^1.2.3", - "mkdirp": "^0.5.1", - "neo-async": "^2.6.1", - "schema-utils": "^1.0.0" - }, - "dependencies": { - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - } - } - }, - "cacheable-request": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", - "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", - "dev": true, - "requires": { - "clone-response": "^1.0.2", - "get-stream": "^5.1.0", - "http-cache-semantics": "^4.0.0", - "keyv": "^3.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^4.1.0", - "responselike": "^1.0.2" - }, - "dependencies": { - "get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", - "dev": true - }, - "normalize-url": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", - "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==", - "dev": true - } - } - }, - "call-me-maybe": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", - "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=", - "dev": true - }, - "caller-callsite": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", - "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", - "dev": true, - "requires": { - "callsites": "^2.0.0" - } - }, - "caller-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", - "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", - "dev": true, - "requires": { - "caller-callsite": "^2.0.0" - } - }, - "callsites": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", - "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", - "dev": true - }, - "camel-case": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", - "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", - "dev": true, - "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.1.1" - } - }, - "camelcase": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.1.0.tgz", - "integrity": "sha512-WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ==", - "dev": true - }, - "caniuse-api": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", - "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", - "dev": true, - "requires": { - "browserslist": "^4.0.0", - "caniuse-lite": "^1.0.0", - "lodash.memoize": "^4.1.2", - "lodash.uniq": "^4.5.0" - } - }, - "caniuse-lite": { - "version": "1.0.30001148", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz", - "integrity": "sha512-E66qcd0KMKZHNJQt9hiLZGE3J4zuTqE1OnU53miEVtylFbwOEmeA5OsRu90noZful+XGSQOni1aT2tiqu/9yYw==", - "dev": true - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "chokidar": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", - "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", - "dev": true, - "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" - } - }, - "chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", - "dev": true - }, - "chrome-trace-event": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz", - "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "ci-info": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz", - "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==", - "dev": true - }, - "cipher-base": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "class-utils": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "dev": true, - "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - } - } - }, - "clean-css": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz", - "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==", - "dev": true, - "requires": { - "source-map": "~0.6.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "cli-boxes": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", - "integrity": "sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==", - "dev": true - }, - "clipboard": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz", - "integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==", - "dev": true, - "optional": true, - "requires": { - "good-listener": "^1.2.2", - "select": "^1.1.2", - "tiny-emitter": "^2.0.0" - } - }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "clone-response": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", - "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", - "dev": true, - "requires": { - "mimic-response": "^1.0.0" - } - }, - "coa": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz", - "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==", - "dev": true, - "requires": { - "@types/q": "^1.5.1", - "chalk": "^2.4.1", - "q": "^1.1.2" - } - }, - "collection-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "dev": true, - "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" - } - }, - "color": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz", - "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==", - "dev": true, - "requires": { - "color-convert": "^1.9.1", - "color-string": "^1.5.4" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "color-string": { - "version": "1.5.4", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz", - "integrity": "sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==", - "dev": true, - "requires": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, - "colorette": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz", - "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==", - "dev": true - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", - "dev": true - }, - "common-tags": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz", - "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==", - "dev": true - }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", - "dev": true - }, - "component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", - "dev": true - }, - "compressible": { - "version": "2.0.18", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", - "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", - "dev": true, - "requires": { - "mime-db": ">= 1.43.0 < 2" - } - }, - "compression": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", - "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", - "dev": true, - "requires": { - "accepts": "~1.3.5", - "bytes": "3.0.0", - "compressible": "~2.0.16", - "debug": "2.6.9", - "on-headers": "~1.0.2", - "safe-buffer": "5.1.2", - "vary": "~1.1.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - } - }, - "configstore": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz", - "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==", - "dev": true, - "requires": { - "dot-prop": "^5.2.0", - "graceful-fs": "^4.1.2", - "make-dir": "^3.0.0", - "unique-string": "^2.0.0", - "write-file-atomic": "^3.0.0", - "xdg-basedir": "^4.0.0" - }, - "dependencies": { - "make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "requires": { - "semver": "^6.0.0" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "connect-history-api-fallback": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", - "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", - "dev": true - }, - "consola": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/consola/-/consola-2.15.0.tgz", - "integrity": "sha512-vlcSGgdYS26mPf7qNi+dCisbhiyDnrN1zaRbw3CSuc2wGOMEGGPsp46PdRG5gqXwgtJfjxDkxRNAgRPr1B77vQ==", - "dev": true - }, - "console-browserify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", - "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", - "dev": true - }, - "consolidate": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz", - "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==", - "dev": true, - "requires": { - "bluebird": "^3.1.1" - } - }, - "constants-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", - "dev": true - }, - "content-disposition": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", - "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", - "dev": true, - "requires": { - "safe-buffer": "5.1.2" - } - }, - "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", - "dev": true - }, - "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.1" - } - }, - "cookie": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", - "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", - "dev": true - }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", - "dev": true - }, - "copy-concurrently": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", - "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", - "dev": true, - "requires": { - "aproba": "^1.1.1", - "fs-write-stream-atomic": "^1.0.8", - "iferr": "^0.1.5", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.0" - } - }, - "copy-descriptor": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", - "dev": true - }, - "copy-to-clipboard": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz", - "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==", - "requires": { - "toggle-selection": "^1.0.6" - } - }, - "copy-webpack-plugin": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz", - "integrity": "sha512-Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ==", - "dev": true, - "requires": { - "cacache": "^12.0.3", - "find-cache-dir": "^2.1.0", - "glob-parent": "^3.1.0", - "globby": "^7.1.1", - "is-glob": "^4.0.1", - "loader-utils": "^1.2.3", - "minimatch": "^3.0.4", - "normalize-path": "^3.0.0", - "p-limit": "^2.2.1", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "webpack-log": "^2.0.0" - }, - "dependencies": { - "globby": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", - "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "dir-glob": "^2.0.0", - "glob": "^7.1.2", - "ignore": "^3.3.5", - "pify": "^3.0.0", - "slash": "^1.0.0" - } - }, - "ignore": { - "version": "3.3.10", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", - "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", - "dev": true - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - }, - "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", - "dev": true - } - } - }, - "core-js": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz", - "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==", - "dev": true - }, - "core-js-compat": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz", - "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==", - "dev": true, - "requires": { - "browserslist": "^4.8.5", - "semver": "7.0.0" - }, - "dependencies": { - "semver": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", - "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", - "dev": true - } - } - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "cosmiconfig": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", - "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", - "dev": true, - "requires": { - "import-fresh": "^2.0.0", - "is-directory": "^0.3.1", - "js-yaml": "^3.13.1", - "parse-json": "^4.0.0" - } - }, - "create-ecdh": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", - "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "elliptic": "^6.5.3" - }, - "dependencies": { - "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==", - "dev": true - } - } - }, - "create-hash": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", - "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", - "dev": true, - "requires": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "md5.js": "^1.3.4", - "ripemd160": "^2.0.1", - "sha.js": "^2.4.0" - } - }, - "create-hmac": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", - "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", - "dev": true, - "requires": { - "cipher-base": "^1.0.3", - "create-hash": "^1.1.0", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "crypto-browserify": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", - "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "dev": true, - "requires": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" - } - }, - "crypto-random-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", - "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", - "dev": true - }, - "css": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz", - "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "source-map": "^0.6.1", - "source-map-resolve": "^0.5.2", - "urix": "^0.1.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "css-color-names": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", - "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", - "dev": true - }, - "css-declaration-sorter": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz", - "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==", - "dev": true, - "requires": { - "postcss": "^7.0.1", - "timsort": "^0.3.0" - } - }, - "css-loader": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.1.tgz", - "integrity": "sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==", - "dev": true, - "requires": { - "camelcase": "^5.2.0", - "icss-utils": "^4.1.0", - "loader-utils": "^1.2.3", - "normalize-path": "^3.0.0", - "postcss": "^7.0.14", - "postcss-modules-extract-imports": "^2.0.0", - "postcss-modules-local-by-default": "^2.0.6", - "postcss-modules-scope": "^2.1.0", - "postcss-modules-values": "^2.0.0", - "postcss-value-parser": "^3.3.0", - "schema-utils": "^1.0.0" - }, - "dependencies": { - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - } - } - }, - "css-parse": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz", - "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=", - "dev": true, - "requires": { - "css": "^2.0.0" - } - }, - "css-select": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz", - "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==", - "dev": true, - "requires": { - "boolbase": "^1.0.0", - "css-what": "^3.2.1", - "domutils": "^1.7.0", - "nth-check": "^1.0.2" - } - }, - "css-select-base-adapter": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz", - "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==", - "dev": true - }, - "css-tree": { - "version": "1.0.0-alpha.37", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz", - "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==", - "dev": true, - "requires": { - "mdn-data": "2.0.4", - "source-map": "^0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "css-what": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz", - "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==", - "dev": true - }, - "cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true - }, - "cssnano": { - "version": "4.1.10", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz", - "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==", - "dev": true, - "requires": { - "cosmiconfig": "^5.0.0", - "cssnano-preset-default": "^4.0.7", - "is-resolvable": "^1.0.0", - "postcss": "^7.0.0" - } - }, - "cssnano-preset-default": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz", - "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==", - "dev": true, - "requires": { - "css-declaration-sorter": "^4.0.1", - "cssnano-util-raw-cache": "^4.0.1", - "postcss": "^7.0.0", - "postcss-calc": "^7.0.1", - "postcss-colormin": "^4.0.3", - "postcss-convert-values": "^4.0.1", - "postcss-discard-comments": "^4.0.2", - "postcss-discard-duplicates": "^4.0.2", - "postcss-discard-empty": "^4.0.1", - "postcss-discard-overridden": "^4.0.1", - "postcss-merge-longhand": "^4.0.11", - "postcss-merge-rules": "^4.0.3", - "postcss-minify-font-values": "^4.0.2", - "postcss-minify-gradients": "^4.0.2", - "postcss-minify-params": "^4.0.2", - "postcss-minify-selectors": "^4.0.2", - "postcss-normalize-charset": "^4.0.1", - "postcss-normalize-display-values": "^4.0.2", - "postcss-normalize-positions": "^4.0.2", - "postcss-normalize-repeat-style": "^4.0.2", - "postcss-normalize-string": "^4.0.2", - "postcss-normalize-timing-functions": "^4.0.2", - "postcss-normalize-unicode": "^4.0.1", - "postcss-normalize-url": "^4.0.1", - "postcss-normalize-whitespace": "^4.0.2", - "postcss-ordered-values": "^4.1.2", - "postcss-reduce-initial": "^4.0.3", - "postcss-reduce-transforms": "^4.0.2", - "postcss-svgo": "^4.0.2", - "postcss-unique-selectors": "^4.0.1" - } - }, - "cssnano-util-get-arguments": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz", - "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=", - "dev": true - }, - "cssnano-util-get-match": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz", - "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=", - "dev": true - }, - "cssnano-util-raw-cache": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz", - "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==", - "dev": true, - "requires": { - "postcss": "^7.0.0" - } - }, - "cssnano-util-same-parent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz", - "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==", - "dev": true - }, - "csso": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz", - "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==", - "dev": true, - "requires": { - "css-tree": "1.0.0-alpha.39" - }, - "dependencies": { - "css-tree": { - "version": "1.0.0-alpha.39", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz", - "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==", - "dev": true, - "requires": { - "mdn-data": "2.0.6", - "source-map": "^0.6.1" - } - }, - "mdn-data": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz", - "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "cyclist": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", - "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=", - "dev": true - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, - "de-indent": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", - "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=", - "dev": true - }, - "debug": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", - "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true - }, - "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", - "dev": true - }, - "decompress-response": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", - "dev": true, - "requires": { - "mimic-response": "^1.0.0" - } - }, - "deep-equal": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", - "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", - "dev": true, - "requires": { - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.1", - "is-regex": "^1.0.4", - "object-is": "^1.0.1", - "object-keys": "^1.1.1", - "regexp.prototype.flags": "^1.2.0" - } - }, - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true - }, - "deepmerge": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", - "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==", - "dev": true - }, - "default-gateway": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", - "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==", - "dev": true, - "requires": { - "execa": "^1.0.0", - "ip-regex": "^2.1.0" - } - }, - "defer-to-connect": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", - "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", - "dev": true - }, - "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, - "requires": { - "object-keys": "^1.0.12" - } - }, - "define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "dev": true, - "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - }, - "dependencies": { - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, - "del": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", - "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", - "dev": true, - "requires": { - "@types/glob": "^7.1.1", - "globby": "^6.1.0", - "is-path-cwd": "^2.0.0", - "is-path-in-cwd": "^2.0.0", - "p-map": "^2.0.0", - "pify": "^4.0.1", - "rimraf": "^2.6.3" - }, - "dependencies": { - "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - } - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true - }, - "delegate": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", - "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==", - "dev": true, - "optional": true - }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", - "dev": true - }, - "des.js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", - "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, - "destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", - "dev": true - }, - "detect-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", - "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", - "dev": true - }, - "diffie-hellman": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", - "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" - }, - "dependencies": { - "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==", - "dev": true - } - } - }, - "dir-glob": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz", - "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==", - "dev": true, - "requires": { - "path-type": "^3.0.0" - } - }, - "dns-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", - "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=", - "dev": true - }, - "dns-packet": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz", - "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", - "dev": true, - "requires": { - "ip": "^1.1.0", - "safe-buffer": "^5.0.1" - } - }, - "dns-txt": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", - "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", - "dev": true, - "requires": { - "buffer-indexof": "^1.0.0" - } - }, - "docsearch.js": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/docsearch.js/-/docsearch.js-2.6.3.tgz", - "integrity": "sha512-GN+MBozuyz664ycpZY0ecdQE0ND/LSgJKhTLA0/v3arIS3S1Rpf2OJz6A35ReMsm91V5apcmzr5/kM84cvUg+A==", - "dev": true, - "requires": { - "algoliasearch": "^3.24.5", - "autocomplete.js": "0.36.0", - "hogan.js": "^3.0.2", - "request": "^2.87.0", - "stack-utils": "^1.0.1", - "to-factory": "^1.0.0", - "zepto": "^1.2.0" - } - }, - "dom-converter": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", - "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", - "dev": true, - "requires": { - "utila": "~0.4" - } - }, - "dom-serializer": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", - "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", - "dev": true, - "requires": { - "domelementtype": "^2.0.1", - "entities": "^2.0.0" - }, - "dependencies": { - "domelementtype": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz", - "integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==", - "dev": true - }, - "entities": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", - "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==", - "dev": true - } - } - }, - "dom-walk": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz", - "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==", - "dev": true - }, - "domain-browser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", - "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", - "dev": true - }, - "domelementtype": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", - "dev": true - }, - "domhandler": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", - "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", - "dev": true, - "requires": { - "domelementtype": "1" - } - }, - "domutils": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", - "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", - "dev": true, - "requires": { - "dom-serializer": "0", - "domelementtype": "1" - } - }, - "dot-prop": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", - "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", - "dev": true, - "requires": { - "is-obj": "^2.0.0" - } - }, - "duplexer3": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", - "dev": true - }, - "duplexify": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", - "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", - "dev": true, - "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" - } - }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", - "dev": true - }, - "electron-to-chromium": { - "version": "1.3.582", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.582.tgz", - "integrity": "sha512-0nCJ7cSqnkMC+kUuPs0YgklFHraWGl/xHqtZWWtOeVtyi+YqkoAOMGuZQad43DscXCQI/yizcTa3u6B5r+BLww==", - "dev": true - }, - "elliptic": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", - "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", - "dev": true, - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" - }, - "dependencies": { - "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==", - "dev": true - } - } - }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true - }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "dev": true - }, - "end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, - "requires": { - "once": "^1.4.0" - } - }, - "enhanced-resolve": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz", - "integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.5.0", - "tapable": "^1.0.0" - }, - "dependencies": { - "memory-fs": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", - "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", - "dev": true, - "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" - } - } - } - }, - "entities": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", - "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", - "dev": true - }, - "envify": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/envify/-/envify-4.1.0.tgz", - "integrity": "sha512-IKRVVoAYr4pIx4yIWNsz9mOsboxlNXiu7TNBnem/K/uTHdkyzXWDzHCK7UTolqBbgaBz0tQHsD3YNls0uIIjiw==", - "dev": true, - "requires": { - "esprima": "^4.0.0", - "through": "~2.3.4" - } - }, - "envinfo": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.7.3.tgz", - "integrity": "sha512-46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA==", - "dev": true - }, - "errno": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", - "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", - "dev": true, - "requires": { - "prr": "~1.0.1" - } - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "es-abstract": { - "version": "1.18.0-next.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", - "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-negative-zero": "^2.0.0", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - } - }, - "es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", - "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, - "es6-promise": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", - "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", - "dev": true - }, - "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true - }, - "escape-goat": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", - "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==", - "dev": true - }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "eslint-scope": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", - "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", - "dev": true, - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - } - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "requires": { - "estraverse": "^5.2.0" - }, - "dependencies": { - "estraverse": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", - "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", - "dev": true - } - } - }, - "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", - "dev": true - }, - "eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", - "dev": true - }, - "events": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz", - "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==", - "dev": true - }, - "eventsource": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", - "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", - "dev": true, - "requires": { - "original": "^1.0.0" - } - }, - "evp_bytestokey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", - "dev": true, - "requires": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" - } - }, - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "dev": true, - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, - "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "express": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", - "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", - "dev": true, - "requires": { - "accepts": "~1.3.7", - "array-flatten": "1.1.1", - "body-parser": "1.19.0", - "content-disposition": "0.5.3", - "content-type": "~1.0.4", - "cookie": "0.4.0", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.1.2", - "fresh": "0.5.2", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.5", - "qs": "6.7.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.1.2", - "send": "0.17.1", - "serve-static": "1.14.1", - "setprototypeof": "1.1.1", - "statuses": "~1.5.0", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "dependencies": { - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", - "dev": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "dev": true, - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, - "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "fast-glob": { - "version": "2.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz", - "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==", - "dev": true, - "requires": { - "@mrmlnc/readdir-enhanced": "^2.2.1", - "@nodelib/fs.stat": "^1.1.2", - "glob-parent": "^3.1.0", - "is-glob": "^4.0.0", - "merge2": "^1.2.3", - "micromatch": "^3.1.10" - } - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "faye-websocket": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", - "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", - "dev": true, - "requires": { - "websocket-driver": ">=0.5.1" - } - }, - "figgy-pudding": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", - "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==", - "dev": true - }, - "figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "file-loader": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz", - "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==", - "dev": true, - "requires": { - "loader-utils": "^1.0.2", - "schema-utils": "^1.0.0" - }, - "dependencies": { - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - } - } - }, - "file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "dev": true, - "optional": true - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "finalhandler": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", - "dev": true, - "requires": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "statuses": "~1.5.0", - "unpipe": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "find-cache-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", - "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^2.0.0", - "pkg-dir": "^3.0.0" - } - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "flush-write-stream": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", - "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "readable-stream": "^2.3.6" - } - }, - "follow-redirects": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz", - "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==", - "dev": true - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true - }, - "foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", - "dev": true - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true - }, - "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - } - }, - "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", - "dev": true - }, - "fragment-cache": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "dev": true, - "requires": { - "map-cache": "^0.2.2" - } - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", - "dev": true - }, - "from2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" - } - }, - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "fs-write-stream-atomic": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", - "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "iferr": "^0.1.5", - "imurmurhash": "^0.1.4", - "readable-stream": "1 || 2" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "dev": true, - "optional": true, - "requires": { - "bindings": "^1.5.0", - "nan": "^2.12.1" - } - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "gensync": { - "version": "1.0.0-beta.1", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", - "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==", - "dev": true - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, - "get-own-enumerable-property-symbols": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz", - "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==", - "dev": true - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "get-value": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", - "dev": true - }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, - "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "^2.1.0" - } - } - } - }, - "glob-to-regexp": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz", - "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=", - "dev": true - }, - "global": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz", - "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==", - "dev": true, - "requires": { - "min-document": "^2.19.0", - "process": "^0.11.10" - } - }, - "global-dirs": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz", - "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==", - "dev": true, - "requires": { - "ini": "^1.3.5" - } - }, - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true - }, - "globby": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz", - "integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==", - "dev": true, - "requires": { - "@types/glob": "^7.1.1", - "array-union": "^1.0.2", - "dir-glob": "^2.2.2", - "fast-glob": "^2.2.6", - "glob": "^7.1.3", - "ignore": "^4.0.3", - "pify": "^4.0.1", - "slash": "^2.0.0" - } - }, - "good-listener": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", - "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=", - "dev": true, - "optional": true, - "requires": { - "delegate": "^3.1.2" - } - }, - "got": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", - "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", - "dev": true, - "requires": { - "@sindresorhus/is": "^0.14.0", - "@szmarczak/http-timer": "^1.1.2", - "cacheable-request": "^6.0.0", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^4.1.0", - "lowercase-keys": "^1.0.1", - "mimic-response": "^1.0.1", - "p-cancelable": "^1.0.0", - "to-readable-stream": "^1.0.0", - "url-parse-lax": "^3.0.0" - } - }, - "graceful-fs": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", - "dev": true - }, - "gray-matter": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.2.tgz", - "integrity": "sha512-7hB/+LxrOjq/dd8APlK0r24uL/67w7SkYnfwhNFwg/VDIGWGmduTDYf3WNstLW2fbbmRwrDGCVSJ2isuf2+4Hw==", - "dev": true, - "requires": { - "js-yaml": "^3.11.0", - "kind-of": "^6.0.2", - "section-matter": "^1.0.0", - "strip-bom-string": "^1.0.0" - } - }, - "handle-thing": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", - "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==", - "dev": true - }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true - }, - "har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "dev": true, - "requires": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" - } - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "has-symbols": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", - "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", - "dev": true - }, - "has-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", - "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", - "dev": true, - "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "has-values": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", - "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", - "dev": true, - "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" - }, - "dependencies": { - "kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "has-yarn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", - "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==", - "dev": true - }, - "hash-base": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", - "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", - "dev": true, - "requires": { - "inherits": "^2.0.4", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - } - } - }, - "hash-sum": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", - "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=", - "dev": true - }, - "hash.js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", - "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" - } - }, - "he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true - }, - "hex-color-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz", - "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==", - "dev": true - }, - "hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "dev": true, - "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "hogan.js": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/hogan.js/-/hogan.js-3.0.2.tgz", - "integrity": "sha1-TNnhq9QpQUbnZ55B14mHMrAse/0=", - "dev": true, - "requires": { - "mkdirp": "0.3.0", - "nopt": "1.0.10" - }, - "dependencies": { - "mkdirp": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz", - "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=", - "dev": true - } - } - }, - "hpack.js": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", - "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "obuf": "^1.0.0", - "readable-stream": "^2.0.1", - "wbuf": "^1.1.0" - } - }, - "hsl-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz", - "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=", - "dev": true - }, - "hsla-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz", - "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=", - "dev": true - }, - "html-comment-regex": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz", - "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==", - "dev": true - }, - "html-entities": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz", - "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==", - "dev": true - }, - "html-minifier": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz", - "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==", - "dev": true, - "requires": { - "camel-case": "3.0.x", - "clean-css": "4.2.x", - "commander": "2.17.x", - "he": "1.2.x", - "param-case": "2.1.x", - "relateurl": "0.2.x", - "uglify-js": "3.4.x" - } - }, - "html-tags": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz", - "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==", - "dev": true - }, - "htmlparser2": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", - "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", - "dev": true, - "requires": { - "domelementtype": "^1.3.1", - "domhandler": "^2.3.0", - "domutils": "^1.5.1", - "entities": "^1.1.1", - "inherits": "^2.0.1", - "readable-stream": "^3.1.1" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, - "http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", - "dev": true - }, - "http-deceiver": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", - "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=", - "dev": true - }, - "http-errors": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", - "dev": true, - "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" - }, - "dependencies": { - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - } - } - }, - "http-proxy": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", - "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", - "dev": true, - "requires": { - "eventemitter3": "^4.0.0", - "follow-redirects": "^1.0.0", - "requires-port": "^1.0.0" - } - }, - "http-proxy-middleware": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz", - "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==", - "dev": true, - "requires": { - "http-proxy": "^1.17.0", - "is-glob": "^4.0.0", - "lodash": "^4.17.11", - "micromatch": "^3.1.10" - } - }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, - "https-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", - "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", - "dev": true - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "icss-replace-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", - "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=", - "dev": true - }, - "icss-utils": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz", - "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==", - "dev": true, - "requires": { - "postcss": "^7.0.14" - } - }, - "ieee754": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==", - "dev": true - }, - "iferr": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", - "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=", - "dev": true - }, - "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "dev": true - }, - "immediate": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz", - "integrity": "sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==", - "dev": true - }, - "import-cwd": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", - "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", - "dev": true, - "requires": { - "import-from": "^2.1.0" - } - }, - "import-fresh": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", - "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", - "dev": true, - "requires": { - "caller-path": "^2.0.0", - "resolve-from": "^3.0.0" - } - }, - "import-from": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz", - "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", - "dev": true, - "requires": { - "resolve-from": "^3.0.0" - } - }, - "import-lazy": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", - "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", - "dev": true - }, - "import-local": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", - "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", - "dev": true, - "requires": { - "pkg-dir": "^3.0.0", - "resolve-cwd": "^2.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true - }, - "indexes-of": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", - "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", - "dev": true - }, - "infer-owner": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", - "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", - "dev": true - }, - "internal-ip": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz", - "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==", - "dev": true, - "requires": { - "default-gateway": "^4.2.0", - "ipaddr.js": "^1.9.0" - } - }, - "ip": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", - "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", - "dev": true - }, - "ip-regex": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", - "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", - "dev": true - }, - "ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "dev": true - }, - "is-absolute-url": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", - "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=", - "dev": true - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-arguments": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", - "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", - "dev": true - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, - "requires": { - "binary-extensions": "^1.0.0" - } - }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "is-callable": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", - "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", - "dev": true - }, - "is-ci": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", - "dev": true, - "requires": { - "ci-info": "^2.0.0" - }, - "dependencies": { - "ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", - "dev": true - } - } - }, - "is-color-stop": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz", - "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=", - "dev": true, - "requires": { - "css-color-names": "^0.0.4", - "hex-color-regex": "^1.1.0", - "hsl-regex": "^1.0.0", - "hsla-regex": "^1.0.0", - "rgb-regex": "^1.0.1", - "rgba-regex": "^1.0.0" - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-date-object": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", - "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", - "dev": true - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } - } - }, - "is-directory": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", - "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", - "dev": true - }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-installed-globally": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz", - "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==", - "dev": true, - "requires": { - "global-dirs": "^2.0.1", - "is-path-inside": "^3.0.1" - }, - "dependencies": { - "is-path-inside": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz", - "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==", - "dev": true - } - } - }, - "is-negative-zero": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", - "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=", - "dev": true - }, - "is-npm": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz", - "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==", - "dev": true - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-obj": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", - "dev": true - }, - "is-path-cwd": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", - "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", - "dev": true - }, - "is-path-in-cwd": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz", - "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", - "dev": true, - "requires": { - "is-path-inside": "^2.1.0" - } - }, - "is-path-inside": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz", - "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", - "dev": true, - "requires": { - "path-is-inside": "^1.0.2" - } - }, - "is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", - "dev": true - }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "is-regex": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", - "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", - "dev": true, - "requires": { - "has-symbols": "^1.0.1" - } - }, - "is-regexp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", - "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=", - "dev": true - }, - "is-resolvable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", - "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", - "dev": true - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "dev": true - }, - "is-svg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz", - "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==", - "dev": true, - "requires": { - "html-comment-regex": "^1.1.0" - } - }, - "is-symbol": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", - "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", - "dev": true, - "requires": { - "has-symbols": "^1.0.1" - } - }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true - }, - "is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", - "dev": true - }, - "is-yarn-global": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", - "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==", - "dev": true - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, - "javascript-stringify": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-1.6.0.tgz", - "integrity": "sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM=", - "dev": true - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "js-yaml": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", - "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true - }, - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true - }, - "json-buffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", - "dev": true - }, - "json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true - }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true - }, - "json3": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz", - "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==", - "dev": true - }, - "json5": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", - "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, - "keyv": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", - "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", - "dev": true, - "requires": { - "json-buffer": "3.0.0" - } - }, - "killable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", - "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==", - "dev": true - }, - "kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true - }, - "last-call-webpack-plugin": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz", - "integrity": "sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w==", - "dev": true, - "requires": { - "lodash": "^4.17.5", - "webpack-sources": "^1.1.0" - } - }, - "latest-version": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", - "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==", - "dev": true, - "requires": { - "package-json": "^6.3.0" - } - }, - "linkify-it": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz", - "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==", - "dev": true, - "requires": { - "uc.micro": "^1.0.1" - } - }, - "load-script": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/load-script/-/load-script-1.0.0.tgz", - "integrity": "sha1-BJGTngvuVkPuSUp+PaPSuscMbKQ=", - "dev": true - }, - "loader-runner": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz", - "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==", - "dev": true - }, - "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - }, - "dependencies": { - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } - } - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", - "dev": true - }, - "lodash._reinterpolate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", - "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", - "dev": true - }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, - "lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", - "dev": true - }, - "lodash.kebabcase": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", - "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY=", - "dev": true - }, - "lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", - "dev": true - }, - "lodash.template": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz", - "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==", - "dev": true, - "requires": { - "lodash._reinterpolate": "^3.0.0", - "lodash.templatesettings": "^4.0.0" - } - }, - "lodash.templatesettings": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz", - "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==", - "dev": true, - "requires": { - "lodash._reinterpolate": "^3.0.0" - } - }, - "lodash.uniq": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", - "dev": true - }, - "loglevel": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz", - "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==", - "dev": true - }, - "lower-case": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", - "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=", - "dev": true - }, - "lowercase-keys": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", - "dev": true - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "dev": true, - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - } - }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", - "dev": true - }, - "map-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", - "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", - "dev": true, - "requires": { - "object-visit": "^1.0.0" - } - }, - "markdown-it": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz", - "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "entities": "~1.1.1", - "linkify-it": "^2.0.0", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" - } - }, - "markdown-it-anchor": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.3.0.tgz", - "integrity": "sha512-/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA==", - "dev": true - }, - "markdown-it-chain": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/markdown-it-chain/-/markdown-it-chain-1.3.0.tgz", - "integrity": "sha512-XClV8I1TKy8L2qsT9iX3qiV+50ZtcInGXI80CA+DP62sMs7hXlyV/RM3hfwy5O3Ad0sJm9xIwQELgANfESo8mQ==", - "dev": true, - "requires": { - "webpack-chain": "^4.9.0" - }, - "dependencies": { - "webpack-chain": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-4.12.1.tgz", - "integrity": "sha512-BCfKo2YkDe2ByqkEWe1Rw+zko4LsyS75LVr29C6xIrxAg9JHJ4pl8kaIZ396SUSNp6b4815dRZPSTAS8LlURRQ==", - "dev": true, - "requires": { - "deepmerge": "^1.5.2", - "javascript-stringify": "^1.6.0" - } - } - } - }, - "markdown-it-container": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/markdown-it-container/-/markdown-it-container-2.0.0.tgz", - "integrity": "sha1-ABm0P9Au7+zi8ZYKKJX7qBpARpU=", - "dev": true - }, - "markdown-it-emoji": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-1.4.0.tgz", - "integrity": "sha1-m+4OmpkKljupbfaYDE/dsF37Tcw=", - "dev": true - }, - "markdown-it-table-of-contents": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/markdown-it-table-of-contents/-/markdown-it-table-of-contents-0.4.4.tgz", - "integrity": "sha512-TAIHTHPwa9+ltKvKPWulm/beozQU41Ab+FIefRaQV1NRnpzwcV9QOe6wXQS5WLivm5Q/nlo0rl6laGkMDZE7Gw==", - "dev": true - }, - "md5.js": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", - "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", - "dev": true, - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "mdn-data": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz", - "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==", - "dev": true - }, - "mdurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=", - "dev": true - }, - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", - "dev": true - }, - "medium-zoom": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/medium-zoom/-/medium-zoom-1.0.6.tgz", - "integrity": "sha512-UdiUWfvz9fZMg1pzf4dcuqA0W079o0mpqbTnOz5ip4VGYX96QjmbM+OgOU/0uOzAytxC0Ny4z+VcYQnhdifimg==", - "dev": true - }, - "memory-fs": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", - "dev": true, - "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" - } - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", - "dev": true - }, - "merge-source-map": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz", - "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==", - "dev": true, - "requires": { - "source-map": "^0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "dev": true - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - } - }, - "miller-rabin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", - "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", - "dev": true, - "requires": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" - }, - "dependencies": { - "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==", - "dev": true - } - } - }, - "mime": { - "version": "2.4.6", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", - "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==", - "dev": true - }, - "mime-db": { - "version": "1.44.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", - "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==", - "dev": true - }, - "mime-types": { - "version": "2.1.27", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", - "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", - "dev": true, - "requires": { - "mime-db": "1.44.0" - } - }, - "mimic-response": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", - "dev": true - }, - "min-document": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", - "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", - "dev": true, - "requires": { - "dom-walk": "^0.1.0" - } - }, - "mini-css-extract-plugin": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz", - "integrity": "sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==", - "dev": true, - "requires": { - "loader-utils": "^1.1.0", - "normalize-url": "^2.0.1", - "schema-utils": "^1.0.0", - "webpack-sources": "^1.1.0" - }, - "dependencies": { - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - } - } - }, - "minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", - "dev": true - }, - "minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "mississippi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", - "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", - "dev": true, - "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^3.0.0", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" - } - }, - "mixin-deep": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", - "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", - "dev": true, - "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "move-concurrently": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", - "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", - "dev": true, - "requires": { - "aproba": "^1.1.1", - "copy-concurrently": "^1.0.0", - "fs-write-stream-atomic": "^1.0.8", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.3" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "multicast-dns": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz", - "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", - "dev": true, - "requires": { - "dns-packet": "^1.3.1", - "thunky": "^1.0.2" - } - }, - "multicast-dns-service-types": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", - "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", - "dev": true - }, - "nan": { - "version": "2.14.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", - "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", - "dev": true, - "optional": true - }, - "nanomatch": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", - "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - } - }, - "negotiator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", - "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", - "dev": true - }, - "neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true - }, - "nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", - "dev": true - }, - "no-case": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", - "dev": true, - "requires": { - "lower-case": "^1.1.1" - } - }, - "node-forge": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", - "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", - "dev": true - }, - "node-libs-browser": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz", - "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==", - "dev": true, - "requires": { - "assert": "^1.1.1", - "browserify-zlib": "^0.2.0", - "buffer": "^4.3.0", - "console-browserify": "^1.1.0", - "constants-browserify": "^1.0.0", - "crypto-browserify": "^3.11.0", - "domain-browser": "^1.1.1", - "events": "^3.0.0", - "https-browserify": "^1.0.0", - "os-browserify": "^0.3.0", - "path-browserify": "0.0.1", - "process": "^0.11.10", - "punycode": "^1.2.4", - "querystring-es3": "^0.2.0", - "readable-stream": "^2.3.3", - "stream-browserify": "^2.0.1", - "stream-http": "^2.7.2", - "string_decoder": "^1.0.0", - "timers-browserify": "^2.0.4", - "tty-browserify": "0.0.0", - "url": "^0.11.0", - "util": "^0.11.0", - "vm-browserify": "^1.0.1" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - } - } - }, - "node-releases": { - "version": "1.1.63", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.63.tgz", - "integrity": "sha512-ukW3iCfQaoxJkSPN+iK7KznTeqDGVJatAEuXsJERYHa9tn/KaT5lBdIyxQjLEVTzSkyjJEuQ17/vaEjrOauDkg==", - "dev": true - }, - "nopt": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", - "dev": true, - "requires": { - "abbrev": "1" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, - "normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", - "dev": true - }, - "normalize-url": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz", - "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", - "dev": true, - "requires": { - "prepend-http": "^2.0.0", - "query-string": "^5.0.1", - "sort-keys": "^2.0.0" - } - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "requires": { - "path-key": "^2.0.0" - } - }, - "nprogress": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz", - "integrity": "sha1-y480xTIT2JVyP8urkH6UIq28r7E=", - "dev": true - }, - "nth-check": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", - "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", - "dev": true, - "requires": { - "boolbase": "~1.0.0" - } - }, - "num2fraction": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", - "dev": true - }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - }, - "object-copy": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", - "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", - "dev": true, - "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "object-inspect": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", - "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", - "dev": true - }, - "object-is": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz", - "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1" - } - }, - "object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true - }, - "object-visit": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", - "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", - "dev": true, - "requires": { - "isobject": "^3.0.0" - } - }, - "object.assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz", - "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.0", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" - } - }, - "object.getownpropertydescriptors": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", - "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" - }, - "dependencies": { - "es-abstract": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", - "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - } - } - } - }, - "object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "object.values": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz", - "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "function-bind": "^1.1.1", - "has": "^1.0.3" - }, - "dependencies": { - "es-abstract": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", - "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - } - } - } - }, - "obuf": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", - "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", - "dev": true - }, - "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", - "dev": true, - "requires": { - "ee-first": "1.1.1" - } - }, - "on-headers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", - "dev": true - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "opencollective-postinstall": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz", - "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==", - "dev": true - }, - "opn": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz", - "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==", - "dev": true, - "requires": { - "is-wsl": "^1.1.0" - } - }, - "optimize-css-assets-webpack-plugin": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz", - "integrity": "sha512-wqd6FdI2a5/FdoiCNNkEvLeA//lHHfG24Ln2Xm2qqdIk4aOlsR18jwpyOihqQ8849W3qu2DX8fOYxpvTMj+93A==", - "dev": true, - "requires": { - "cssnano": "^4.1.10", - "last-call-webpack-plugin": "^3.0.0" - } - }, - "original": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", - "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", - "dev": true, - "requires": { - "url-parse": "^1.4.3" - } - }, - "os-browserify": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", - "dev": true - }, - "p-cancelable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", - "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", - "dev": true - }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "dev": true - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-map": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", - "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", - "dev": true - }, - "p-retry": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz", - "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==", - "dev": true, - "requires": { - "retry": "^0.12.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "package-json": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", - "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==", - "dev": true, - "requires": { - "got": "^9.6.0", - "registry-auth-token": "^4.0.0", - "registry-url": "^5.0.0", - "semver": "^6.2.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "pako": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", - "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", - "dev": true - }, - "parallel-transform": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz", - "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==", - "dev": true, - "requires": { - "cyclist": "^1.0.1", - "inherits": "^2.0.3", - "readable-stream": "^2.1.5" - } - }, - "param-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", - "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", - "dev": true, - "requires": { - "no-case": "^2.2.0" - } - }, - "parse-asn1": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", - "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", - "dev": true, - "requires": { - "asn1.js": "^5.2.0", - "browserify-aes": "^1.0.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3", - "safe-buffer": "^5.1.1" - } - }, - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - }, - "parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true - }, - "pascalcase": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", - "dev": true - }, - "path-browserify": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz", - "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==", - "dev": true - }, - "path-dirname": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", - "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", - "dev": true - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - }, - "path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", - "dev": true - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, - "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true - }, - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", - "dev": true - }, - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "requires": { - "pify": "^3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - } - } - }, - "pbkdf2": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz", - "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==", - "dev": true, - "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true - }, - "picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", - "dev": true, - "optional": true - }, - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "requires": { - "pinkie": "^2.0.0" - } - }, - "pkg-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", - "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", - "dev": true, - "requires": { - "find-up": "^3.0.0" - } - }, - "portfinder": { - "version": "1.0.28", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", - "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", - "dev": true, - "requires": { - "async": "^2.6.2", - "debug": "^3.1.1", - "mkdirp": "^0.5.5" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "posix-character-classes": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", - "dev": true - }, - "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "postcss-calc": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz", - "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==", - "dev": true, - "requires": { - "postcss": "^7.0.27", - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.0.2" - } - }, - "postcss-colormin": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz", - "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==", - "dev": true, - "requires": { - "browserslist": "^4.0.0", - "color": "^3.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-convert-values": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz", - "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==", - "dev": true, - "requires": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-discard-comments": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz", - "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==", - "dev": true, - "requires": { - "postcss": "^7.0.0" - } - }, - "postcss-discard-duplicates": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz", - "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==", - "dev": true, - "requires": { - "postcss": "^7.0.0" - } - }, - "postcss-discard-empty": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz", - "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==", - "dev": true, - "requires": { - "postcss": "^7.0.0" - } - }, - "postcss-discard-overridden": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz", - "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==", - "dev": true, - "requires": { - "postcss": "^7.0.0" - } - }, - "postcss-load-config": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz", - "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==", - "dev": true, - "requires": { - "cosmiconfig": "^5.0.0", - "import-cwd": "^2.0.0" - } - }, - "postcss-loader": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz", - "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==", - "dev": true, - "requires": { - "loader-utils": "^1.1.0", - "postcss": "^7.0.0", - "postcss-load-config": "^2.0.0", - "schema-utils": "^1.0.0" - }, - "dependencies": { - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - } - } - }, - "postcss-merge-longhand": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz", - "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==", - "dev": true, - "requires": { - "css-color-names": "0.0.4", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "stylehacks": "^4.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-merge-rules": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz", - "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==", - "dev": true, - "requires": { - "browserslist": "^4.0.0", - "caniuse-api": "^3.0.0", - "cssnano-util-same-parent": "^4.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0", - "vendors": "^1.0.0" - }, - "dependencies": { - "postcss-selector-parser": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", - "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", - "dev": true, - "requires": { - "dot-prop": "^5.2.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - } - } - }, - "postcss-minify-font-values": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz", - "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==", - "dev": true, - "requires": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-minify-gradients": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz", - "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==", - "dev": true, - "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "is-color-stop": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-minify-params": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz", - "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==", - "dev": true, - "requires": { - "alphanum-sort": "^1.0.0", - "browserslist": "^4.0.0", - "cssnano-util-get-arguments": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "uniqs": "^2.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-minify-selectors": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz", - "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==", - "dev": true, - "requires": { - "alphanum-sort": "^1.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0" - }, - "dependencies": { - "postcss-selector-parser": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", - "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", - "dev": true, - "requires": { - "dot-prop": "^5.2.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - } - } - }, - "postcss-modules-extract-imports": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz", - "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==", - "dev": true, - "requires": { - "postcss": "^7.0.5" - } - }, - "postcss-modules-local-by-default": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz", - "integrity": "sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==", - "dev": true, - "requires": { - "postcss": "^7.0.6", - "postcss-selector-parser": "^6.0.0", - "postcss-value-parser": "^3.3.1" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-modules-scope": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz", - "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==", - "dev": true, - "requires": { - "postcss": "^7.0.6", - "postcss-selector-parser": "^6.0.0" - } - }, - "postcss-modules-values": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz", - "integrity": "sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==", - "dev": true, - "requires": { - "icss-replace-symbols": "^1.1.0", - "postcss": "^7.0.6" - } - }, - "postcss-normalize-charset": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz", - "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==", - "dev": true, - "requires": { - "postcss": "^7.0.0" - } - }, - "postcss-normalize-display-values": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz", - "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==", - "dev": true, - "requires": { - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-normalize-positions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz", - "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==", - "dev": true, - "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-normalize-repeat-style": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz", - "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==", - "dev": true, - "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-normalize-string": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz", - "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==", - "dev": true, - "requires": { - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-normalize-timing-functions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz", - "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==", - "dev": true, - "requires": { - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-normalize-unicode": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz", - "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==", - "dev": true, - "requires": { - "browserslist": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-normalize-url": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz", - "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==", - "dev": true, - "requires": { - "is-absolute-url": "^2.0.0", - "normalize-url": "^3.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "normalize-url": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz", - "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==", - "dev": true - }, - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-normalize-whitespace": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz", - "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==", - "dev": true, - "requires": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-ordered-values": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz", - "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==", - "dev": true, - "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-reduce-initial": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz", - "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==", - "dev": true, - "requires": { - "browserslist": "^4.0.0", - "caniuse-api": "^3.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0" - } - }, - "postcss-reduce-transforms": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz", - "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==", - "dev": true, - "requires": { - "cssnano-util-get-match": "^4.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-safe-parser": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz", - "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==", - "dev": true, - "requires": { - "postcss": "^7.0.26" - } - }, - "postcss-selector-parser": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz", - "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==", - "dev": true, - "requires": { - "cssesc": "^3.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1", - "util-deprecate": "^1.0.2" - } - }, - "postcss-svgo": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz", - "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==", - "dev": true, - "requires": { - "is-svg": "^3.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "svgo": "^1.0.0" - }, - "dependencies": { - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - } - } - }, - "postcss-unique-selectors": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz", - "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==", - "dev": true, - "requires": { - "alphanum-sort": "^1.0.0", - "postcss": "^7.0.0", - "uniqs": "^2.0.0" - } - }, - "postcss-value-parser": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", - "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", - "dev": true - }, - "prepend-http": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", - "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", - "dev": true - }, - "prettier": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", - "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", - "dev": true, - "optional": true - }, - "pretty-bytes": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.4.1.tgz", - "integrity": "sha512-s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA==", - "dev": true - }, - "pretty-error": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz", - "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", - "dev": true, - "requires": { - "renderkid": "^2.0.1", - "utila": "~0.4" - } - }, - "pretty-time": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz", - "integrity": "sha512-28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA==", - "dev": true - }, - "prismjs": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.22.0.tgz", - "integrity": "sha512-lLJ/Wt9yy0AiSYBf212kK3mM5L8ycwlyTlSxHBAneXLR0nzFMlZ5y7riFPF3E33zXOF2IH95xdY5jIyZbM9z/w==", - "dev": true, - "requires": { - "clipboard": "^2.0.0" - } - }, - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true - }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true - }, - "promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", - "dev": true - }, - "proxy-addr": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", - "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", - "dev": true, - "requires": { - "forwarded": "~0.1.2", - "ipaddr.js": "1.9.1" - } - }, - "prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", - "dev": true - }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, - "psl": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", - "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", - "dev": true - }, - "public-encrypt": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", - "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1", - "safe-buffer": "^5.1.2" - }, - "dependencies": { - "bn.js": { - "version": "4.11.9", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", - "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==", - "dev": true - } - } - }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "pumpify": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", - "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", - "dev": true, - "requires": { - "duplexify": "^3.6.0", - "inherits": "^2.0.3", - "pump": "^2.0.0" - }, - "dependencies": { - "pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - } - } - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true - }, - "pupa": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz", - "integrity": "sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==", - "dev": true, - "requires": { - "escape-goat": "^2.0.0" - } - }, - "q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", - "dev": true - }, - "qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", - "dev": true - }, - "query-string": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz", - "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", - "dev": true, - "requires": { - "decode-uri-component": "^0.2.0", - "object-assign": "^4.1.0", - "strict-uri-encode": "^1.0.0" - } - }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "dev": true - }, - "querystring-es3": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", - "dev": true - }, - "querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true - }, - "randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "requires": { - "safe-buffer": "^5.1.0" - } - }, - "randomfill": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", - "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", - "dev": true, - "requires": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" - } - }, - "range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true - }, - "raw-body": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", - "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", - "dev": true, - "requires": { - "bytes": "3.1.0", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "dependencies": { - "bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", - "dev": true - } - } - }, - "rc": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", - "dev": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - } - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "readdirp": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", - "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" - } - }, - "reduce": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/reduce/-/reduce-1.0.2.tgz", - "integrity": "sha512-xX7Fxke/oHO5IfZSk77lvPa/7bjMh9BuCk4OOoX5XTXrM7s0Z+MkPfSDfz0q7r91BhhGSs8gii/VEN/7zhCPpQ==", - "dev": true, - "requires": { - "object-keys": "^1.1.0" - } - }, - "regenerate": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz", - "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==", - "dev": true - }, - "regenerate-unicode-properties": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", - "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", - "dev": true, - "requires": { - "regenerate": "^1.4.0" - } - }, - "regenerator-runtime": { - "version": "0.13.7", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", - "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==", - "dev": true - }, - "regenerator-transform": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz", - "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==", - "dev": true, - "requires": { - "@babel/runtime": "^7.8.4" - } - }, - "regex-not": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", - "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "dev": true, - "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" - } - }, - "regexp.prototype.flags": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", - "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" - }, - "dependencies": { - "es-abstract": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", - "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - } - } - } - }, - "regexpu-core": { - "version": "4.7.1", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz", - "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==", - "dev": true, - "requires": { - "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" - } - }, - "register-service-worker": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/register-service-worker/-/register-service-worker-1.7.1.tgz", - "integrity": "sha512-IdTfUZ4u8iJL8o1w8es8l6UMGPmkwHolUdT+UmM1UypC80IB4KbpuIlvwWVj8UDS7eJwkEYRcKRgfRX+oTmJsw==", - "dev": true - }, - "registry-auth-token": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz", - "integrity": "sha512-P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w==", - "dev": true, - "requires": { - "rc": "^1.2.8" - } - }, - "registry-url": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz", - "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==", - "dev": true, - "requires": { - "rc": "^1.2.8" - } - }, - "regjsgen": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz", - "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==", - "dev": true - }, - "regjsparser": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz", - "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", - "dev": true, - "requires": { - "jsesc": "~0.5.0" - }, - "dependencies": { - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", - "dev": true - } - } - }, - "relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", - "dev": true - }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, - "renderkid": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz", - "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==", - "dev": true, - "requires": { - "css-select": "^1.1.0", - "dom-converter": "^0.2", - "htmlparser2": "^3.3.0", - "strip-ansi": "^3.0.0", - "utila": "^0.4.0" - }, - "dependencies": { - "css-select": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", - "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", - "dev": true, - "requires": { - "boolbase": "~1.0.0", - "css-what": "2.1", - "domutils": "1.5.1", - "nth-check": "~1.0.1" - } - }, - "css-what": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", - "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==", - "dev": true - }, - "domutils": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", - "dev": true, - "requires": { - "dom-serializer": "0", - "domelementtype": "1" - } - } - } - }, - "repeat-element": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", - "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==", - "dev": true - }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true - }, - "request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "dependencies": { - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true - } - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", - "dev": true - }, - "resolve": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", - "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", - "dev": true, - "requires": { - "path-parse": "^1.0.6" - } - }, - "resolve-cwd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", - "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", - "dev": true, - "requires": { - "resolve-from": "^3.0.0" - } - }, - "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", - "dev": true - }, - "resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", - "dev": true - }, - "responselike": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", - "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", - "dev": true, - "requires": { - "lowercase-keys": "^1.0.0" - } - }, - "ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", - "dev": true - }, - "retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", - "dev": true - }, - "rgb-regex": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz", - "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=", - "dev": true - }, - "rgba-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz", - "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=", - "dev": true - }, - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "ripemd160": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", - "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", - "dev": true, - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" - } - }, - "run-queue": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", - "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", - "dev": true, - "requires": { - "aproba": "^1.1.1" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "safe-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "dev": true, - "requires": { - "ret": "~0.1.10" - } - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true - }, - "schema-utils": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", - "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.5", - "ajv": "^6.12.4", - "ajv-keywords": "^3.5.2" - } - }, - "section-matter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz", - "integrity": "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "kind-of": "^6.0.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "select": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", - "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=", - "dev": true, - "optional": true - }, - "select-hose": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", - "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", - "dev": true - }, - "selfsigned": { - "version": "1.10.8", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz", - "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==", - "dev": true, - "requires": { - "node-forge": "^0.10.0" - } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - }, - "semver-diff": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz", - "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==", - "dev": true, - "requires": { - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } - } - }, - "send": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", - "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", - "dev": true, - "requires": { - "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "~1.7.2", - "mime": "1.6.0", - "ms": "2.1.1", - "on-finished": "~2.3.0", - "range-parser": "~1.2.1", - "statuses": "~1.5.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true - } - } - }, - "serialize-javascript": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", - "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", - "dev": true, - "requires": { - "randombytes": "^2.1.0" - } - }, - "serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", - "dev": true, - "requires": { - "accepts": "~1.3.4", - "batch": "0.6.1", - "debug": "2.6.9", - "escape-html": "~1.0.3", - "http-errors": "~1.6.2", - "mime-types": "~2.1.17", - "parseurl": "~1.3.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", - "dev": true, - "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true - } - } - }, - "serve-static": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", - "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", - "dev": true, - "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.17.1" - } - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "set-value": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", - "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", - "dev": true - }, - "setprototypeof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==", - "dev": true - }, - "sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - }, - "signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", - "dev": true - }, - "simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", - "dev": true, - "requires": { - "is-arrayish": "^0.3.1" - }, - "dependencies": { - "is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", - "dev": true - } - } - }, - "slash": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", - "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", - "dev": true - }, - "smoothscroll-polyfill": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/smoothscroll-polyfill/-/smoothscroll-polyfill-0.4.4.tgz", - "integrity": "sha512-TK5ZA9U5RqCwMpfoMq/l1mrH0JAR7y7KRvOBx0n2869aLxch+gT9GhN3yUfjiw+d/DiF1mKo14+hd62JyMmoBg==", - "dev": true - }, - "snapdragon": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", - "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", - "dev": true, - "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "snapdragon-node": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", - "dev": true, - "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, - "snapdragon-util": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", - "dev": true, - "requires": { - "kind-of": "^3.2.0" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "sockjs": { - "version": "0.3.20", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz", - "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==", - "dev": true, - "requires": { - "faye-websocket": "^0.10.0", - "uuid": "^3.4.0", - "websocket-driver": "0.6.5" - } - }, - "sockjs-client": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz", - "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==", - "dev": true, - "requires": { - "debug": "^3.2.5", - "eventsource": "^1.0.7", - "faye-websocket": "~0.11.1", - "inherits": "^2.0.3", - "json3": "^3.3.2", - "url-parse": "^1.4.3" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "faye-websocket": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", - "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", - "dev": true, - "requires": { - "websocket-driver": ">=0.5.1" - } - } - } - }, - "sort-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz", - "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=", - "dev": true, - "requires": { - "is-plain-obj": "^1.0.0" - } - }, - "source-list-map": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", - "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "source-map-resolve": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", - "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", - "dev": true, - "requires": { - "atob": "^2.1.2", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" - } - }, - "source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "source-map-url": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", - "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", - "dev": true - }, - "spdy": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", - "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "handle-thing": "^2.0.0", - "http-deceiver": "^1.2.7", - "select-hose": "^2.0.0", - "spdy-transport": "^3.0.0" - } - }, - "spdy-transport": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", - "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "detect-node": "^2.0.4", - "hpack.js": "^2.1.6", - "obuf": "^1.1.2", - "readable-stream": "^3.0.6", - "wbuf": "^1.7.3" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, - "split-string": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "dev": true, - "requires": { - "extend-shallow": "^3.0.0" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - } - }, - "ssri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", - "dev": true, - "requires": { - "figgy-pudding": "^3.5.1" - } - }, - "stable": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", - "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", - "dev": true - }, - "stack-utils": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz", - "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==", - "dev": true - }, - "static-extend": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", - "dev": true, - "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - } - } - }, - "statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", - "dev": true - }, - "std-env": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-2.2.1.tgz", - "integrity": "sha512-IjYQUinA3lg5re/YMlwlfhqNRTzMZMqE+pezevdcTaHceqx8ngEi1alX9nNCk9Sc81fy1fLDeQoaCzeiW1yBOQ==", - "dev": true, - "requires": { - "ci-info": "^1.6.0" - } - }, - "stream-browserify": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", - "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", - "dev": true, - "requires": { - "inherits": "~2.0.1", - "readable-stream": "^2.0.2" - } - }, - "stream-each": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", - "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "stream-shift": "^1.0.0" - } - }, - "stream-http": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz", - "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", - "dev": true, - "requires": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.3.6", - "to-arraybuffer": "^1.0.0", - "xtend": "^4.0.0" - } - }, - "stream-shift": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", - "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", - "dev": true - }, - "strict-uri-encode": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", - "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "string.prototype.trimend": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz", - "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" - }, - "dependencies": { - "es-abstract": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", - "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - } - } - } - }, - "string.prototype.trimstart": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz", - "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" - }, - "dependencies": { - "es-abstract": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", - "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - } - } - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "stringify-object": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz", - "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==", - "dev": true, - "requires": { - "get-own-enumerable-property-symbols": "^3.0.0", - "is-obj": "^1.0.1", - "is-regexp": "^1.0.0" - }, - "dependencies": { - "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", - "dev": true - } - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-bom-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz", - "integrity": "sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI=", - "dev": true - }, - "strip-comments": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-1.0.2.tgz", - "integrity": "sha512-kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw==", - "dev": true, - "requires": { - "babel-extract-comments": "^1.0.0", - "babel-plugin-transform-object-rest-spread": "^6.26.0" - } - }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", - "dev": true - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true - }, - "stylehacks": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz", - "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==", - "dev": true, - "requires": { - "browserslist": "^4.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0" - }, - "dependencies": { - "postcss-selector-parser": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", - "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", - "dev": true, - "requires": { - "dot-prop": "^5.2.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - } - } - }, - "stylus": { - "version": "0.54.8", - "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.8.tgz", - "integrity": "sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==", - "dev": true, - "requires": { - "css-parse": "~2.0.0", - "debug": "~3.1.0", - "glob": "^7.1.6", - "mkdirp": "~1.0.4", - "safer-buffer": "^2.1.2", - "sax": "~1.2.4", - "semver": "^6.3.0", - "source-map": "^0.7.3" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true - } - } - }, - "stylus-loader": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz", - "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", - "dev": true, - "requires": { - "loader-utils": "^1.0.2", - "lodash.clonedeep": "^4.5.0", - "when": "~3.6.x" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - }, - "svg-tags": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", - "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=", - "dev": true - }, - "svgo": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", - "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==", - "dev": true, - "requires": { - "chalk": "^2.4.1", - "coa": "^2.0.2", - "css-select": "^2.0.0", - "css-select-base-adapter": "^0.1.1", - "css-tree": "1.0.0-alpha.37", - "csso": "^4.0.2", - "js-yaml": "^3.13.1", - "mkdirp": "~0.5.1", - "object.values": "^1.1.0", - "sax": "~1.2.4", - "stable": "^0.1.8", - "unquote": "~1.1.1", - "util.promisify": "~1.0.0" - } - }, - "tapable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", - "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==", - "dev": true - }, - "term-size": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz", - "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==", - "dev": true - }, - "terser": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", - "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", - "dev": true, - "requires": { - "commander": "^2.20.0", - "source-map": "~0.6.1", - "source-map-support": "~0.5.12" - }, - "dependencies": { - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "terser-webpack-plugin": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", - "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", - "dev": true, - "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" - }, - "dependencies": { - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", - "dev": true - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", - "dev": true - }, - "through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "thunky": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", - "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", - "dev": true - }, - "timers-browserify": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz", - "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", - "dev": true, - "requires": { - "setimmediate": "^1.0.4" - } - }, - "timsort": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", - "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", - "dev": true - }, - "tiny-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", - "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==", - "dev": true, - "optional": true - }, - "to-arraybuffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", - "dev": true - }, - "to-factory": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/to-factory/-/to-factory-1.0.0.tgz", - "integrity": "sha1-hzivi9lxIK0dQEeXKtpVY7+UebE=", - "dev": true - }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "dev": true - }, - "to-object-path": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "to-readable-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", - "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", - "dev": true - }, - "to-regex": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", - "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "dev": true, - "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" - } - }, - "to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } - }, - "toggle-selection": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz", - "integrity": "sha1-bkWxJj8gF/oKzH2J14sVuL932jI=" - }, - "toidentifier": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", - "dev": true - }, - "toml": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz", - "integrity": "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==", - "dev": true - }, - "toposort": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz", - "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=", - "dev": true - }, - "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "tty-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", - "dev": true - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true - }, - "type-fest": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", - "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", - "dev": true - }, - "type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "dev": true, - "requires": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - } - }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true - }, - "typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, - "requires": { - "is-typedarray": "^1.0.0" - } - }, - "uc.micro": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", - "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", - "dev": true - }, - "uglify-js": { - "version": "3.4.10", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz", - "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==", - "dev": true, - "requires": { - "commander": "~2.19.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "commander": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", - "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "unicode-canonical-property-names-ecmascript": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", - "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==", - "dev": true - }, - "unicode-match-property-ecmascript": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz", - "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==", - "dev": true, - "requires": { - "unicode-canonical-property-names-ecmascript": "^1.0.4", - "unicode-property-aliases-ecmascript": "^1.0.4" - } - }, - "unicode-match-property-value-ecmascript": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", - "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==", - "dev": true - }, - "unicode-property-aliases-ecmascript": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz", - "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==", - "dev": true - }, - "union-value": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", - "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", - "dev": true, - "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^2.0.1" - } - }, - "uniq": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", - "dev": true - }, - "uniqs": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", - "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=", - "dev": true - }, - "unique-filename": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", - "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", - "dev": true, - "requires": { - "unique-slug": "^2.0.0" - } - }, - "unique-slug": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", - "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4" - } - }, - "unique-string": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", - "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", - "dev": true, - "requires": { - "crypto-random-string": "^2.0.0" - } - }, - "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", - "dev": true - }, - "unquote": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz", - "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=", - "dev": true - }, - "unset-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", - "dev": true, - "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" - }, - "dependencies": { - "has-value": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", - "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", - "dev": true, - "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" - }, - "dependencies": { - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "requires": { - "isarray": "1.0.0" - } - } - } - }, - "has-values": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", - "dev": true - } - } - }, - "upath": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", - "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", - "dev": true - }, - "update-notifier": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz", - "integrity": "sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A==", - "dev": true, - "requires": { - "boxen": "^4.2.0", - "chalk": "^3.0.0", - "configstore": "^5.0.1", - "has-yarn": "^2.1.0", - "import-lazy": "^2.1.0", - "is-ci": "^2.0.0", - "is-installed-globally": "^0.3.1", - "is-npm": "^4.0.0", - "is-yarn-global": "^0.3.0", - "latest-version": "^5.0.0", - "pupa": "^2.0.1", - "semver-diff": "^3.1.1", - "xdg-basedir": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "upper-case": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=", - "dev": true - }, - "uri-js": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", - "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - }, - "urix": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", - "dev": true - }, - "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "dev": true, - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - }, - "dependencies": { - "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true - } - } - }, - "url-loader": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.1.2.tgz", - "integrity": "sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==", - "dev": true, - "requires": { - "loader-utils": "^1.1.0", - "mime": "^2.0.3", - "schema-utils": "^1.0.0" - }, - "dependencies": { - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - } - } - }, - "url-parse": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", - "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", - "dev": true, - "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, - "url-parse-lax": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", - "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", - "dev": true, - "requires": { - "prepend-http": "^2.0.0" - } - }, - "use": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", - "dev": true - }, - "util": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", - "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==", - "dev": true, - "requires": { - "inherits": "2.0.3" - }, - "dependencies": { - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - } - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "util.promisify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz", - "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.2", - "has-symbols": "^1.0.1", - "object.getownpropertydescriptors": "^2.1.0" - }, - "dependencies": { - "es-abstract": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", - "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - } - } - } - }, - "utila": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", - "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=", - "dev": true - }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", - "dev": true - }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "dev": true - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", - "dev": true - }, - "vendors": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz", - "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==", - "dev": true - }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "vm-browserify": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", - "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==", - "dev": true - }, - "vue": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz", - "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==", - "dev": true - }, - "vue-hot-reload-api": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz", - "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==", - "dev": true - }, - "vue-loader": { - "version": "15.9.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.3.tgz", - "integrity": "sha512-Y67VnGGgVLH5Voostx8JBZgPQTlDQeOVBLOEsjc2cXbCYBKexSKEpOA56x0YZofoDOTszrLnIShyOX1p9uCEHA==", - "dev": true, - "requires": { - "@vue/component-compiler-utils": "^3.1.0", - "hash-sum": "^1.0.2", - "loader-utils": "^1.1.0", - "vue-hot-reload-api": "^2.3.0", - "vue-style-loader": "^4.1.0" - } - }, - "vue-router": { - "version": "3.4.7", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.7.tgz", - "integrity": "sha512-CbHXue5BLrDivOk5O4eZ0WT4Yj8XwdXa4kCnsEIOzYUPF/07ZukayA2jGxDCJxLc9SgVQX9QX0OuGOwGlVB4Qg==", - "dev": true - }, - "vue-server-renderer": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.6.12.tgz", - "integrity": "sha512-3LODaOsnQx7iMFTBLjki8xSyOxhCtbZ+nQie0wWY4iOVeEtTg1a3YQAjd82WvKxrWHHTshjvLb7OXMc2/dYuxw==", - "dev": true, - "requires": { - "chalk": "^1.1.3", - "hash-sum": "^1.0.2", - "he": "^1.1.0", - "lodash.template": "^4.5.0", - "lodash.uniq": "^4.5.0", - "resolve": "^1.2.0", - "serialize-javascript": "^3.1.0", - "source-map": "0.5.6" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "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" - } - }, - "serialize-javascript": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz", - "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==", - "dev": true, - "requires": { - "randombytes": "^2.1.0" - } - }, - "source-map": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", - "dev": true - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "vue-style-loader": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", - "integrity": "sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ==", - "dev": true, - "requires": { - "hash-sum": "^1.0.2", - "loader-utils": "^1.0.2" - } - }, - "vue-template-compiler": { - "version": "2.6.12", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz", - "integrity": "sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==", - "dev": true, - "requires": { - "de-indent": "^1.0.2", - "he": "^1.1.0" - } - }, - "vue-template-es2015-compiler": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz", - "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", - "dev": true - }, - "vuepress": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/vuepress/-/vuepress-1.7.1.tgz", - "integrity": "sha512-AdA3do1L4DNzeF8sMTE+cSUJ5hR/6f3YujU8DVowi/vFOg/SX2lJF8urvDkZUSXzaAT6aSgkI9L+B6D+i7SJjA==", - "dev": true, - "requires": { - "@vuepress/core": "1.7.1", - "@vuepress/theme-default": "1.7.1", - "cac": "^6.5.6", - "envinfo": "^7.2.0", - "opencollective-postinstall": "^2.0.2", - "update-notifier": "^4.0.0" - } - }, - "vuepress-html-webpack-plugin": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/vuepress-html-webpack-plugin/-/vuepress-html-webpack-plugin-3.2.0.tgz", - "integrity": "sha512-BebAEl1BmWlro3+VyDhIOCY6Gef2MCBllEVAP3NUAtMguiyOwo/dClbwJ167WYmcxHJKLl7b0Chr9H7fpn1d0A==", - "dev": true, - "requires": { - "html-minifier": "^3.2.3", - "loader-utils": "^0.2.16", - "lodash": "^4.17.3", - "pretty-error": "^2.0.2", - "tapable": "^1.0.0", - "toposort": "^1.0.0", - "util.promisify": "1.0.0" - }, - "dependencies": { - "big.js": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz", - "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", - "dev": true - }, - "emojis-list": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", - "dev": true - }, - "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", - "dev": true - }, - "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, - "requires": { - "big.js": "^3.1.3", - "emojis-list": "^2.0.0", - "json5": "^0.5.0", - "object-assign": "^4.0.1" - } - }, - "util.promisify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", - "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "object.getownpropertydescriptors": "^2.0.3" - } - } - } - }, - "vuepress-plugin-container": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/vuepress-plugin-container/-/vuepress-plugin-container-2.1.5.tgz", - "integrity": "sha512-TQrDX/v+WHOihj3jpilVnjXu9RcTm6m8tzljNJwYhxnJUW0WWQ0hFLcDTqTBwgKIFdEiSxVOmYE+bJX/sq46MA==", - "dev": true, - "requires": { - "@vuepress/shared-utils": "^1.2.0", - "markdown-it-container": "^2.0.0" - } - }, - "vuepress-plugin-smooth-scroll": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/vuepress-plugin-smooth-scroll/-/vuepress-plugin-smooth-scroll-0.0.3.tgz", - "integrity": "sha512-qsQkDftLVFLe8BiviIHaLV0Ea38YLZKKonDGsNQy1IE0wllFpFIEldWD8frWZtDFdx6b/O3KDMgVQ0qp5NjJCg==", - "dev": true, - "requires": { - "smoothscroll-polyfill": "^0.4.3" - } - }, - "vuepress-plugin-versioning": { - "version": "git+https://github.com/nonebot/vuepress-plugin-versioning.git#cae7ad04c266f8bd9af91883d5942204c9197c17", - "from": "git+https://github.com/nonebot/vuepress-plugin-versioning.git", - "dev": true, - "requires": { - "@vuepress/shared-utils": "^1.5.2", - "fs-extra": "^8.1.0" - }, - "dependencies": { - "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - } - } - }, - "vuepress-theme-nonebot": { - "version": "git+https://github.com/nonebot/vuepress-theme-nonebot.git#29b6c7a7b0f69eee8fa98b78094057de20c4233c", - "from": "git+https://github.com/nonebot/vuepress-theme-nonebot.git", - "dev": true, - "requires": { - "@vuepress/plugin-nprogress": "^1.5.2", - "@vuepress/plugin-search": "^1.5.2", - "docsearch.js": "^2.6.3", - "lodash": "^4.17.15", - "stylus": "^0.54.5", - "stylus-loader": "^3.0.2", - "vuepress-plugin-container": "^2.0.2", - "vuepress-plugin-smooth-scroll": "^0.0.9" - }, - "dependencies": { - "vuepress-plugin-smooth-scroll": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/vuepress-plugin-smooth-scroll/-/vuepress-plugin-smooth-scroll-0.0.9.tgz", - "integrity": "sha512-UXX+HLZO1NKVwyiOJlj0smh8F9dKnwybjEi7w/Mj9EYLhKrNYr5uXs+N+OTt8VwKCn3f0vZ1XAwFIjsPlD7GJA==", - "dev": true, - "requires": { - "smoothscroll-polyfill": "^0.4.4" - } - } - } - }, - "vuetify": { - "version": "2.3.16", - "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.3.16.tgz", - "integrity": "sha512-LHPqY+Gmyb/75xJscO0a3CuB4ZdpqHLNaGMAbmfTyapI8Q02+hjABEZzitFU/XObD2KhrNWPJzmGZPhbshGUzg==" - }, - "watchpack": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz", - "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==", - "dev": true, - "requires": { - "chokidar": "^3.4.1", - "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0", - "watchpack-chokidar2": "^2.0.0" - }, - "dependencies": { - "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", - "dev": true, - "optional": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "binary-extensions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", - "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", - "dev": true, - "optional": true - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "optional": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "chokidar": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", - "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", - "dev": true, - "optional": true, - "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.1.2", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.5.0" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "optional": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "fsevents": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", - "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", - "dev": true, - "optional": true - }, - "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", - "dev": true, - "optional": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "optional": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "optional": true - }, - "readdirp": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", - "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", - "dev": true, - "optional": true, - "requires": { - "picomatch": "^2.2.1" - } - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "optional": true, - "requires": { - "is-number": "^7.0.0" - } - } - } - }, - "watchpack-chokidar2": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz", - "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==", - "dev": true, - "optional": true, - "requires": { - "chokidar": "^2.1.8" - } - }, - "wbuf": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", - "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", - "dev": true, - "requires": { - "minimalistic-assert": "^1.0.0" - } - }, - "webpack": { - "version": "4.44.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz", - "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.9.0", - "@webassemblyjs/helper-module-context": "1.9.0", - "@webassemblyjs/wasm-edit": "1.9.0", - "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.3.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" - }, - "dependencies": { - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - } - } - }, - "webpack-chain": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz", - "integrity": "sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA==", - "dev": true, - "requires": { - "deepmerge": "^1.5.2", - "javascript-stringify": "^2.0.1" - }, - "dependencies": { - "javascript-stringify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.0.1.tgz", - "integrity": "sha512-yV+gqbd5vaOYjqlbk16EG89xB5udgjqQF3C5FAORDg4f/IS1Yc5ERCv5e/57yBcfJYw05V5JyIXabhwb75Xxow==", - "dev": true - } - } - }, - "webpack-dev-middleware": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz", - "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==", - "dev": true, - "requires": { - "memory-fs": "^0.4.1", - "mime": "^2.4.4", - "mkdirp": "^0.5.1", - "range-parser": "^1.2.1", - "webpack-log": "^2.0.0" - } - }, - "webpack-dev-server": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz", - "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==", - "dev": true, - "requires": { - "ansi-html": "0.0.7", - "bonjour": "^3.5.0", - "chokidar": "^2.1.8", - "compression": "^1.7.4", - "connect-history-api-fallback": "^1.6.0", - "debug": "^4.1.1", - "del": "^4.1.1", - "express": "^4.17.1", - "html-entities": "^1.3.1", - "http-proxy-middleware": "0.19.1", - "import-local": "^2.0.0", - "internal-ip": "^4.3.0", - "ip": "^1.1.5", - "is-absolute-url": "^3.0.3", - "killable": "^1.0.1", - "loglevel": "^1.6.8", - "opn": "^5.5.0", - "p-retry": "^3.0.1", - "portfinder": "^1.0.26", - "schema-utils": "^1.0.0", - "selfsigned": "^1.10.7", - "semver": "^6.3.0", - "serve-index": "^1.9.1", - "sockjs": "0.3.20", - "sockjs-client": "1.4.0", - "spdy": "^4.0.2", - "strip-ansi": "^3.0.1", - "supports-color": "^6.1.0", - "url": "^0.11.0", - "webpack-dev-middleware": "^3.7.2", - "webpack-log": "^2.0.0", - "ws": "^6.2.1", - "yargs": "^13.3.2" - }, - "dependencies": { - "is-absolute-url": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz", - "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==", - "dev": true - }, - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "webpack-log": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz", - "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", - "dev": true, - "requires": { - "ansi-colors": "^3.0.0", - "uuid": "^3.3.2" - } - }, - "webpack-merge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz", - "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==", - "dev": true, - "requires": { - "lodash": "^4.17.15" - } - }, - "webpack-sources": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", - "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", - "dev": true, - "requires": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "webpackbar": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/webpackbar/-/webpackbar-3.2.0.tgz", - "integrity": "sha512-PC4o+1c8gWWileUfwabe0gqptlXUDJd5E0zbpr2xHP1VSOVlZVPBZ8j6NCR8zM5zbKdxPhctHXahgpNK1qFDPw==", - "dev": true, - "requires": { - "ansi-escapes": "^4.1.0", - "chalk": "^2.4.1", - "consola": "^2.6.0", - "figures": "^3.0.0", - "pretty-time": "^1.1.0", - "std-env": "^2.2.1", - "text-table": "^0.2.0", - "wrap-ansi": "^5.1.0" - } - }, - "websocket-driver": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz", - "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=", - "dev": true, - "requires": { - "websocket-extensions": ">=0.1.1" - } - }, - "websocket-extensions": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", - "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", - "dev": true - }, - "when": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz", - "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=", - "dev": true - }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "widest-line": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", - "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==", - "dev": true, - "requires": { - "string-width": "^4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - } - } - }, - "workbox-background-sync": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-4.3.1.tgz", - "integrity": "sha512-1uFkvU8JXi7L7fCHVBEEnc3asPpiAL33kO495UMcD5+arew9IbKW2rV5lpzhoWcm/qhGB89YfO4PmB/0hQwPRg==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-broadcast-update": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-4.3.1.tgz", - "integrity": "sha512-MTSfgzIljpKLTBPROo4IpKjESD86pPFlZwlvVG32Kb70hW+aob4Jxpblud8EhNb1/L5m43DUM4q7C+W6eQMMbA==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-build": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-4.3.1.tgz", - "integrity": "sha512-UHdwrN3FrDvicM3AqJS/J07X0KXj67R8Cg0waq1MKEOqzo89ap6zh6LmaLnRAjpB+bDIz+7OlPye9iii9KBnxw==", - "dev": true, - "requires": { - "@babel/runtime": "^7.3.4", - "@hapi/joi": "^15.0.0", - "common-tags": "^1.8.0", - "fs-extra": "^4.0.2", - "glob": "^7.1.3", - "lodash.template": "^4.4.0", - "pretty-bytes": "^5.1.0", - "stringify-object": "^3.3.0", - "strip-comments": "^1.0.2", - "workbox-background-sync": "^4.3.1", - "workbox-broadcast-update": "^4.3.1", - "workbox-cacheable-response": "^4.3.1", - "workbox-core": "^4.3.1", - "workbox-expiration": "^4.3.1", - "workbox-google-analytics": "^4.3.1", - "workbox-navigation-preload": "^4.3.1", - "workbox-precaching": "^4.3.1", - "workbox-range-requests": "^4.3.1", - "workbox-routing": "^4.3.1", - "workbox-strategies": "^4.3.1", - "workbox-streams": "^4.3.1", - "workbox-sw": "^4.3.1", - "workbox-window": "^4.3.1" - }, - "dependencies": { - "fs-extra": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", - "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - } - } - }, - "workbox-cacheable-response": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-4.3.1.tgz", - "integrity": "sha512-Rp5qlzm6z8IOvnQNkCdO9qrDgDpoPNguovs0H8C+wswLuPgSzSp9p2afb5maUt9R1uTIwOXrVQMmPfPypv+npw==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-core": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-4.3.1.tgz", - "integrity": "sha512-I3C9jlLmMKPxAC1t0ExCq+QoAMd0vAAHULEgRZ7kieCdUd919n53WC0AfvokHNwqRhGn+tIIj7vcb5duCjs2Kg==", - "dev": true - }, - "workbox-expiration": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-4.3.1.tgz", - "integrity": "sha512-vsJLhgQsQouv9m0rpbXubT5jw0jMQdjpkum0uT+d9tTwhXcEZks7qLfQ9dGSaufTD2eimxbUOJfWLbNQpIDMPw==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-google-analytics": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-4.3.1.tgz", - "integrity": "sha512-xzCjAoKuOb55CBSwQrbyWBKqp35yg1vw9ohIlU2wTy06ZrYfJ8rKochb1MSGlnoBfXGWss3UPzxR5QL5guIFdg==", - "dev": true, - "requires": { - "workbox-background-sync": "^4.3.1", - "workbox-core": "^4.3.1", - "workbox-routing": "^4.3.1", - "workbox-strategies": "^4.3.1" - } - }, - "workbox-navigation-preload": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-4.3.1.tgz", - "integrity": "sha512-K076n3oFHYp16/C+F8CwrRqD25GitA6Rkd6+qAmLmMv1QHPI2jfDwYqrytOfKfYq42bYtW8Pr21ejZX7GvALOw==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-precaching": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-4.3.1.tgz", - "integrity": "sha512-piSg/2csPoIi/vPpp48t1q5JLYjMkmg5gsXBQkh/QYapCdVwwmKlU9mHdmy52KsDGIjVaqEUMFvEzn2LRaigqQ==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-range-requests": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-4.3.1.tgz", - "integrity": "sha512-S+HhL9+iTFypJZ/yQSl/x2Bf5pWnbXdd3j57xnb0V60FW1LVn9LRZkPtneODklzYuFZv7qK6riZ5BNyc0R0jZA==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-routing": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-4.3.1.tgz", - "integrity": "sha512-FkbtrODA4Imsi0p7TW9u9MXuQ5P4pVs1sWHK4dJMMChVROsbEltuE79fBoIk/BCztvOJ7yUpErMKa4z3uQLX+g==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-strategies": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-4.3.1.tgz", - "integrity": "sha512-F/+E57BmVG8dX6dCCopBlkDvvhg/zj6VDs0PigYwSN23L8hseSRwljrceU2WzTvk/+BSYICsWmRq5qHS2UYzhw==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-streams": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-4.3.1.tgz", - "integrity": "sha512-4Kisis1f/y0ihf4l3u/+ndMkJkIT4/6UOacU3A4BwZSAC9pQ9vSvJpIi/WFGQRH/uPXvuVjF5c2RfIPQFSS2uA==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "workbox-sw": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-4.3.1.tgz", - "integrity": "sha512-0jXdusCL2uC5gM3yYFT6QMBzKfBr2XTk0g5TPAV4y8IZDyVNDyj1a8uSXy3/XrvkVTmQvLN4O5k3JawGReXr9w==", - "dev": true - }, - "workbox-window": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-4.3.1.tgz", - "integrity": "sha512-C5gWKh6I58w3GeSc0wp2Ne+rqVw8qwcmZnQGpjiek8A2wpbxSJb1FdCoQVO+jDJs35bFgo/WETgl1fqgsxN0Hg==", - "dev": true, - "requires": { - "workbox-core": "^4.3.1" - } - }, - "worker-farm": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz", - "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", - "dev": true, - "requires": { - "errno": "~0.1.7" - } - }, - "wowjs": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wowjs/-/wowjs-1.1.3.tgz", - "integrity": "sha1-RA/Bu0x+iWhA7keXIpaitZB1rL0=", - "requires": { - "animate.css": "^4.1.1" - } - }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "write-file-atomic": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4", - "is-typedarray": "^1.0.0", - "signal-exit": "^3.0.2", - "typedarray-to-buffer": "^3.1.5" - } - }, - "ws": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", - "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", - "dev": true, - "requires": { - "async-limiter": "~1.0.0" - } - }, - "xdg-basedir": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", - "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", - "dev": true - }, - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true - }, - "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", - "dev": true - }, - "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true - }, - "yargs": { - "version": "13.3.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", - "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", - "dev": true, - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" - } - }, - "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - }, - "dependencies": { - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - } - } - }, - "zepto": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/zepto/-/zepto-1.2.0.tgz", - "integrity": "sha1-4Se9nmb9hGvl6rSME5SIL3wOT5g=", - "dev": true - } - } -} diff --git a/package.json b/package.json deleted file mode 100644 index 10f2a435..00000000 --- a/package.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "nonebot", - "version": "2.0.0", - "description": "An asynchronous python bot framework.", - "homepage": "https://docs.nonebot.dev/", - "main": "index.js", - "contributors": [ - { - "name": "yanyongyu", - "email": "yanyongyu_1@126.com" - } - ], - "repository": "https://github.com/nonebot/nonebot/", - "bugs": { - "url": "https://github.com/nonebot/nonebot/issues" - }, - "scripts": { - "dev": "vuepress dev docs", - "build": "vuepress build docs", - "lint": "npx prettier --config .prettierrc -c docs/**/* !docs/api/**/*", - "lint:fix": "npx prettier --config .prettierrc --write docs/**/* !docs/api/**/*" - }, - "license": "MIT", - "devDependencies": { - "@vuepress/plugin-back-to-top": "^1.7.1", - "@vuepress/plugin-medium-zoom": "^1.7.1", - "@vuepress/plugin-pwa": "^1.7.1", - "vuepress": "^1.7.1", - "vuepress-plugin-versioning": "git+https://github.com/nonebot/vuepress-plugin-versioning.git", - "vuepress-theme-nonebot": "git+https://github.com/nonebot/vuepress-theme-nonebot.git" - }, - "dependencies": { - "copy-to-clipboard": "^3.3.1", - "vuetify": "^2.3.16", - "wowjs": "^1.1.3" - } -} diff --git a/pages/store.md b/pages/store.md deleted file mode 100644 index 1621816a..00000000 --- a/pages/store.md +++ /dev/null @@ -1,6 +0,0 @@ ---- ---- - -# 商店 - - diff --git a/website/README.md b/website/README.md new file mode 100644 index 00000000..55d0c3ef --- /dev/null +++ b/website/README.md @@ -0,0 +1,33 @@ +# Website + +This website is built using [Docusaurus 2](https://docusaurus.io/), a modern static website generator. + +### Installation + +``` +$ yarn +``` + +### Local Development + +``` +$ yarn start +``` + +This command starts a local development server and opens up a browser window. Most changes are reflected live without having to restart the server. + +### Build + +``` +$ yarn build +``` + +This command generates static content into the `build` directory and can be served using any static contents hosting service. + +### Deployment + +``` +$ GIT_USER= USE_SSH=true yarn deploy +``` + +If you are using GitHub pages for hosting, this command is a convenient way to build the website and push to the `gh-pages` branch. diff --git a/website/babel.config.js b/website/babel.config.js new file mode 100644 index 00000000..e00595da --- /dev/null +++ b/website/babel.config.js @@ -0,0 +1,3 @@ +module.exports = { + presets: [require.resolve('@docusaurus/core/lib/babel/preset')], +}; diff --git a/docs/README.md b/website/docs/README.md similarity index 100% rename from docs/README.md rename to website/docs/README.md diff --git a/docs/advanced/README.md b/website/docs/advanced/README.md similarity index 98% rename from docs/advanced/README.md rename to website/docs/advanced/README.md index 6bdba844..e302594d 100644 --- a/docs/advanced/README.md +++ b/website/docs/advanced/README.md @@ -1,3 +1,14 @@ +--- +sidebar_position: 1 +id: advanced +slug: /advanced + +options: + menu: + weight: 10 + catogory: advanced +--- + # 深入 ## 它如何工作？ diff --git a/website/docs/advanced/developer/_category_.json b/website/docs/advanced/developer/_category_.json new file mode 100644 index 00000000..0c774ade --- /dev/null +++ b/website/docs/advanced/developer/_category_.json @@ -0,0 +1,4 @@ +{ + "label": "发布", + "position": 1 +} diff --git a/docs/advanced/images/plugin_store_publish.png b/website/docs/advanced/developer/images/plugin_store_publish.png similarity index 100% rename from docs/advanced/images/plugin_store_publish.png rename to website/docs/advanced/developer/images/plugin_store_publish.png diff --git a/docs/advanced/images/plugin_store_publish_2.png b/website/docs/advanced/developer/images/plugin_store_publish_2.png similarity index 100% rename from docs/advanced/images/plugin_store_publish_2.png rename to website/docs/advanced/developer/images/plugin_store_publish_2.png diff --git a/docs/advanced/publish-plugin.md b/website/docs/advanced/developer/publish-plugin.md similarity index 97% rename from docs/advanced/publish-plugin.md rename to website/docs/advanced/developer/publish-plugin.md index 34b0fa1b..d0142570 100644 --- a/docs/advanced/publish-plugin.md +++ b/website/docs/advanced/developer/publish-plugin.md @@ -1,3 +1,12 @@ +--- +sidebar_position: 5 + +options: + menu: + weight: 110 + catogory: advanced +--- + # 发布插件 ## 前注 diff --git a/docs/advanced/export-and-require.md b/website/docs/advanced/export-and-require.md similarity index 97% rename from docs/advanced/export-and-require.md rename to website/docs/advanced/export-and-require.md index eef88990..83297333 100644 --- a/docs/advanced/export-and-require.md +++ b/website/docs/advanced/export-and-require.md @@ -1,3 +1,12 @@ +--- +sidebar_position: 5 + +options: + menu: + weight: 50 + catogory: advanced +--- + # 跨插件访问 由于 `nonebot2` 独特的插件加载机制，在使用 python 原有的 import 机制来进行插件之间的访问时，很可能会有奇怪的或者意料以外的情况发生。为了避免这种情况的发生，您可以有两种方法来实现跨插件访问： diff --git a/docs/advanced/overloaded-handlers.md b/website/docs/advanced/overloaded-handlers.md similarity index 96% rename from docs/advanced/overloaded-handlers.md rename to website/docs/advanced/overloaded-handlers.md index 47fea384..a56b6cbf 100644 --- a/docs/advanced/overloaded-handlers.md +++ b/website/docs/advanced/overloaded-handlers.md @@ -1,3 +1,12 @@ +--- +sidebar_position: 6 + +options: + menu: + weight: 60 + catogory: advanced +--- + # 事件处理函数重载 当我们在编写 `nonebot2` 应用时，常常会遇到这样一个问题：该怎么让同一类型的不同事件执行不同的响应逻辑？又或者如何让不同的 `adapter` 针对同一类型的事件作出不同响应？ diff --git a/docs/advanced/permission.md b/website/docs/advanced/permission.md similarity index 97% rename from docs/advanced/permission.md rename to website/docs/advanced/permission.md index 63c84535..2faef928 100644 --- a/docs/advanced/permission.md +++ b/website/docs/advanced/permission.md @@ -1,3 +1,12 @@ +--- +sidebar_position: 3 + +options: + menu: + weight: 30 + catogory: advanced +--- + # 权限控制 **权限控制**是机器人在实际应用中需要解决的重点问题之一，`Nonebot` 提供了十分完善且灵活的权限控制机制—— `Permission` 机制。接下来我们将对这个机制进行简单的说明。 diff --git a/docs/advanced/runtime-hook.md b/website/docs/advanced/runtime-hook.md similarity index 97% rename from docs/advanced/runtime-hook.md rename to website/docs/advanced/runtime-hook.md index faeaa88e..949bfc2d 100644 --- a/docs/advanced/runtime-hook.md +++ b/website/docs/advanced/runtime-hook.md @@ -1,3 +1,12 @@ +--- +sidebar_position: 4 + +options: + menu: + weight: 40 + catogory: advanced +--- + # 钩子函数 [`钩子编程`](https://zh.wikipedia.org/wiki/%E9%92%A9%E5%AD%90%E7%BC%96%E7%A8%8B) diff --git a/docs/advanced/scheduler.md b/website/docs/advanced/scheduler.md similarity index 98% rename from docs/advanced/scheduler.md rename to website/docs/advanced/scheduler.md index 9b979fea..d4b55eb7 100644 --- a/docs/advanced/scheduler.md +++ b/website/docs/advanced/scheduler.md @@ -1,3 +1,12 @@ +--- +sidebar_position: 2 + +options: + menu: + weight: 20 + catogory: advanced +--- + # 定时任务 [`APScheduler`](https://apscheduler.readthedocs.io/en/3.x/) —— Advanced Python Scheduler diff --git a/website/docs/api/README.md b/website/docs/api/README.md new file mode 100644 index 00000000..72941d0f --- /dev/null +++ b/website/docs/api/README.md @@ -0,0 +1,50 @@ +--- +id: index +slug: /api/ +--- + +# NoneBot Api Reference + +- **模块索引** + + - [nonebot](nonebot.html) + + - [nonebot.config](config.html) + + - [nonebot.plugin](plugin.html) + + - [nonebot.message](message.html) + + - [nonebot.matcher](matcher.html) + + - [nonebot.handler](handler.html) + + - [nonebot.rule](rule.html) + + - [nonebot.permission](permission.html) + + - [nonebot.log](log.html) + + - [nonebot.utils](utils.html) + + - [nonebot.typing](typing.html) + + - [nonebot.exception](exception.html) + + - [nonebot.drivers](drivers/) + + - [nonebot.drivers.fastapi](drivers/fastapi.html) + + - [nonebot.drivers.quart](drivers/quart.html) + + - [nonebot.drivers.aiohttp](drivers/aiohttp.html) + + - [nonebot.adapters](adapters/) + + - [nonebot.adapters.cqhttp](adapters/cqhttp.html) + + - [nonebot.adapters.ding](adapters/ding.html) + + - [nonebot.adapters.mirai](adapters/mirai.html) + + - [nonebot.adapters.feishu](adapters/feishu.html) diff --git a/docs/api/adapters/README.md b/website/docs/api/adapters/README.md similarity index 99% rename from docs/api/adapters/README.md rename to website/docs/api/adapters/README.md index 98692156..59fcfe10 100644 --- a/docs/api/adapters/README.md +++ b/website/docs/api/adapters/README.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.adapters 模块 ## 协议适配基类 diff --git a/docs/api/adapters/ding.md b/website/docs/api/adapters/ding.md similarity index 99% rename from docs/api/adapters/ding.md rename to website/docs/api/adapters/ding.md index 34dd333a..228c4a22 100644 --- a/docs/api/adapters/ding.md +++ b/website/docs/api/adapters/ding.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.adapters.ding 模块 ## 钉钉群机器人 协议适配 diff --git a/docs/api/adapters/feishu.md b/website/docs/api/adapters/feishu.md similarity index 98% rename from docs/api/adapters/feishu.md rename to website/docs/api/adapters/feishu.md index fa7799e9..d341539d 100644 --- a/docs/api/adapters/feishu.md +++ b/website/docs/api/adapters/feishu.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.adapters.feishu 模块 # NoneBot.adapters.feishu.config 模块 diff --git a/docs/api/adapters/mirai.md b/website/docs/api/adapters/mirai.md similarity index 99% rename from docs/api/adapters/mirai.md rename to website/docs/api/adapters/mirai.md index 87c8eca2..ba855bb4 100644 --- a/docs/api/adapters/mirai.md +++ b/website/docs/api/adapters/mirai.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.adapters.mirai 模块 ## Mirai-API-HTTP 协议适配 diff --git a/docs/api/config.md b/website/docs/api/config.md similarity index 98% rename from docs/api/config.md rename to website/docs/api/config.md index cf7ef369..a7772946 100644 --- a/docs/api/config.md +++ b/website/docs/api/config.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.config 模块 ## 配置 diff --git a/docs/api/dependencies.md b/website/docs/api/dependencies.md similarity index 93% rename from docs/api/dependencies.md rename to website/docs/api/dependencies.md index a93902dc..6ad3e4bb 100644 --- a/docs/api/dependencies.md +++ b/website/docs/api/dependencies.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.handler 模块 ## 依赖注入处理模块 diff --git a/docs/api/drivers/README.md b/website/docs/api/drivers/README.md similarity index 99% rename from docs/api/drivers/README.md rename to website/docs/api/drivers/README.md index 9f8ee3ee..4cf2ee40 100644 --- a/docs/api/drivers/README.md +++ b/website/docs/api/drivers/README.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.drivers 模块 ## 后端驱动适配基类 @@ -524,6 +519,11 @@ URL HTTP headers +### `reconnect` + +WebSocket 是否重连 + + ### `reconnect_interval` WebSocket 重连间隔 diff --git a/docs/api/drivers/aiohttp.md b/website/docs/api/drivers/aiohttp.md similarity index 96% rename from docs/api/drivers/aiohttp.md rename to website/docs/api/drivers/aiohttp.md index 4159d44e..1b8d2f5c 100644 --- a/docs/api/drivers/aiohttp.md +++ b/website/docs/api/drivers/aiohttp.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.drivers.aiohttp 模块 ## AIOHTTP 驱动适配 diff --git a/docs/api/drivers/fastapi.md b/website/docs/api/drivers/fastapi.md similarity index 98% rename from docs/api/drivers/fastapi.md rename to website/docs/api/drivers/fastapi.md index ac7cc77b..98262b3a 100644 --- a/docs/api/drivers/fastapi.md +++ b/website/docs/api/drivers/fastapi.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.drivers.fastapi 模块 ## FastAPI 驱动适配 diff --git a/docs/api/drivers/quart.md b/website/docs/api/drivers/quart.md similarity index 97% rename from docs/api/drivers/quart.md rename to website/docs/api/drivers/quart.md index 546b5a3f..2809b3c1 100644 --- a/docs/api/drivers/quart.md +++ b/website/docs/api/drivers/quart.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.drivers.quart 模块 ## Quart 驱动适配 diff --git a/docs/api/exception.md b/website/docs/api/exception.md similarity index 98% rename from docs/api/exception.md rename to website/docs/api/exception.md index 984aa80c..d0b5fe05 100644 --- a/docs/api/exception.md +++ b/website/docs/api/exception.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.exception 模块 ## 异常 diff --git a/docs/api/handler.md b/website/docs/api/handler.md similarity index 95% rename from docs/api/handler.md rename to website/docs/api/handler.md index 6f319435..dffcbbe3 100644 --- a/docs/api/handler.md +++ b/website/docs/api/handler.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.handler 模块 ## 事件处理函数 diff --git a/docs/api/log.md b/website/docs/api/log.md similarity index 91% rename from docs/api/log.md rename to website/docs/api/log.md index e6096cff..69819413 100644 --- a/docs/api/log.md +++ b/website/docs/api/log.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.log 模块 ## 日志 diff --git a/docs/api/matcher.md b/website/docs/api/matcher.md similarity index 99% rename from docs/api/matcher.md rename to website/docs/api/matcher.md index d520c8b1..067e9dec 100644 --- a/docs/api/matcher.md +++ b/website/docs/api/matcher.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.matcher 模块 ## 事件响应器 diff --git a/docs/api/message.md b/website/docs/api/message.md similarity index 95% rename from docs/api/message.md rename to website/docs/api/message.md index 645ac8cd..6c8425b5 100644 --- a/docs/api/message.md +++ b/website/docs/api/message.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.message 模块 ## 事件处理 diff --git a/docs/api/nonebot.md b/website/docs/api/nonebot.md similarity index 98% rename from docs/api/nonebot.md rename to website/docs/api/nonebot.md index b7384bf6..30be8023 100644 --- a/docs/api/nonebot.md +++ b/website/docs/api/nonebot.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot 模块 ## 快捷导入 diff --git a/docs/api/permission.md b/website/docs/api/permission.md similarity index 97% rename from docs/api/permission.md rename to website/docs/api/permission.md index f2ee1973..f43d2aca 100644 --- a/docs/api/permission.md +++ b/website/docs/api/permission.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.permission 模块 ## 权限 diff --git a/docs/api/plugin.md b/website/docs/api/plugin.md similarity index 99% rename from docs/api/plugin.md rename to website/docs/api/plugin.md index 7575692e..f38d228e 100644 --- a/docs/api/plugin.md +++ b/website/docs/api/plugin.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.plugin 模块 ## 插件 diff --git a/docs/api/rule.md b/website/docs/api/rule.md similarity index 98% rename from docs/api/rule.md rename to website/docs/api/rule.md index 872cb73d..aab3e68c 100644 --- a/docs/api/rule.md +++ b/website/docs/api/rule.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.rule 模块 ## 规则 diff --git a/docs/api/typing.md b/website/docs/api/typing.md similarity index 98% rename from docs/api/typing.md rename to website/docs/api/typing.md index 403c7f53..b380762f 100644 --- a/docs/api/typing.md +++ b/website/docs/api/typing.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.typing 模块 ## 类型 diff --git a/docs/api/utils.md b/website/docs/api/utils.md similarity index 95% rename from docs/api/utils.md rename to website/docs/api/utils.md index 54aa11cb..9874687e 100644 --- a/docs/api/utils.md +++ b/website/docs/api/utils.md @@ -1,8 +1,3 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - # NoneBot.utils 模块 diff --git a/website/docs/guide/coding/_category_.json b/website/docs/guide/coding/_category_.json new file mode 100644 index 00000000..6f8024f6 --- /dev/null +++ b/website/docs/guide/coding/_category_.json @@ -0,0 +1,4 @@ +{ + "label": "编写插件", + "position": 2 +} diff --git a/docs/guide/creating-a-handler.md b/website/docs/guide/coding/creating-a-handler.md similarity index 98% rename from docs/guide/creating-a-handler.md rename to website/docs/guide/coding/creating-a-handler.md index f11c1463..647fb355 100644 --- a/docs/guide/creating-a-handler.md +++ b/website/docs/guide/coding/creating-a-handler.md @@ -1,3 +1,12 @@ +--- +sidebar_position: 4 + +options: + menu: + weight: 140 + catogory: guide +--- + # 事件处理 在上一章中，我们已经注册了事件响应器，现在我们可以正式编写事件处理逻辑了！ diff --git a/docs/guide/creating-a-matcher.md b/website/docs/guide/coding/creating-a-matcher.md similarity index 87% rename from docs/guide/creating-a-matcher.md rename to website/docs/guide/coding/creating-a-matcher.md index 61a5143d..3be42481 100644 --- a/docs/guide/creating-a-matcher.md +++ b/website/docs/guide/coding/creating-a-matcher.md @@ -1,3 +1,12 @@ +--- +sidebar_position: 3 + +options: + menu: + weight: 130 + catogory: guide +--- + # 注册事件响应器 好了，现在插件已经创建完毕，我们可以开始编写实际代码了，下面将以一个简易单文件天气查询插件为例。 @@ -41,7 +50,7 @@ async def get_weather(city: str): 从这里开始，你需要对 Python 的 asyncio 编程有所了解，因为 NoneBot 是完全基于 asyncio 的，具体可以参考 [廖雪峰的 Python 教程](https://www.liaoxuefeng.com/wiki/1016959663602400/1017959540289152) ::: -## [事件响应器](../api/matcher.md) +## [事件响应器](../../api/matcher.md) ```python{5} from nonebot import on_command @@ -72,11 +81,11 @@ weather = on_command("天气", rule=to_me(), permission=Permission(), priority=5 - `on_message()` ~ `on("message")`: 消息事件响应器 - `on_request()` ~ `on("request")`: 请求事件响应器 - `on_notice()` ~ `on("notice")`: 通知事件响应器 -- `on_startswith(str)` ~ `on("message", startswith(str))`: 消息开头匹配响应器，参考 [startswith](../api/rule.md#startswith-msg) -- `on_endswith(str)` ~ `on("message", endswith(str))`: 消息结尾匹配响应器，参考 [endswith](../api/rule.md#endswith-msg) -- `on_keyword(set)` ~ `on("message", keyword(str))`: 消息关键词匹配响应器，参考 [keyword](../api/rule.md#keyword-keywords) -- `on_command(str|tuple)` ~ `on("message", command(str|tuple))`: 命令响应器，参考 [command](../api/rule.md#command-cmds) -- `on_regex(pattern_str)` ~ `on("message", regex(pattern_str))`: 正则匹配处理器，参考 [regex](../api/rule.md#regex-regex-flags-0) +- `on_startswith(str)` ~ `on("message", startswith(str))`: 消息开头匹配响应器，参考 [startswith](../../api/rule.md#startswith-msg) +- `on_endswith(str)` ~ `on("message", endswith(str))`: 消息结尾匹配响应器，参考 [endswith](../../api/rule.md#endswith-msg) +- `on_keyword(set)` ~ `on("message", keyword(str))`: 消息关键词匹配响应器，参考 [keyword](../../api/rule.md#keyword-keywords) +- `on_command(str|tuple)` ~ `on("message", command(str|tuple))`: 命令响应器，参考 [command](../../api/rule.md#command-cmds) +- `on_regex(pattern_str)` ~ `on("message", regex(pattern_str))`: 正则匹配处理器，参考 [regex](../../api/rule.md#regex-regex-flags-0) ### 匹配规则 rule @@ -107,11 +116,11 @@ NoneBot 内置的事件响应器中，所有 `message` 类的事件响应器默 rule 的出现使得 nonebot 对事件的响应可以非常自由，nonebot 内置了一些规则： -- [startswith(msg)](../api/rule.md#startswith-msg) -- [endswith(msg)](../api/rule.md#endswith-msg) -- [keyword(\*keywords)](../api/rule.md#keyword-keywords) -- [command(\*cmds)](../api/rule.md#command-cmds) -- [regex(regex, flag)](../api/rule.md#regex-regex-flags-0) +- [startswith(msg)](../../api/rule.md#startswith-msg) +- [endswith(msg)](../../api/rule.md#endswith-msg) +- [keyword(\*keywords)](../../api/rule.md#keyword-keywords) +- [command(\*cmds)](../../api/rule.md#command-cmds) +- [regex(regex, flag)](../../api/rule.md#regex-regex-flags-0) 以上规则都是返回类型为 `Rule` 的函数，`Rule` 由非负个 `RuleChecker` 组成，当所有 `RuleChecker` 返回 `True` 时匹配成功。这些 `Rule`, `RuleChecker` 的形式如下： diff --git a/docs/guide/creating-a-plugin.md b/website/docs/guide/coding/creating-a-plugin.md similarity index 97% rename from docs/guide/creating-a-plugin.md rename to website/docs/guide/coding/creating-a-plugin.md index f5deb009..dc896101 100644 --- a/docs/guide/creating-a-plugin.md +++ b/website/docs/guide/coding/creating-a-plugin.md @@ -1,3 +1,12 @@ +--- +sidebar_position: 2 + +options: + menu: + weight: 120 + catogory: guide +--- + # 创建插件 如果之前使用 `nb-cli` 生成了项目结构，那我们已经有了一个空的插件目录 `Awesome-Bot/awesome_bot/plugins`，并且它已在 `bot.py` 中被加载，我们现在可以开始创建插件了！ diff --git a/docs/guide/end-or-start.md b/website/docs/guide/coding/end-or-start.md similarity index 91% rename from docs/guide/end-or-start.md rename to website/docs/guide/coding/end-or-start.md index aa072c3d..4d8a3e42 100644 --- a/docs/guide/end-or-start.md +++ b/website/docs/guide/coding/end-or-start.md @@ -1,3 +1,7 @@ +--- +sidebar_position: 5 +--- + # 结语 至此，相信你已经能够写出一个基础的插件了。这里给出几个小提示： diff --git a/docs/guide/loading-a-plugin.md b/website/docs/guide/coding/loading-a-plugin.md similarity index 96% rename from docs/guide/loading-a-plugin.md rename to website/docs/guide/coding/loading-a-plugin.md index 5f445a14..164369e8 100644 --- a/docs/guide/loading-a-plugin.md +++ b/website/docs/guide/coding/loading-a-plugin.md @@ -1,3 +1,12 @@ +--- +sidebar_position: 1 + +options: + menu: + weight: 110 + catogory: guide +--- + # 加载插件 在 [创建一个完整的项目](creating-a-project) 一章节中，我们已经创建了插件目录 `awesome_bot/plugins`，现在我们在机器人入口文件中加载它。当然，你也可以单独加载一个插件。 @@ -33,7 +42,7 @@ if __name__ == "__main__": - 命令 `say`：可由**superuser**使用，可以将消息内容由特殊纯文本转为富文本 - 命令 `echo`：可由任何人使用，将消息原样返回 -以上命令均需要指定机器人，即私聊、群聊内@机器人、群聊内称呼机器人昵称。参考 [Rule: to_me](../api/rule.md#to-me) +以上命令均需要指定机器人，即私聊、群聊内@机器人、群聊内称呼机器人昵称。参考 [Rule: to_me](../../api/rule.md#to-me) ## 加载插件目录 @@ -62,7 +71,7 @@ if __name__ == "__main__": ::: :::danger 警告 -插件间不应该存在过多的耦合，如果确实需要导入某个插件内的数据，可以参考 [进阶-跨插件访问](../advanced/export-and-require.md) +插件间不应该存在过多的耦合，如果确实需要导入某个插件内的数据，可以参考 [进阶-跨插件访问](../../advanced/export-and-require.md) ::: ## 加载单个插件 diff --git a/docs/guide/cqhttp-guide.md b/website/docs/guide/cqhttp-guide.md similarity index 99% rename from docs/guide/cqhttp-guide.md rename to website/docs/guide/cqhttp-guide.md index bfe69246..1d6ee314 100644 --- a/docs/guide/cqhttp-guide.md +++ b/website/docs/guide/cqhttp-guide.md @@ -112,6 +112,6 @@ CQHTTP_WS_URLS={"机器人QQ号": "ws://127.0.0.1:6700/"} 到这里如果一切 OK，你应该会收到机器人给你回复了 `你好，世界`。这一历史性的对话标志着你已经成功地运行了一个 NoneBot 的最小实例，开始了编写更强大的 QQ 机器人的创意之旅！ - + diff --git a/docs/guide/ding-guide.md b/website/docs/guide/ding-guide.md similarity index 100% rename from docs/guide/ding-guide.md rename to website/docs/guide/ding-guide.md diff --git a/docs/guide/feishu-guide.md b/website/docs/guide/feishu-guide.md similarity index 100% rename from docs/guide/feishu-guide.md rename to website/docs/guide/feishu-guide.md diff --git a/docs/guide/images/Handle-Event.png b/website/docs/guide/images/Handle-Event.png similarity index 100% rename from docs/guide/images/Handle-Event.png rename to website/docs/guide/images/Handle-Event.png diff --git a/docs/guide/images/ding/jiaqian.png b/website/docs/guide/images/ding/jiaqian.png similarity index 100% rename from docs/guide/images/ding/jiaqian.png rename to website/docs/guide/images/ding/jiaqian.png diff --git a/docs/guide/images/ding/test_webhook.png b/website/docs/guide/images/ding/test_webhook.png similarity index 100% rename from docs/guide/images/ding/test_webhook.png rename to website/docs/guide/images/ding/test_webhook.png diff --git a/docs/guide/images/ding/webhook.png b/website/docs/guide/images/ding/webhook.png similarity index 100% rename from docs/guide/images/ding/webhook.png rename to website/docs/guide/images/ding/webhook.png diff --git a/docs/guide/mirai-guide.md b/website/docs/guide/mirai-guide.md similarity index 100% rename from docs/guide/mirai-guide.md rename to website/docs/guide/mirai-guide.md diff --git a/docs/guide/README.md b/website/docs/guide/start/README.md similarity index 94% rename from docs/guide/README.md rename to website/docs/guide/start/README.md index b737031e..186fe7c0 100644 --- a/docs/guide/README.md +++ b/website/docs/guide/start/README.md @@ -1,3 +1,14 @@ +--- +sidebar_position: 1 +id: guide +slug: /guide + +options: + menu: + weight: 10 + catogory: guide +--- + # 概览 - :::tip 提示 初次使用时可能会觉得这里的概览过于枯燥，可以先简单略读之后直接前往 [安装](./installation.md) 查看安装方法，并进行后续的基础使用教程。 ::: diff --git a/website/docs/guide/start/basic-configuration.md b/website/docs/guide/basic-configuration.md similarity index 99% rename from website/docs/guide/start/basic-configuration.md rename to website/docs/guide/basic-configuration.md index 4df965b7..9a7cc59c 100644 --- a/website/docs/guide/start/basic-configuration.md +++ b/website/docs/guide/basic-configuration.md @@ -4,7 +4,7 @@ sidebar_position: 5 options: menu: weight: 50 - catogory: guide + category: guide --- # 基本配置 diff --git a/website/docs/guide/coding/_category_.json b/website/docs/guide/coding/_category_.json deleted file mode 100644 index 6f8024f6..00000000 --- a/website/docs/guide/coding/_category_.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "label": "编写插件", - "position": 2 -} diff --git a/website/docs/guide/coding/creating-a-handler.md b/website/docs/guide/creating-a-handler.md similarity index 92% rename from website/docs/guide/coding/creating-a-handler.md rename to website/docs/guide/creating-a-handler.md index 647fb355..eb7adb73 100644 --- a/website/docs/guide/coding/creating-a-handler.md +++ b/website/docs/guide/creating-a-handler.md @@ -1,10 +1,10 @@ --- -sidebar_position: 4 +sidebar_position: 9 options: menu: - weight: 140 - catogory: guide + weight: 90 + category: guide --- # 事件处理 @@ -122,8 +122,8 @@ async def handle(bot: Bot): 参数分别为： -1. [nonebot.adapters.Bot](../api/adapters/#class-bot): 即事件上报连接对应的 Bot 对象，为 BaseBot 的子类。特别注意，此处的类型注释可以替换为指定的 Bot 类型，例如：`nonebot.adapters.cqhttp.Bot`，只有在上报事件的 Bot 类型与类型注释相符时才会执行该处理函数！可用于多平台进行不同的处理。 -2. [nonebot.adapters.Event](../api/adapters/#class-event): 即上报事件对象，可以获取到上报的所有信息。 +1. [nonebot.adapters.Bot](../api/adapters/README.md#class-bot): 即事件上报连接对应的 Bot 对象，为 BaseBot 的子类。特别注意，此处的类型注释可以替换为指定的 Bot 类型，例如：`nonebot.adapters.cqhttp.Bot`，只有在上报事件的 Bot 类型与类型注释相符时才会执行该处理函数！可用于多平台进行不同的处理。 +2. [nonebot.adapters.Event](../api/adapters/README.md#class-event): 即上报事件对象，可以获取到上报的所有信息。 3. [state](../api/typing.md#t-state): 状态字典，可以存储任意的信息，其中还包含一些特殊的值以获取 NoneBot 内部处理时的一些信息，如： - `state["_current_key"]`: 存储当前 `got` 获取的参数名 diff --git a/website/docs/guide/coding/creating-a-matcher.md b/website/docs/guide/creating-a-matcher.md similarity index 88% rename from website/docs/guide/coding/creating-a-matcher.md rename to website/docs/guide/creating-a-matcher.md index 3be42481..e028d718 100644 --- a/website/docs/guide/coding/creating-a-matcher.md +++ b/website/docs/guide/creating-a-matcher.md @@ -1,10 +1,10 @@ --- -sidebar_position: 3 +sidebar_position: 8 options: menu: - weight: 130 - catogory: guide + weight: 80 + category: guide --- # 注册事件响应器 @@ -50,7 +50,7 @@ async def get_weather(city: str): 从这里开始，你需要对 Python 的 asyncio 编程有所了解，因为 NoneBot 是完全基于 asyncio 的，具体可以参考 [廖雪峰的 Python 教程](https://www.liaoxuefeng.com/wiki/1016959663602400/1017959540289152) ::: -## [事件响应器](../../api/matcher.md) +## [事件响应器](../api/matcher.md) ```python{5} from nonebot import on_command @@ -81,11 +81,11 @@ weather = on_command("天气", rule=to_me(), permission=Permission(), priority=5 - `on_message()` ~ `on("message")`: 消息事件响应器 - `on_request()` ~ `on("request")`: 请求事件响应器 - `on_notice()` ~ `on("notice")`: 通知事件响应器 -- `on_startswith(str)` ~ `on("message", startswith(str))`: 消息开头匹配响应器，参考 [startswith](../../api/rule.md#startswith-msg) -- `on_endswith(str)` ~ `on("message", endswith(str))`: 消息结尾匹配响应器，参考 [endswith](../../api/rule.md#endswith-msg) -- `on_keyword(set)` ~ `on("message", keyword(str))`: 消息关键词匹配响应器，参考 [keyword](../../api/rule.md#keyword-keywords) -- `on_command(str|tuple)` ~ `on("message", command(str|tuple))`: 命令响应器，参考 [command](../../api/rule.md#command-cmds) -- `on_regex(pattern_str)` ~ `on("message", regex(pattern_str))`: 正则匹配处理器，参考 [regex](../../api/rule.md#regex-regex-flags-0) +- `on_startswith(str)` ~ `on("message", startswith(str))`: 消息开头匹配响应器，参考 [startswith](../api/rule.md#startswith-msg) +- `on_endswith(str)` ~ `on("message", endswith(str))`: 消息结尾匹配响应器，参考 [endswith](../api/rule.md#endswith-msg) +- `on_keyword(set)` ~ `on("message", keyword(str))`: 消息关键词匹配响应器，参考 [keyword](../api/rule.md#keyword-keywords) +- `on_command(str|tuple)` ~ `on("message", command(str|tuple))`: 命令响应器，参考 [command](../api/rule.md#command-cmds) +- `on_regex(pattern_str)` ~ `on("message", regex(pattern_str))`: 正则匹配处理器，参考 [regex](../api/rule.md#regex-regex-flags-0) ### 匹配规则 rule @@ -116,11 +116,11 @@ NoneBot 内置的事件响应器中，所有 `message` 类的事件响应器默 rule 的出现使得 nonebot 对事件的响应可以非常自由，nonebot 内置了一些规则： -- [startswith(msg)](../../api/rule.md#startswith-msg) -- [endswith(msg)](../../api/rule.md#endswith-msg) -- [keyword(\*keywords)](../../api/rule.md#keyword-keywords) -- [command(\*cmds)](../../api/rule.md#command-cmds) -- [regex(regex, flag)](../../api/rule.md#regex-regex-flags-0) +- [startswith(msg)](../api/rule.md#startswith-msg) +- [endswith(msg)](../api/rule.md#endswith-msg) +- [keyword(\*keywords)](../api/rule.md#keyword-keywords) +- [command(\*cmds)](../api/rule.md#command-cmds) +- [regex(regex, flag)](../api/rule.md#regex-regex-flags-0) 以上规则都是返回类型为 `Rule` 的函数，`Rule` 由非负个 `RuleChecker` 组成，当所有 `RuleChecker` 返回 `True` 时匹配成功。这些 `Rule`, `RuleChecker` 的形式如下： diff --git a/website/docs/guide/coding/creating-a-plugin.md b/website/docs/guide/creating-a-plugin.md similarity index 98% rename from website/docs/guide/coding/creating-a-plugin.md rename to website/docs/guide/creating-a-plugin.md index dc896101..3ab21e35 100644 --- a/website/docs/guide/coding/creating-a-plugin.md +++ b/website/docs/guide/creating-a-plugin.md @@ -1,10 +1,10 @@ --- -sidebar_position: 2 +sidebar_position: 7 options: menu: - weight: 120 - catogory: guide + weight: 70 + category: guide --- # 创建插件 diff --git a/website/docs/guide/start/creating-a-project.md b/website/docs/guide/creating-a-project.md similarity index 98% rename from website/docs/guide/start/creating-a-project.md rename to website/docs/guide/creating-a-project.md index 858f75c2..ce2a76b0 100644 --- a/website/docs/guide/start/creating-a-project.md +++ b/website/docs/guide/creating-a-project.md @@ -4,7 +4,7 @@ sidebar_position: 4 options: menu: weight: 40 - catogory: guide + category: guide --- # 创建一个完整的项目 diff --git a/website/docs/guide/coding/end-or-start.md b/website/docs/guide/end-or-start.md similarity index 100% rename from website/docs/guide/coding/end-or-start.md rename to website/docs/guide/end-or-start.md diff --git a/website/docs/guide/feishu-guide.md b/website/docs/guide/feishu-guide.md index b58aca83..83c7fb24 100644 --- a/website/docs/guide/feishu-guide.md +++ b/website/docs/guide/feishu-guide.md @@ -99,4 +99,3 @@ async def feishu_helper(bot: FeishuBot, event: MessageEvent, state: T_State): 以上代码注册了一个对飞书平台适用的`say`指令，并会提取`/say`之后的内容发送到事件所对应的群或私聊。 大功告成！现在可以试试向机器人发送类似`/say Hello, Feishu!`的消息进行测试了。 - diff --git a/website/docs/guide/start/getting-started.md b/website/docs/guide/getting-started.md similarity index 99% rename from website/docs/guide/start/getting-started.md rename to website/docs/guide/getting-started.md index 251dd428..fc19eb8d 100644 --- a/website/docs/guide/start/getting-started.md +++ b/website/docs/guide/getting-started.md @@ -4,7 +4,7 @@ sidebar_position: 3 options: menu: weight: 30 - catogory: guide + category: guide --- # 开始使用 diff --git a/website/docs/guide/start/installation.md b/website/docs/guide/installation.md similarity index 97% rename from website/docs/guide/start/installation.md rename to website/docs/guide/installation.md index 75868e48..081a0e2e 100644 --- a/website/docs/guide/start/installation.md +++ b/website/docs/guide/installation.md @@ -4,7 +4,7 @@ sidebar_position: 2 options: menu: weight: 20 - catogory: guide + category: guide --- # 安装 @@ -115,7 +115,7 @@ nb plugin install ### 其他插件 -还有更多的插件在 [这里](/store.html) 等着你发现～ +还有更多的插件在 [这里](/store) 等着你发现～ ## 安装开发环境(可选) diff --git a/website/docs/guide/coding/loading-a-plugin.md b/website/docs/guide/loading-a-plugin.md similarity index 97% rename from website/docs/guide/coding/loading-a-plugin.md rename to website/docs/guide/loading-a-plugin.md index 164369e8..1913008f 100644 --- a/website/docs/guide/coding/loading-a-plugin.md +++ b/website/docs/guide/loading-a-plugin.md @@ -1,10 +1,10 @@ --- -sidebar_position: 1 +sidebar_position: 6 options: menu: - weight: 110 - catogory: guide + weight: 60 + category: guide --- # 加载插件 @@ -42,7 +42,7 @@ if __name__ == "__main__": - 命令 `say`：可由**superuser**使用，可以将消息内容由特殊纯文本转为富文本 - 命令 `echo`：可由任何人使用，将消息原样返回 -以上命令均需要指定机器人，即私聊、群聊内@机器人、群聊内称呼机器人昵称。参考 [Rule: to_me](../../api/rule.md#to-me) +以上命令均需要指定机器人，即私聊、群聊内@机器人、群聊内称呼机器人昵称。参考 [Rule: to_me](../api/rule.md#to-me) ## 加载插件目录 @@ -71,7 +71,7 @@ if __name__ == "__main__": ::: :::danger 警告 -插件间不应该存在过多的耦合，如果确实需要导入某个插件内的数据，可以参考 [进阶-跨插件访问](../../advanced/export-and-require.md) +插件间不应该存在过多的耦合，如果确实需要导入某个插件内的数据，可以参考 [进阶-跨插件访问](../advanced/export-and-require.md) ::: ## 加载单个插件 diff --git a/website/docs/guide/mirai-guide.md b/website/docs/guide/mirai-guide.md index aa598dfa..60b72a35 100644 --- a/website/docs/guide/mirai-guide.md +++ b/website/docs/guide/mirai-guide.md @@ -133,11 +133,11 @@ pip install nonebot-adapter-mirai from nonebot.adapters.mirai import Bot nonebot.init() - nonebot.get_driver().register_adapter('mirai', - Bot, + nonebot.get_driver().register_adapter('mirai', + Bot, qq=12345678) # qq参数需要填在mah中登录的qq, 如果需要多个帐号, 可以填写类似于 [123456,789100] 的数组形式 - + nonebot.load_builtin_plugins() # 加载 nonebot 内置插件 nonebot.run() ``` @@ -246,7 +246,7 @@ async def _echo(bot: Bot, event: MessageEvent): 它具有两种行为 -- 在指定机器人，即私聊、群聊内@机器人、群聊内称呼机器人昵称的情况下 (即 [Rule: to_me](../api/rule.md#to-me)), 如果消息内包含 `reply` 字段, 则该消息会被机器人重复一次 +- 在指定机器人，即私聊、群聊内@机器人、群聊内称呼机器人昵称的情况下 (即 [Rule: to_me](../api/rule.md#to_me)), 如果消息内包含 `reply` 字段, 则该消息会被机器人重复一次 - 在执行指令`miecho xxx`时, 机器人会发送回参数`xxx` diff --git a/website/docs/guide/start/_category_.json b/website/docs/guide/start/_category_.json deleted file mode 100644 index 1962f43b..00000000 --- a/website/docs/guide/start/_category_.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "label": "开始", - "position": 1 -} diff --git a/website/sidebars.js b/website/sidebars.js index 1ad7e6b8..1ad12483 100644 --- a/website/sidebars.js +++ b/website/sidebars.js @@ -14,8 +14,64 @@ /** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */ const sidebars = { // By default, Docusaurus generates a sidebar from the docs folder structure - guide: [{ type: "autogenerated", dirName: "guide" }], - advanced: [{ type: "autogenerated", dirName: "advanced" }], + guide: [ + { + type: "category", + label: "开始", + collapsible: false, + items: [ + "guide/index", + "guide/installation", + "guide/getting-started", + "guide/creating-a-project", + "guide/basic-configuration", + ], + }, + { + type: "category", + label: "编写插件", + collapsible: false, + items: [ + "guide/loading-a-plugin", + "guide/creating-a-plugin", + "guide/creating-a-matcher", + "guide/creating-a-handler", + "guide/end-or-start", + ], + }, + { + type: "category", + label: "协议适配", + collapsible: false, + items: [ + "guide/cqhttp-guide", + "guide/ding-guide", + "guide/mirai-guide", + "guide/feishu-guide", + ], + }, + ], + advanced: [ + { + type: "category", + label: "进阶", + collapsible: false, + items: [ + "advanced/index", + "advanced/scheduler", + "advanced/permission", + "advanced/runtime-hook", + "advanced/export-and-require", + "advanced/overloaded-handlers", + ], + }, + { + type: "category", + label: "发布", + collapsible: false, + items: ["advanced/publish-plugin"], + }, + ], api: [{ type: "autogenerated", dirName: "api" }], // But you can create a sidebar manually diff --git a/website/yarn.lock b/yarn.lock similarity index 99% rename from website/yarn.lock rename to yarn.lock index 4e043dc2..1809a587 100644 --- a/website/yarn.lock +++ b/yarn.lock @@ -1553,10 +1553,10 @@ resolved "https://registry.nlark.com/@seznam/compose-react-refs/download/@seznam/compose-react-refs-1.0.6.tgz#6ec4e70bdd6e32f8e70b4100f27267cf306bd8df" integrity sha1-bsTnC91uMvjnC0EA8nJnzzBr2N8= -"@sideway/address@^4.1.0": - version "4.1.2" - resolved "https://registry.nlark.com/@sideway/address/download/@sideway/address-4.1.2.tgz?cache=0&sync_timestamp=1620367945721&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40sideway%2Faddress%2Fdownload%2F%40sideway%2Faddress-4.1.2.tgz#811b84333a335739d3969cfc434736268170cad1" - integrity sha1-gRuEMzozVznTlpz8Q0c2JoFwytE= +"@sideway/address@^4.1.3": + version "4.1.3" + resolved "https://registry.npmmirror.com/@sideway/address/download/@sideway/address-4.1.3.tgz#d93cce5d45c5daec92ad76db492cc2ee3c64ab27" + integrity sha512-8ncEUtmnTsMmL7z1YPB47kPUq7LpKWJNFPsRzHiIajGC5uXlWGn+AmkYPcHNl8S4tcEGx+cnORnNYaw2wvL+LQ== dependencies: "@hapi/hoek" "^9.0.0" @@ -3230,20 +3230,20 @@ dns-txt@^2.0.2: dependencies: buffer-indexof "^1.0.0" -docusaurus-preset-nonepress@canary: - version "0.0.0-107" - resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-107.tgz#b9a1727f5452fc7d15d706aa9e07daf0079b665f" - integrity sha512-26xugwSdg3iIlzoNKOaw5aGAFVnyzAX23q7xTixzbYVtDXJc628trbm3kJ+YzatXaOz+LkItBrB3kqIQMK5UJw== +docusaurus-preset-nonepress@0.0.0-108, docusaurus-preset-nonepress@canary: + version "0.0.0-108" + resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-108.tgz#37a4068c71fe335d2486d9effcadcb18503b50cb" + integrity sha512-GuH22RrrI5FWiUPIKEWWisWJ/laymWMY+aFbfXY5fNLzarLFkAmshUpGHuuAMAnL/U1W812RYyJNoNHnUA/XgQ== dependencies: "@docusaurus/core" "2.0.0-beta.9" "@docusaurus/plugin-content-docs" "2.0.0-beta.9" "@docusaurus/plugin-content-pages" "2.0.0-beta.9" - docusaurus-theme-nonepress "0.0.0-107" + docusaurus-theme-nonepress "0.0.0-108" -docusaurus-theme-nonepress@0.0.0-107: - version "0.0.0-107" - resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-107.tgz#bc9a4ee894f7162848e71abebca9ce2aad61378f" - integrity sha512-ShYfDCHLP/g+RIMB+ET89u9/43EwUvuSeuHwsr1dvxSn/yebiw4K5ZBFZOaJLw0ftcFolgqt2tJL5i5DagQLNg== +docusaurus-theme-nonepress@0.0.0-108: + version "0.0.0-108" + resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-108.tgz#d1e381a446d1179841ae4fe5f51cd6314df9b0a1" + integrity sha512-PSawVRZFvn6kBKBsiET7Ihs98jRxnq+Mg9J6KRTTGdJBOyUCBd/9E1oE2YF9VaQGil0NbhuM7Avysri4YP3meA== dependencies: "@docsearch/react" "^3.0.0-alpha.39" "@docusaurus/core" "2.0.0-beta.9" @@ -3392,9 +3392,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.896: - version "1.4.6" - resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.6.tgz#7bf0c03001bcdbd0fc57a45c6b23bc6432246ade" - integrity sha512-YDZAXP0P8USm0YoyIXWijxFT3tJHbt3WwY7CTQiK3+Ad6Ai/b9N4GqfDR107jfGilAfxl7Gkhb+h0KPoKXAgqw== + version "1.4.7" + resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.7.tgz#58e0b4ec9096ee1422e4d9e83ceeb05b0cf076eb" + integrity sha512-UPy2MsQw1OdcbxR7fvwWZH/rXcv+V26+uvQVHx0fGa1kqRfydtfOw+NMGAvZJ63hyaH4aEBxbhSEtqbpliSNWA== emoji-regex@^8.0.0: version "8.0.0" @@ -4721,13 +4721,13 @@ jest-worker@^27.0.2, jest-worker@^27.0.6: supports-color "^8.0.0" joi@^17.4.0, joi@^17.4.2: - version "17.4.2" - resolved "https://registry.nlark.com/joi/download/joi-17.4.2.tgz#02f4eb5cf88e515e614830239379dcbbe28ce7f7" - integrity sha1-AvTrXPiOUV5hSDAjk3ncu+KM5/c= + version "17.4.3" + resolved "https://registry.npmmirror.com/joi/download/joi-17.4.3.tgz#462941fd994f11fcb92f59ba9f004706b9a45d17" + integrity sha512-8W3oOogFRuy2aLAdlhMpzS4fNBIMiyIa3xBaBYMFgA272/d5sob1DAth6jjo+5VrOlzbEgmbBGbU4cLrffPKog== dependencies: "@hapi/hoek" "^9.0.0" "@hapi/topo" "^5.0.0" - "@sideway/address" "^4.1.0" + "@sideway/address" "^4.1.3" "@sideway/formula" "^3.0.0" "@sideway/pinpoint" "^2.0.0" @@ -5148,11 +5148,6 @@ mime@1.6.0: resolved "https://registry.npmmirror.com/mime/download/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE= -mime@^2.3.1: - version "2.6.0" - resolved "https://registry.npmmirror.com/mime/download/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" - integrity sha1-oqaCqVzU0MsdYlfij4PafjWAA2c= - mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" @@ -5204,6 +5199,11 @@ mkdirp@^0.5.5, mkdirp@~0.5.1: dependencies: minimist "^1.2.5" +mrmime@^1.0.0: + version "1.0.0" + resolved "https://registry.npmmirror.com/mrmime/download/mrmime-1.0.0.tgz#14d387f0585a5233d291baba339b063752a2398b" + integrity sha1-FNOH8FhaUjPSkbq6M5sGN1KiOYs= + ms@2.0.0: version "2.0.0" resolved "https://registry.npmmirror.com/ms/download/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -5996,6 +5996,11 @@ prepend-http@^2.0.0: resolved "https://registry.nlark.com/prepend-http/download/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= +prettier@^2.5.0: + version "2.5.0" + resolved "https://registry.npmmirror.com/prettier/download/prettier-2.5.0.tgz#a6370e2d4594e093270419d9cc47f7670488f893" + integrity sha512-FM/zAKgWTxj40rH03VxzIPdXmj39SwSjwG0heUcNFwI+EMZJnY93yAiKXM3dObIKAM5TA88werc8T/EwhB45eg== + pretty-error@^4.0.0: version "4.0.0" resolved "https://registry.npmmirror.com/pretty-error/download/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6" @@ -6829,12 +6834,12 @@ signal-exit@^3.0.2, signal-exit@^3.0.3: integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== sirv@^1.0.7: - version "1.0.18" - resolved "https://registry.npmmirror.com/sirv/download/sirv-1.0.18.tgz#105fab52fb656ce8a2bebbf36b11052005952899" - integrity sha1-EF+rUvtlbOiivrvzaxEFIAWVKJk= + version "1.0.19" + resolved "https://registry.npmmirror.com/sirv/download/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49" + integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ== dependencies: "@polka/url" "^1.0.0-next.20" - mime "^2.3.1" + mrmime "^1.0.0" totalist "^1.0.0" sisteransi@^1.0.5: From dcb6f69f2151f7579ae8b5b0d99bcb81de232b2f Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 2 Dec 2021 14:03:06 +0800 Subject: [PATCH 052/174] :bug: fix build and ci bug --- .github/workflows/release-plugin-docs.yml | 14 ++++- .github/workflows/release.yml | 19 ++++++- .github/workflows/website-deploy.yml | 24 +++++++- package.json | 2 + website/docs/guide/mirai-guide.md | 18 +++--- website/docusaurus.config.js | 11 +++- yarn.lock | 67 +++++++++++++++++++++-- 7 files changed, 134 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release-plugin-docs.yml b/.github/workflows/release-plugin-docs.yml index 518804b2..a575c7e2 100644 --- a/.github/workflows/release-plugin-docs.yml +++ b/.github/workflows/release-plugin-docs.yml @@ -14,7 +14,17 @@ jobs: - name: Setup Node uses: actions/setup-node@v1 with: - node-version: '16' + node-version: "16" + + - name: Get yarn cache directory path + id: yarn-cache-dir-path + run: echo "::set-output name=dir::$(yarn cache dir)" + + - name: Cache Packages + uses: actions/cache@v2 + with: + path: ${{ steps.yarn-cache-dir-path.outputs.dir }} + key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - name: Set up Python uses: actions/setup-python@v2 @@ -27,7 +37,7 @@ jobs: - name: Build Docs run: | yarn install - yarn build:plugin --out-dir ./packages/nonebot-plugin-docs/nonebot_plugin_docs/dist + yarn build:plugin --out-dir ../packages/nonebot-plugin-docs/nonebot_plugin_docs/dist - name: Publish Package run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3fd39030..c8f20111 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,6 +25,21 @@ jobs: path: ~/.cache/pypoetry/virtualenvs key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }} + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: "16" + + - name: Get yarn cache directory path + id: yarn-cache-dir-path + run: echo "::set-output name=dir::$(yarn cache dir)" + + - name: Cache Packages + uses: actions/cache@v2 + with: + path: ${{ steps.yarn-cache-dir-path.outputs.dir }} + key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} + - name: Set up dependencies run: | poetry install -E all @@ -36,7 +51,9 @@ jobs: run: cp -r ./build/markdown/* ./website/docs/api/ - name: Archive Files - run: yarn archive $(poetry version -s) + run: | + yarn install + yarn archive $(poetry version -s) - name: Push Tag and Release to PyPI run: | diff --git a/.github/workflows/website-deploy.yml b/.github/workflows/website-deploy.yml index f77013bf..2d3a6d34 100644 --- a/.github/workflows/website-deploy.yml +++ b/.github/workflows/website-deploy.yml @@ -17,6 +17,24 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: 3.8 + architecture: "x64" + + - uses: Gr1N/setup-poetry@v4 + + - uses: actions/cache@v1 + with: + path: ~/.cache/pypoetry/virtualenvs + key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }} + + - name: Setup Node + uses: actions/setup-node@v1 + with: + node-version: "16" + - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" @@ -26,11 +44,13 @@ jobs: with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- + run: cp -r ./build/markdown/* ./website/docs/api/ - name: Install and build run: | + poetry install -E all + poetry run sphinx-build -M markdown ./docs_build ./build + cp -r ./build/markdown/* ./website/docs/api/ yarn install yarn build diff --git a/package.json b/package.json index c6635c8b..fe45c517 100644 --- a/package.json +++ b/package.json @@ -9,9 +9,11 @@ "build": "yarn workspace nonebot build", "build:plugin": "cross-env BASE_URL='/docs/' yarn workspace nonebot build", "start": "yarn workspace nonebot start", + "clear": "yarn workspace nonebot clear", "prettier": "prettier --config ./.prettierrc --write \"./website/**/*.md\"" }, "devDependencies": { + "cross-env": "^7.0.3", "prettier": "^2.5.0" }, "dependencies": { diff --git a/website/docs/guide/mirai-guide.md b/website/docs/guide/mirai-guide.md index 60b72a35..b4e050f7 100644 --- a/website/docs/guide/mirai-guide.md +++ b/website/docs/guide/mirai-guide.md @@ -1,6 +1,6 @@ # Mirai-API-HTTP 协议使用指南 -::: warning +:::warning Mirai-API-HTTP 的适配现在仍然处于早期阶段, 可能没有进行过充分的测试 @@ -8,7 +8,7 @@ Mirai-API-HTTP 的适配现在仍然处于早期阶段, 可能没有进行过充 ::: -::: tip +:::tip 为了你的使用之旅更加顺畅, 我们建议您在配置之前具有以下的前置知识 @@ -18,7 +18,7 @@ Mirai-API-HTTP 的适配现在仍然处于早期阶段, 可能没有进行过充 ::: -::: danger +:::danger Mirai-API-HTTP 的适配器以 [AGPLv3 许可](https://opensource.org/licenses/AGPL-3.0) 单独开源 @@ -59,7 +59,7 @@ pip install nonebot-adapter-mirai - 在 Mirai Console Loader 目录下执行该指令 - - ```shell + ```bash ./mcl --update-package net.mamoe:mirai-api-http --channel stable --type plugin ``` @@ -67,7 +67,7 @@ pip install nonebot-adapter-mirai 4. 修改配置文件 - ::: tip + :::tip 在此之前, 你可能需要了解我们为 MAH 设计的两种通信方式 @@ -97,7 +97,7 @@ pip install nonebot-adapter-mirai - `nonebot.drivers.fastapi`: 同时支持正向和反向 - `nonebot.drivers.aiohttp`: 仅支持正向 - ::: warning + :::warning 在默认情况下, NoneBot 和 MAH 会同时监听 8080 端口, 这会导致端口冲突的错误 请确保二者配置不在同一端口下 @@ -149,7 +149,7 @@ pip install nonebot-adapter-mirai - ```yaml # 省略了部分无需修改的部分 - host: '0.0.0.0' # 监听地址 + host: "0.0.0.0" # 监听地址 port: 8080 # 监听端口 authKey: 1234567890 # 访问密钥, 最少八位 @@ -157,7 +157,7 @@ pip install nonebot-adapter-mirai report: enable: true # 必须为true groupMessage: - report: true # 群消息上报 + report: true # 群消息上报 friendMessage: report: true # 好友消息上报 tempMessage: @@ -165,7 +165,7 @@ pip install nonebot-adapter-mirai eventMessage: report: true # 事件上报 destinations: - - 'http://127.0.0.1:2333/mirai/http' #上报地址, 请按照实际情况修改 + - "http://127.0.0.1:2333/mirai/http" #上报地址, 请按照实际情况修改 # 上报时的额外Header extraHeaders: {} ``` diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index 7204b31f..c71bc13e 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -9,12 +9,19 @@ const config = { title: "NoneBot", tagline: "跨平台 Python 异步机器人框架", url: "https://v2.nonebot.dev", - baseUrl: "/", + baseUrl: process.env.BASE_URL || "/", onBrokenLinks: "throw", onBrokenMarkdownLinks: "warn", favicon: "icons/favicon.ico", organizationName: "nonebot", // Usually your GitHub org/user name. projectName: "nonebot2", // Usually your repo name. + i18n: { + defaultLocale: "zh-Hans", + locales: ["zh-Hans"], + localeConfigs: { + "zh-Hans": { label: "简体中文" }, + }, + }, presets: [ [ @@ -33,7 +40,7 @@ const config = { ], themeConfig: - /** @type {import('docusaurus-theme-nonepress/types').ThemeConfig} */ + /** @type {import('docusaurus-preset-nonepress').ThemeConfig} */ ({ colorMode: { defaultMode: "light", diff --git a/yarn.lock b/yarn.lock index 1809a587..67088a3c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2857,7 +2857,14 @@ cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: path-type "^4.0.0" yaml "^1.10.0" -cross-spawn@^7.0.3: +cross-env@^7.0.3: + version "7.0.3" + resolved "https://registry.npm.taobao.org/cross-env/download/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha1-hlJkspZ33AFbqEGJGJZd0jL8VM8= + dependencies: + cross-spawn "^7.0.1" + +cross-spawn@^7.0.1, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.nlark.com/cross-spawn/download/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha1-9zqFudXUHQRVUcF34ogtSshXKKY= @@ -3230,7 +3237,7 @@ dns-txt@^2.0.2: dependencies: buffer-indexof "^1.0.0" -docusaurus-preset-nonepress@0.0.0-108, docusaurus-preset-nonepress@canary: +docusaurus-preset-nonepress@0.0.0-108: version "0.0.0-108" resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-108.tgz#37a4068c71fe335d2486d9effcadcb18503b50cb" integrity sha512-GuH22RrrI5FWiUPIKEWWisWJ/laymWMY+aFbfXY5fNLzarLFkAmshUpGHuuAMAnL/U1W812RYyJNoNHnUA/XgQ== @@ -3240,6 +3247,16 @@ docusaurus-preset-nonepress@0.0.0-108, docusaurus-preset-nonepress@canary: "@docusaurus/plugin-content-pages" "2.0.0-beta.9" docusaurus-theme-nonepress "0.0.0-108" +docusaurus-preset-nonepress@canary: + version "0.0.0-109" + resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-109.tgz#bb3d373beb908ae981a1e0f41e3d2d3619672c0c" + integrity sha512-bZRyInMVPdJ9jn/lo/24yT67WwuO0yPVOItRe3f7w2ziDUMIQ1/UM2RAc8My+RyRbByyFu6kWc9SBIeJlmupVQ== + dependencies: + "@docusaurus/core" "2.0.0-beta.9" + "@docusaurus/plugin-content-docs" "2.0.0-beta.9" + "@docusaurus/plugin-content-pages" "2.0.0-beta.9" + docusaurus-theme-nonepress "0.0.0-109" + docusaurus-theme-nonepress@0.0.0-108: version "0.0.0-108" resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-108.tgz#d1e381a446d1179841ae4fe5f51cd6314df9b0a1" @@ -3280,6 +3297,46 @@ docusaurus-theme-nonepress@0.0.0-108: react-router-dom "^5.2.0" tailwindcss ">=3.0.0 || >=3.0.0-alpha.1" +docusaurus-theme-nonepress@0.0.0-109: + version "0.0.0-109" + resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-109.tgz#955b8ca07b9c4d971ec9eb7d86d98f5b5640c4a2" + integrity sha512-qkck6fAYQPmajFeaWKzh61wIrOuxVVJDH+NhqyWHuSkbCqBxHo5qjHV3LZyZh+480PtAmHornkXVDluSJSRM7w== + dependencies: + "@docsearch/react" "^3.0.0-alpha.39" + "@docusaurus/core" "2.0.0-beta.9" + "@docusaurus/plugin-content-docs" "2.0.0-beta.9" + "@docusaurus/plugin-content-pages" "2.0.0-beta.9" + "@docusaurus/theme-common" "2.0.0-beta.9" + "@docusaurus/utils" "2.0.0-beta.9" + "@docusaurus/utils-common" "2.0.0-beta.9" + "@docusaurus/utils-validation" "2.0.0-beta.9" + "@fortawesome/fontawesome-svg-core" "^1.2.36" + "@fortawesome/free-brands-svg-icons" "^5.15.4" + "@fortawesome/free-regular-svg-icons" "^5.15.4" + "@fortawesome/free-solid-svg-icons" "^5.15.4" + "@fortawesome/react-fontawesome" "^0.1.16" + "@mdx-js/mdx" "^1.6.21" + "@mdx-js/react" "^1.6.21" + "@seznam/compose-react-refs" "^1.0.6" + "@tailwindcss/typography" "^0.5.0-alpha.3" + algoliasearch "^4.11.0" + algoliasearch-helper "^3.5.5" + autoprefixer "^10.3.1" + chalk "^4.1.2" + clsx "^1.1.1" + copy-text-to-clipboard "^3.0.1" + eta "^1.12.3" + globby "^11.0.2" + lodash "^4.17.20" + parse-numeric-range "^1.2.0" + postcss "^8.3.7" + postcss-import "^14.0.2" + prism-react-renderer "^1.2.1" + prismjs "^1.23.0" + react-cool-onclickoutside "^1.6.2" + react-router-dom "^5.2.0" + tailwindcss ">=3.0.0 || >=3.0.0-alpha.1" + dom-converter@^0.2.0: version "0.2.0" resolved "https://registry.npm.taobao.org/dom-converter/download/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" @@ -3392,9 +3449,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.896: - version "1.4.7" - resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.7.tgz#58e0b4ec9096ee1422e4d9e83ceeb05b0cf076eb" - integrity sha512-UPy2MsQw1OdcbxR7fvwWZH/rXcv+V26+uvQVHx0fGa1kqRfydtfOw+NMGAvZJ63hyaH4aEBxbhSEtqbpliSNWA== + version "1.4.8" + resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.8.tgz#e1b7752ac1a75e39b5dd90cc7e29ea08b351c484" + integrity sha512-Cu5+dbg55+1E3ohlsa8HT0s4b8D0gBewXEGG8s5wBl8ynWv60VuvYW25GpsOeTVXpulhyU/U8JYZH+yxASSJBQ== emoji-regex@^8.0.0: version "8.0.0" From b47869198d5af91071d81cb01534ab44df6155e4 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 2 Dec 2021 14:07:52 +0800 Subject: [PATCH 053/174] :construction_worker: fix ci syntax --- .github/workflows/website-deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/website-deploy.yml b/.github/workflows/website-deploy.yml index 2d3a6d34..628e8f1a 100644 --- a/.github/workflows/website-deploy.yml +++ b/.github/workflows/website-deploy.yml @@ -44,7 +44,6 @@ jobs: with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - run: cp -r ./build/markdown/* ./website/docs/api/ - name: Install and build run: | From b4e49d8b8d19bd75bf011f46fa5f6ee39d27feb1 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 2 Dec 2021 14:11:13 +0800 Subject: [PATCH 054/174] :construction_worker: fix missing directory --- website/docs/api/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 website/docs/api/.gitkeep diff --git a/website/docs/api/.gitkeep b/website/docs/api/.gitkeep new file mode 100644 index 00000000..e69de29b From c037c7a19617a42b83ed806d1732a458e3489b1c Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 2 Dec 2021 15:00:55 +0800 Subject: [PATCH 055/174] :arrow_up: update theme version --- .yarnrc | 1 + package.json | 4 +- yarn.lock | 1214 ++++++++++++++++++++++++-------------------------- 3 files changed, 584 insertions(+), 635 deletions(-) create mode 100644 .yarnrc diff --git a/.yarnrc b/.yarnrc new file mode 100644 index 00000000..45291c13 --- /dev/null +++ b/.yarnrc @@ -0,0 +1 @@ +registry "https://registry.npmjs.org/" diff --git a/package.json b/package.json index fe45c517..24bf73af 100644 --- a/package.json +++ b/package.json @@ -9,14 +9,12 @@ "build": "yarn workspace nonebot build", "build:plugin": "cross-env BASE_URL='/docs/' yarn workspace nonebot build", "start": "yarn workspace nonebot start", + "serve": "yarn workspace nonebot serve", "clear": "yarn workspace nonebot clear", "prettier": "prettier --config ./.prettierrc --write \"./website/**/*.md\"" }, "devDependencies": { "cross-env": "^7.0.3", "prettier": "^2.5.0" - }, - "dependencies": { - "docusaurus-preset-nonepress": "0.0.0-108" } } diff --git a/yarn.lock b/yarn.lock index 67088a3c..7624b66b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4,7 +4,7 @@ "@algolia/autocomplete-core@1.2.2": version "1.2.2" - resolved "https://registry.npmmirror.com/@algolia/autocomplete-core/download/@algolia/autocomplete-core-1.2.2.tgz?cache=0&sync_timestamp=1635927913428&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40algolia%2Fautocomplete-core%2Fdownload%2F%40algolia%2Fautocomplete-core-1.2.2.tgz#c121e70c78fd0175c989a219918124ad7758e48b" + resolved "https://registry.npmmirror.com/@algolia/autocomplete-core/download/@algolia/autocomplete-core-1.2.2.tgz#c121e70c78fd0175c989a219918124ad7758e48b" integrity sha1-wSHnDHj9AXXJiaIZkYEkrXdY5Is= dependencies: "@algolia/autocomplete-shared" "1.2.2" @@ -127,19 +127,19 @@ "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.8.3": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/code-frame/download/@babel/code-frame-7.16.0.tgz?cache=0&sync_timestamp=1635560663383&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcode-frame%2Fdownload%2F%40babel%2Fcode-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" + resolved "https://registry.npmmirror.com/@babel/code-frame/download/@babel/code-frame-7.16.0.tgz?cache=0&sync_timestamp=1635560657003&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcode-frame%2Fdownload%2F%40babel%2Fcode-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" integrity sha1-DfyAMJvuyEEeZecGRhxAiwu5tDE= dependencies: "@babel/highlight" "^7.16.0" "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.0", "@babel/compat-data@^7.16.4": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/compat-data/download/@babel/compat-data-7.16.4.tgz?cache=0&sync_timestamp=1637102917946&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcompat-data%2Fdownload%2F%40babel%2Fcompat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" + resolved "https://registry.npmmirror.com/@babel/compat-data/download/@babel/compat-data-7.16.4.tgz?cache=0&sync_timestamp=1637102860099&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcompat-data%2Fdownload%2F%40babel%2Fcompat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q== "@babel/core@7.12.9": version "7.12.9" - resolved "https://registry.npmmirror.com/@babel/core/download/@babel/core-7.12.9.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcore%2Fdownload%2F%40babel%2Fcore-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8" + resolved "https://registry.npmmirror.com/@babel/core/download/@babel/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8" integrity sha1-/UUMTsEM27mA4pKLeqeihIRZP8g= dependencies: "@babel/code-frame" "^7.10.4" @@ -161,7 +161,7 @@ "@babel/core@^7.12.16", "@babel/core@^7.12.3": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/core/download/@babel/core-7.16.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcore%2Fdownload%2F%40babel%2Fcore-7.16.0.tgz#c4ff44046f5fe310525cc9eb4ef5147f0c5374d4" + resolved "https://registry.npmmirror.com/@babel/core/download/@babel/core-7.16.0.tgz#c4ff44046f5fe310525cc9eb4ef5147f0c5374d4" integrity sha1-xP9EBG9f4xBSXMnrTvUUfwxTdNQ= dependencies: "@babel/code-frame" "^7.16.0" @@ -182,7 +182,7 @@ "@babel/generator@^7.12.15", "@babel/generator@^7.12.5", "@babel/generator@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/generator/download/@babel/generator-7.16.0.tgz?cache=0&sync_timestamp=1635560663614&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fgenerator%2Fdownload%2F%40babel%2Fgenerator-7.16.0.tgz#d40f3d1d5075e62d3500bccb67f3daa8a95265b2" + resolved "https://registry.npmmirror.com/@babel/generator/download/@babel/generator-7.16.0.tgz#d40f3d1d5075e62d3500bccb67f3daa8a95265b2" integrity sha1-1A89HVB15i01ALzLZ/PaqKlSZbI= dependencies: "@babel/types" "^7.16.0" @@ -191,7 +191,7 @@ "@babel/helper-annotate-as-pure@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.16.0.tgz?cache=0&sync_timestamp=1635560944976&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-annotate-as-pure%2Fdownload%2F%40babel%2Fhelper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" + resolved "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" integrity sha1-mh8OvNpT2aLQAQjEzqzmpdXx8I0= dependencies: "@babel/types" "^7.16.0" @@ -206,7 +206,7 @@ "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.0", "@babel/helper-compilation-targets@^7.16.3": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/download/@babel/helper-compilation-targets-7.16.3.tgz?cache=0&sync_timestamp=1636494857717&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-compilation-targets%2Fdownload%2F%40babel%2Fhelper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" + resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/download/@babel/helper-compilation-targets-7.16.3.tgz?cache=0&sync_timestamp=1636496295030&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-compilation-targets%2Fdownload%2F%40babel%2Fhelper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA== dependencies: "@babel/compat-data" "^7.16.0" @@ -216,7 +216,7 @@ "@babel/helper-create-class-features-plugin@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/download/@babel/helper-create-class-features-plugin-7.16.0.tgz?cache=0&sync_timestamp=1635560843669&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-create-class-features-plugin%2Fdownload%2F%40babel%2Fhelper-create-class-features-plugin-7.16.0.tgz#090d4d166b342a03a9fec37ef4fd5aeb9c7c6a4b" + resolved "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/download/@babel/helper-create-class-features-plugin-7.16.0.tgz#090d4d166b342a03a9fec37ef4fd5aeb9c7c6a4b" integrity sha1-CQ1NFms0KgOp/sN+9P1a65x8aks= dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -228,7 +228,7 @@ "@babel/helper-create-regexp-features-plugin@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/download/@babel/helper-create-regexp-features-plugin-7.16.0.tgz?cache=0&sync_timestamp=1635566958507&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-create-regexp-features-plugin%2Fdownload%2F%40babel%2Fhelper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" + resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/download/@babel/helper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" integrity sha1-BrI0jON/zMT14Y3NjXUFPyp8RP8= dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -236,7 +236,7 @@ "@babel/helper-define-polyfill-provider@^0.3.0": version "0.3.0" - resolved "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/download/@babel/helper-define-polyfill-provider-0.3.0.tgz?cache=0&sync_timestamp=1636799963185&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-define-polyfill-provider%2Fdownload%2F%40babel%2Fhelper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971" + resolved "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/download/@babel/helper-define-polyfill-provider-0.3.0.tgz?cache=0&sync_timestamp=1636799795992&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-define-polyfill-provider%2Fdownload%2F%40babel%2Fhelper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971" integrity sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg== dependencies: "@babel/helper-compilation-targets" "^7.13.0" @@ -250,7 +250,7 @@ "@babel/helper-explode-assignable-expression@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-explode-assignable-expression/download/@babel/helper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778" + resolved "https://registry.npmmirror.com/@babel/helper-explode-assignable-expression/download/@babel/helper-explode-assignable-expression-7.16.0.tgz?cache=0&sync_timestamp=1635567269941&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-explode-assignable-expression%2Fdownload%2F%40babel%2Fhelper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778" integrity sha1-dTAXM3oV9G+cCfZ0z/EM7pudd3g= dependencies: "@babel/types" "^7.16.0" @@ -315,17 +315,17 @@ "@babel/helper-plugin-utils@7.10.4": version "7.10.4" - resolved "https://registry.nlark.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" + resolved "https://registry.nlark.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.10.4.tgz?cache=0&sync_timestamp=1623280296194&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-plugin-utils%2Fdownload%2F%40babel%2Fhelper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" integrity sha1-L3WoMSadT2d95JmG3/WZJ1M883U= "@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.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": version "7.14.5" - resolved "https://registry.nlark.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" + resolved "https://registry.nlark.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.14.5.tgz?cache=0&sync_timestamp=1623280296194&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-plugin-utils%2Fdownload%2F%40babel%2Fhelper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" integrity sha1-WsgizpfuxGdBq3ClF5ceRDpwxak= "@babel/helper-remap-async-to-generator@^7.16.0", "@babel/helper-remap-async-to-generator@^7.16.4": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/download/@babel/helper-remap-async-to-generator-7.16.4.tgz?cache=0&sync_timestamp=1637103423365&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-remap-async-to-generator%2Fdownload%2F%40babel%2Fhelper-remap-async-to-generator-7.16.4.tgz#5d7902f61349ff6b963e07f06a389ce139fbfe6e" + resolved "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/download/@babel/helper-remap-async-to-generator-7.16.4.tgz?cache=0&sync_timestamp=1637103399116&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-remap-async-to-generator%2Fdownload%2F%40babel%2Fhelper-remap-async-to-generator-7.16.4.tgz#5d7902f61349ff6b963e07f06a389ce139fbfe6e" integrity sha512-vGERmmhR+s7eH5Y/cp8PCVzj4XEjerq8jooMfxFdA5xVtAk9Sh4AQsrWgiErUEBjtGrBtOFKDUcWQFW4/dFwMA== dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -334,7 +334,7 @@ "@babel/helper-replace-supers@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-replace-supers/download/@babel/helper-replace-supers-7.16.0.tgz?cache=0&sync_timestamp=1635560943145&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-replace-supers%2Fdownload%2F%40babel%2Fhelper-replace-supers-7.16.0.tgz#73055e8d3cf9bcba8ddb55cad93fedc860f68f17" + resolved "https://registry.npmmirror.com/@babel/helper-replace-supers/download/@babel/helper-replace-supers-7.16.0.tgz#73055e8d3cf9bcba8ddb55cad93fedc860f68f17" integrity sha1-cwVejTz5vLqN21XK2T/tyGD2jxc= dependencies: "@babel/helper-member-expression-to-functions" "^7.16.0" @@ -344,38 +344,38 @@ "@babel/helper-simple-access@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-simple-access/download/@babel/helper-simple-access-7.16.0.tgz?cache=0&sync_timestamp=1635560942808&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-simple-access%2Fdownload%2F%40babel%2Fhelper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" + resolved "https://registry.npmmirror.com/@babel/helper-simple-access/download/@babel/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" integrity sha1-IdaidiDjg+N1NM9sELugGab5BRc= dependencies: "@babel/types" "^7.16.0" "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/download/@babel/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" + resolved "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/download/@babel/helper-skip-transparent-expression-wrappers-7.16.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-skip-transparent-expression-wrappers%2Fdownload%2F%40babel%2Fhelper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" integrity sha1-DuM4gHAUfDrgUeSH7KPrsOLouwk= dependencies: "@babel/types" "^7.16.0" "@babel/helper-split-export-declaration@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-split-export-declaration/download/@babel/helper-split-export-declaration-7.16.0.tgz?cache=0&sync_timestamp=1635560943488&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-split-export-declaration%2Fdownload%2F%40babel%2Fhelper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" + resolved "https://registry.npmmirror.com/@babel/helper-split-export-declaration/download/@babel/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" integrity sha1-KWcvQ2Y+k23zcKrrIr7ds7rsdDg= dependencies: "@babel/types" "^7.16.0" "@babel/helper-validator-identifier@^7.15.7": version "7.15.7" - resolved "https://registry.nlark.com/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.15.7.tgz?cache=0&sync_timestamp=1631920000984&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-validator-identifier%2Fdownload%2F%40babel%2Fhelper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" + resolved "https://registry.nlark.com/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.15.7.tgz?cache=0&sync_timestamp=1631920857390&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-validator-identifier%2Fdownload%2F%40babel%2Fhelper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" integrity sha1-Ig35k7/pBKSmsCq08zhaXr9uI4k= "@babel/helper-validator-option@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/helper-validator-option/download/@babel/helper-validator-option-7.14.5.tgz?cache=0&sync_timestamp=1623281108450&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-validator-option%2Fdownload%2F%40babel%2Fhelper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" + resolved "https://registry.nlark.com/@babel/helper-validator-option/download/@babel/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" integrity sha1-bnKh//GNXfy4eOHmLxoCHEty1aM= "@babel/helper-wrap-function@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-wrap-function/download/@babel/helper-wrap-function-7.16.0.tgz#b3cf318afce774dfe75b86767cd6d68f3482e57c" + resolved "https://registry.npmmirror.com/@babel/helper-wrap-function/download/@babel/helper-wrap-function-7.16.0.tgz?cache=0&sync_timestamp=1635567238019&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-wrap-function%2Fdownload%2F%40babel%2Fhelper-wrap-function-7.16.0.tgz#b3cf318afce774dfe75b86767cd6d68f3482e57c" integrity sha1-s88xivzndN/nW4Z2fNbWjzSC5Xw= dependencies: "@babel/helper-function-name" "^7.16.0" @@ -385,7 +385,7 @@ "@babel/helpers@^7.12.5", "@babel/helpers@^7.16.0": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/helpers/download/@babel/helpers-7.16.3.tgz?cache=0&sync_timestamp=1636494884812&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelpers%2Fdownload%2F%40babel%2Fhelpers-7.16.3.tgz#27fc64f40b996e7074dc73128c3e5c3e7f55c43c" + resolved "https://registry.npmmirror.com/@babel/helpers/download/@babel/helpers-7.16.3.tgz?cache=0&sync_timestamp=1636496293613&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelpers%2Fdownload%2F%40babel%2Fhelpers-7.16.3.tgz#27fc64f40b996e7074dc73128c3e5c3e7f55c43c" integrity sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w== dependencies: "@babel/template" "^7.16.0" @@ -394,7 +394,7 @@ "@babel/highlight@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/highlight/download/@babel/highlight-7.16.0.tgz?cache=0&sync_timestamp=1635560940881&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhighlight%2Fdownload%2F%40babel%2Fhighlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" + resolved "https://registry.npmmirror.com/@babel/highlight/download/@babel/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" integrity sha1-bOsysspLj182H7f9gh4/3fShclo= dependencies: "@babel/helper-validator-identifier" "^7.15.7" @@ -403,7 +403,7 @@ "@babel/parser@^7.12.16", "@babel/parser@^7.12.7", "@babel/parser@^7.16.0", "@babel/parser@^7.16.3": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/parser/download/@babel/parser-7.16.4.tgz?cache=0&sync_timestamp=1637102912616&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fparser%2Fdownload%2F%40babel%2Fparser-7.16.4.tgz#d5f92f57cf2c74ffe9b37981c0e72fee7311372e" + resolved "https://registry.npmmirror.com/@babel/parser/download/@babel/parser-7.16.4.tgz?cache=0&sync_timestamp=1637102852943&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fparser%2Fdownload%2F%40babel%2Fparser-7.16.4.tgz#d5f92f57cf2c74ffe9b37981c0e72fee7311372e" integrity sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.2": @@ -424,7 +424,7 @@ "@babel/plugin-proposal-async-generator-functions@^7.16.4": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-async-generator-functions/download/@babel/plugin-proposal-async-generator-functions-7.16.4.tgz?cache=0&sync_timestamp=1637103364027&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-proposal-async-generator-functions%2Fdownload%2F%40babel%2Fplugin-proposal-async-generator-functions-7.16.4.tgz#e606eb6015fec6fa5978c940f315eae4e300b081" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-async-generator-functions/download/@babel/plugin-proposal-async-generator-functions-7.16.4.tgz?cache=0&sync_timestamp=1637103399235&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-proposal-async-generator-functions%2Fdownload%2F%40babel%2Fplugin-proposal-async-generator-functions-7.16.4.tgz#e606eb6015fec6fa5978c940f315eae4e300b081" integrity sha512-/CUekqaAaZCQHleSK/9HajvcD/zdnJiKRiuUFq8ITE+0HsPzquf53cpFiqAwl/UfmJbR6n5uGPQSPdrmKOvHHg== dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -450,7 +450,7 @@ "@babel/plugin-proposal-dynamic-import@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-dynamic-import/download/@babel/plugin-proposal-dynamic-import-7.16.0.tgz#783eca61d50526202f9b296095453977e88659f1" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-dynamic-import/download/@babel/plugin-proposal-dynamic-import-7.16.0.tgz?cache=0&sync_timestamp=1635566469916&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-proposal-dynamic-import%2Fdownload%2F%40babel%2Fplugin-proposal-dynamic-import-7.16.0.tgz#783eca61d50526202f9b296095453977e88659f1" integrity sha1-eD7KYdUFJiAvmylglUU5d+iGWfE= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -561,42 +561,42 @@ "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" - resolved "https://registry.nlark.com/@babel/plugin-syntax-async-generators/download/@babel/plugin-syntax-async-generators-7.8.4.tgz?cache=0&sync_timestamp=1618847046078&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-async-generators%2Fdownload%2F%40babel%2Fplugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + resolved "https://registry.nlark.com/@babel/plugin-syntax-async-generators/download/@babel/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" integrity sha1-qYP7Gusuw/btBCohD2QOkOeG/g0= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-class-properties@^7.12.13": version "7.12.13" - resolved "https://registry.nlark.com/@babel/plugin-syntax-class-properties/download/@babel/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-class-properties/download/@babel/plugin-syntax-class-properties-7.12.13.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-syntax-class-properties%2Fdownload%2F%40babel%2Fplugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" integrity sha1-tcmHJ0xKOoK4lxR5aTGmtTVErhA= dependencies: "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-class-static-block@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-class-static-block/download/@babel/plugin-syntax-class-static-block-7.14.5.tgz?cache=0&sync_timestamp=1623281106862&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-class-static-block%2Fdownload%2F%40babel%2Fplugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" + resolved "https://registry.nlark.com/@babel/plugin-syntax-class-static-block/download/@babel/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" integrity sha1-GV34mxRrS3izv4l/16JXyEZZ1AY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-dynamic-import@^7.8.3": version "7.8.3" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-dynamic-import/download/@babel/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" + resolved "https://registry.nlark.com/@babel/plugin-syntax-dynamic-import/download/@babel/plugin-syntax-dynamic-import-7.8.3.tgz?cache=0&sync_timestamp=1618847125283&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-dynamic-import%2Fdownload%2F%40babel%2Fplugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" integrity sha1-Yr+Ysto80h1iYVT8lu5bPLaOrLM= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-export-namespace-from@^7.8.3": version "7.8.3" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-export-namespace-from/download/@babel/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" + resolved "https://registry.nlark.com/@babel/plugin-syntax-export-namespace-from/download/@babel/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" integrity sha1-AolkqbqA28CUyRXEh618TnpmRlo= dependencies: "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-json-strings@^7.8.3": version "7.8.3" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-json-strings/download/@babel/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" + resolved "https://registry.nlark.com/@babel/plugin-syntax-json-strings/download/@babel/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" integrity sha1-AcohtmjNghjJ5kDLbdiMVBKyyWo= dependencies: "@babel/helper-plugin-utils" "^7.8.0" @@ -624,14 +624,14 @@ "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": version "7.8.3" - resolved "https://registry.nlark.com/@babel/plugin-syntax-nullish-coalescing-operator/download/@babel/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-nullish-coalescing-operator/download/@babel/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" integrity sha1-Fn7XA2iIYIH3S1w2xlqIwDtm0ak= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-numeric-separator@^7.10.4": version "7.10.4" - resolved "https://registry.nlark.com/@babel/plugin-syntax-numeric-separator/download/@babel/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-numeric-separator/download/@babel/plugin-syntax-numeric-separator-7.10.4.tgz?cache=0&sync_timestamp=1593522054358&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-syntax-numeric-separator%2Fdownload%2F%40babel%2Fplugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" integrity sha1-ubBws+M1cM2f0Hun+pHA3Te5r5c= dependencies: "@babel/helper-plugin-utils" "^7.10.4" @@ -659,21 +659,21 @@ "@babel/plugin-syntax-private-property-in-object@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-private-property-in-object/download/@babel/plugin-syntax-private-property-in-object-7.14.5.tgz?cache=0&sync_timestamp=1623280462994&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-private-property-in-object%2Fdownload%2F%40babel%2Fplugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" + resolved "https://registry.nlark.com/@babel/plugin-syntax-private-property-in-object/download/@babel/plugin-syntax-private-property-in-object-7.14.5.tgz?cache=0&sync_timestamp=1623280423879&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-private-property-in-object%2Fdownload%2F%40babel%2Fplugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" integrity sha1-DcZnHsDqIrbpShEU+FeXDNOd4a0= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-top-level-await@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-top-level-await/download/@babel/plugin-syntax-top-level-await-7.14.5.tgz?cache=0&sync_timestamp=1623280464882&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-top-level-await%2Fdownload%2F%40babel%2Fplugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" + resolved "https://registry.nlark.com/@babel/plugin-syntax-top-level-await/download/@babel/plugin-syntax-top-level-await-7.14.5.tgz?cache=0&sync_timestamp=1623280427172&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-top-level-await%2Fdownload%2F%40babel%2Fplugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" integrity sha1-wc/a3DWmRiQAAfBhOCR7dBw02Uw= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-syntax-typescript/download/@babel/plugin-syntax-typescript-7.16.0.tgz?cache=0&sync_timestamp=1635560844194&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-syntax-typescript%2Fdownload%2F%40babel%2Fplugin-syntax-typescript-7.16.0.tgz#2feeb13d9334cc582ea9111d3506f773174179bb" + resolved "https://registry.npmmirror.com/@babel/plugin-syntax-typescript/download/@babel/plugin-syntax-typescript-7.16.0.tgz#2feeb13d9334cc582ea9111d3506f773174179bb" integrity sha1-L+6xPZM0zFguqREdNQb3cxdBebs= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -696,21 +696,21 @@ "@babel/plugin-transform-block-scoped-functions@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/download/@babel/plugin-transform-block-scoped-functions-7.16.0.tgz#c618763233ad02847805abcac4c345ce9de7145d" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/download/@babel/plugin-transform-block-scoped-functions-7.16.0.tgz?cache=0&sync_timestamp=1635567466710&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-block-scoped-functions%2Fdownload%2F%40babel%2Fplugin-transform-block-scoped-functions-7.16.0.tgz#c618763233ad02847805abcac4c345ce9de7145d" integrity sha1-xhh2MjOtAoR4BavKxMNFzp3nFF0= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-block-scoping@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/download/@babel/plugin-transform-block-scoping-7.16.0.tgz#bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/download/@babel/plugin-transform-block-scoping-7.16.0.tgz?cache=0&sync_timestamp=1635567471555&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-block-scoping%2Fdownload%2F%40babel%2Fplugin-transform-block-scoping-7.16.0.tgz#bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16" integrity sha1-vPQz+0gv6MPTtOimaxxKjnfTfBY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-classes@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-classes/download/@babel/plugin-transform-classes-7.16.0.tgz?cache=0&sync_timestamp=1635567479103&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-classes%2Fdownload%2F%40babel%2Fplugin-transform-classes-7.16.0.tgz#54cf5ff0b2242c6573d753cd4bfc7077a8b282f5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-classes/download/@babel/plugin-transform-classes-7.16.0.tgz?cache=0&sync_timestamp=1635566945526&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-classes%2Fdownload%2F%40babel%2Fplugin-transform-classes-7.16.0.tgz#54cf5ff0b2242c6573d753cd4bfc7077a8b282f5" integrity sha1-VM9f8LIkLGVz11PNS/xwd6iygvU= dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -723,14 +723,14 @@ "@babel/plugin-transform-computed-properties@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-computed-properties/download/@babel/plugin-transform-computed-properties-7.16.0.tgz#e0c385507d21e1b0b076d66bed6d5231b85110b7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-computed-properties/download/@babel/plugin-transform-computed-properties-7.16.0.tgz?cache=0&sync_timestamp=1635567483688&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-computed-properties%2Fdownload%2F%40babel%2Fplugin-transform-computed-properties-7.16.0.tgz#e0c385507d21e1b0b076d66bed6d5231b85110b7" integrity sha1-4MOFUH0h4bCwdtZr7W1SMbhRELc= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-destructuring@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/download/@babel/plugin-transform-destructuring-7.16.0.tgz#ad3d7e74584ad5ea4eadb1e6642146c590dee33c" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/download/@babel/plugin-transform-destructuring-7.16.0.tgz?cache=0&sync_timestamp=1635567488550&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-destructuring%2Fdownload%2F%40babel%2Fplugin-transform-destructuring-7.16.0.tgz#ad3d7e74584ad5ea4eadb1e6642146c590dee33c" integrity sha1-rT1+dFhK1epOrbHmZCFGxZDe4zw= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -745,7 +745,7 @@ "@babel/plugin-transform-duplicate-keys@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/download/@babel/plugin-transform-duplicate-keys-7.16.0.tgz#8bc2e21813e3e89e5e5bf3b60aa5fc458575a176" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/download/@babel/plugin-transform-duplicate-keys-7.16.0.tgz?cache=0&sync_timestamp=1635567498133&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-duplicate-keys%2Fdownload%2F%40babel%2Fplugin-transform-duplicate-keys-7.16.0.tgz#8bc2e21813e3e89e5e5bf3b60aa5fc458575a176" integrity sha1-i8LiGBPj6J5eW/O2CqX8RYV1oXY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -760,14 +760,14 @@ "@babel/plugin-transform-for-of@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-for-of/download/@babel/plugin-transform-for-of-7.16.0.tgz?cache=0&sync_timestamp=1635567508437&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-for-of%2Fdownload%2F%40babel%2Fplugin-transform-for-of-7.16.0.tgz#f7abaced155260e2461359bbc7c7248aca5e6bd2" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-for-of/download/@babel/plugin-transform-for-of-7.16.0.tgz?cache=0&sync_timestamp=1635566911464&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-for-of%2Fdownload%2F%40babel%2Fplugin-transform-for-of-7.16.0.tgz#f7abaced155260e2461359bbc7c7248aca5e6bd2" integrity sha1-96us7RVSYOJGE1m7x8ckispea9I= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-function-name@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-function-name/download/@babel/plugin-transform-function-name-7.16.0.tgz?cache=0&sync_timestamp=1635567514667&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-function-name%2Fdownload%2F%40babel%2Fplugin-transform-function-name-7.16.0.tgz#02e3699c284c6262236599f751065c5d5f1f400e" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-function-name/download/@babel/plugin-transform-function-name-7.16.0.tgz?cache=0&sync_timestamp=1635566947920&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-function-name%2Fdownload%2F%40babel%2Fplugin-transform-function-name-7.16.0.tgz#02e3699c284c6262236599f751065c5d5f1f400e" integrity sha1-AuNpnChMYmIjZZn3UQZcXV8fQA4= dependencies: "@babel/helper-function-name" "^7.16.0" @@ -775,21 +775,21 @@ "@babel/plugin-transform-literals@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-literals/download/@babel/plugin-transform-literals-7.16.0.tgz?cache=0&sync_timestamp=1635567519307&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-literals%2Fdownload%2F%40babel%2Fplugin-transform-literals-7.16.0.tgz#79711e670ffceb31bd298229d50f3621f7980cac" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-literals/download/@babel/plugin-transform-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566912041&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-literals%2Fdownload%2F%40babel%2Fplugin-transform-literals-7.16.0.tgz#79711e670ffceb31bd298229d50f3621f7980cac" integrity sha1-eXEeZw/86zG9KYIp1Q82IfeYDKw= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-member-expression-literals@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-member-expression-literals/download/@babel/plugin-transform-member-expression-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566948649&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-member-expression-literals%2Fdownload%2F%40babel%2Fplugin-transform-member-expression-literals-7.16.0.tgz#5251b4cce01eaf8314403d21aedb269d79f5e64b" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-member-expression-literals/download/@babel/plugin-transform-member-expression-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566991360&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-member-expression-literals%2Fdownload%2F%40babel%2Fplugin-transform-member-expression-literals-7.16.0.tgz#5251b4cce01eaf8314403d21aedb269d79f5e64b" integrity sha1-UlG0zOAer4MUQD0hrtsmnXn15ks= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-modules-amd@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/download/@babel/plugin-transform-modules-amd-7.16.0.tgz?cache=0&sync_timestamp=1635566949344&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-amd%2Fdownload%2F%40babel%2Fplugin-transform-modules-amd-7.16.0.tgz#09abd41e18dcf4fd479c598c1cef7bd39eb1337e" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/download/@babel/plugin-transform-modules-amd-7.16.0.tgz?cache=0&sync_timestamp=1635566912764&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-amd%2Fdownload%2F%40babel%2Fplugin-transform-modules-amd-7.16.0.tgz#09abd41e18dcf4fd479c598c1cef7bd39eb1337e" integrity sha1-CavUHhjc9P1HnFmMHO97056xM34= dependencies: "@babel/helper-module-transforms" "^7.16.0" @@ -808,7 +808,7 @@ "@babel/plugin-transform-modules-systemjs@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/download/@babel/plugin-transform-modules-systemjs-7.16.0.tgz?cache=0&sync_timestamp=1635566913014&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-systemjs%2Fdownload%2F%40babel%2Fplugin-transform-modules-systemjs-7.16.0.tgz#a92cf240afeb605f4ca16670453024425e421ea4" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/download/@babel/plugin-transform-modules-systemjs-7.16.0.tgz?cache=0&sync_timestamp=1635566949693&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-systemjs%2Fdownload%2F%40babel%2Fplugin-transform-modules-systemjs-7.16.0.tgz#a92cf240afeb605f4ca16670453024425e421ea4" integrity sha1-qSzyQK/rYF9MoWZwRTAkQl5CHqQ= dependencies: "@babel/helper-hoist-variables" "^7.16.0" @@ -819,7 +819,7 @@ "@babel/plugin-transform-modules-umd@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/download/@babel/plugin-transform-modules-umd-7.16.0.tgz?cache=0&sync_timestamp=1635566913244&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-umd%2Fdownload%2F%40babel%2Fplugin-transform-modules-umd-7.16.0.tgz#195f26c2ad6d6a391b70880effce18ce625e06a7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/download/@babel/plugin-transform-modules-umd-7.16.0.tgz?cache=0&sync_timestamp=1635566950831&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-umd%2Fdownload%2F%40babel%2Fplugin-transform-modules-umd-7.16.0.tgz#195f26c2ad6d6a391b70880effce18ce625e06a7" integrity sha1-GV8mwq1tajkbcIgO/84YzmJeBqc= dependencies: "@babel/helper-module-transforms" "^7.16.0" @@ -834,7 +834,7 @@ "@babel/plugin-transform-new-target@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-new-target/download/@babel/plugin-transform-new-target-7.16.0.tgz?cache=0&sync_timestamp=1635566951246&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-new-target%2Fdownload%2F%40babel%2Fplugin-transform-new-target-7.16.0.tgz#af823ab576f752215a49937779a41ca65825ab35" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-new-target/download/@babel/plugin-transform-new-target-7.16.0.tgz?cache=0&sync_timestamp=1635566913480&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-new-target%2Fdownload%2F%40babel%2Fplugin-transform-new-target-7.16.0.tgz#af823ab576f752215a49937779a41ca65825ab35" integrity sha1-r4I6tXb3UiFaSZN3eaQcplglqzU= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -849,21 +849,21 @@ "@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.16.0", "@babel/plugin-transform-parameters@^7.16.3": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-parameters/download/@babel/plugin-transform-parameters-7.16.3.tgz?cache=0&sync_timestamp=1636494867938&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-parameters%2Fdownload%2F%40babel%2Fplugin-transform-parameters-7.16.3.tgz#fa9e4c874ee5223f891ee6fa8d737f4766d31d15" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-parameters/download/@babel/plugin-transform-parameters-7.16.3.tgz?cache=0&sync_timestamp=1636496296752&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-parameters%2Fdownload%2F%40babel%2Fplugin-transform-parameters-7.16.3.tgz#fa9e4c874ee5223f891ee6fa8d737f4766d31d15" integrity sha512-3MaDpJrOXT1MZ/WCmkOFo7EtmVVC8H4EUZVrHvFOsmwkk4lOjQj8rzv8JKUZV4YoQKeoIgk07GO+acPU9IMu/w== dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-property-literals@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/download/@babel/plugin-transform-property-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566952712&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-property-literals%2Fdownload%2F%40babel%2Fplugin-transform-property-literals-7.16.0.tgz#a95c552189a96a00059f6776dc4e00e3690c78d1" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/download/@babel/plugin-transform-property-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566914424&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-property-literals%2Fdownload%2F%40babel%2Fplugin-transform-property-literals-7.16.0.tgz#a95c552189a96a00059f6776dc4e00e3690c78d1" integrity sha1-qVxVIYmpagAFn2d23E4A42kMeNE= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-react-constant-elements@^7.12.1": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-constant-elements/download/@babel/plugin-transform-react-constant-elements-7.16.0.tgz?cache=0&sync_timestamp=1635739349094&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-react-constant-elements%2Fdownload%2F%40babel%2Fplugin-transform-react-constant-elements-7.16.0.tgz#1483b894b8e6ef0709d260532fbd4db9fc27a0e6" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-constant-elements/download/@babel/plugin-transform-react-constant-elements-7.16.0.tgz?cache=0&sync_timestamp=1635739052504&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-react-constant-elements%2Fdownload%2F%40babel%2Fplugin-transform-react-constant-elements-7.16.0.tgz#1483b894b8e6ef0709d260532fbd4db9fc27a0e6" integrity sha1-FIO4lLjm7wcJ0mBTL71NufwnoOY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -903,21 +903,21 @@ "@babel/plugin-transform-regenerator@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/download/@babel/plugin-transform-regenerator-7.16.0.tgz?cache=0&sync_timestamp=1635566953056&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-regenerator%2Fdownload%2F%40babel%2Fplugin-transform-regenerator-7.16.0.tgz#eaee422c84b0232d03aea7db99c97deeaf6125a4" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/download/@babel/plugin-transform-regenerator-7.16.0.tgz?cache=0&sync_timestamp=1635566914723&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-regenerator%2Fdownload%2F%40babel%2Fplugin-transform-regenerator-7.16.0.tgz#eaee422c84b0232d03aea7db99c97deeaf6125a4" integrity sha1-6u5CLISwIy0Drqfbmcl97q9hJaQ= dependencies: regenerator-transform "^0.14.2" "@babel/plugin-transform-reserved-words@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/download/@babel/plugin-transform-reserved-words-7.16.0.tgz?cache=0&sync_timestamp=1635566953412&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-reserved-words%2Fdownload%2F%40babel%2Fplugin-transform-reserved-words-7.16.0.tgz#fff4b9dcb19e12619394bda172d14f2d04c0379c" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/download/@babel/plugin-transform-reserved-words-7.16.0.tgz?cache=0&sync_timestamp=1635566914972&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-reserved-words%2Fdownload%2F%40babel%2Fplugin-transform-reserved-words-7.16.0.tgz#fff4b9dcb19e12619394bda172d14f2d04c0379c" integrity sha1-//S53LGeEmGTlL2hctFPLQTAN5w= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-runtime@^7.15.0": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-runtime/download/@babel/plugin-transform-runtime-7.16.4.tgz?cache=0&sync_timestamp=1637103539571&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-runtime%2Fdownload%2F%40babel%2Fplugin-transform-runtime-7.16.4.tgz#f9ba3c7034d429c581e1bd41b4952f3db3c2c7e8" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-runtime/download/@babel/plugin-transform-runtime-7.16.4.tgz?cache=0&sync_timestamp=1637102846932&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-runtime%2Fdownload%2F%40babel%2Fplugin-transform-runtime-7.16.4.tgz#f9ba3c7034d429c581e1bd41b4952f3db3c2c7e8" integrity sha512-pru6+yHANMTukMtEZGC4fs7XPwg35v8sj5CIEmE+gEkFljFiVJxEWxx/7ZDkTK+iZRYo1bFXBtfIN95+K3cJ5A== dependencies: "@babel/helper-module-imports" "^7.16.0" @@ -929,7 +929,7 @@ "@babel/plugin-transform-shorthand-properties@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/download/@babel/plugin-transform-shorthand-properties-7.16.0.tgz?cache=0&sync_timestamp=1635566953711&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-shorthand-properties%2Fdownload%2F%40babel%2Fplugin-transform-shorthand-properties-7.16.0.tgz#090372e3141f7cc324ed70b3daf5379df2fa384d" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/download/@babel/plugin-transform-shorthand-properties-7.16.0.tgz?cache=0&sync_timestamp=1635566916554&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-shorthand-properties%2Fdownload%2F%40babel%2Fplugin-transform-shorthand-properties-7.16.0.tgz#090372e3141f7cc324ed70b3daf5379df2fa384d" integrity sha1-CQNy4xQffMMk7XCz2vU3nfL6OE0= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -944,21 +944,21 @@ "@babel/plugin-transform-sticky-regex@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-sticky-regex/download/@babel/plugin-transform-sticky-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566954378&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-sticky-regex%2Fdownload%2F%40babel%2Fplugin-transform-sticky-regex-7.16.0.tgz#c35ea31a02d86be485f6aa510184b677a91738fd" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-sticky-regex/download/@babel/plugin-transform-sticky-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566917052&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-sticky-regex%2Fdownload%2F%40babel%2Fplugin-transform-sticky-regex-7.16.0.tgz#c35ea31a02d86be485f6aa510184b677a91738fd" integrity sha1-w16jGgLYa+SF9qpRAYS2d6kXOP0= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-template-literals@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/download/@babel/plugin-transform-template-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566954713&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-template-literals%2Fdownload%2F%40babel%2Fplugin-transform-template-literals-7.16.0.tgz#a8eced3a8e7b8e2d40ec4ec4548a45912630d302" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/download/@babel/plugin-transform-template-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566917280&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-template-literals%2Fdownload%2F%40babel%2Fplugin-transform-template-literals-7.16.0.tgz#a8eced3a8e7b8e2d40ec4ec4548a45912630d302" integrity sha1-qOztOo57ji1A7E7EVIpFkSYw0wI= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-typeof-symbol@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/download/@babel/plugin-transform-typeof-symbol-7.16.0.tgz?cache=0&sync_timestamp=1635566955088&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-typeof-symbol%2Fdownload%2F%40babel%2Fplugin-transform-typeof-symbol-7.16.0.tgz#8b19a244c6f8c9d668dca6a6f754ad6ead1128f2" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/download/@babel/plugin-transform-typeof-symbol-7.16.0.tgz?cache=0&sync_timestamp=1635566920452&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-typeof-symbol%2Fdownload%2F%40babel%2Fplugin-transform-typeof-symbol-7.16.0.tgz#8b19a244c6f8c9d668dca6a6f754ad6ead1128f2" integrity sha1-ixmiRMb4ydZo3Kam91Stbq0RKPI= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -974,14 +974,14 @@ "@babel/plugin-transform-unicode-escapes@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/download/@babel/plugin-transform-unicode-escapes-7.16.0.tgz?cache=0&sync_timestamp=1635566955407&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-unicode-escapes%2Fdownload%2F%40babel%2Fplugin-transform-unicode-escapes-7.16.0.tgz#1a354064b4c45663a32334f46fa0cf6100b5b1f3" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/download/@babel/plugin-transform-unicode-escapes-7.16.0.tgz?cache=0&sync_timestamp=1635566920674&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-unicode-escapes%2Fdownload%2F%40babel%2Fplugin-transform-unicode-escapes-7.16.0.tgz#1a354064b4c45663a32334f46fa0cf6100b5b1f3" integrity sha1-GjVAZLTEVmOjIzT0b6DPYQC1sfM= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-unicode-regex@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-regex/download/@babel/plugin-transform-unicode-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566955737&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-unicode-regex%2Fdownload%2F%40babel%2Fplugin-transform-unicode-regex-7.16.0.tgz#293b80950177c8c85aede87cef280259fb995402" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-regex/download/@babel/plugin-transform-unicode-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566921655&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-unicode-regex%2Fdownload%2F%40babel%2Fplugin-transform-unicode-regex-7.16.0.tgz#293b80950177c8c85aede87cef280259fb995402" integrity sha1-KTuAlQF3yMha7eh87ygCWfuZVAI= dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.0" @@ -989,7 +989,7 @@ "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.15.6": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/preset-env/download/@babel/preset-env-7.16.4.tgz?cache=0&sync_timestamp=1637103547851&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-env%2Fdownload%2F%40babel%2Fpreset-env-7.16.4.tgz#4f6ec33b2a3fe72d6bfdcdf3859500232563a2e3" + resolved "https://registry.npmmirror.com/@babel/preset-env/download/@babel/preset-env-7.16.4.tgz?cache=0&sync_timestamp=1637103615805&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-env%2Fdownload%2F%40babel%2Fpreset-env-7.16.4.tgz#4f6ec33b2a3fe72d6bfdcdf3859500232563a2e3" integrity sha512-v0QtNd81v/xKj4gNKeuAerQ/azeNn/G1B1qMLeXOcV8+4TWlD2j3NV1u8q29SDFBXx/NBq5kyEAO+0mpRgacjA== dependencies: "@babel/compat-data" "^7.16.4" @@ -1069,7 +1069,7 @@ "@babel/preset-modules@^0.1.5": version "0.1.5" - resolved "https://registry.npmmirror.com/@babel/preset-modules/download/@babel/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" + resolved "https://registry.npmmirror.com/@babel/preset-modules/download/@babel/preset-modules-0.1.5.tgz?cache=0&sync_timestamp=1635094844477&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-modules%2Fdownload%2F%40babel%2Fpreset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" integrity sha1-75Odbn8miCfhhBY43G/5VRXhFdk= dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -1080,7 +1080,7 @@ "@babel/preset-react@^7.12.13", "@babel/preset-react@^7.12.5": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/preset-react/download/@babel/preset-react-7.16.0.tgz?cache=0&sync_timestamp=1635579106611&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-react%2Fdownload%2F%40babel%2Fpreset-react-7.16.0.tgz#f71d3e8dff5218478011df037fad52660ee6d82a" + resolved "https://registry.npmmirror.com/@babel/preset-react/download/@babel/preset-react-7.16.0.tgz#f71d3e8dff5218478011df037fad52660ee6d82a" integrity sha1-9x0+jf9SGEeAEd8Df61SZg7m2Co= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -1101,7 +1101,7 @@ "@babel/runtime-corejs3@^7.15.4": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/runtime-corejs3/download/@babel/runtime-corejs3-7.16.3.tgz?cache=0&sync_timestamp=1636494859987&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fruntime-corejs3%2Fdownload%2F%40babel%2Fruntime-corejs3-7.16.3.tgz#1e25de4fa994c57c18e5fdda6cc810dac70f5590" + resolved "https://registry.npmmirror.com/@babel/runtime-corejs3/download/@babel/runtime-corejs3-7.16.3.tgz#1e25de4fa994c57c18e5fdda6cc810dac70f5590" integrity sha512-IAdDC7T0+wEB4y2gbIL0uOXEYpiZEeuFUTVbdGq+UwCcF35T/tS8KrmMomEwEc5wBbyfH3PJVpTSUqrhPDXFcQ== dependencies: core-js-pure "^3.19.0" @@ -1109,14 +1109,14 @@ "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.15.4", "@babel/runtime@^7.8.4": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/runtime/download/@babel/runtime-7.16.3.tgz?cache=0&sync_timestamp=1636494819594&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5" + resolved "https://registry.npmmirror.com/@babel/runtime/download/@babel/runtime-7.16.3.tgz?cache=0&sync_timestamp=1636494920863&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5" integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ== dependencies: regenerator-runtime "^0.13.4" "@babel/template@^7.12.7", "@babel/template@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/template/download/@babel/template-7.16.0.tgz?cache=0&sync_timestamp=1635560664232&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Ftemplate%2Fdownload%2F%40babel%2Ftemplate-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" + resolved "https://registry.npmmirror.com/@babel/template/download/@babel/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" integrity sha1-0Wo16/TNdOICCDNW+rId2JNj3dY= dependencies: "@babel/code-frame" "^7.16.0" @@ -1125,7 +1125,7 @@ "@babel/traverse@^7.12.13", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.16.3": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/traverse/download/@babel/traverse-7.16.3.tgz?cache=0&sync_timestamp=1636494921751&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Ftraverse%2Fdownload%2F%40babel%2Ftraverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787" + resolved "https://registry.npmmirror.com/@babel/traverse/download/@babel/traverse-7.16.3.tgz?cache=0&sync_timestamp=1636496295750&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Ftraverse%2Fdownload%2F%40babel%2Ftraverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787" integrity sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag== dependencies: "@babel/code-frame" "^7.16.0" @@ -1140,7 +1140,7 @@ "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.16.0", "@babel/types@^7.4.4": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/types/download/@babel/types-7.16.0.tgz?cache=0&sync_timestamp=1635560908248&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Ftypes%2Fdownload%2F%40babel%2Ftypes-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" + resolved "https://registry.npmmirror.com/@babel/types/download/@babel/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" integrity sha1-2zsxOAT5aq3Qt3bEgj4SetZyibo= dependencies: "@babel/helper-validator-identifier" "^7.15.7" @@ -1148,12 +1148,12 @@ "@docsearch/css@3.0.0-alpha.41": version "3.0.0-alpha.41" - resolved "https://registry.npmmirror.com/@docsearch/css/download/@docsearch/css-3.0.0-alpha.41.tgz?cache=0&sync_timestamp=1634547093765&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40docsearch%2Fcss%2Fdownload%2F%40docsearch%2Fcss-3.0.0-alpha.41.tgz#c5c8e803541bd157ad86e764c2c1e9f1b5a68592" + resolved "https://registry.npmmirror.com/@docsearch/css/download/@docsearch/css-3.0.0-alpha.41.tgz#c5c8e803541bd157ad86e764c2c1e9f1b5a68592" integrity sha1-xcjoA1Qb0VethudkwsHp8bWmhZI= "@docsearch/react@^3.0.0-alpha.39": version "3.0.0-alpha.41" - resolved "https://registry.npmmirror.com/@docsearch/react/download/@docsearch/react-3.0.0-alpha.41.tgz?cache=0&sync_timestamp=1634547111085&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40docsearch%2Freact%2Fdownload%2F%40docsearch%2Freact-3.0.0-alpha.41.tgz#07e85a664e85f251ce3d13153abce65a4d5997ab" + resolved "https://registry.npmmirror.com/@docsearch/react/download/@docsearch/react-3.0.0-alpha.41.tgz#07e85a664e85f251ce3d13153abce65a4d5997ab" integrity sha1-B+haZk6F8lHOPRMVOrzmWk1Zl6s= dependencies: "@algolia/autocomplete-core" "1.2.2" @@ -1468,7 +1468,7 @@ "@hapi/hoek@^9.0.0": version "9.2.1" - resolved "https://registry.npmmirror.com/@hapi/hoek/download/@hapi/hoek-9.2.1.tgz?cache=0&sync_timestamp=1632777883600&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40hapi%2Fhoek%2Fdownload%2F%40hapi%2Fhoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" + resolved "https://registry.npmmirror.com/@hapi/hoek/download/@hapi/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" integrity sha1-lVEUKhmAUDdSU2tQUP2Z9KfxOxc= "@hapi/topo@^5.0.0": @@ -1480,7 +1480,7 @@ "@mdx-js/mdx@1.6.22", "@mdx-js/mdx@^1.6.21": version "1.6.22" - resolved "https://registry.npmmirror.com/@mdx-js/mdx/download/@mdx-js/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" + resolved "https://registry.npmmirror.com/@mdx-js/mdx/download/@mdx-js/mdx-1.6.22.tgz?cache=0&sync_timestamp=1637010128219&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40mdx-js%2Fmdx%2Fdownload%2F%40mdx-js%2Fmdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" integrity sha1-inIxV7+Q548X3A8nmVOY5scx8bo= dependencies: "@babel/core" "7.12.9" @@ -1505,12 +1505,12 @@ "@mdx-js/react@1.6.22", "@mdx-js/react@^1.6.21": version "1.6.22" - resolved "https://registry.npmmirror.com/@mdx-js/react/download/@mdx-js/react-1.6.22.tgz?cache=0&sync_timestamp=1637010066448&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40mdx-js%2Freact%2Fdownload%2F%40mdx-js%2Freact-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573" + resolved "https://registry.npmmirror.com/@mdx-js/react/download/@mdx-js/react-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573" integrity sha1-rgm0dE/dx0cU7p+dbxembnfENXM= "@mdx-js/runtime@^1.6.22": version "1.6.22" - resolved "https://registry.npmmirror.com/@mdx-js/runtime/download/@mdx-js/runtime-1.6.22.tgz#3edd388bf68a519ffa1aaf9c446b548165102345" + resolved "https://registry.nlark.com/@mdx-js/runtime/download/@mdx-js/runtime-1.6.22.tgz#3edd388bf68a519ffa1aaf9c446b548165102345" integrity sha1-Pt04i/aKUZ/6Gq+cRGtUgWUQI0U= dependencies: "@mdx-js/mdx" "1.6.22" @@ -1519,12 +1519,12 @@ "@mdx-js/util@1.6.22": version "1.6.22" - resolved "https://registry.npm.taobao.org/@mdx-js/util/download/@mdx-js/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" + resolved "https://registry.npm.taobao.org/@mdx-js/util/download/@mdx-js/util-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40mdx-js%2Futil%2Fdownload%2F%40mdx-js%2Futil-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" integrity sha1-IZ39ia5bl6iAHwFTI/+kti9FcYs= "@nodelib/fs.scandir@2.1.5": version "2.1.5" - resolved "https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + resolved "https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz?cache=0&sync_timestamp=1622792738877&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.scandir%2Fdownload%2F%40nodelib%2Ffs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" integrity sha1-dhnC6yGyVIP20WdUi0z9WnSIw9U= dependencies: "@nodelib/fs.stat" "2.0.5" @@ -1532,12 +1532,12 @@ "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" - resolved "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&sync_timestamp=1622792655362&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + resolved "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&sync_timestamp=1622792616417&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha1-W9Jir5Tp0lvR5xsF3u1Eh2oiLos= "@nodelib/fs.walk@^1.2.3": version "1.2.8" - resolved "https://registry.nlark.com/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.8.tgz?cache=0&sync_timestamp=1625769815389&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.walk%2Fdownload%2F%40nodelib%2Ffs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + resolved "https://registry.nlark.com/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" integrity sha1-6Vc36LtnRt3t9pxVaVNJTxlv5po= dependencies: "@nodelib/fs.scandir" "2.1.5" @@ -1545,12 +1545,12 @@ "@polka/url@^1.0.0-next.20": version "1.0.0-next.21" - resolved "https://registry.npmmirror.com/@polka/url/download/@polka/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" + resolved "https://registry.npmmirror.com/@polka/url/download/@polka/url-1.0.0-next.21.tgz?cache=0&sync_timestamp=1633093101880&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40polka%2Furl%2Fdownload%2F%40polka%2Furl-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha1-XeWiOFo1MJQn9gEZkrVEUU1VmqE= "@seznam/compose-react-refs@^1.0.6": version "1.0.6" - resolved "https://registry.nlark.com/@seznam/compose-react-refs/download/@seznam/compose-react-refs-1.0.6.tgz#6ec4e70bdd6e32f8e70b4100f27267cf306bd8df" + resolved "https://registry.npm.taobao.org/@seznam/compose-react-refs/download/@seznam/compose-react-refs-1.0.6.tgz#6ec4e70bdd6e32f8e70b4100f27267cf306bd8df" integrity sha1-bsTnC91uMvjnC0EA8nJnzzBr2N8= "@sideway/address@^4.1.3": @@ -1562,7 +1562,7 @@ "@sideway/formula@^3.0.0": version "3.0.0" - resolved "https://registry.nlark.com/@sideway/formula/download/@sideway/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" + resolved "https://registry.npm.taobao.org/@sideway/formula/download/@sideway/formula-3.0.0.tgz?cache=0&sync_timestamp=1603525579815&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40sideway%2Fformula%2Fdownload%2F%40sideway%2Fformula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" integrity sha1-/hWK7jLmvV3oUES+YVvAhHigoTw= "@sideway/pinpoint@^2.0.0": @@ -1572,7 +1572,7 @@ "@sindresorhus/is@^0.14.0": version "0.14.0" - resolved "https://registry.nlark.com/@sindresorhus/is/download/@sindresorhus/is-0.14.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40sindresorhus%2Fis%2Fdownload%2F%40sindresorhus%2Fis-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" + resolved "https://registry.nlark.com/@sindresorhus/is/download/@sindresorhus/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" integrity sha1-n7OjzzEyMoFR81PeRjLgHlIQK+o= "@slorber/static-site-generator-webpack-plugin@^4.0.0": @@ -1691,7 +1691,7 @@ "@szmarczak/http-timer@^1.1.2": version "1.1.2" - resolved "https://registry.nlark.com/@szmarczak/http-timer/download/@szmarczak/http-timer-1.1.2.tgz?cache=0&sync_timestamp=1629502165113&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40szmarczak%2Fhttp-timer%2Fdownload%2F%40szmarczak%2Fhttp-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" + resolved "https://registry.nlark.com/@szmarczak/http-timer/download/@szmarczak/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" integrity sha1-sWZeLEYaLNkvTBu/UNVFTeDUtCE= dependencies: defer-to-connect "^1.0.1" @@ -1741,7 +1741,7 @@ "@types/estree@*", "@types/estree@^0.0.50": version "0.0.50" - resolved "https://registry.npmmirror.com/@types/estree/download/@types/estree-0.0.50.tgz?cache=0&sync_timestamp=1637264753186&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Festree%2Fdownload%2F%40types%2Festree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" + resolved "https://registry.npmmirror.com/@types/estree/download/@types/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" integrity sha1-Hgyqk2TT/M0pMcPtlv2+ql1MyoM= "@types/github-slugger@^1.3.0": @@ -1768,14 +1768,14 @@ "@types/http-proxy@^1.17.5": version "1.17.7" - resolved "https://registry.npmmirror.com/@types/http-proxy/download/@types/http-proxy-1.17.7.tgz?cache=0&sync_timestamp=1637266134966&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fhttp-proxy%2Fdownload%2F%40types%2Fhttp-proxy-1.17.7.tgz#30ea85cc2c868368352a37f0d0d3581e24834c6f" + resolved "https://registry.npmmirror.com/@types/http-proxy/download/@types/http-proxy-1.17.7.tgz#30ea85cc2c868368352a37f0d0d3581e24834c6f" integrity sha1-MOqFzCyGg2g1Kjfw0NNYHiSDTG8= dependencies: "@types/node" "*" "@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.9" - resolved "https://registry.npmmirror.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + resolved "https://registry.npmmirror.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz?cache=0&sync_timestamp=1637266073261&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fjson-schema%2Fdownload%2F%40types%2Fjson-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha1-l+3JA36gw4WFMgsolk3eOznkZg0= "@types/mdast@^3.0.0": @@ -1802,24 +1802,24 @@ "@types/prop-types@*": version "15.7.4" - resolved "https://registry.npmmirror.com/@types/prop-types/download/@types/prop-types-15.7.4.tgz?cache=0&sync_timestamp=1637270164807&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fprop-types%2Fdownload%2F%40types%2Fprop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + resolved "https://registry.npmmirror.com/@types/prop-types/download/@types/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" integrity sha1-/PcgXCXf95Xuea8eMNosl5CAjxE= "@types/q@^1.5.1": version "1.5.5" - resolved "https://registry.npmmirror.com/@types/q/download/@types/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" + resolved "https://registry.npmmirror.com/@types/q/download/@types/q-1.5.5.tgz?cache=0&sync_timestamp=1637268455272&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fq%2Fdownload%2F%40types%2Fq-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" integrity sha1-daKo59irSyMEFFBdkjNdHctTpt8= "@types/react-helmet@*": version "6.1.4" - resolved "https://registry.npmmirror.com/@types/react-helmet/download/@types/react-helmet-6.1.4.tgz?cache=0&sync_timestamp=1637270334903&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Freact-helmet%2Fdownload%2F%40types%2Freact-helmet-6.1.4.tgz#3e54a3eb37ba7fb34ffafc64f425be4e68df03b9" + resolved "https://registry.npmmirror.com/@types/react-helmet/download/@types/react-helmet-6.1.4.tgz#3e54a3eb37ba7fb34ffafc64f425be4e68df03b9" integrity sha1-PlSj6ze6f7NP+vxk9CW+TmjfA7k= dependencies: "@types/react" "*" "@types/react-router-config@*": version "5.0.3" - resolved "https://registry.nlark.com/@types/react-router-config/download/@types/react-router-config-5.0.3.tgz?cache=0&sync_timestamp=1629709032056&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Freact-router-config%2Fdownload%2F%40types%2Freact-router-config-5.0.3.tgz#72a53561bcb5e13b82c576527b818fa2579591c7" + resolved "https://registry.nlark.com/@types/react-router-config/download/@types/react-router-config-5.0.3.tgz?cache=0&sync_timestamp=1629709123097&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Freact-router-config%2Fdownload%2F%40types%2Freact-router-config-5.0.3.tgz#72a53561bcb5e13b82c576527b818fa2579591c7" integrity sha1-cqU1Yby14TuCxXZSe4GPoleVkcc= dependencies: "@types/history" "*" @@ -1828,7 +1828,7 @@ "@types/react-router-dom@*": version "5.3.2" - resolved "https://registry.npmmirror.com/@types/react-router-dom/download/@types/react-router-dom-5.3.2.tgz?cache=0&sync_timestamp=1637450082491&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Freact-router-dom%2Fdownload%2F%40types%2Freact-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee" + resolved "https://registry.npmmirror.com/@types/react-router-dom/download/@types/react-router-dom-5.3.2.tgz?cache=0&sync_timestamp=1637449508387&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Freact-router-dom%2Fdownload%2F%40types%2Freact-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee" integrity sha1-69jhRc8FbbXGbrHaxjxy9S6FQu4= dependencies: "@types/history" "*" @@ -1854,22 +1854,22 @@ "@types/retry@^0.12.0": version "0.12.1" - resolved "https://registry.npmmirror.com/@types/retry/download/@types/retry-0.12.1.tgz?cache=0&sync_timestamp=1637270319130&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fretry%2Fdownload%2F%40types%2Fretry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" + resolved "https://registry.npmmirror.com/@types/retry/download/@types/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" integrity sha1-2PHA0Nwjr61twWqemToIZXdLQGU= "@types/scheduler@*": version "0.16.2" - resolved "https://registry.npmmirror.com/@types/scheduler/download/@types/scheduler-0.16.2.tgz?cache=0&sync_timestamp=1637270322974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fscheduler%2Fdownload%2F%40types%2Fscheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + resolved "https://registry.npmmirror.com/@types/scheduler/download/@types/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" integrity sha1-GmL4lSVyPd4kuhsBsJK/XfitTTk= "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3": version "2.0.6" - resolved "https://registry.npmmirror.com/@types/unist/download/@types/unist-2.0.6.tgz?cache=0&sync_timestamp=1637272115806&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Funist%2Fdownload%2F%40types%2Funist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" + resolved "https://registry.npmmirror.com/@types/unist/download/@types/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" integrity sha1-JQp7FsO5H2cqJFUuxkZ47rHToI0= "@webassemblyjs/ast@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.1.tgz?cache=0&sync_timestamp=1625473466238&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fast%2Fdownload%2F%40webassemblyjs%2Fast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" + resolved "https://registry.nlark.com/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.1.tgz?cache=0&sync_timestamp=1625473420080&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fast%2Fdownload%2F%40webassemblyjs%2Fast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" integrity sha1-K/12fq4aaZb0Mv9+jX/HVnnAtqc= dependencies: "@webassemblyjs/helper-numbers" "1.11.1" @@ -1877,17 +1877,17 @@ "@webassemblyjs/floating-point-hex-parser@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.11.1.tgz?cache=0&sync_timestamp=1625473463638&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Ffloating-point-hex-parser%2Fdownload%2F%40webassemblyjs%2Ffloating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" + resolved "https://registry.nlark.com/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" integrity sha1-9sYacF8P16auyqToGY8j2dwXnk8= "@webassemblyjs/helper-api-error@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" + resolved "https://registry.nlark.com/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.11.1.tgz?cache=0&sync_timestamp=1625473412127&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-api-error%2Fdownload%2F%40webassemblyjs%2Fhelper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" integrity sha1-GmMZLYeI5cASgAump6RscFKI/RY= "@webassemblyjs/helper-buffer@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" + resolved "https://registry.nlark.com/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.11.1.tgz?cache=0&sync_timestamp=1625473414638&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-buffer%2Fdownload%2F%40webassemblyjs%2Fhelper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" integrity sha1-gyqQDrREiEzemnytRn+BUA9eWrU= "@webassemblyjs/helper-numbers@1.11.1": @@ -1901,7 +1901,7 @@ "@webassemblyjs/helper-wasm-bytecode@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.11.1.tgz?cache=0&sync_timestamp=1625473463016&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-wasm-bytecode%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" + resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.11.1.tgz?cache=0&sync_timestamp=1625473415013&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-wasm-bytecode%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" integrity sha1-8ygkHkHnsZnQsgwY6IQpxEMyleE= "@webassemblyjs/helper-wasm-section@1.11.1": @@ -1930,12 +1930,12 @@ "@webassemblyjs/utf8@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" + resolved "https://registry.nlark.com/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.11.1.tgz?cache=0&sync_timestamp=1625473462317&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Futf8%2Fdownload%2F%40webassemblyjs%2Futf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" integrity sha1-0fi3ZDaefG5rrjUOhU3smlnwo/8= "@webassemblyjs/wasm-edit@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.11.1.tgz?cache=0&sync_timestamp=1625473468202&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-edit%2Fdownload%2F%40webassemblyjs%2Fwasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.11.1.tgz?cache=0&sync_timestamp=1625473490556&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-edit%2Fdownload%2F%40webassemblyjs%2Fwasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" integrity sha1-rSBuv0v5WgWM6YgKjAksXeyBk9Y= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -1960,7 +1960,7 @@ "@webassemblyjs/wasm-opt@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-opt/download/@webassemblyjs/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-opt/download/@webassemblyjs/wasm-opt-1.11.1.tgz?cache=0&sync_timestamp=1625473467198&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-opt%2Fdownload%2F%40webassemblyjs%2Fwasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" integrity sha1-ZXtMIgL0zzs0X4pMZGHIwkGJhfI= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -1995,7 +1995,7 @@ "@xtuc/long@4.2.2": version "4.2.2" - resolved "https://registry.nlark.com/@xtuc/long/download/@xtuc/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + resolved "https://registry.npm.taobao.org/@xtuc/long/download/@xtuc/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha1-0pHGpOl5ibXGHZrPOWrk/hM6cY0= accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: @@ -2013,7 +2013,7 @@ acorn-dynamic-import@^4.0.0: acorn-import-assertions@^1.7.6: version "1.8.0" - resolved "https://registry.npmmirror.com/acorn-import-assertions/download/acorn-import-assertions-1.8.0.tgz?cache=0&sync_timestamp=1633349167595&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Facorn-import-assertions%2Fdownload%2Facorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" + resolved "https://registry.npmmirror.com/acorn-import-assertions/download/acorn-import-assertions-1.8.0.tgz?cache=0&sync_timestamp=1633349407828&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Facorn-import-assertions%2Fdownload%2Facorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" integrity sha1-uitZOc5iwjjbbZPYHJsRGym4Vek= acorn-jsx@^5.0.1: @@ -2032,12 +2032,12 @@ acorn-node@^1.6.1: acorn-walk@^7.0.0: version "7.2.0" - resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-7.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-7.2.0.tgz?cache=0&sync_timestamp=1630916608758&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha1-DeiJpgEgOQmw++B7iTjcIdLpZ7w= acorn-walk@^8.0.0: version "8.2.0" - resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-8.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-8.2.0.tgz?cache=0&sync_timestamp=1630916608758&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha1-dBIQ8uJCZFRQiFOi9E0KuDt/acE= acorn@^6.1.1: @@ -2057,12 +2057,12 @@ acorn@^8.0.4, acorn@^8.4.1: address@^1.0.1, address@^1.1.2: version "1.1.2" - resolved "https://registry.nlark.com/address/download/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" + resolved "https://registry.npm.taobao.org/address/download/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" integrity sha1-vxEWycdYxRt6kz0pa3LCIe2UKLY= aggregate-error@^3.0.0: version "3.1.0" - resolved "https://registry.nlark.com/aggregate-error/download/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + resolved "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.1.0.tgz?cache=0&sync_timestamp=1618681553608&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faggregate-error%2Fdownload%2Faggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" integrity sha1-kmcP9Q9TWb23o+DUDQ7DDFc3aHo= dependencies: clean-stack "^2.0.0" @@ -2070,26 +2070,26 @@ aggregate-error@^3.0.0: ajv-formats@^2.1.1: version "2.1.1" - resolved "https://registry.npmmirror.com/ajv-formats/download/ajv-formats-2.1.1.tgz?cache=0&sync_timestamp=1636312243183&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-formats%2Fdownload%2Fajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + resolved "https://registry.npmmirror.com/ajv-formats/download/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" integrity sha1-bmaUAGWet0lzu/LjMycYCgmWtSA= dependencies: ajv "^8.0.0" ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: version "3.5.2" - resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1637523772179&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1637523824664&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha1-MfKdpatuANHC0yms97WSlhTVAU0= ajv-keywords@^5.0.0: version "5.1.0" - resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-5.1.0.tgz?cache=0&sync_timestamp=1637523772179&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-5.1.0.tgz?cache=0&sync_timestamp=1637523824664&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== dependencies: fast-deep-equal "^3.1.3" ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" - resolved "https://registry.npmmirror.com/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1637522318370&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + resolved "https://registry.npmmirror.com/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1637522259668&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha1-uvWmLoArB9l3A0WG+MO69a3ybfQ= dependencies: fast-deep-equal "^3.1.1" @@ -2099,7 +2099,7 @@ ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: ajv@^8.0.0, ajv@^8.8.0: version "8.8.2" - resolved "https://registry.npmmirror.com/ajv/download/ajv-8.8.2.tgz?cache=0&sync_timestamp=1637522318370&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb" + resolved "https://registry.npmmirror.com/ajv/download/ajv-8.8.2.tgz?cache=0&sync_timestamp=1637522259668&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb" integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw== dependencies: fast-deep-equal "^3.1.1" @@ -2116,7 +2116,7 @@ algoliasearch-helper@^3.5.5: algoliasearch@^4.0.0, algoliasearch@^4.11.0: version "4.11.0" - resolved "https://registry.npmmirror.com/algoliasearch/download/algoliasearch-4.11.0.tgz?cache=0&sync_timestamp=1634738174058&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Falgoliasearch%2Fdownload%2Falgoliasearch-4.11.0.tgz#234befb3ac355c094077f0edf3777240b1ee013c" + resolved "https://registry.npmmirror.com/algoliasearch/download/algoliasearch-4.11.0.tgz?cache=0&sync_timestamp=1634738335372&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Falgoliasearch%2Fdownload%2Falgoliasearch-4.11.0.tgz#234befb3ac355c094077f0edf3777240b1ee013c" integrity sha1-I0vvs6w1XAlAd/Dt83dyQLHuATw= dependencies: "@algolia/cache-browser-local-storage" "4.11.0" @@ -2136,29 +2136,29 @@ algoliasearch@^4.0.0, algoliasearch@^4.11.0: alphanum-sort@^1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/alphanum-sort/download/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" + resolved "https://registry.npm.taobao.org/alphanum-sort/download/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= ansi-align@^3.0.0: version "3.0.1" - resolved "https://registry.npmmirror.com/ansi-align/download/ansi-align-3.0.1.tgz?cache=0&sync_timestamp=1632743673432&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fansi-align%2Fdownload%2Fansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" + resolved "https://registry.npmmirror.com/ansi-align/download/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" integrity sha1-DN8S4RGs53OobpofrRIlxDyxmlk= dependencies: string-width "^4.1.0" ansi-html-community@^0.0.8: version "0.0.8" - resolved "https://registry.nlark.com/ansi-html-community/download/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" + resolved "https://registry.nlark.com/ansi-html-community/download/ansi-html-community-0.0.8.tgz?cache=0&sync_timestamp=1631016068950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-html-community%2Fdownload%2Fansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" integrity sha1-afvE1sy+OD+XNpNK40w/gpDxv0E= ansi-regex@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-5.0.1.tgz?cache=0&sync_timestamp=1631634988487&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-regex%2Fdownload%2Fansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha1-CCyyyJyf6GWaMRpTvWpNxTAdswQ= ansi-regex@^6.0.1: version "6.0.1" - resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-6.0.1.tgz?cache=0&sync_timestamp=1631634988487&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-regex%2Fdownload%2Fansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" integrity sha1-MYPjj66aZdfLXlOUXNWJfQJgoGo= ansi-styles@^3.2.1: @@ -2185,7 +2185,7 @@ anymatch@~3.1.2: arg@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/arg/download/arg-5.0.1.tgz?cache=0&sync_timestamp=1629166495886&other_urls=https%3A%2F%2Fregistry.nlark.com%2Farg%2Fdownload%2Farg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb" + resolved "https://registry.nlark.com/arg/download/arg-5.0.1.tgz?cache=0&sync_timestamp=1629166537485&other_urls=https%3A%2F%2Fregistry.nlark.com%2Farg%2Fdownload%2Farg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb" integrity sha1-6wyaj3d4bK0q+P8rhiiZhC17ats= argparse@^1.0.7: @@ -2212,7 +2212,7 @@ array-flatten@^2.1.0: array-union@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/array-union/download/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + resolved "https://registry.npm.taobao.org/array-union/download/array-union-2.1.0.tgz?cache=0&sync_timestamp=1614624262896&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Farray-union%2Fdownload%2Farray-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha1-t5hCCtvrHego2ErNii4j0+/oXo0= async@^2.6.2: @@ -2224,7 +2224,7 @@ async@^2.6.2: at-least-node@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/at-least-node/download/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + resolved "https://registry.nlark.com/at-least-node/download/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha1-YCzUtG6EStTv/JKoARo8RuAjjcI= autoprefixer@^10.3.1, autoprefixer@^10.3.5, autoprefixer@^10.3.7: @@ -2241,14 +2241,14 @@ autoprefixer@^10.3.1, autoprefixer@^10.3.5, autoprefixer@^10.3.7: axios@^0.21.1: version "0.21.4" - resolved "https://registry.npmmirror.com/axios/download/axios-0.21.4.tgz?cache=0&sync_timestamp=1635213960429&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Faxios%2Fdownload%2Faxios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" + resolved "https://registry.npmmirror.com/axios/download/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" integrity sha1-xnuQ3AVo5cHPKwuFjEO6KOLtpXU= dependencies: follow-redirects "^1.14.0" babel-loader@^8.2.2: version "8.2.3" - resolved "https://registry.npmmirror.com/babel-loader/download/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" + resolved "https://registry.npmmirror.com/babel-loader/download/babel-loader-8.2.3.tgz?cache=0&sync_timestamp=1634769533620&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-loader%2Fdownload%2Fbabel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" integrity sha1-iYa0Dxpkys/LS4QpMgCF72ixNC0= dependencies: find-cache-dir "^3.3.1" @@ -2258,7 +2258,7 @@ babel-loader@^8.2.2: babel-plugin-apply-mdx-type-prop@1.6.22: version "1.6.22" - resolved "https://registry.npm.taobao.org/babel-plugin-apply-mdx-type-prop/download/babel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b" + resolved "https://registry.npm.taobao.org/babel-plugin-apply-mdx-type-prop/download/babel-plugin-apply-mdx-type-prop-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-apply-mdx-type-prop%2Fdownload%2Fbabel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b" integrity sha1-0hbo/Q3pHePxR47zIx4FRGvIcFs= dependencies: "@babel/helper-plugin-utils" "7.10.4" @@ -2266,28 +2266,28 @@ babel-plugin-apply-mdx-type-prop@1.6.22: babel-plugin-dynamic-import-node@2.3.0: version "2.3.0" - resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.0.tgz?cache=0&sync_timestamp=1618846790496&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" + resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.0.tgz?cache=0&sync_timestamp=1618846958717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" integrity sha1-8A9Qe9qjw+P/bn5emNkKesq5b38= dependencies: object.assign "^4.1.0" babel-plugin-dynamic-import-node@^2.3.3: version "2.3.3" - resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.3.tgz?cache=0&sync_timestamp=1618846790496&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" + resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.3.tgz?cache=0&sync_timestamp=1618846958717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" integrity sha1-hP2hnJduxcbe/vV/lCez3vZuF6M= dependencies: object.assign "^4.1.0" babel-plugin-extract-import-names@1.6.22: version "1.6.22" - resolved "https://registry.npm.taobao.org/babel-plugin-extract-import-names/download/babel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc" + resolved "https://registry.npm.taobao.org/babel-plugin-extract-import-names/download/babel-plugin-extract-import-names-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-extract-import-names%2Fdownload%2Fbabel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc" integrity sha1-3l+aKOsS8+sleL90RyIE5m0aE9w= dependencies: "@babel/helper-plugin-utils" "7.10.4" babel-plugin-polyfill-corejs2@^0.3.0: version "0.3.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/download/babel-plugin-polyfill-corejs2-0.3.0.tgz?cache=0&sync_timestamp=1636799826882&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs2%2Fdownload%2Fbabel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/download/babel-plugin-polyfill-corejs2-0.3.0.tgz?cache=0&sync_timestamp=1636799843170&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs2%2Fdownload%2Fbabel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd" integrity sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA== dependencies: "@babel/compat-data" "^7.13.11" @@ -2296,7 +2296,7 @@ babel-plugin-polyfill-corejs2@^0.3.0: babel-plugin-polyfill-corejs3@^0.4.0: version "0.4.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/download/babel-plugin-polyfill-corejs3-0.4.0.tgz?cache=0&sync_timestamp=1636799935761&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs3%2Fdownload%2Fbabel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/download/babel-plugin-polyfill-corejs3-0.4.0.tgz?cache=0&sync_timestamp=1636799842810&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs3%2Fdownload%2Fbabel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087" integrity sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.0" @@ -2304,19 +2304,19 @@ babel-plugin-polyfill-corejs3@^0.4.0: babel-plugin-polyfill-regenerator@^0.3.0: version "0.3.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/download/babel-plugin-polyfill-regenerator-0.3.0.tgz?cache=0&sync_timestamp=1636799716073&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-regenerator%2Fdownload%2Fbabel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/download/babel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be" integrity sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.0" bail@^1.0.0: version "1.0.5" - resolved "https://registry.npmmirror.com/bail/download/bail-1.0.5.tgz?cache=0&sync_timestamp=1636274421830&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbail%2Fdownload%2Fbail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" + resolved "https://registry.npmmirror.com/bail/download/bail-1.0.5.tgz?cache=0&sync_timestamp=1636274632406&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbail%2Fdownload%2Fbail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" integrity sha1-tvoTNASjksvB+MS/Y/WVM1Hnp3Y= balanced-match@^1.0.0: version "1.0.2" - resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.2.tgz?cache=0&sync_timestamp=1617714233441&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbalanced-match%2Fdownload%2Fbalanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4= batch@0.6.1: @@ -2336,12 +2336,12 @@ binary-extensions@^2.0.0: bluebird@^3.7.1: version "3.7.2" - resolved "https://registry.nlark.com/bluebird/download/bluebird-3.7.2.tgz?cache=0&sync_timestamp=1622605302685&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbluebird%2Fdownload%2Fbluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + resolved "https://registry.npm.taobao.org/bluebird/download/bluebird-3.7.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbluebird%2Fdownload%2Fbluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha1-nyKcFb4nJFT/qXOs4NvueaGww28= body-parser@1.19.0: version "1.19.0" - resolved "https://registry.npm.taobao.org/body-parser/download/body-parser-1.19.0.tgz?cache=0&sync_timestamp=1615984442879&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbody-parser%2Fdownload%2Fbody-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + resolved "https://registry.npm.taobao.org/body-parser/download/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" integrity sha1-lrJwnlfJxOCab9Zqj9l5hE9p8Io= dependencies: bytes "3.1.0" @@ -2357,7 +2357,7 @@ body-parser@1.19.0: bonjour@^3.5.0: version "3.5.0" - resolved "https://registry.nlark.com/bonjour/download/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" + resolved "https://registry.npm.taobao.org/bonjour/download/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU= dependencies: array-flatten "^2.1.0" @@ -2388,7 +2388,7 @@ boxen@^5.0.0, boxen@^5.0.1: brace-expansion@^1.1.7: version "1.1.11" - resolved "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + resolved "https://registry.nlark.com/brace-expansion/download/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" integrity sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0= dependencies: balanced-match "^1.0.0" @@ -2403,7 +2403,7 @@ braces@^3.0.1, braces@~3.0.2: browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.18.1: version "4.18.1" - resolved "https://registry.npmmirror.com/browserslist/download/browserslist-4.18.1.tgz?cache=0&sync_timestamp=1636994406288&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbrowserslist%2Fdownload%2Fbrowserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f" + resolved "https://registry.npmmirror.com/browserslist/download/browserslist-4.18.1.tgz?cache=0&sync_timestamp=1636994462878&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbrowserslist%2Fdownload%2Fbrowserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f" integrity sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ== dependencies: caniuse-lite "^1.0.30001280" @@ -2427,7 +2427,7 @@ buble-jsx-only@^0.19.8: buffer-from@^1.0.0: version "1.1.2" - resolved "https://registry.nlark.com/buffer-from/download/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + resolved "https://registry.nlark.com/buffer-from/download/buffer-from-1.1.2.tgz?cache=0&sync_timestamp=1627578450949&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbuffer-from%2Fdownload%2Fbuffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha1-KxRqb9cugLT1XSVfNe1Zo6mkG9U= buffer-indexof@^1.0.0: @@ -2437,17 +2437,17 @@ buffer-indexof@^1.0.0: bytes@3.0.0: version "3.0.0" - resolved "https://registry.npmmirror.com/bytes/download/bytes-3.0.0.tgz?cache=0&sync_timestamp=1637015063162&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbytes%2Fdownload%2Fbytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + resolved "https://registry.npmmirror.com/bytes/download/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= bytes@3.1.0: version "3.1.0" - resolved "https://registry.npmmirror.com/bytes/download/bytes-3.1.0.tgz?cache=0&sync_timestamp=1637015063162&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbytes%2Fdownload%2Fbytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + resolved "https://registry.npmmirror.com/bytes/download/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha1-9s95M6Ng4FiPqf3oVlHNx/gF0fY= cacheable-request@^6.0.0: version "6.1.0" - resolved "https://registry.nlark.com/cacheable-request/download/cacheable-request-6.1.0.tgz?cache=0&sync_timestamp=1623237504263&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcacheable-request%2Fdownload%2Fcacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" + resolved "https://registry.nlark.com/cacheable-request/download/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" integrity sha1-IP+4vRYrpL4R6VZ9gj22UQUsqRI= dependencies: clone-response "^1.0.2" @@ -2460,7 +2460,7 @@ cacheable-request@^6.0.0: call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/call-bind/download/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + resolved "https://registry.npm.taobao.org/call-bind/download/call-bind-1.0.2.tgz?cache=0&sync_timestamp=1610403020286&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcall-bind%2Fdownload%2Fcall-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha1-sdTonmiBGcPJqQOtMKuy9qkZvjw= dependencies: function-bind "^1.1.1" @@ -2486,7 +2486,7 @@ camelcase-css@2.0.1, camelcase-css@^2.0.1: camelcase@^6.2.0: version "6.2.1" - resolved "https://registry.npmmirror.com/camelcase/download/camelcase-6.2.1.tgz?cache=0&sync_timestamp=1636945151239&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" + resolved "https://registry.npmmirror.com/camelcase/download/camelcase-6.2.1.tgz?cache=0&sync_timestamp=1636945130104&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== caniuse-api@^3.0.0: @@ -2528,22 +2528,22 @@ chalk@^4.1.0, chalk@^4.1.2: character-entities-legacy@^1.0.0: version "1.1.4" - resolved "https://registry.npmmirror.com/character-entities-legacy/download/character-entities-legacy-1.1.4.tgz?cache=0&sync_timestamp=1635911795757&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities-legacy%2Fdownload%2Fcharacter-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" + resolved "https://registry.npmmirror.com/character-entities-legacy/download/character-entities-legacy-1.1.4.tgz?cache=0&sync_timestamp=1635911807340&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities-legacy%2Fdownload%2Fcharacter-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" integrity sha1-lLwYRdznClu50uzHSHJWYSk9j8E= character-entities@^1.0.0: version "1.2.4" - resolved "https://registry.npmmirror.com/character-entities/download/character-entities-1.2.4.tgz?cache=0&sync_timestamp=1635869130345&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities%2Fdownload%2Fcharacter-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" + resolved "https://registry.npmmirror.com/character-entities/download/character-entities-1.2.4.tgz?cache=0&sync_timestamp=1635868930605&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities%2Fdownload%2Fcharacter-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" integrity sha1-4Sw5Obfq9OWxXnrUxeKOHUjFsWs= character-reference-invalid@^1.0.0: version "1.1.4" - resolved "https://registry.npmmirror.com/character-reference-invalid/download/character-reference-invalid-1.1.4.tgz?cache=0&sync_timestamp=1636446288388&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-reference-invalid%2Fdownload%2Fcharacter-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" + resolved "https://registry.npmmirror.com/character-reference-invalid/download/character-reference-invalid-1.1.4.tgz?cache=0&sync_timestamp=1636446304022&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-reference-invalid%2Fdownload%2Fcharacter-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" integrity sha1-CDMpzaDq4nKrPbvzfpo4LBOvFWA= cheerio@^0.22.0: version "0.22.0" - resolved "https://registry.nlark.com/cheerio/download/cheerio-0.22.0.tgz?cache=0&sync_timestamp=1623167701954&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcheerio%2Fdownload%2Fcheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" + resolved "https://registry.nlark.com/cheerio/download/cheerio-0.22.0.tgz?cache=0&sync_timestamp=1623167648923&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcheerio%2Fdownload%2Fcheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4= dependencies: css-select "~1.2.0" @@ -2621,19 +2621,19 @@ clone-deep@^4.0.1: clone-response@^1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/clone-response/download/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" + resolved "https://registry.npm.taobao.org/clone-response/download/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= dependencies: mimic-response "^1.0.0" clsx@^1.1.1: version "1.1.1" - resolved "https://registry.nlark.com/clsx/download/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" + resolved "https://registry.npm.taobao.org/clsx/download/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" integrity sha1-mLMTT5q73yOyZjSRrOE8XAOnMYg= coa@^2.0.2: version "2.0.2" - resolved "https://registry.npmmirror.com/coa/download/coa-2.0.2.tgz?cache=0&sync_timestamp=1636035838814&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcoa%2Fdownload%2Fcoa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" + resolved "https://registry.npmmirror.com/coa/download/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" integrity sha1-Q/bCEVG07yv1cYfbDXPeIp4+fsM= dependencies: "@types/q" "^1.5.1" @@ -2642,31 +2642,31 @@ coa@^2.0.2: collapse-white-space@^1.0.2: version "1.0.6" - resolved "https://registry.npm.taobao.org/collapse-white-space/download/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287" + resolved "https://registry.npm.taobao.org/collapse-white-space/download/collapse-white-space-1.0.6.tgz?cache=0&sync_timestamp=1615196586817&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcollapse-white-space%2Fdownload%2Fcollapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287" integrity sha1-5jYpwAFmZXkgYNu+t5xCI50sUoc= color-convert@^1.9.0: version "1.9.3" - resolved "https://registry.npm.taobao.org/color-convert/download/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + resolved "https://registry.nlark.com/color-convert/download/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg= dependencies: color-name "1.1.3" color-convert@^2.0.1: version "2.0.1" - resolved "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + resolved "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" integrity sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM= dependencies: color-name "~1.1.4" color-name@1.1.3: version "1.1.3" - resolved "https://registry.nlark.com/color-name/download/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + resolved "https://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= color-name@^1.1.4, color-name@~1.1.4: version "1.1.4" - resolved "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + resolved "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha1-wqCah6y95pVD3m9j+jmVyCbFNqI= colord@^2.9.1: @@ -2676,7 +2676,7 @@ colord@^2.9.1: colorette@^2.0.10: version "2.0.16" - resolved "https://registry.npmmirror.com/colorette/download/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" + resolved "https://registry.npmmirror.com/colorette/download/colorette-2.0.16.tgz?cache=0&sync_timestamp=1633673160250&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcolorette%2Fdownload%2Fcolorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" integrity sha1-cTua+E/bAAE58EVGvUqT9ipQhdo= combine-promises@^1.1.0: @@ -2686,44 +2686,44 @@ combine-promises@^1.1.0: comma-separated-tokens@^1.0.0: version "1.0.8" - resolved "https://registry.npmmirror.com/comma-separated-tokens/download/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" + resolved "https://registry.nlark.com/comma-separated-tokens/download/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" integrity sha1-YyuAthF4Z6FY8QgK1Jiy++fj9eo= commander@^2.20.0: version "2.20.3" - resolved "https://registry.npmmirror.com/commander/download/commander-2.20.3.tgz?cache=0&sync_timestamp=1634886396986&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + resolved "https://registry.npmmirror.com/commander/download/commander-2.20.3.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha1-/UhehMA+tIgcIHIrpIA16FMa6zM= commander@^5.1.0: version "5.1.0" - resolved "https://registry.npmmirror.com/commander/download/commander-5.1.0.tgz?cache=0&sync_timestamp=1634886396986&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" + resolved "https://registry.npmmirror.com/commander/download/commander-5.1.0.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha1-Rqu9FlL44Fm92u+Zu9yyrZzxea4= commander@^7.2.0: version "7.2.0" - resolved "https://registry.npmmirror.com/commander/download/commander-7.2.0.tgz?cache=0&sync_timestamp=1634886396986&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + resolved "https://registry.npmmirror.com/commander/download/commander-7.2.0.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha1-o2y1fQtQHOEI5NIFWaFQo5HZerc= commander@^8.3.0: version "8.3.0" - resolved "https://registry.npmmirror.com/commander/download/commander-8.3.0.tgz?cache=0&sync_timestamp=1634886396986&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" + resolved "https://registry.npmmirror.com/commander/download/commander-8.3.0.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha1-SDfqGy2me5xhamevuw+v7lZ7ymY= commondir@^1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/commondir/download/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + resolved "https://registry.nlark.com/commondir/download/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= compressible@~2.0.16: version "2.0.18" - resolved "https://registry.nlark.com/compressible/download/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" + resolved "https://registry.npm.taobao.org/compressible/download/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" integrity sha1-r1PMprBw1MPAdQ+9dyhqbXzEb7o= dependencies: mime-db ">= 1.43.0 < 2" compression@^1.7.4: version "1.7.4" - resolved "https://registry.npm.taobao.org/compression/download/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" + resolved "https://registry.nlark.com/compression/download/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" integrity sha1-lVI+/xcMpXwpoMpB5v4TH0Hlu48= dependencies: accepts "~1.3.5" @@ -2736,7 +2736,7 @@ compression@^1.7.4: concat-map@0.0.1: version "0.0.1" - resolved "https://registry.nlark.com/concat-map/download/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + resolved "https://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= configstore@^5.0.1: @@ -2753,22 +2753,22 @@ configstore@^5.0.1: connect-history-api-fallback@^1.6.0: version "1.6.0" - resolved "https://registry.nlark.com/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz?cache=0&sync_timestamp=1618847040596&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fconnect-history-api-fallback%2Fdownload%2Fconnect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" + resolved "https://registry.npm.taobao.org/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha1-izIIk1kwjRERFdgcrT/Oq4iPl7w= consola@^2.15.3: version "2.15.3" - resolved "https://registry.nlark.com/consola/download/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550" + resolved "https://registry.npm.taobao.org/consola/download/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550" integrity sha1-LhH5jWpL5x/3LgvfB70j4Sy2FVA= content-disposition@0.5.2: version "0.5.2" - resolved "https://registry.npm.taobao.org/content-disposition/download/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" + resolved "https://registry.nlark.com/content-disposition/download/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ= content-disposition@0.5.3: version "0.5.3" - resolved "https://registry.npm.taobao.org/content-disposition/download/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" + resolved "https://registry.nlark.com/content-disposition/download/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" integrity sha1-4TDK9+cnkIfFYWwgB9BIVpiYT70= dependencies: safe-buffer "5.1.2" @@ -2787,7 +2787,7 @@ convert-source-map@^1.7.0: cookie-signature@1.0.6: version "1.0.6" - resolved "https://registry.npm.taobao.org/cookie-signature/download/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + resolved "https://registry.nlark.com/cookie-signature/download/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= cookie@0.4.0: @@ -2797,12 +2797,12 @@ cookie@0.4.0: copy-text-to-clipboard@^3.0.1: version "3.0.1" - resolved "https://registry.npm.taobao.org/copy-text-to-clipboard/download/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c" + resolved "https://registry.nlark.com/copy-text-to-clipboard/download/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c" integrity sha1-jL+PkOCkfxLkokdDc2Jl0Ve85pw= copy-webpack-plugin@^9.0.1: version "9.1.0" - resolved "https://registry.npmmirror.com/copy-webpack-plugin/download/copy-webpack-plugin-9.1.0.tgz?cache=0&sync_timestamp=1637161330355&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcopy-webpack-plugin%2Fdownload%2Fcopy-webpack-plugin-9.1.0.tgz#2d2c460c4c4695ec0a58afb2801a1205256c4e6b" + resolved "https://registry.npmmirror.com/copy-webpack-plugin/download/copy-webpack-plugin-9.1.0.tgz?cache=0&sync_timestamp=1637161372227&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcopy-webpack-plugin%2Fdownload%2Fcopy-webpack-plugin-9.1.0.tgz#2d2c460c4c4695ec0a58afb2801a1205256c4e6b" integrity sha512-rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA== dependencies: fast-glob "^3.2.7" @@ -2832,12 +2832,12 @@ core-js@^3.18.0: core-util-is@~1.0.0: version "1.0.3" - resolved "https://registry.nlark.com/core-util-is/download/core-util-is-1.0.3.tgz?cache=0&sync_timestamp=1630420570787&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-util-is%2Fdownload%2Fcore-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + resolved "https://registry.nlark.com/core-util-is/download/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha1-pgQtNjTCsn6TKPg3uWX6yDgI24U= cosmiconfig@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-6.0.0.tgz?cache=0&sync_timestamp=1629585969900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" + resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-6.0.0.tgz?cache=0&sync_timestamp=1629586119976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" integrity sha1-2k/uhTxS9rHmk19BwaL8UL1KmYI= dependencies: "@types/parse-json" "^4.0.0" @@ -2848,7 +2848,7 @@ cosmiconfig@^6.0.0: cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: version "7.0.1" - resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz?cache=0&sync_timestamp=1629585969900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz?cache=0&sync_timestamp=1629586119976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" integrity sha1-cU11ZSLKzoZ4Z8y0R0xdAbuuXW0= dependencies: "@types/parse-json" "^4.0.0" @@ -2859,7 +2859,7 @@ cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: cross-env@^7.0.3: version "7.0.3" - resolved "https://registry.npm.taobao.org/cross-env/download/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + resolved "https://registry.nlark.com/cross-env/download/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" integrity sha1-hlJkspZ33AFbqEGJGJZd0jL8VM8= dependencies: cross-spawn "^7.0.1" @@ -2880,7 +2880,7 @@ crypto-random-string@^2.0.0: css-declaration-sorter@^6.0.3: version "6.1.3" - resolved "https://registry.nlark.com/css-declaration-sorter/download/css-declaration-sorter-6.1.3.tgz?cache=0&sync_timestamp=1630965563343&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcss-declaration-sorter%2Fdownload%2Fcss-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2" + resolved "https://registry.nlark.com/css-declaration-sorter/download/css-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2" integrity sha1-6YUuTPlAunn1CdlCWxN9H5RDjcI= dependencies: timsort "^0.3.0" @@ -2921,7 +2921,7 @@ css-select-base-adapter@^0.1.1: css-select@^2.0.0: version "2.1.0" - resolved "https://registry.nlark.com/css-select/download/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" + resolved "https://registry.nlark.com/css-select/download/css-select-2.1.0.tgz?cache=0&sync_timestamp=1622994276976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcss-select%2Fdownload%2Fcss-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" integrity sha1-ajRlM1ZjWTSoG6ymjQJVQyEF2+8= dependencies: boolbase "^1.0.0" @@ -2931,7 +2931,7 @@ css-select@^2.0.0: css-select@^4.1.3: version "4.1.3" - resolved "https://registry.nlark.com/css-select/download/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" + resolved "https://registry.nlark.com/css-select/download/css-select-4.1.3.tgz?cache=0&sync_timestamp=1622994276976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcss-select%2Fdownload%2Fcss-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" integrity sha1-pwRA9wMX8maRGK10/xBeZYSccGc= dependencies: boolbase "^1.0.0" @@ -2942,7 +2942,7 @@ css-select@^4.1.3: css-select@~1.2.0: version "1.2.0" - resolved "https://registry.nlark.com/css-select/download/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" + resolved "https://registry.nlark.com/css-select/download/css-select-1.2.0.tgz?cache=0&sync_timestamp=1622994276976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcss-select%2Fdownload%2Fcss-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg= dependencies: boolbase "~1.0.0" @@ -2968,22 +2968,22 @@ css-tree@^1.1.2, css-tree@^1.1.3: css-what@2.1: version "2.1.3" - resolved "https://registry.npmmirror.com/css-what/download/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" + resolved "https://registry.npmmirror.com/css-what/download/css-what-2.1.3.tgz?cache=0&sync_timestamp=1633863955744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-what%2Fdownload%2Fcss-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" integrity sha1-ptdgRXM2X+dGhsPzEcVlE9iChfI= css-what@^3.2.1: version "3.4.2" - resolved "https://registry.npmmirror.com/css-what/download/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" + resolved "https://registry.npmmirror.com/css-what/download/css-what-3.4.2.tgz?cache=0&sync_timestamp=1633863955744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-what%2Fdownload%2Fcss-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" integrity sha1-6nAm/LAXd+295SEk4h8yfnrpUOQ= css-what@^5.0.0: version "5.1.0" - resolved "https://registry.npmmirror.com/css-what/download/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" + resolved "https://registry.npmmirror.com/css-what/download/css-what-5.1.0.tgz?cache=0&sync_timestamp=1633863955744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-what%2Fdownload%2Fcss-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" integrity sha1-P3tweq32M7r2LCzrhXm1RbtA9/4= cssesc@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/cssesc/download/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + resolved "https://registry.nlark.com/cssesc/download/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4= cssnano-preset-advanced@^5.1.4: @@ -3050,14 +3050,14 @@ cssnano@^5.0.6, cssnano@^5.0.8: csso@^4.0.2, csso@^4.2.0: version "4.2.0" - resolved "https://registry.npm.taobao.org/csso/download/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" + resolved "https://registry.nlark.com/csso/download/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" integrity sha1-6jpWE0bo3J9UbW/r7dUBh884lSk= dependencies: css-tree "^1.1.2" csstype@^3.0.2: version "3.0.10" - resolved "https://registry.npmmirror.com/csstype/download/csstype-3.0.10.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcsstype%2Fdownload%2Fcsstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" + resolved "https://registry.npmmirror.com/csstype/download/csstype-3.0.10.tgz?cache=0&sync_timestamp=1637224514674&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcsstype%2Fdownload%2Fcsstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA== debug@2.6.9, debug@^2.6.0: @@ -3083,14 +3083,14 @@ debug@^4.1.0, debug@^4.1.1: decompress-response@^3.3.0: version "3.3.0" - resolved "https://registry.npm.taobao.org/decompress-response/download/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" + resolved "https://registry.npm.taobao.org/decompress-response/download/decompress-response-3.3.0.tgz?cache=0&sync_timestamp=1613125280468&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdecompress-response%2Fdownload%2Fdecompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= dependencies: mimic-response "^1.0.0" deep-equal@^1.0.1: version "1.1.1" - resolved "https://registry.nlark.com/deep-equal/download/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + resolved "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz?cache=0&sync_timestamp=1606860754950&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeep-equal%2Fdownload%2Fdeep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" integrity sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o= dependencies: is-arguments "^1.0.4" @@ -3102,12 +3102,12 @@ deep-equal@^1.0.1: deep-extend@^0.6.0: version "0.6.0" - resolved "https://registry.npm.taobao.org/deep-extend/download/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + resolved "https://registry.nlark.com/deep-extend/download/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha1-xPp8lUBKF6nD6Mp+FTcxK3NjMKw= deepmerge@^4.2.2: version "4.2.2" - resolved "https://registry.npm.taobao.org/deepmerge/download/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + resolved "https://registry.nlark.com/deepmerge/download/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha1-RNLqNnm49NT/ujPwPYZfwee/SVU= default-gateway@^6.0.3: @@ -3124,12 +3124,12 @@ defer-to-connect@^1.0.1: define-lazy-prop@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/define-lazy-prop/download/define-lazy-prop-2.0.0.tgz?cache=0&sync_timestamp=1618387627365&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdefine-lazy-prop%2Fdownload%2Fdefine-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + resolved "https://registry.npmmirror.com/define-lazy-prop/download/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha1-P3rkIRKbyqrJvHSQXJigAJ7J7n8= define-properties@^1.1.3: version "1.1.3" - resolved "https://registry.nlark.com/define-properties/download/define-properties-1.1.3.tgz?cache=0&sync_timestamp=1618847174317&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdefine-properties%2Fdownload%2Fdefine-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + resolved "https://registry.npm.taobao.org/define-properties/download/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" integrity sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE= dependencies: object-keys "^1.0.12" @@ -3141,7 +3141,7 @@ defined@^1.0.0: del@^6.0.0: version "6.0.0" - resolved "https://registry.npm.taobao.org/del/download/del-6.0.0.tgz?cache=0&sync_timestamp=1615984345486&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdel%2Fdownload%2Fdel-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" + resolved "https://registry.npm.taobao.org/del/download/del-6.0.0.tgz?cache=0&sync_timestamp=1618321540358&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdel%2Fdownload%2Fdel-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" integrity sha1-C0DQMyzqdD8WFPgYvk/rcXcUyVI= dependencies: globby "^11.0.1" @@ -3165,7 +3165,7 @@ destroy@~1.0.4: detab@2.0.4: version "2.0.4" - resolved "https://registry.nlark.com/detab/download/detab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43" + resolved "https://registry.nlark.com/detab/download/detab-2.0.4.tgz?cache=0&sync_timestamp=1629724300992&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdetab%2Fdownload%2Fdetab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43" integrity sha1-uSeJIGmv9AX7uaGG/pekSpKpS0M= dependencies: repeat-string "^1.5.4" @@ -3202,7 +3202,7 @@ detective@^5.2.0: didyoumean@^1.2.2: version "1.2.2" - resolved "https://registry.nlark.com/didyoumean/download/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" + resolved "https://registry.nlark.com/didyoumean/download/didyoumean-1.2.2.tgz?cache=0&sync_timestamp=1624543452248&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdidyoumean%2Fdownload%2Fdidyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" integrity sha1-mJNG/+noObRVXs9WZu3qDT6K0Dc= dir-glob@^3.0.1: @@ -3219,12 +3219,12 @@ dlv@^1.1.3: dns-equal@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/dns-equal/download/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" + resolved "https://registry.npm.taobao.org/dns-equal/download/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= dns-packet@^1.3.1: version "1.3.4" - resolved "https://registry.nlark.com/dns-packet/download/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" + resolved "https://registry.nlark.com/dns-packet/download/dns-packet-1.3.4.tgz?cache=0&sync_timestamp=1625480066754&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdns-packet%2Fdownload%2Fdns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" integrity sha1-40VQZYJKJQe6iGxVqJljuxB97G8= dependencies: ip "^1.1.0" @@ -3232,75 +3232,25 @@ dns-packet@^1.3.1: dns-txt@^2.0.2: version "2.0.2" - resolved "https://registry.npm.taobao.org/dns-txt/download/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" + resolved "https://registry.nlark.com/dns-txt/download/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= dependencies: buffer-indexof "^1.0.0" -docusaurus-preset-nonepress@0.0.0-108: - version "0.0.0-108" - resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-108.tgz#37a4068c71fe335d2486d9effcadcb18503b50cb" - integrity sha512-GuH22RrrI5FWiUPIKEWWisWJ/laymWMY+aFbfXY5fNLzarLFkAmshUpGHuuAMAnL/U1W812RYyJNoNHnUA/XgQ== - dependencies: - "@docusaurus/core" "2.0.0-beta.9" - "@docusaurus/plugin-content-docs" "2.0.0-beta.9" - "@docusaurus/plugin-content-pages" "2.0.0-beta.9" - docusaurus-theme-nonepress "0.0.0-108" - docusaurus-preset-nonepress@canary: - version "0.0.0-109" - resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-109.tgz#bb3d373beb908ae981a1e0f41e3d2d3619672c0c" - integrity sha512-bZRyInMVPdJ9jn/lo/24yT67WwuO0yPVOItRe3f7w2ziDUMIQ1/UM2RAc8My+RyRbByyFu6kWc9SBIeJlmupVQ== + version "0.0.0-111" + resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-111.tgz#c0c56f353789875391c7c6c91bb86651d4e93a4a" + integrity sha512-uVQlfzpO4m1xxQk3X22oqDXz+uyw3faBjLzGYshhkGMhyC66prx2Bxlz8SdKIjeFuBjLAazcTDEPER333R8n3Q== dependencies: "@docusaurus/core" "2.0.0-beta.9" "@docusaurus/plugin-content-docs" "2.0.0-beta.9" "@docusaurus/plugin-content-pages" "2.0.0-beta.9" - docusaurus-theme-nonepress "0.0.0-109" + docusaurus-theme-nonepress "0.0.0-111" -docusaurus-theme-nonepress@0.0.0-108: - version "0.0.0-108" - resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-108.tgz#d1e381a446d1179841ae4fe5f51cd6314df9b0a1" - integrity sha512-PSawVRZFvn6kBKBsiET7Ihs98jRxnq+Mg9J6KRTTGdJBOyUCBd/9E1oE2YF9VaQGil0NbhuM7Avysri4YP3meA== - dependencies: - "@docsearch/react" "^3.0.0-alpha.39" - "@docusaurus/core" "2.0.0-beta.9" - "@docusaurus/plugin-content-docs" "2.0.0-beta.9" - "@docusaurus/plugin-content-pages" "2.0.0-beta.9" - "@docusaurus/theme-common" "2.0.0-beta.9" - "@docusaurus/utils" "2.0.0-beta.9" - "@docusaurus/utils-common" "2.0.0-beta.9" - "@docusaurus/utils-validation" "2.0.0-beta.9" - "@fortawesome/fontawesome-svg-core" "^1.2.36" - "@fortawesome/free-brands-svg-icons" "^5.15.4" - "@fortawesome/free-regular-svg-icons" "^5.15.4" - "@fortawesome/free-solid-svg-icons" "^5.15.4" - "@fortawesome/react-fontawesome" "^0.1.16" - "@mdx-js/mdx" "^1.6.21" - "@mdx-js/react" "^1.6.21" - "@seznam/compose-react-refs" "^1.0.6" - "@tailwindcss/typography" "^0.5.0-alpha.3" - algoliasearch "^4.11.0" - algoliasearch-helper "^3.5.5" - autoprefixer "^10.3.1" - chalk "^4.1.2" - clsx "^1.1.1" - copy-text-to-clipboard "^3.0.1" - eta "^1.12.3" - globby "^11.0.2" - lodash "^4.17.20" - parse-numeric-range "^1.2.0" - postcss "^8.3.7" - postcss-import "^14.0.2" - prism-react-renderer "^1.2.1" - prismjs "^1.23.0" - react-cool-onclickoutside "^1.6.2" - react-router-dom "^5.2.0" - tailwindcss ">=3.0.0 || >=3.0.0-alpha.1" - -docusaurus-theme-nonepress@0.0.0-109: - version "0.0.0-109" - resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-109.tgz#955b8ca07b9c4d971ec9eb7d86d98f5b5640c4a2" - integrity sha512-qkck6fAYQPmajFeaWKzh61wIrOuxVVJDH+NhqyWHuSkbCqBxHo5qjHV3LZyZh+480PtAmHornkXVDluSJSRM7w== +docusaurus-theme-nonepress@0.0.0-111: + version "0.0.0-111" + resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-111.tgz#e0cd2633402a9b211e77341d51f89eeaff9dee3d" + integrity sha512-T1188L+nkjSAHNMt6r2QtRBW7PN2N7XIScXlY3lAuQ2kyQVcFyW8aaxxYplJeJ0nyn0n+2Bxg2TdYaubQvqA8Q== dependencies: "@docsearch/react" "^3.0.0-alpha.39" "@docusaurus/core" "2.0.0-beta.9" @@ -3346,7 +3296,7 @@ dom-converter@^0.2.0: dom-serializer@0: version "0.2.2" - resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.2.2.tgz?cache=0&sync_timestamp=1621256830355&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" + resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.2.2.tgz?cache=0&sync_timestamp=1621256918158&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" integrity sha1-GvuB9TNxcXXUeGVd68XjMtn5u1E= dependencies: domelementtype "^2.0.1" @@ -3354,7 +3304,7 @@ dom-serializer@0: dom-serializer@^1.0.1: version "1.3.2" - resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-1.3.2.tgz?cache=0&sync_timestamp=1621256830355&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" + resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-1.3.2.tgz?cache=0&sync_timestamp=1621256918158&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" integrity sha1-YgZDfTLO767HFhgDIwx6ILwbTZE= dependencies: domelementtype "^2.0.1" @@ -3363,7 +3313,7 @@ dom-serializer@^1.0.1: dom-serializer@~0.1.0: version "0.1.1" - resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.1.1.tgz?cache=0&sync_timestamp=1621256830355&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" + resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.1.1.tgz?cache=0&sync_timestamp=1621256918158&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" integrity sha1-HsQFnihLq+027sKUHUqXChic58A= dependencies: domelementtype "^1.3.0" @@ -3371,12 +3321,12 @@ dom-serializer@~0.1.0: domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: version "1.3.1" - resolved "https://registry.npm.taobao.org/domelementtype/download/domelementtype-1.3.1.tgz?cache=0&sync_timestamp=1617298545989&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomelementtype%2Fdownload%2Fdomelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" + resolved "https://registry.nlark.com/domelementtype/download/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha1-0EjESzew0Qp/Kj1f7j9DM9eQSB8= domelementtype@^2.0.1, domelementtype@^2.2.0: version "2.2.0" - resolved "https://registry.npm.taobao.org/domelementtype/download/domelementtype-2.2.0.tgz?cache=0&sync_timestamp=1617298545989&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomelementtype%2Fdownload%2Fdomelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + resolved "https://registry.nlark.com/domelementtype/download/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" integrity sha1-mgtsJ4LtahxzI9QiZxg9+b2LHVc= domhandler@^2.3.0: @@ -3420,7 +3370,7 @@ domutils@^2.5.2, domutils@^2.6.0: dot-case@^3.0.4: version "3.0.4" - resolved "https://registry.nlark.com/dot-case/download/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" + resolved "https://registry.npm.taobao.org/dot-case/download/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" integrity sha1-mytnDQCkMWZ6inW6Kc0bmICc51E= dependencies: no-case "^3.0.4" @@ -3428,7 +3378,7 @@ dot-case@^3.0.4: dot-prop@^5.2.0: version "5.3.0" - resolved "https://registry.nlark.com/dot-prop/download/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + resolved "https://registry.npm.taobao.org/dot-prop/download/dot-prop-5.3.0.tgz?cache=0&sync_timestamp=1605778245785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdot-prop%2Fdownload%2Fdot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" integrity sha1-kMzOcIzZzYLMTcjD3dmr3VWyDog= dependencies: is-obj "^2.0.0" @@ -3440,7 +3390,7 @@ duplexer3@^0.1.4: duplexer@^0.1.1, duplexer@^0.1.2: version "0.1.2" - resolved "https://registry.nlark.com/duplexer/download/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" + resolved "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fduplexer%2Fdownload%2Fduplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha1-Or5DrvODX4rgd9E23c4PJ2sEAOY= ee-first@1.1.1: @@ -3455,7 +3405,7 @@ electron-to-chromium@^1.3.896: emoji-regex@^8.0.0: version "8.0.0" - resolved "https://registry.npmmirror.com/emoji-regex/download/emoji-regex-8.0.0.tgz?cache=0&sync_timestamp=1632811716250&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Femoji-regex%2Fdownload%2Femoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + resolved "https://registry.npmmirror.com/emoji-regex/download/emoji-regex-8.0.0.tgz?cache=0&sync_timestamp=1632751333727&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Femoji-regex%2Fdownload%2Femoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha1-6Bj9ac5cz8tARZT4QpY79TFkzDc= emojis-list@^3.0.0: @@ -3465,7 +3415,7 @@ emojis-list@^3.0.0: emoticon@^3.2.0: version "3.2.0" - resolved "https://registry.npmmirror.com/emoticon/download/emoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f" + resolved "https://registry.npmmirror.com/emoticon/download/emoticon-3.2.0.tgz?cache=0&sync_timestamp=1636290949842&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Femoticon%2Fdownload%2Femoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f" integrity sha1-wAjKfXYg+sdC/hv0r4/4/tFUrn8= encodeurl@~1.0.2: @@ -3482,7 +3432,7 @@ end-of-stream@^1.1.0: enhanced-resolve@^5.8.3: version "5.8.3" - resolved "https://registry.nlark.com/enhanced-resolve/download/enhanced-resolve-5.8.3.tgz?cache=0&sync_timestamp=1632130808043&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" + resolved "https://registry.nlark.com/enhanced-resolve/download/enhanced-resolve-5.8.3.tgz?cache=0&sync_timestamp=1632130840337&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" integrity sha1-bVUtRlzOBCP1s9cYUR6lOCansvA= dependencies: graceful-fs "^4.2.4" @@ -3500,14 +3450,14 @@ entities@^2.0.0: error-ex@^1.3.1: version "1.3.2" - resolved "https://registry.nlark.com/error-ex/download/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + resolved "https://registry.npm.taobao.org/error-ex/download/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" integrity sha1-tKxAZIEH/c3PriQvQovqihTU8b8= dependencies: is-arrayish "^0.2.1" es-abstract@^1.17.2, es-abstract@^1.19.1: version "1.19.1" - resolved "https://registry.npmmirror.com/es-abstract/download/es-abstract-1.19.1.tgz?cache=0&sync_timestamp=1633234258828&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-abstract%2Fdownload%2Fes-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" + resolved "https://registry.npmmirror.com/es-abstract/download/es-abstract-1.19.1.tgz?cache=0&sync_timestamp=1633234313248&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-abstract%2Fdownload%2Fes-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" integrity sha1-1IhXlodpFpWd547aoN9FZicRXsM= dependencies: call-bind "^1.0.2" @@ -3533,7 +3483,7 @@ es-abstract@^1.17.2, es-abstract@^1.19.1: es-module-lexer@^0.9.0: version "0.9.3" - resolved "https://registry.npmmirror.com/es-module-lexer/download/es-module-lexer-0.9.3.tgz?cache=0&sync_timestamp=1633649003753&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-module-lexer%2Fdownload%2Fes-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" + resolved "https://registry.npmmirror.com/es-module-lexer/download/es-module-lexer-0.9.3.tgz?cache=0&sync_timestamp=1633646154044&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-module-lexer%2Fdownload%2Fes-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" integrity sha1-bxPbAMw4QXE32vdDZvU1yOtDjxk= es-to-primitive@^1.2.1: @@ -3547,7 +3497,7 @@ es-to-primitive@^1.2.1: escalade@^3.1.1: version "3.1.1" - resolved "https://registry.nlark.com/escalade/download/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + resolved "https://registry.npm.taobao.org/escalade/download/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha1-2M/ccACWXFoBdLSoLqpcBVJ0LkA= escape-goat@^2.0.0: @@ -3577,7 +3527,7 @@ escape-string-regexp@^4.0.0: eslint-scope@5.1.1: version "5.1.1" - resolved "https://registry.npmmirror.com/eslint-scope/download/eslint-scope-5.1.1.tgz?cache=0&sync_timestamp=1637466831846&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Feslint-scope%2Fdownload%2Feslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + resolved "https://registry.npmmirror.com/eslint-scope/download/eslint-scope-5.1.1.tgz?cache=0&sync_timestamp=1637466913662&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Feslint-scope%2Fdownload%2Feslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha1-54blmmbLkrP2wfsNUIqrF0hI9Iw= dependencies: esrecurse "^4.3.0" @@ -3585,24 +3535,24 @@ eslint-scope@5.1.1: esprima@^4.0.0: version "4.0.1" - resolved "https://registry.npm.taobao.org/esprima/download/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + resolved "https://registry.nlark.com/esprima/download/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha1-E7BM2z5sXRnfkatph6hpVhmwqnE= esrecurse@^4.3.0: version "4.3.0" - resolved "https://registry.nlark.com/esrecurse/download/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + resolved "https://registry.npm.taobao.org/esrecurse/download/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" integrity sha1-eteWTWeauyi+5yzsY3WLHF0smSE= dependencies: estraverse "^5.2.0" estraverse@^4.1.1: version "4.3.0" - resolved "https://registry.npmmirror.com/estraverse/download/estraverse-4.3.0.tgz?cache=0&sync_timestamp=1635237706876&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + resolved "https://registry.npmmirror.com/estraverse/download/estraverse-4.3.0.tgz?cache=0&sync_timestamp=1635237716974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha1-OYrT88WiSUi+dyXoPRGn3ijNvR0= estraverse@^5.2.0: version "5.3.0" - resolved "https://registry.npmmirror.com/estraverse/download/estraverse-5.3.0.tgz?cache=0&sync_timestamp=1635237706876&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + resolved "https://registry.npmmirror.com/estraverse/download/estraverse-5.3.0.tgz?cache=0&sync_timestamp=1635237716974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" integrity sha1-LupSkHAvJquP5TcDcP+GyWXSESM= esutils@^2.0.2: @@ -3617,7 +3567,7 @@ eta@^1.12.3: etag@~1.8.1: version "1.8.1" - resolved "https://registry.npm.taobao.org/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + resolved "https://registry.nlark.com/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= eval@^0.1.4: @@ -3629,22 +3579,22 @@ eval@^0.1.4: eventemitter3@^4.0.0: version "4.0.7" - resolved "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + resolved "https://registry.nlark.com/eventemitter3/download/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha1-Lem2j2Uo1WRO9cWVJqG0oHMGFp8= events@^1.1.1: version "1.1.1" - resolved "https://registry.npmmirror.com/events/download/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" + resolved "https://registry.npmmirror.com/events/download/events-1.1.1.tgz?cache=0&sync_timestamp=1636449286836&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fevents%2Fdownload%2Fevents-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= events@^3.2.0: version "3.3.0" - resolved "https://registry.npmmirror.com/events/download/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + resolved "https://registry.npmmirror.com/events/download/events-3.3.0.tgz?cache=0&sync_timestamp=1636449286836&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fevents%2Fdownload%2Fevents-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha1-Mala0Kkk4tLEGagTrrLE6HjqdAA= execa@^5.0.0: version "5.1.1" - resolved "https://registry.npmmirror.com/execa/download/execa-5.1.1.tgz?cache=0&sync_timestamp=1637147207309&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fexeca%2Fdownload%2Fexeca-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + resolved "https://registry.npmmirror.com/execa/download/execa-5.1.1.tgz?cache=0&sync_timestamp=1637147188673&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fexeca%2Fdownload%2Fexeca-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" integrity sha1-+ArZy/Qpj3vR1MlVXCHpN0HEEd0= dependencies: cross-spawn "^7.0.3" @@ -3659,7 +3609,7 @@ execa@^5.0.0: express@^4.17.1: version "4.17.1" - resolved "https://registry.nlark.com/express/download/express-4.17.1.tgz?cache=0&sync_timestamp=1618847120573&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fexpress%2Fdownload%2Fexpress-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + resolved "https://registry.nlark.com/express/download/express-4.17.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fexpress%2Fdownload%2Fexpress-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" integrity sha1-RJH8OGBc9R+GKdOcK10Cb5ikwTQ= dependencies: accepts "~1.3.7" @@ -3702,7 +3652,7 @@ extend-shallow@^2.0.1: extend@^3.0.0: version "3.0.2" - resolved "https://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + resolved "https://registry.nlark.com/extend/download/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo= fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: @@ -3723,7 +3673,7 @@ fast-glob@^3.1.1, fast-glob@^3.2.7: fast-json-stable-stringify@^2.0.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + resolved "https://registry.nlark.com/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM= fast-url-parser@1.1.3: @@ -3756,7 +3706,7 @@ feed@^4.2.2: file-loader@^6.2.0: version "6.2.0" - resolved "https://registry.npm.taobao.org/file-loader/download/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" + resolved "https://registry.nlark.com/file-loader/download/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" integrity sha1-uu98+OGEDfMl5DkLRISHlIDuvk0= dependencies: loader-utils "^2.0.0" @@ -3769,14 +3719,14 @@ filesize@^6.1.0: fill-range@^7.0.1: version "7.0.1" - resolved "https://registry.nlark.com/fill-range/download/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + resolved "https://registry.npm.taobao.org/fill-range/download/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" integrity sha1-GRmmp8df44ssfHflGYU12prN2kA= dependencies: to-regex-range "^5.0.1" finalhandler@~1.1.2: version "1.1.2" - resolved "https://registry.npm.taobao.org/finalhandler/download/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + resolved "https://registry.nlark.com/finalhandler/download/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" integrity sha1-t+fQAP/RGTjQ/bBTUG9uur6fWH0= dependencies: debug "2.6.9" @@ -3789,7 +3739,7 @@ finalhandler@~1.1.2: find-cache-dir@^3.3.1: version "3.3.2" - resolved "https://registry.nlark.com/find-cache-dir/download/find-cache-dir-3.3.2.tgz?cache=0&sync_timestamp=1630260035189&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffind-cache-dir%2Fdownload%2Ffind-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + resolved "https://registry.nlark.com/find-cache-dir/download/find-cache-dir-3.3.2.tgz?cache=0&sync_timestamp=1630259965392&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffind-cache-dir%2Fdownload%2Ffind-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" integrity sha1-swxbbv8HMHMa6pu9nb7L2AJW1ks= dependencies: commondir "^1.0.1" @@ -3798,14 +3748,14 @@ find-cache-dir@^3.3.1: find-up@^3.0.0: version "3.0.0" - resolved "https://registry.npmmirror.com/find-up/download/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + resolved "https://registry.npmmirror.com/find-up/download/find-up-3.0.0.tgz?cache=0&sync_timestamp=1633620747957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffind-up%2Fdownload%2Ffind-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" integrity sha1-SRafHXmTQwZG2mHsxa41XCHJe3M= dependencies: locate-path "^3.0.0" find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" - resolved "https://registry.npmmirror.com/find-up/download/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + resolved "https://registry.npmmirror.com/find-up/download/find-up-4.1.0.tgz?cache=0&sync_timestamp=1633620747957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffind-up%2Fdownload%2Ffind-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" integrity sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk= dependencies: locate-path "^5.0.0" @@ -3871,7 +3821,7 @@ fs-extra@^9.0.0: fs-monkey@1.0.3: version "1.0.3" - resolved "https://registry.npm.taobao.org/fs-monkey/download/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" + resolved "https://registry.npm.taobao.org/fs-monkey/download/fs-monkey-1.0.3.tgz?cache=0&sync_timestamp=1617593422622&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-monkey%2Fdownload%2Ffs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" integrity sha1-rjrJLVO7Mo7+DpodlUH2rY1I4tM= fs.realpath@^1.0.0: @@ -3896,7 +3846,7 @@ gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2: get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: version "1.1.1" - resolved "https://registry.nlark.com/get-intrinsic/download/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + resolved "https://registry.npm.taobao.org/get-intrinsic/download/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" integrity sha1-FfWfN2+FXERpY5SPDSTNNje0q8Y= dependencies: function-bind "^1.1.1" @@ -3905,7 +3855,7 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: get-own-enumerable-property-symbols@^3.0.0: version "3.0.2" - resolved "https://registry.nlark.com/get-own-enumerable-property-symbols/download/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" + resolved "https://registry.npm.taobao.org/get-own-enumerable-property-symbols/download/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" integrity sha1-tf3nfyLL4185C04ImSLFC85u9mQ= get-stream@^4.1.0: @@ -3937,19 +3887,19 @@ get-symbol-description@^1.0.0: github-slugger@^1.4.0: version "1.4.0" - resolved "https://registry.nlark.com/github-slugger/download/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" + resolved "https://registry.nlark.com/github-slugger/download/github-slugger-1.4.0.tgz?cache=0&sync_timestamp=1629817837468&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fgithub-slugger%2Fdownload%2Fgithub-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" integrity sha1-IG65bNsi7lb9xToo1aMCM4RjRE4= glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" - resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-5.1.2.tgz?cache=0&sync_timestamp=1632954501757&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha1-hpgyxYA0/mikCTwX3BXoNA2EAcQ= dependencies: is-glob "^4.0.1" glob-parent@^6.0.1, glob-parent@^6.0.2: version "6.0.2" - resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-6.0.2.tgz?cache=0&sync_timestamp=1632954501757&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" integrity sha1-bSN9mQg5UMeSkPJMdkKj3poo+eM= dependencies: is-glob "^4.0.3" @@ -3973,7 +3923,7 @@ glob@^7.0.0, glob@^7.1.3, glob@^7.1.6: global-dirs@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/global-dirs/download/global-dirs-3.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglobal-dirs%2Fdownload%2Fglobal-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" + resolved "https://registry.npm.taobao.org/global-dirs/download/global-dirs-3.0.0.tgz?cache=0&sync_timestamp=1610454716901&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobal-dirs%2Fdownload%2Fglobal-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" integrity sha1-cKdv6E6jFas3sfVXbL3n1I73JoY= dependencies: ini "2.0.0" @@ -3987,7 +3937,7 @@ global-modules@^2.0.0: global-prefix@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/global-prefix/download/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" + resolved "https://registry.nlark.com/global-prefix/download/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" integrity sha1-/IX3MGTfafUEIfR/iD/luRO6m5c= dependencies: ini "^1.3.5" @@ -3996,7 +3946,7 @@ global-prefix@^3.0.0: globals@^11.1.0: version "11.12.0" - resolved "https://registry.npmmirror.com/globals/download/globals-11.12.0.tgz?cache=0&sync_timestamp=1635390798667&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglobals%2Fdownload%2Fglobals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + resolved "https://registry.npmmirror.com/globals/download/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha1-q4eVM4hooLq9hSV1gBjCp+uVxC4= globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.0.4: @@ -4013,7 +3963,7 @@ globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.0.4: got@^9.6.0: version "9.6.0" - resolved "https://registry.npmmirror.com/got/download/got-9.6.0.tgz?cache=0&sync_timestamp=1637211987701&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fgot%2Fdownload%2Fgot-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" + resolved "https://registry.npmmirror.com/got/download/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" integrity sha1-7fRefWf5lUVwXeH3u+7rEhdl7YU= dependencies: "@sindresorhus/is" "^0.14.0" @@ -4060,7 +4010,7 @@ gzip-size@^6.0.0: handle-thing@^2.0.0: version "2.0.1" - resolved "https://registry.npm.taobao.org/handle-thing/download/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" + resolved "https://registry.nlark.com/handle-thing/download/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" integrity sha1-hX95zjWVgMNA1DCBzGSJcNC7I04= has-bigints@^1.0.1: @@ -4070,29 +4020,29 @@ has-bigints@^1.0.1: has-flag@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/has-flag/download/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + resolved "https://registry.nlark.com/has-flag/download/has-flag-3.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= has-flag@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + resolved "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s= has-symbols@^1.0.1, has-symbols@^1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/has-symbols/download/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + resolved "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.2.tgz?cache=0&sync_timestamp=1614443557459&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhas-symbols%2Fdownload%2Fhas-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha1-Fl0wcMADCXUqEjakeTMeOsVvFCM= has-tostringtag@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/has-tostringtag/download/has-tostringtag-1.0.0.tgz?cache=0&sync_timestamp=1628198671004&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-tostringtag%2Fdownload%2Fhas-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + resolved "https://registry.nlark.com/has-tostringtag/download/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" integrity sha1-fhM4GKfTlHNPlB5zw9P5KR5liyU= dependencies: has-symbols "^1.0.2" has-yarn@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/has-yarn/download/has-yarn-2.1.0.tgz?cache=0&sync_timestamp=1631298711761&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-yarn%2Fdownload%2Fhas-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" + resolved "https://registry.nlark.com/has-yarn/download/has-yarn-2.1.0.tgz?cache=0&sync_timestamp=1631299286113&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-yarn%2Fdownload%2Fhas-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" integrity sha1-E34RNUp7W/EapctknPDG8/8rLnc= has@^1.0.3: @@ -4104,7 +4054,7 @@ has@^1.0.3: hast-to-hyperscript@^9.0.0: version "9.0.1" - resolved "https://registry.nlark.com/hast-to-hyperscript/download/hast-to-hyperscript-9.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-to-hyperscript%2Fdownload%2Fhast-to-hyperscript-9.0.1.tgz#9b67fd188e4c81e8ad66f803855334173920218d" + resolved "https://registry.nlark.com/hast-to-hyperscript/download/hast-to-hyperscript-9.0.1.tgz?cache=0&sync_timestamp=1627029601196&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-to-hyperscript%2Fdownload%2Fhast-to-hyperscript-9.0.1.tgz#9b67fd188e4c81e8ad66f803855334173920218d" integrity sha1-m2f9GI5MgeitZvgDhVM0FzkgIY0= dependencies: "@types/unist" "^2.0.3" @@ -4117,7 +4067,7 @@ hast-to-hyperscript@^9.0.0: hast-util-from-parse5@^5.0.0: version "5.0.3" - resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-5.0.3.tgz?cache=0&sync_timestamp=1627032098094&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-util-from-parse5%2Fdownload%2Fhast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" + resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" integrity sha1-MIncDuLM9uyLxBaRm1GlSlieCXw= dependencies: ccount "^1.0.3" @@ -4128,7 +4078,7 @@ hast-util-from-parse5@^5.0.0: hast-util-from-parse5@^6.0.0: version "6.0.1" - resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-6.0.1.tgz?cache=0&sync_timestamp=1627032098094&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-util-from-parse5%2Fdownload%2Fhast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" + resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" integrity sha1-VU40q97qJax29b2VCh8BgOCzvCo= dependencies: "@types/parse5" "^5.0.0" @@ -4145,7 +4095,7 @@ hast-util-parse-selector@^2.0.0: hast-util-raw@6.0.1: version "6.0.1" - resolved "https://registry.npmmirror.com/hast-util-raw/download/hast-util-raw-6.0.1.tgz?cache=0&sync_timestamp=1636449577205&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhast-util-raw%2Fdownload%2Fhast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977" + resolved "https://registry.npmmirror.com/hast-util-raw/download/hast-util-raw-6.0.1.tgz?cache=0&sync_timestamp=1636450214370&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhast-util-raw%2Fdownload%2Fhast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977" integrity sha1-lzsVkwt1Kae2aYTJgUi0ZSaIWXc= dependencies: "@types/hast" "^2.0.0" @@ -4172,7 +4122,7 @@ hast-util-to-parse5@^6.0.0: hastscript@^5.0.0: version "5.1.2" - resolved "https://registry.nlark.com/hastscript/download/hastscript-5.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhastscript%2Fdownload%2Fhastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a" + resolved "https://registry.nlark.com/hastscript/download/hastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a" integrity sha1-veLC5W0Exi3SToxd8ojQUKNV+4o= dependencies: comma-separated-tokens "^1.0.0" @@ -4182,7 +4132,7 @@ hastscript@^5.0.0: hastscript@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/hastscript/download/hastscript-6.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhastscript%2Fdownload%2Fhastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" + resolved "https://registry.nlark.com/hastscript/download/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" integrity sha1-6HaNfqxWw/3qyKkoMNWOgR5b9kA= dependencies: "@types/hast" "^2.0.0" @@ -4193,7 +4143,7 @@ hastscript@^6.0.0: he@^1.2.0: version "1.2.0" - resolved "https://registry.npm.taobao.org/he/download/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + resolved "https://registry.nlark.com/he/download/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha1-hK5l+n6vsWX922FWauFLrwVmTw8= history@^4.9.0: @@ -4227,12 +4177,12 @@ hpack.js@^2.1.6: html-entities@^2.3.2: version "2.3.2" - resolved "https://registry.nlark.com/html-entities/download/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" + resolved "https://registry.npm.taobao.org/html-entities/download/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" integrity sha1-dgtARoXLHXlOT0t0QzLjsA3P5Ig= html-minifier-terser@^6.0.2: version "6.1.0" - resolved "https://registry.npmmirror.com/html-minifier-terser/download/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab" + resolved "https://registry.npmmirror.com/html-minifier-terser/download/html-minifier-terser-6.1.0.tgz?cache=0&sync_timestamp=1637572739623&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtml-minifier-terser%2Fdownload%2Fhtml-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab" integrity sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw== dependencies: camel-case "^4.1.2" @@ -4245,17 +4195,17 @@ html-minifier-terser@^6.0.2: html-tags@^3.1.0: version "3.1.0" - resolved "https://registry.npm.taobao.org/html-tags/download/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" + resolved "https://registry.nlark.com/html-tags/download/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" integrity sha1-e15vfmZen7QfMAB+2eDUHpf7IUA= html-void-elements@^1.0.0: version "1.0.5" - resolved "https://registry.npm.taobao.org/html-void-elements/download/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483" + resolved "https://registry.nlark.com/html-void-elements/download/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483" integrity sha1-zpFZSU6G2V5FeVsWbCAhws/KRIM= html-webpack-plugin@^5.4.0: version "5.5.0" - resolved "https://registry.npmmirror.com/html-webpack-plugin/download/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" + resolved "https://registry.npmmirror.com/html-webpack-plugin/download/html-webpack-plugin-5.5.0.tgz?cache=0&sync_timestamp=1635212582127&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtml-webpack-plugin%2Fdownload%2Fhtml-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" integrity sha1-w5EZNvV2gcH59Ni2jBWM2d/lL1A= dependencies: "@types/html-minifier-terser" "^6.0.0" @@ -4266,7 +4216,7 @@ html-webpack-plugin@^5.4.0: htmlparser2@^3.9.1: version "3.10.1" - resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-3.10.1.tgz?cache=0&sync_timestamp=1636641539121&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" + resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-3.10.1.tgz?cache=0&sync_timestamp=1636640841489&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" integrity sha1-vWedw/WYl7ajS7EHSchVu1OpOS8= dependencies: domelementtype "^1.3.1" @@ -4278,7 +4228,7 @@ htmlparser2@^3.9.1: htmlparser2@^6.1.0: version "6.1.0" - resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-6.1.0.tgz?cache=0&sync_timestamp=1636641539121&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" + resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-6.1.0.tgz?cache=0&sync_timestamp=1636640841489&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" integrity sha1-xNditsM3GgXb5l6UrkOp+EX7j7c= dependencies: domelementtype "^2.0.1" @@ -4293,12 +4243,12 @@ http-cache-semantics@^4.0.0: http-deceiver@^1.2.7: version "1.2.7" - resolved "https://registry.nlark.com/http-deceiver/download/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" + resolved "https://registry.npm.taobao.org/http-deceiver/download/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= http-errors@1.7.2: version "1.7.2" - resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.7.2.tgz?cache=0&sync_timestamp=1636932154238&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.7.2.tgz?cache=0&sync_timestamp=1636932216570&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" integrity sha1-T1ApzxMjnzEDblsuVSkrz7zIXI8= dependencies: depd "~1.1.2" @@ -4309,7 +4259,7 @@ http-errors@1.7.2: http-errors@~1.6.2: version "1.6.3" - resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.6.3.tgz?cache=0&sync_timestamp=1636932154238&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" + resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.6.3.tgz?cache=0&sync_timestamp=1636932216570&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= dependencies: depd "~1.1.2" @@ -4319,7 +4269,7 @@ http-errors@~1.6.2: http-errors@~1.7.2: version "1.7.3" - resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.7.3.tgz?cache=0&sync_timestamp=1636932154238&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.7.3.tgz?cache=0&sync_timestamp=1636932216570&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" integrity sha1-bGGeT5xgMIw4UZSYwU+7EKrOuwY= dependencies: depd "~1.1.2" @@ -4335,7 +4285,7 @@ http-parser-js@>=0.5.1: http-proxy-middleware@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/http-proxy-middleware/download/http-proxy-middleware-2.0.1.tgz#7ef3417a479fb7666a571e09966c66a39bd2c15f" + resolved "https://registry.nlark.com/http-proxy-middleware/download/http-proxy-middleware-2.0.1.tgz?cache=0&sync_timestamp=1625172260511&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhttp-proxy-middleware%2Fdownload%2Fhttp-proxy-middleware-2.0.1.tgz#7ef3417a479fb7666a571e09966c66a39bd2c15f" integrity sha1-fvNBekeft2ZqVx4Jlmxmo5vSwV8= dependencies: "@types/http-proxy" "^1.17.5" @@ -4346,7 +4296,7 @@ http-proxy-middleware@^2.0.0: http-proxy@^1.18.1: version "1.18.1" - resolved "https://registry.nlark.com/http-proxy/download/http-proxy-1.18.1.tgz?cache=0&sync_timestamp=1618847045732&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhttp-proxy%2Fdownload%2Fhttp-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + resolved "https://registry.npm.taobao.org/http-proxy/download/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" integrity sha1-QBVB8FNIhLv5UmAzTnL4juOXZUk= dependencies: eventemitter3 "^4.0.0" @@ -4355,24 +4305,24 @@ http-proxy@^1.18.1: human-signals@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/human-signals/download/human-signals-2.1.0.tgz?cache=0&sync_timestamp=1624364695595&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhuman-signals%2Fdownload%2Fhuman-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + resolved "https://registry.nlark.com/human-signals/download/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha1-3JH8ukLk0G5Kuu0zs+ejwC9RTqA= iconv-lite@0.4.24: version "0.4.24" - resolved "https://registry.nlark.com/iconv-lite/download/iconv-lite-0.4.24.tgz?cache=0&sync_timestamp=1621826342262&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ficonv-lite%2Fdownload%2Ficonv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + resolved "https://registry.nlark.com/iconv-lite/download/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha1-ICK0sl+93CHS9SSXSkdKr+czkIs= dependencies: safer-buffer ">= 2.1.2 < 3" icss-utils@^5.0.0, icss-utils@^5.1.0: version "5.1.0" - resolved "https://registry.npm.taobao.org/icss-utils/download/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + resolved "https://registry.nlark.com/icss-utils/download/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" integrity sha1-xr5oWKvQE9do6YNmrkfiXViHsa4= ignore@^5.1.4: version "5.1.9" - resolved "https://registry.npmmirror.com/ignore/download/ignore-5.1.9.tgz?cache=0&sync_timestamp=1635926632542&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fignore%2Fdownload%2Fignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb" + resolved "https://registry.npmmirror.com/ignore/download/ignore-5.1.9.tgz?cache=0&sync_timestamp=1635926740448&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fignore%2Fdownload%2Fignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb" integrity sha1-nsGly+jhRG7GDUQgBg1Dqm5zgvs= immer@^9.0.6: @@ -4389,7 +4339,7 @@ import-cwd@^3.0.0: import-fresh@^3.1.0, import-fresh@^3.2.1, import-fresh@^3.2.2, import-fresh@^3.3.0: version "3.3.0" - resolved "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + resolved "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz?cache=0&sync_timestamp=1608469579940&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimport-fresh%2Fdownload%2Fimport-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha1-NxYsJfy566oublPVtNiM4X2eDCs= dependencies: parent-module "^1.0.0" @@ -4404,7 +4354,7 @@ import-from@^3.0.0: import-lazy@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/import-lazy/download/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + resolved "https://registry.npm.taobao.org/import-lazy/download/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= imurmurhash@^0.1.4: @@ -4414,7 +4364,7 @@ imurmurhash@^0.1.4: indent-string@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/indent-string/download/indent-string-4.0.0.tgz?cache=0&sync_timestamp=1618679561483&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Findent-string%2Fdownload%2Findent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + resolved "https://registry.nlark.com/indent-string/download/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha1-Yk+PRJfWGbLZdoUx1Y9BIoVNclE= inflight@^1.0.4: @@ -4427,12 +4377,12 @@ inflight@^1.0.4: inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: version "2.0.4" - resolved "https://registry.nlark.com/inherits/download/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + resolved "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w= inherits@2.0.3: version "2.0.3" - resolved "https://registry.nlark.com/inherits/download/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + resolved "https://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= ini@2.0.0: @@ -4461,7 +4411,7 @@ internal-slot@^1.0.3: interpret@^1.0.0: version "1.4.0" - resolved "https://registry.npmmirror.com/interpret/download/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + resolved "https://registry.nlark.com/interpret/download/interpret-1.4.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Finterpret%2Fdownload%2Finterpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha1-Zlq4vE2iendKQFhOgS4+D6RbGh4= ip@^1.1.0: @@ -4481,7 +4431,7 @@ ipaddr.js@^2.0.1: is-absolute-url@^3.0.3: version "3.0.3" - resolved "https://registry.nlark.com/is-absolute-url/download/is-absolute-url-3.0.3.tgz?cache=0&sync_timestamp=1628691761253&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-absolute-url%2Fdownload%2Fis-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" + resolved "https://registry.nlark.com/is-absolute-url/download/is-absolute-url-3.0.3.tgz?cache=0&sync_timestamp=1628691816236&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-absolute-url%2Fdownload%2Fis-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" integrity sha1-lsaiK2ojkpsR6gr7GDbDatSl1pg= is-alphabetical@1.0.4, is-alphabetical@^1.0.0: @@ -4499,7 +4449,7 @@ is-alphanumerical@^1.0.0: is-arguments@^1.0.4: version "1.1.1" - resolved "https://registry.nlark.com/is-arguments/download/is-arguments-1.1.1.tgz?cache=0&sync_timestamp=1628201919104&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-arguments%2Fdownload%2Fis-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + resolved "https://registry.nlark.com/is-arguments/download/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" integrity sha1-FbP4j9oB8ql/7ITKdhpWDxI++ps= dependencies: call-bind "^1.0.2" @@ -4526,7 +4476,7 @@ is-binary-path@~2.1.0: is-boolean-object@^1.1.0: version "1.1.2" - resolved "https://registry.nlark.com/is-boolean-object/download/is-boolean-object-1.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-boolean-object%2Fdownload%2Fis-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + resolved "https://registry.nlark.com/is-boolean-object/download/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" integrity sha1-XG3CACRt2TIa5LiFoRS7H3X2Nxk= dependencies: call-bind "^1.0.2" @@ -4534,31 +4484,31 @@ is-boolean-object@^1.1.0: is-buffer@^2.0.0: version "2.0.5" - resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.5.tgz?cache=0&sync_timestamp=1604432327227&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-buffer%2Fdownload%2Fis-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" + resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.5.tgz?cache=0&sync_timestamp=1604429876103&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-buffer%2Fdownload%2Fis-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha1-68JS5ADSL/jXf6CYiIIaJKZYwZE= is-callable@^1.1.4, is-callable@^1.2.4: version "1.2.4" - resolved "https://registry.nlark.com/is-callable/download/is-callable-1.2.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-callable%2Fdownload%2Fis-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + resolved "https://registry.nlark.com/is-callable/download/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha1-RzAdWN0CWUB4ZVR4U99tYf5HGUU= is-ci@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/is-ci/download/is-ci-2.0.0.tgz?cache=0&sync_timestamp=1635261061017&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-ci%2Fdownload%2Fis-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + resolved "https://registry.npmmirror.com/is-ci/download/is-ci-2.0.0.tgz?cache=0&sync_timestamp=1635261114993&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-ci%2Fdownload%2Fis-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" integrity sha1-a8YzQYGBDgS1wis9WJ/cpVAmQEw= dependencies: ci-info "^2.0.0" is-core-module@^2.2.0: version "2.8.0" - resolved "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz?cache=0&sync_timestamp=1634236731601&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-core-module%2Fdownload%2Fis-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" + resolved "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" integrity sha1-AyEzbD0JJeSX/Zf12VyxFKXM1Ug= dependencies: has "^1.0.3" is-date-object@^1.0.1: version "1.0.5" - resolved "https://registry.nlark.com/is-date-object/download/is-date-object-1.0.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-date-object%2Fdownload%2Fis-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + resolved "https://registry.nlark.com/is-date-object/download/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" integrity sha1-CEHVU25yTCVZe/bqYuG9OCmN8x8= dependencies: has-tostringtag "^1.0.0" @@ -4570,17 +4520,17 @@ is-decimal@^1.0.0: is-docker@^2.0.0, is-docker@^2.1.1: version "2.2.1" - resolved "https://registry.nlark.com/is-docker/download/is-docker-2.2.1.tgz?cache=0&sync_timestamp=1630451108035&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-docker%2Fdownload%2Fis-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + resolved "https://registry.nlark.com/is-docker/download/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha1-M+6r4jz+hvFL3kQIoCwM+4U6zao= is-extendable@^0.1.0: version "0.1.1" - resolved "https://registry.nlark.com/is-extendable/download/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + resolved "https://registry.npm.taobao.org/is-extendable/download/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= is-extglob@^2.1.1: version "2.1.1" - resolved "https://registry.nlark.com/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + resolved "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= is-fullwidth-code-point@^3.0.0: @@ -4590,7 +4540,7 @@ is-fullwidth-code-point@^3.0.0: is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" - resolved "https://registry.npmmirror.com/is-glob/download/is-glob-4.0.3.tgz?cache=0&sync_timestamp=1632934586547&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-glob%2Fdownload%2Fis-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + resolved "https://registry.npmmirror.com/is-glob/download/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha1-ZPYeQsu7LuwgcanawLKLoeZdUIQ= dependencies: is-extglob "^2.1.1" @@ -4602,7 +4552,7 @@ is-hexadecimal@^1.0.0: is-installed-globally@^0.4.0: version "0.4.0" - resolved "https://registry.npm.taobao.org/is-installed-globally/download/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" + resolved "https://registry.npm.taobao.org/is-installed-globally/download/is-installed-globally-0.4.0.tgz?cache=0&sync_timestamp=1610875398433&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-installed-globally%2Fdownload%2Fis-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" integrity sha1-mg/UB5ScMPhutpWe8beZTtC3tSA= dependencies: global-dirs "^3.0.0" @@ -4615,7 +4565,7 @@ is-negative-zero@^2.0.1: is-npm@^5.0.0: version "5.0.0" - resolved "https://registry.nlark.com/is-npm/download/is-npm-5.0.0.tgz?cache=0&sync_timestamp=1631992770984&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-npm%2Fdownload%2Fis-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" + resolved "https://registry.nlark.com/is-npm/download/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" integrity sha1-Q+jWXMVuG2f41HJiz2ZwmRk/Rag= is-number-object@^1.0.4: @@ -4632,12 +4582,12 @@ is-number@^7.0.0: is-obj@^1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/is-obj/download/is-obj-1.0.1.tgz?cache=0&sync_timestamp=1618600919478&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-obj%2Fdownload%2Fis-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + resolved "https://registry.nlark.com/is-obj/download/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= is-obj@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/is-obj/download/is-obj-2.0.0.tgz?cache=0&sync_timestamp=1618600919478&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-obj%2Fdownload%2Fis-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + resolved "https://registry.nlark.com/is-obj/download/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha1-Rz+wXZc3BeP9liBUUBjKjiLvSYI= is-path-cwd@^2.2.0: @@ -4647,17 +4597,17 @@ is-path-cwd@^2.2.0: is-path-inside@^3.0.2: version "3.0.3" - resolved "https://registry.nlark.com/is-path-inside/download/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + resolved "https://registry.nlark.com/is-path-inside/download/is-path-inside-3.0.3.tgz?cache=0&sync_timestamp=1620046845369&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-path-inside%2Fdownload%2Fis-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha1-0jE2LlOgf/Kw4Op/7QSRYf/RYoM= is-plain-obj@^2.0.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" + resolved "https://registry.nlark.com/is-plain-obj/download/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" integrity sha1-ReQuN/zPH0Dajl927iFRWEDAkoc= is-plain-obj@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" + resolved "https://registry.nlark.com/is-plain-obj/download/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" integrity sha1-r28uoUrFpkYYOlu9tbqrvBVq2dc= is-plain-object@^2.0.4: @@ -4677,17 +4627,17 @@ is-regex@^1.0.4, is-regex@^1.1.4: is-regexp@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/is-regexp/download/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" + resolved "https://registry.npm.taobao.org/is-regexp/download/is-regexp-1.0.0.tgz?cache=0&sync_timestamp=1617816768041&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-regexp%2Fdownload%2Fis-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= is-resolvable@^1.1.0: version "1.1.0" - resolved "https://registry.nlark.com/is-resolvable/download/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" + resolved "https://registry.npm.taobao.org/is-resolvable/download/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" integrity sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg= is-root@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/is-root/download/is-root-2.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-root%2Fdownload%2Fis-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" + resolved "https://registry.npm.taobao.org/is-root/download/is-root-2.1.0.tgz?cache=0&sync_timestamp=1617783382597&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-root%2Fdownload%2Fis-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" integrity sha1-gJ4YEpzxEpZEMCpPhUQDXVGYSpw= is-shared-array-buffer@^1.0.1: @@ -4709,7 +4659,7 @@ is-string@^1.0.5, is-string@^1.0.7: is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" - resolved "https://registry.nlark.com/is-symbol/download/is-symbol-1.0.4.tgz?cache=0&sync_timestamp=1620501174327&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-symbol%2Fdownload%2Fis-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + resolved "https://registry.nlark.com/is-symbol/download/is-symbol-1.0.4.tgz?cache=0&sync_timestamp=1620501182675&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-symbol%2Fdownload%2Fis-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" integrity sha1-ptrJO2NbBjymhyI23oiRClevE5w= dependencies: has-symbols "^1.0.2" @@ -4738,34 +4688,34 @@ is-word-character@^1.0.0: is-wsl@^2.1.1, is-wsl@^2.2.0: version "2.2.0" - resolved "https://registry.nlark.com/is-wsl/download/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + resolved "https://registry.npm.taobao.org/is-wsl/download/is-wsl-2.2.0.tgz?cache=0&sync_timestamp=1592843177178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-wsl%2Fdownload%2Fis-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" integrity sha1-dKTHbnfKn9P5MvKQwX6jJs0VcnE= dependencies: is-docker "^2.0.0" is-yarn-global@^0.3.0: version "0.3.0" - resolved "https://registry.nlark.com/is-yarn-global/download/is-yarn-global-0.3.0.tgz?cache=0&sync_timestamp=1619356554445&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-yarn-global%2Fdownload%2Fis-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" + resolved "https://registry.nlark.com/is-yarn-global/download/is-yarn-global-0.3.0.tgz?cache=0&sync_timestamp=1619356824740&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-yarn-global%2Fdownload%2Fis-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" integrity sha1-1QLTOCWQ6jAEiTdGdUyJE5lz4jI= isarray@0.0.1: version "0.0.1" - resolved "https://registry.npm.taobao.org/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + resolved "https://registry.nlark.com/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= isarray@~1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + resolved "https://registry.nlark.com/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= isexe@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + resolved "https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= isobject@^3.0.1: version "3.0.1" - resolved "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + resolved "https://registry.nlark.com/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= jest-worker@^27.0.2, jest-worker@^27.0.6: @@ -4778,9 +4728,9 @@ jest-worker@^27.0.2, jest-worker@^27.0.6: supports-color "^8.0.0" joi@^17.4.0, joi@^17.4.2: - version "17.4.3" - resolved "https://registry.npmmirror.com/joi/download/joi-17.4.3.tgz#462941fd994f11fcb92f59ba9f004706b9a45d17" - integrity sha512-8W3oOogFRuy2aLAdlhMpzS4fNBIMiyIa3xBaBYMFgA272/d5sob1DAth6jjo+5VrOlzbEgmbBGbU4cLrffPKog== + version "17.5.0" + resolved "https://registry.npmmirror.com/joi/download/joi-17.5.0.tgz#7e66d0004b5045d971cf416a55fb61d33ac6e011" + integrity sha512-R7hR50COp7StzLnDi4ywOXHrBrgNXuUUfJWIR5lPY5Bm/pOD3jZaTwpluUXVLRWcoWZxkrHBBJ5hLxgnlehbdw== dependencies: "@hapi/hoek" "^9.0.0" "@hapi/topo" "^5.0.0" @@ -4790,12 +4740,12 @@ joi@^17.4.0, joi@^17.4.2: "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/js-tokens/download/js-tokens-4.0.0.tgz?cache=0&sync_timestamp=1619345098261&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-tokens%2Fdownload%2Fjs-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + resolved "https://registry.nlark.com/js-tokens/download/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha1-GSA/tZmR35jjoocFDUZHzerzJJk= js-yaml@^3.13.1: version "3.14.1" - resolved "https://registry.npm.taobao.org/js-yaml/download/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + resolved "https://registry.nlark.com/js-yaml/download/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha1-2ugS/bOCX6MGYJqHFzg8UMNqBTc= dependencies: argparse "^1.0.7" @@ -4803,7 +4753,7 @@ js-yaml@^3.13.1: js-yaml@^4.0.0: version "4.1.0" - resolved "https://registry.npm.taobao.org/js-yaml/download/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + resolved "https://registry.nlark.com/js-yaml/download/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" integrity sha1-wftl+PUBeQHN0slRhkuhhFihBgI= dependencies: argparse "^2.0.1" @@ -4830,17 +4780,17 @@ json-parse-better-errors@^1.0.2: json-parse-even-better-errors@^2.3.0: version "2.3.1" - resolved "https://registry.nlark.com/json-parse-even-better-errors/download/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + resolved "https://registry.npm.taobao.org/json-parse-even-better-errors/download/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha1-fEeAWpQxmSjgV3dAXcEuH3pO4C0= json-schema-traverse@^0.4.1: version "0.4.1" - resolved "https://registry.nlark.com/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + resolved "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha1-afaofZUTq4u4/mO9sJecRI5oRmA= json-schema-traverse@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/json-schema-traverse/download/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + resolved "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha1-rnvLNlard6c7pcSb9lTzjmtoYOI= json5@^1.0.1: @@ -4859,7 +4809,7 @@ json5@^2.1.2: jsonfile@^6.0.1: version "6.1.0" - resolved "https://registry.nlark.com/jsonfile/download/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + resolved "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" integrity sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4= dependencies: universalify "^2.0.0" @@ -4875,7 +4825,7 @@ keyv@^3.0.0: kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.3" - resolved "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + resolved "https://registry.nlark.com/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0= kleur@^3.0.3: @@ -4885,24 +4835,24 @@ kleur@^3.0.3: klona@^2.0.5: version "2.0.5" - resolved "https://registry.npmmirror.com/klona/download/klona-2.0.5.tgz?cache=0&sync_timestamp=1635385383825&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fklona%2Fdownload%2Fklona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" + resolved "https://registry.npmmirror.com/klona/download/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" integrity sha1-0WZXTZAHY5XZljqnqSj6u412r7w= latest-version@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/latest-version/download/latest-version-5.1.0.tgz?cache=0&sync_timestamp=1626951703884&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flatest-version%2Fdownload%2Flatest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + resolved "https://registry.nlark.com/latest-version/download/latest-version-5.1.0.tgz?cache=0&sync_timestamp=1626951682795&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flatest-version%2Fdownload%2Flatest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" integrity sha1-EZ3+kI/jjRXfpD7NE/oS7Igy+s4= dependencies: package-json "^6.3.0" leven@^3.1.0: version "3.1.0" - resolved "https://registry.nlark.com/leven/download/leven-3.1.0.tgz?cache=0&sync_timestamp=1628597922950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fleven%2Fdownload%2Fleven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + resolved "https://registry.nlark.com/leven/download/leven-3.1.0.tgz?cache=0&sync_timestamp=1628597917913&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fleven%2Fdownload%2Fleven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" integrity sha1-d4kd6DQGTMy6gq54QrtrFKE+1/I= lilconfig@^2.0.3: version "2.0.4" - resolved "https://registry.npmmirror.com/lilconfig/download/lilconfig-2.0.4.tgz?cache=0&sync_timestamp=1636150747257&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flilconfig%2Fdownload%2Flilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" + resolved "https://registry.npmmirror.com/lilconfig/download/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" integrity sha1-9FB9BD1wWLOAtqj1y3vNSzTO4II= lines-and-columns@^1.1.6: @@ -4912,12 +4862,12 @@ lines-and-columns@^1.1.6: loader-runner@^4.2.0: version "4.2.0" - resolved "https://registry.npm.taobao.org/loader-runner/download/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" + resolved "https://registry.nlark.com/loader-runner/download/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" integrity sha1-1wIjgNZtFMX7HUlriYZOvP1Hg4Q= loader-utils@^1.4.0: version "1.4.0" - resolved "https://registry.npmmirror.com/loader-utils/download/loader-utils-1.4.0.tgz?cache=0&sync_timestamp=1636687958815&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + resolved "https://registry.npmmirror.com/loader-utils/download/loader-utils-1.4.0.tgz?cache=0&sync_timestamp=1636687889409&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" integrity sha1-xXm140yzSxp07cbB+za/o3HVphM= dependencies: big.js "^5.2.2" @@ -4926,7 +4876,7 @@ loader-utils@^1.4.0: loader-utils@^2.0.0: version "2.0.2" - resolved "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz?cache=0&sync_timestamp=1636687958815&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" + resolved "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz?cache=0&sync_timestamp=1636687889409&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" integrity sha1-1uO0+4GHByGuTghoqxHdY4NowSk= dependencies: big.js "^5.2.2" @@ -4965,12 +4915,12 @@ lodash.castarray@^4.4.0: lodash.debounce@^4.0.8: version "4.0.8" - resolved "https://registry.nlark.com/lodash.debounce/download/lodash.debounce-4.0.8.tgz?cache=0&sync_timestamp=1618847031591&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flodash.debounce%2Fdownload%2Flodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + resolved "https://registry.nlark.com/lodash.debounce/download/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= lodash.defaults@^4.0.1: version "4.2.0" - resolved "https://registry.nlark.com/lodash.defaults/download/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" + resolved "https://registry.npm.taobao.org/lodash.defaults/download/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= lodash.filter@^4.4.0: @@ -4980,7 +4930,7 @@ lodash.filter@^4.4.0: lodash.flatten@^4.2.0: version "4.4.0" - resolved "https://registry.nlark.com/lodash.flatten/download/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" + resolved "https://registry.npm.taobao.org/lodash.flatten/download/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= lodash.foreach@^4.3.0: @@ -4990,27 +4940,27 @@ lodash.foreach@^4.3.0: lodash.isplainobject@^4.0.6: version "4.0.6" - resolved "https://registry.nlark.com/lodash.isplainobject/download/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + resolved "https://registry.npm.taobao.org/lodash.isplainobject/download/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= lodash.map@^4.4.0: version "4.6.0" - resolved "https://registry.nlark.com/lodash.map/download/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" + resolved "https://registry.npm.taobao.org/lodash.map/download/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= lodash.memoize@^4.1.2: version "4.1.2" - resolved "https://registry.npm.taobao.org/lodash.memoize/download/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + resolved "https://registry.nlark.com/lodash.memoize/download/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= lodash.merge@^4.4.0, lodash.merge@^4.6.2: version "4.6.2" - resolved "https://registry.nlark.com/lodash.merge/download/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + resolved "https://registry.npm.taobao.org/lodash.merge/download/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha1-VYqlO0O2YeGSWgr9+japoQhf5Xo= lodash.pick@^4.2.1: version "4.4.0" - resolved "https://registry.nlark.com/lodash.pick/download/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" + resolved "https://registry.npm.taobao.org/lodash.pick/download/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= lodash.reduce@^4.4.0: @@ -5025,86 +4975,86 @@ lodash.reject@^4.4.0: lodash.some@^4.4.0: version "4.6.0" - resolved "https://registry.nlark.com/lodash.some/download/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" + resolved "https://registry.npm.taobao.org/lodash.some/download/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0= lodash.uniq@4.5.0, lodash.uniq@^4.5.0: version "4.5.0" - resolved "https://registry.nlark.com/lodash.uniq/download/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + resolved "https://registry.npm.taobao.org/lodash.uniq/download/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" - resolved "https://registry.nlark.com/lodash/download/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + resolved "https://registry.nlark.com/lodash/download/lodash-4.17.21.tgz?cache=0&sync_timestamp=1618847150612&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flodash%2Fdownload%2Flodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw= loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" - resolved "https://registry.nlark.com/loose-envify/download/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + resolved "https://registry.nlark.com/loose-envify/download/loose-envify-1.4.0.tgz?cache=0&sync_timestamp=1627566748051&other_urls=https%3A%2F%2Fregistry.nlark.com%2Floose-envify%2Fdownload%2Floose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8= dependencies: js-tokens "^3.0.0 || ^4.0.0" lower-case@^2.0.2: version "2.0.2" - resolved "https://registry.nlark.com/lower-case/download/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" + resolved "https://registry.npm.taobao.org/lower-case/download/lower-case-2.0.2.tgz?cache=0&sync_timestamp=1606867514181&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flower-case%2Fdownload%2Flower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" integrity sha1-b6I3xj29xKgsoP2ILkci3F5jTig= dependencies: tslib "^2.0.3" lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-1.0.1.tgz?cache=0&sync_timestamp=1634551715073&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flowercase-keys%2Fdownload%2Flowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" integrity sha1-b54wtHCE2XGnyCD/FabFFnt0wm8= lowercase-keys@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-2.0.0.tgz?cache=0&sync_timestamp=1634551715073&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flowercase-keys%2Fdownload%2Flowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha1-JgPni3tLAAbLyi+8yKMgJVislHk= lru-cache@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/lru-cache/download/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + resolved "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" integrity sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ= dependencies: yallist "^4.0.0" magic-string@^0.25.3: version "0.25.7" - resolved "https://registry.nlark.com/magic-string/download/magic-string-0.25.7.tgz?cache=0&sync_timestamp=1618847046304&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmagic-string%2Fdownload%2Fmagic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" + resolved "https://registry.npm.taobao.org/magic-string/download/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" integrity sha1-P0l9b9NMZpxnmNy4IfLvMfVEUFE= dependencies: sourcemap-codec "^1.4.4" make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" - resolved "https://registry.npm.taobao.org/make-dir/download/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + resolved "https://registry.nlark.com/make-dir/download/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha1-QV6WcEazp/HRhSd9hKpYIDcmoT8= dependencies: semver "^6.0.0" markdown-escapes@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/markdown-escapes/download/markdown-escapes-1.0.4.tgz?cache=0&sync_timestamp=1635887464232&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmarkdown-escapes%2Fdownload%2Fmarkdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" + resolved "https://registry.npmmirror.com/markdown-escapes/download/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" integrity sha1-yVQV70UUmddgK5EJXzyOiXX3hTU= mdast-squeeze-paragraphs@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/mdast-squeeze-paragraphs/download/mdast-squeeze-paragraphs-4.0.0.tgz?cache=0&sync_timestamp=1627994916092&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-squeeze-paragraphs%2Fdownload%2Fmdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97" + resolved "https://registry.nlark.com/mdast-squeeze-paragraphs/download/mdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97" integrity sha1-fEwRRnnDvuJ+8QtY4uAVvnnx75c= dependencies: unist-util-remove "^2.0.0" mdast-util-definitions@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/mdast-util-definitions/download/mdast-util-definitions-4.0.0.tgz?cache=0&sync_timestamp=1627293635701&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-util-definitions%2Fdownload%2Fmdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2" + resolved "https://registry.nlark.com/mdast-util-definitions/download/mdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2" integrity sha1-xcGoTbeZFztNz3ZDzamZ5EDCTbI= dependencies: unist-util-visit "^2.0.0" mdast-util-to-hast@10.0.1: version "10.0.1" - resolved "https://registry.npmmirror.com/mdast-util-to-hast/download/mdast-util-to-hast-10.0.1.tgz?cache=0&sync_timestamp=1633275408860&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmdast-util-to-hast%2Fdownload%2Fmdast-util-to-hast-10.0.1.tgz#0cfc82089494c52d46eb0e3edb7a4eb2aea021eb" + resolved "https://registry.npmmirror.com/mdast-util-to-hast/download/mdast-util-to-hast-10.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmdast-util-to-hast%2Fdownload%2Fmdast-util-to-hast-10.0.1.tgz#0cfc82089494c52d46eb0e3edb7a4eb2aea021eb" integrity sha1-DPyCCJSUxS1G6w4+23pOsq6gIes= dependencies: "@types/mdast" "^3.0.0" @@ -5118,7 +5068,7 @@ mdast-util-to-hast@10.0.1: mdast-util-to-string@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/mdast-util-to-string/download/mdast-util-to-string-2.0.0.tgz?cache=0&sync_timestamp=1619426294961&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-util-to-string%2Fdownload%2Fmdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" + resolved "https://registry.nlark.com/mdast-util-to-string/download/mdast-util-to-string-2.0.0.tgz?cache=0&sync_timestamp=1619426190900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-util-to-string%2Fdownload%2Fmdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" integrity sha1-uM/mpxPhCRy1tyj8SIhaR2f4uXs= mdn-data@2.0.14: @@ -5155,7 +5105,7 @@ merge-descriptors@1.0.1: merge-stream@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/merge-stream/download/merge-stream-2.0.0.tgz?cache=0&sync_timestamp=1622025345923&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmerge-stream%2Fdownload%2Fmerge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + resolved "https://registry.nlark.com/merge-stream/download/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha1-UoI2KaFN0AyXcPtq1H3GMQ8sH2A= merge2@^1.3.0: @@ -5178,24 +5128,24 @@ micromatch@^4.0.2, micromatch@^4.0.4: mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": version "1.51.0" - resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.51.0.tgz?cache=0&sync_timestamp=1636425951030&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.51.0.tgz?cache=0&sync_timestamp=1636425932298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== mime-db@~1.33.0: version "1.33.0" - resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.33.0.tgz?cache=0&sync_timestamp=1636425951030&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" + resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.33.0.tgz?cache=0&sync_timestamp=1636425932298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" integrity sha1-o0kgUKXLm2NFBUHjnZeI0icng9s= mime-types@2.1.18: version "2.1.18" - resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.18.tgz?cache=0&sync_timestamp=1636432244120&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" + resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.18.tgz?cache=0&sync_timestamp=1636432275511&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" integrity sha1-bzI/YKg9ERRvgx/xH9ZuL+VQO7g= dependencies: mime-db "~1.33.0" mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24: version "2.1.34" - resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.34.tgz?cache=0&sync_timestamp=1636432244120&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" + resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.34.tgz?cache=0&sync_timestamp=1636432275511&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== dependencies: mime-db "1.51.0" @@ -5207,7 +5157,7 @@ mime@1.6.0: mimic-fn@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + resolved "https://registry.nlark.com/mimic-fn/download/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs= mimic-response@^1.0.0, mimic-response@^1.0.1: @@ -5217,7 +5167,7 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: mini-create-react-context@^0.4.0: version "0.4.1" - resolved "https://registry.npm.taobao.org/mini-create-react-context/download/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" + resolved "https://registry.nlark.com/mini-create-react-context/download/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" integrity sha1-ByFxVhv9ySLaCKYMIZekl8wtHV4= dependencies: "@babel/runtime" "^7.12.1" @@ -5225,7 +5175,7 @@ mini-create-react-context@^0.4.0: mini-css-extract-plugin@^1.6.0: version "1.6.2" - resolved "https://registry.npmmirror.com/mini-css-extract-plugin/download/mini-css-extract-plugin-1.6.2.tgz?cache=0&sync_timestamp=1637170563108&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" + resolved "https://registry.npmmirror.com/mini-css-extract-plugin/download/mini-css-extract-plugin-1.6.2.tgz?cache=0&sync_timestamp=1637170529830&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" integrity sha1-gxcrT9gS+PxKCdb20W+ST1OZDKg= dependencies: loader-utils "^2.0.0" @@ -5239,14 +5189,14 @@ minimalistic-assert@^1.0.0: minimatch@3.0.4, minimatch@^3.0.4: version "3.0.4" - resolved "https://registry.nlark.com/minimatch/download/minimatch-3.0.4.tgz?cache=0&sync_timestamp=1618846754554&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fminimatch%2Fdownload%2Fminimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + resolved "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM= dependencies: brace-expansion "^1.1.7" minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" - resolved "https://registry.nlark.com/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1618847017774&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + resolved "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI= mkdirp@^0.5.5, mkdirp@~0.5.1: @@ -5301,12 +5251,12 @@ nanoid@^3.1.30: negotiator@0.6.2: version "0.6.2" - resolved "https://registry.nlark.com/negotiator/download/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + resolved "https://registry.npm.taobao.org/negotiator/download/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha1-/qz3zPUlp3rpY0Q2pkiD/+yjRvs= neo-async@^2.6.2: version "2.6.2" - resolved "https://registry.nlark.com/neo-async/download/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + resolved "https://registry.npm.taobao.org/neo-async/download/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha1-tKr7k+OustgXTKU88WOrfXMIMF8= no-case@^3.0.4: @@ -5319,24 +5269,24 @@ no-case@^3.0.4: node-emoji@^1.10.0: version "1.11.0" - resolved "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" + resolved "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz?cache=0&sync_timestamp=1628672555671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-emoji%2Fdownload%2Fnode-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" integrity sha1-aaAVDmlG4vEV6dfqTfeXHiYoMBw= dependencies: lodash "^4.17.21" node-forge@^0.10.0: version "0.10.0" - resolved "https://registry.nlark.com/node-forge/download/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" + resolved "https://registry.npm.taobao.org/node-forge/download/node-forge-0.10.0.tgz?cache=0&sync_timestamp=1599010726129&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-forge%2Fdownload%2Fnode-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha1-Mt6ir7Ppkm8C7lzoeUkCaRpna/M= node-releases@^2.0.1: version "2.0.1" - resolved "https://registry.npmmirror.com/node-releases/download/node-releases-2.0.1.tgz?cache=0&sync_timestamp=1634806960337&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnode-releases%2Fdownload%2Fnode-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" + resolved "https://registry.npmmirror.com/node-releases/download/node-releases-2.0.1.tgz?cache=0&sync_timestamp=1634806914912&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnode-releases%2Fdownload%2Fnode-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" integrity sha1-PR05XyBPHy8ppUNYuftnh2WtL8U= normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/normalize-path/download/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + resolved "https://registry.npm.taobao.org/normalize-path/download/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU= normalize-range@^0.1.2: @@ -5356,33 +5306,33 @@ normalize-url@^6.0.1: npm-run-path@^4.0.1: version "4.0.1" - resolved "https://registry.npmmirror.com/npm-run-path/download/npm-run-path-4.0.1.tgz?cache=0&sync_timestamp=1633420566316&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnpm-run-path%2Fdownload%2Fnpm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + resolved "https://registry.npmmirror.com/npm-run-path/download/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha1-t+zR5e1T2o43pV4cImnguX7XSOo= dependencies: path-key "^3.0.0" nprogress@^0.2.0: version "0.2.0" - resolved "https://registry.nlark.com/nprogress/download/nprogress-0.2.0.tgz#cb8f34c53213d895723fcbab907e9422adbcafb1" + resolved "https://registry.npm.taobao.org/nprogress/download/nprogress-0.2.0.tgz#cb8f34c53213d895723fcbab907e9422adbcafb1" integrity sha1-y480xTIT2JVyP8urkH6UIq28r7E= nth-check@^1.0.2, nth-check@~1.0.1: version "1.0.2" - resolved "https://registry.nlark.com/nth-check/download/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" + resolved "https://registry.nlark.com/nth-check/download/nth-check-1.0.2.tgz?cache=0&sync_timestamp=1631793617973&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" integrity sha1-sr0pXDfj3VijvwcAN2Zjuk2c8Fw= dependencies: boolbase "~1.0.0" nth-check@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/nth-check/download/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" + resolved "https://registry.nlark.com/nth-check/download/nth-check-2.0.1.tgz?cache=0&sync_timestamp=1631793617973&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" integrity sha1-Lv4WL1w9oGoolZ+9PbddvuqfD8I= dependencies: boolbase "^1.0.0" object-assign@^4.1.1: version "4.1.1" - resolved "https://registry.nlark.com/object-assign/download/object-assign-4.1.1.tgz?cache=0&sync_timestamp=1618847043548&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fobject-assign%2Fdownload%2Fobject-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + resolved "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= object-hash@^2.2.0: @@ -5392,12 +5342,12 @@ object-hash@^2.2.0: object-inspect@^1.11.0, object-inspect@^1.9.0: version "1.11.0" - resolved "https://registry.nlark.com/object-inspect/download/object-inspect-1.11.0.tgz?cache=0&sync_timestamp=1626120241132&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fobject-inspect%2Fdownload%2Fobject-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" + resolved "https://registry.nlark.com/object-inspect/download/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" integrity sha1-nc6xRs7dQUig2eUauI00z1CZIrE= object-is@^1.0.1: version "1.1.5" - resolved "https://registry.npm.taobao.org/object-is/download/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + resolved "https://registry.nlark.com/object-is/download/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" integrity sha1-ud7qpfx/GEag+uzc7sE45XePU6w= dependencies: call-bind "^1.0.2" @@ -5420,7 +5370,7 @@ object.assign@^4.1.0, object.assign@^4.1.2: object.getownpropertydescriptors@^2.1.0: version "2.1.3" - resolved "https://registry.npmmirror.com/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.1.3.tgz?cache=0&sync_timestamp=1633321702182&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" + resolved "https://registry.npmmirror.com/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.1.3.tgz?cache=0&sync_timestamp=1633321822200&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" integrity sha1-siPPOOF/77l6Y8EMkd9yzLOG354= dependencies: call-bind "^1.0.2" @@ -5429,7 +5379,7 @@ object.getownpropertydescriptors@^2.1.0: object.values@^1.1.0: version "1.1.5" - resolved "https://registry.npmmirror.com/object.values/download/object.values-1.1.5.tgz?cache=0&sync_timestamp=1633327765894&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.values%2Fdownload%2Fobject.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" + resolved "https://registry.npmmirror.com/object.values/download/object.values-1.1.5.tgz?cache=0&sync_timestamp=1633326898457&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.values%2Fdownload%2Fobject.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" integrity sha1-lZ9j486e8QhyAzMIITHkpFm3Fqw= dependencies: call-bind "^1.0.2" @@ -5438,12 +5388,12 @@ object.values@^1.1.0: obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" - resolved "https://registry.nlark.com/obuf/download/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" + resolved "https://registry.npm.taobao.org/obuf/download/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha1-Cb6jND1BhZ69RGKS0RydTbYZCE4= on-finished@~2.3.0: version "2.3.0" - resolved "https://registry.nlark.com/on-finished/download/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + resolved "https://registry.npm.taobao.org/on-finished/download/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= dependencies: ee-first "1.1.1" @@ -5462,14 +5412,14 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: onetime@^5.1.2: version "5.1.2" - resolved "https://registry.npm.taobao.org/onetime/download/onetime-5.1.2.tgz?cache=0&sync_timestamp=1617889724435&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fonetime%2Fdownload%2Fonetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + resolved "https://registry.nlark.com/onetime/download/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha1-0Oluu1awdHbfHdnEgG5SN5hcpF4= dependencies: mimic-fn "^2.1.0" open@^7.0.2: version "7.4.2" - resolved "https://registry.npmmirror.com/open/download/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" + resolved "https://registry.npmmirror.com/open/download/open-7.4.2.tgz?cache=0&sync_timestamp=1635048357738&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fopen%2Fdownload%2Fopen-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" integrity sha1-uBR+Jtzz5CYxbHMAif1x7dKcIyE= dependencies: is-docker "^2.0.0" @@ -5477,7 +5427,7 @@ open@^7.0.2: open@^8.0.9: version "8.4.0" - resolved "https://registry.npmmirror.com/open/download/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" + resolved "https://registry.npmmirror.com/open/download/open-8.4.0.tgz?cache=0&sync_timestamp=1635048357738&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fopen%2Fdownload%2Fopen-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" integrity sha1-NFMhrhj4E4+CVlqRD9xrOejCRPg= dependencies: define-lazy-prop "^2.0.0" @@ -5486,7 +5436,7 @@ open@^8.0.9: opener@^1.5.2: version "1.5.2" - resolved "https://registry.nlark.com/opener/download/opener-1.5.2.tgz?cache=0&sync_timestamp=1618847055043&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fopener%2Fdownload%2Fopener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" + resolved "https://registry.nlark.com/opener/download/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" integrity sha1-XTfh81B3udysQwE3InGv3rKhNZg= p-cancelable@^1.0.0: @@ -5496,35 +5446,35 @@ p-cancelable@^1.0.0: p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" - resolved "https://registry.nlark.com/p-limit/download/p-limit-2.3.0.tgz?cache=0&sync_timestamp=1628812721654&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-limit%2Fdownload%2Fp-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + resolved "https://registry.nlark.com/p-limit/download/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" integrity sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE= dependencies: p-try "^2.0.0" p-locate@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/p-locate/download/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + resolved "https://registry.nlark.com/p-locate/download/p-locate-3.0.0.tgz?cache=0&sync_timestamp=1629892721671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-locate%2Fdownload%2Fp-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" integrity sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ= dependencies: p-limit "^2.0.0" p-locate@^4.1.0: version "4.1.0" - resolved "https://registry.nlark.com/p-locate/download/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + resolved "https://registry.nlark.com/p-locate/download/p-locate-4.1.0.tgz?cache=0&sync_timestamp=1629892721671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-locate%2Fdownload%2Fp-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" integrity sha1-o0KLtwiLOmApL2aRkni3wpetTwc= dependencies: p-limit "^2.2.0" p-map@^4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/p-map/download/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + resolved "https://registry.npmmirror.com/p-map/download/p-map-4.0.0.tgz?cache=0&sync_timestamp=1635931861684&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-map%2Fdownload%2Fp-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" integrity sha1-uy+Vpe2i7BaOySdOBqdHw+KQTSs= dependencies: aggregate-error "^3.0.0" p-retry@^4.5.0: version "4.6.1" - resolved "https://registry.npmmirror.com/p-retry/download/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" + resolved "https://registry.npmmirror.com/p-retry/download/p-retry-4.6.1.tgz?cache=0&sync_timestamp=1635967027504&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-retry%2Fdownload%2Fp-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" integrity sha1-j83dXN96Z6CRGpzy7w5d9/YCMWw= dependencies: "@types/retry" "^0.12.0" @@ -5532,7 +5482,7 @@ p-retry@^4.5.0: p-try@^2.0.0: version "2.2.0" - resolved "https://registry.npmmirror.com/p-try/download/p-try-2.2.0.tgz?cache=0&sync_timestamp=1633364397780&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-try%2Fdownload%2Fp-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + resolved "https://registry.npmmirror.com/p-try/download/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha1-yyhoVA4xPWHeWPr741zpAE1VQOY= package-json@^6.3.0: @@ -5599,7 +5549,7 @@ parse5@^6.0.0: parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" - resolved "https://registry.npm.taobao.org/parseurl/download/parseurl-1.3.3.tgz?cache=0&sync_timestamp=1615984376007&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparseurl%2Fdownload%2Fparseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + resolved "https://registry.npm.taobao.org/parseurl/download/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ= pascal-case@^3.1.2: @@ -5612,12 +5562,12 @@ pascal-case@^3.1.2: path-exists@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/path-exists/download/path-exists-3.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpath-exists%2Fdownload%2Fpath-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + resolved "https://registry.nlark.com/path-exists/download/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= path-exists@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/path-exists/download/path-exists-4.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpath-exists%2Fdownload%2Fpath-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + resolved "https://registry.nlark.com/path-exists/download/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" integrity sha1-UTvb4tO5XXdi6METfvoZXGxhtbM= path-is-absolute@^1.0.0: @@ -5627,12 +5577,12 @@ path-is-absolute@^1.0.0: path-is-inside@1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/path-is-inside/download/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" + resolved "https://registry.npm.taobao.org/path-is-inside/download/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" - resolved "https://registry.npm.taobao.org/path-key/download/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + resolved "https://registry.nlark.com/path-key/download/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha1-WB9q3mWMu6ZaDTOA3ndTKVBU83U= path-parse@^1.0.6: @@ -5642,61 +5592,61 @@ path-parse@^1.0.6: path-to-regexp@0.1.7: version "0.1.7" - resolved "https://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= path-to-regexp@2.2.1: version "2.2.1" - resolved "https://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" + resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" integrity sha1-kLYXAloWOBqHm8gqONTovesrz0U= path-to-regexp@^1.7.0: version "1.8.0" - resolved "https://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" + resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" integrity sha1-iHs7qdhDk+h6CgufTLdWGYtTVIo= dependencies: isarray "0.0.1" path-type@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/path-type/download/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + resolved "https://registry.nlark.com/path-type/download/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs= picocolors@^0.2.1: version "0.2.1" - resolved "https://registry.npmmirror.com/picocolors/download/picocolors-0.2.1.tgz?cache=0&sync_timestamp=1634093339035&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" + resolved "https://registry.npmmirror.com/picocolors/download/picocolors-0.2.1.tgz?cache=0&sync_timestamp=1634093378416&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" integrity sha1-VwZw95NkaFHRuhNZlpYqutWHhZ8= picocolors@^1.0.0: version "1.0.0" - resolved "https://registry.npmmirror.com/picocolors/download/picocolors-1.0.0.tgz?cache=0&sync_timestamp=1634093339035&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + resolved "https://registry.npmmirror.com/picocolors/download/picocolors-1.0.0.tgz?cache=0&sync_timestamp=1634093378416&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha1-y1vcdP8/UYkiNur3nWi8RFZKuBw= picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: version "2.3.0" - resolved "https://registry.nlark.com/picomatch/download/picomatch-2.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpicomatch%2Fdownload%2Fpicomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + resolved "https://registry.nlark.com/picomatch/download/picomatch-2.3.0.tgz?cache=0&sync_timestamp=1621648246651&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpicomatch%2Fdownload%2Fpicomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" integrity sha1-8fBh3o9qS/AiiS4tEoI0+5gwKXI= pify@^2.3.0: version "2.3.0" - resolved "https://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + resolved "https://registry.nlark.com/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= pify@^4.0.1: version "4.0.1" - resolved "https://registry.npm.taobao.org/pify/download/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + resolved "https://registry.nlark.com/pify/download/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE= pkg-dir@^4.1.0: version "4.2.0" - resolved "https://registry.npmmirror.com/pkg-dir/download/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + resolved "https://registry.npmmirror.com/pkg-dir/download/pkg-dir-4.2.0.tgz?cache=0&sync_timestamp=1633498133295&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-dir%2Fdownload%2Fpkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" integrity sha1-8JkTPfft5CLoHR2ESCcO6z5CYfM= dependencies: find-up "^4.0.0" pkg-up@^3.1.0: version "3.1.0" - resolved "https://registry.npmmirror.com/pkg-up/download/pkg-up-3.1.0.tgz?cache=0&sync_timestamp=1636035062199&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-up%2Fdownload%2Fpkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" + resolved "https://registry.npmmirror.com/pkg-up/download/pkg-up-3.1.0.tgz?cache=0&sync_timestamp=1636035118070&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-up%2Fdownload%2Fpkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" integrity sha1-EA7CNcwVDk/UJRlBJZaihRKg3vU= dependencies: find-up "^3.0.0" @@ -5720,7 +5670,7 @@ postcss-calc@^8.0.0: postcss-colormin@^5.2.1: version "5.2.1" - resolved "https://registry.npmmirror.com/postcss-colormin/download/postcss-colormin-5.2.1.tgz#6e444a806fd3c578827dbad022762df19334414d" + resolved "https://registry.npmmirror.com/postcss-colormin/download/postcss-colormin-5.2.1.tgz?cache=0&sync_timestamp=1635857516973&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-colormin%2Fdownload%2Fpostcss-colormin-5.2.1.tgz#6e444a806fd3c578827dbad022762df19334414d" integrity sha1-bkRKgG/TxXiCfbrQInYt8ZM0QU0= dependencies: browserslist "^4.16.6" @@ -5730,19 +5680,19 @@ postcss-colormin@^5.2.1: postcss-convert-values@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-convert-values/download/postcss-convert-values-5.0.2.tgz#879b849dc3677c7d6bc94b6a2c1a3f0808798059" + resolved "https://registry.npmmirror.com/postcss-convert-values/download/postcss-convert-values-5.0.2.tgz?cache=0&sync_timestamp=1635857664165&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-convert-values%2Fdownload%2Fpostcss-convert-values-5.0.2.tgz#879b849dc3677c7d6bc94b6a2c1a3f0808798059" integrity sha1-h5uEncNnfH1ryUtqLBo/CAh5gFk= dependencies: postcss-value-parser "^4.1.0" postcss-discard-comments@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-comments/download/postcss-discard-comments-5.0.1.tgz?cache=0&sync_timestamp=1621449558287&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-comments%2Fdownload%2Fpostcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" + resolved "https://registry.nlark.com/postcss-discard-comments/download/postcss-discard-comments-5.0.1.tgz?cache=0&sync_timestamp=1621449592883&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-comments%2Fdownload%2Fpostcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" integrity sha1-nq5LdHz3YNMfJEfCfwYZ1XGJAf4= postcss-discard-duplicates@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-duplicates/download/postcss-discard-duplicates-5.0.1.tgz?cache=0&sync_timestamp=1621449558296&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-duplicates%2Fdownload%2Fpostcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" + resolved "https://registry.nlark.com/postcss-discard-duplicates/download/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" integrity sha1-aPfMZFj+a6suRsn1WuUoafaA5m0= postcss-discard-empty@^5.0.1: @@ -5752,7 +5702,7 @@ postcss-discard-empty@^5.0.1: postcss-discard-overridden@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-overridden/download/postcss-discard-overridden-5.0.1.tgz?cache=0&sync_timestamp=1621449732464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-overridden%2Fdownload%2Fpostcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" + resolved "https://registry.nlark.com/postcss-discard-overridden/download/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" integrity sha1-RUtB9wcwC5gQmnUAXKSrD/J0OsY= postcss-discard-unused@^5.0.1: @@ -5764,7 +5714,7 @@ postcss-discard-unused@^5.0.1: postcss-import@^14.0.2: version "14.0.2" - resolved "https://registry.nlark.com/postcss-import/download/postcss-import-14.0.2.tgz?cache=0&sync_timestamp=1620671193913&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-import%2Fdownload%2Fpostcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1" + resolved "https://registry.nlark.com/postcss-import/download/postcss-import-14.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-import%2Fdownload%2Fpostcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1" integrity sha1-YO/3fmvpLntn/kaex5fZQkyuGqE= dependencies: postcss-value-parser "^4.0.0" @@ -5773,7 +5723,7 @@ postcss-import@^14.0.2: postcss-js@^3.0.3: version "3.0.3" - resolved "https://registry.npm.taobao.org/postcss-js/download/postcss-js-3.0.3.tgz#2f0bd370a2e8599d45439f6970403b5873abda33" + resolved "https://registry.nlark.com/postcss-js/download/postcss-js-3.0.3.tgz#2f0bd370a2e8599d45439f6970403b5873abda33" integrity sha1-LwvTcKLoWZ1FQ59pcEA7WHOr2jM= dependencies: camelcase-css "^2.0.1" @@ -5807,7 +5757,7 @@ postcss-merge-idents@^5.0.1: postcss-merge-longhand@^5.0.4: version "5.0.4" - resolved "https://registry.npmmirror.com/postcss-merge-longhand/download/postcss-merge-longhand-5.0.4.tgz?cache=0&sync_timestamp=1637084835421&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-longhand%2Fdownload%2Fpostcss-merge-longhand-5.0.4.tgz#41f4f3270282ea1a145ece078b7679f0cef21c32" + resolved "https://registry.npmmirror.com/postcss-merge-longhand/download/postcss-merge-longhand-5.0.4.tgz#41f4f3270282ea1a145ece078b7679f0cef21c32" integrity sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw== dependencies: postcss-value-parser "^4.1.0" @@ -5815,7 +5765,7 @@ postcss-merge-longhand@^5.0.4: postcss-merge-rules@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-merge-rules/download/postcss-merge-rules-5.0.3.tgz?cache=0&sync_timestamp=1637085530842&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-rules%2Fdownload%2Fpostcss-merge-rules-5.0.3.tgz#b5cae31f53129812a77e3eb1eeee448f8cf1a1db" + resolved "https://registry.npmmirror.com/postcss-merge-rules/download/postcss-merge-rules-5.0.3.tgz?cache=0&sync_timestamp=1637085394901&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-rules%2Fdownload%2Fpostcss-merge-rules-5.0.3.tgz#b5cae31f53129812a77e3eb1eeee448f8cf1a1db" integrity sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg== dependencies: browserslist "^4.16.6" @@ -5841,7 +5791,7 @@ postcss-minify-gradients@^5.0.3: postcss-minify-params@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-minify-params/download/postcss-minify-params-5.0.2.tgz?cache=0&sync_timestamp=1637084835630&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-minify-params%2Fdownload%2Fpostcss-minify-params-5.0.2.tgz#1b644da903473fbbb18fbe07b8e239883684b85c" + resolved "https://registry.npmmirror.com/postcss-minify-params/download/postcss-minify-params-5.0.2.tgz#1b644da903473fbbb18fbe07b8e239883684b85c" integrity sha512-qJAPuBzxO1yhLad7h2Dzk/F7n1vPyfHfCCh5grjGfjhi1ttCnq4ZXGIW77GSrEbh9Hus9Lc/e/+tB4vh3/GpDg== dependencies: alphanum-sort "^1.0.2" @@ -5851,7 +5801,7 @@ postcss-minify-params@^5.0.2: postcss-minify-selectors@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/postcss-minify-selectors/download/postcss-minify-selectors-5.1.0.tgz?cache=0&sync_timestamp=1621449558355&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-minify-selectors%2Fdownload%2Fpostcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" + resolved "https://registry.nlark.com/postcss-minify-selectors/download/postcss-minify-selectors-5.1.0.tgz?cache=0&sync_timestamp=1621449593365&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-minify-selectors%2Fdownload%2Fpostcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" integrity sha1-Q4XIRdOXn/FgKRd0Uj/6VOr9WlQ= dependencies: alphanum-sort "^1.0.2" @@ -5859,12 +5809,12 @@ postcss-minify-selectors@^5.1.0: postcss-modules-extract-imports@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/postcss-modules-extract-imports/download/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" + resolved "https://registry.nlark.com/postcss-modules-extract-imports/download/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" integrity sha1-zaHwR8CugMl9vijD52pDuIAldB0= postcss-modules-local-by-default@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/postcss-modules-local-by-default/download/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" + resolved "https://registry.npm.taobao.org/postcss-modules-local-by-default/download/postcss-modules-local-by-default-4.0.0.tgz?cache=0&sync_timestamp=1602587625149&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-local-by-default%2Fdownload%2Fpostcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" integrity sha1-67tU+uFZjuz99pGgKz/zs5ClpRw= dependencies: icss-utils "^5.0.0" @@ -5873,33 +5823,33 @@ postcss-modules-local-by-default@^4.0.0: postcss-modules-scope@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/postcss-modules-scope/download/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" + resolved "https://registry.npm.taobao.org/postcss-modules-scope/download/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" integrity sha1-nvMVFFbTu/oSDKRImN/Kby+gHwY= dependencies: postcss-selector-parser "^6.0.4" postcss-modules-values@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/postcss-modules-values/download/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + resolved "https://registry.nlark.com/postcss-modules-values/download/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" integrity sha1-18Xn5ow7s8myfL9Iyguz/7RgLJw= dependencies: icss-utils "^5.0.0" postcss-nested@5.0.6: version "5.0.6" - resolved "https://registry.nlark.com/postcss-nested/download/postcss-nested-5.0.6.tgz?cache=0&sync_timestamp=1627468102377&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-nested%2Fdownload%2Fpostcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" + resolved "https://registry.nlark.com/postcss-nested/download/postcss-nested-5.0.6.tgz?cache=0&sync_timestamp=1627468122159&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-nested%2Fdownload%2Fpostcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" integrity sha1-RmND9/yNPUavPn26P81H0FKpRbw= dependencies: postcss-selector-parser "^6.0.6" postcss-normalize-charset@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-charset/download/postcss-normalize-charset-5.0.1.tgz?cache=0&sync_timestamp=1621449558308&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-charset%2Fdownload%2Fpostcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" + resolved "https://registry.nlark.com/postcss-normalize-charset/download/postcss-normalize-charset-5.0.1.tgz?cache=0&sync_timestamp=1621449593655&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-charset%2Fdownload%2Fpostcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" integrity sha1-EhVZ0b68VayNJK839nvU2p79kdA= postcss-normalize-display-values@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-display-values/download/postcss-normalize-display-values-5.0.1.tgz?cache=0&sync_timestamp=1621449652268&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-display-values%2Fdownload%2Fpostcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" + resolved "https://registry.nlark.com/postcss-normalize-display-values/download/postcss-normalize-display-values-5.0.1.tgz?cache=0&sync_timestamp=1621449599414&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-display-values%2Fdownload%2Fpostcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" integrity sha1-YmULllmBqVXf/ugzY0U9uC9q0f0= dependencies: cssnano-utils "^2.0.1" @@ -5945,7 +5895,7 @@ postcss-normalize-unicode@^5.0.1: postcss-normalize-url@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-normalize-url/download/postcss-normalize-url-5.0.3.tgz?cache=0&sync_timestamp=1637084835796&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-normalize-url%2Fdownload%2Fpostcss-normalize-url-5.0.3.tgz#42eca6ede57fe69075fab0f88ac8e48916ef931c" + resolved "https://registry.npmmirror.com/postcss-normalize-url/download/postcss-normalize-url-5.0.3.tgz#42eca6ede57fe69075fab0f88ac8e48916ef931c" integrity sha512-qWiUMbvkRx3kc1Dp5opzUwc7MBWZcSDK2yofCmdvFBCpx+zFPkxBC1FASQ59Pt+flYfj/nTZSkmF56+XG5elSg== dependencies: is-absolute-url "^3.0.3" @@ -5954,14 +5904,14 @@ postcss-normalize-url@^5.0.3: postcss-normalize-whitespace@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-whitespace/download/postcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" + resolved "https://registry.nlark.com/postcss-normalize-whitespace/download/postcss-normalize-whitespace-5.0.1.tgz?cache=0&sync_timestamp=1621449593892&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-whitespace%2Fdownload%2Fpostcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" integrity sha1-sLQLW8rINYX/B+rS2vLc++7vjpo= dependencies: postcss-value-parser "^4.1.0" postcss-ordered-values@^5.0.2: version "5.0.2" - resolved "https://registry.nlark.com/postcss-ordered-values/download/postcss-ordered-values-5.0.2.tgz?cache=0&sync_timestamp=1623330460500&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-ordered-values%2Fdownload%2Fpostcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" + resolved "https://registry.nlark.com/postcss-ordered-values/download/postcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" integrity sha1-HzUUJpd74A4PdlsxZK11PayO0EQ= dependencies: cssnano-utils "^2.0.1" @@ -5984,7 +5934,7 @@ postcss-reduce-initial@^5.0.2: postcss-reduce-transforms@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-reduce-transforms/download/postcss-reduce-transforms-5.0.1.tgz?cache=0&sync_timestamp=1621449730895&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-reduce-transforms%2Fdownload%2Fpostcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640" + resolved "https://registry.nlark.com/postcss-reduce-transforms/download/postcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640" integrity sha1-k8EvahWUdKpxHVJpkj4jg87c9kA= dependencies: cssnano-utils "^2.0.1" @@ -6007,7 +5957,7 @@ postcss-sort-media-queries@^4.1.0: postcss-svgo@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-svgo/download/postcss-svgo-5.0.3.tgz?cache=0&sync_timestamp=1635857761721&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-svgo%2Fdownload%2Fpostcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30" + resolved "https://registry.npmmirror.com/postcss-svgo/download/postcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30" integrity sha1-2UUYV1bl36rgf57bDTyuf/efmzA= dependencies: postcss-value-parser "^4.1.0" @@ -6015,7 +5965,7 @@ postcss-svgo@^5.0.3: postcss-unique-selectors@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-unique-selectors/download/postcss-unique-selectors-5.0.2.tgz?cache=0&sync_timestamp=1637084835538&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-unique-selectors%2Fdownload%2Fpostcss-unique-selectors-5.0.2.tgz#5d6893daf534ae52626708e0d62250890108c0c1" + resolved "https://registry.npmmirror.com/postcss-unique-selectors/download/postcss-unique-selectors-5.0.2.tgz#5d6893daf534ae52626708e0d62250890108c0c1" integrity sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA== dependencies: alphanum-sort "^1.0.2" @@ -6078,7 +6028,7 @@ prism-react-renderer@^1.2.1: prismjs@^1.23.0: version "1.25.0" - resolved "https://registry.nlark.com/prismjs/download/prismjs-1.25.0.tgz?cache=0&sync_timestamp=1631809405776&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fprismjs%2Fdownload%2Fprismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756" + resolved "https://registry.nlark.com/prismjs/download/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756" integrity sha1-b4It8b2tllc0sxCzFaIzFc+Zl1Y= process-nextick-args@~2.0.0: @@ -6088,7 +6038,7 @@ process-nextick-args@~2.0.0: prompts@^2.4.0, prompts@^2.4.1: version "2.4.2" - resolved "https://registry.npmmirror.com/prompts/download/prompts-2.4.2.tgz?cache=0&sync_timestamp=1633642460453&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fprompts%2Fdownload%2Fprompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" + resolved "https://registry.npmmirror.com/prompts/download/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" integrity sha1-e1fnOzpIAprRDr1E90sBcipMsGk= dependencies: kleur "^3.0.3" @@ -6112,7 +6062,7 @@ property-information@^5.0.0, property-information@^5.3.0: proxy-addr@~2.0.5: version "2.0.7" - resolved "https://registry.nlark.com/proxy-addr/download/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + resolved "https://registry.nlark.com/proxy-addr/download/proxy-addr-2.0.7.tgz?cache=0&sync_timestamp=1622509170257&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fproxy-addr%2Fdownload%2Fproxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" integrity sha1-8Z/mnOqzEe65S0LnDowgcPm6ECU= dependencies: forwarded "0.2.0" @@ -6120,7 +6070,7 @@ proxy-addr@~2.0.5: pump@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + resolved "https://registry.nlark.com/pump/download/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" integrity sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ= dependencies: end-of-stream "^1.1.0" @@ -6143,7 +6093,7 @@ punycode@^2.1.0: pupa@^2.1.1: version "2.1.1" - resolved "https://registry.nlark.com/pupa/download/pupa-2.1.1.tgz?cache=0&sync_timestamp=1631543593292&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpupa%2Fdownload%2Fpupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" + resolved "https://registry.nlark.com/pupa/download/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" integrity sha1-9ej9SvwsXZeCj6pSNUnth0SiDWI= dependencies: escape-goat "^2.0.0" @@ -6170,29 +6120,29 @@ queue-microtask@^1.2.2: quick-lru@^5.1.1: version "5.1.1" - resolved "https://registry.npmmirror.com/quick-lru/download/quick-lru-5.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fquick-lru%2Fdownload%2Fquick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + resolved "https://registry.npmmirror.com/quick-lru/download/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" integrity sha1-NmST5rPkKjpoheLpnRj4D7eoyTI= randombytes@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + resolved "https://registry.nlark.com/randombytes/download/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" integrity sha1-32+ENy8CcNxlzfYpE0mrekc9Tyo= dependencies: safe-buffer "^5.1.0" range-parser@1.2.0: version "1.2.0" - resolved "https://registry.npm.taobao.org/range-parser/download/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" + resolved "https://registry.nlark.com/range-parser/download/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4= range-parser@^1.2.1, range-parser@~1.2.1: version "1.2.1" - resolved "https://registry.npm.taobao.org/range-parser/download/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + resolved "https://registry.nlark.com/range-parser/download/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE= raw-body@2.4.0: version "2.4.0" - resolved "https://registry.npmmirror.com/raw-body/download/raw-body-2.4.0.tgz?cache=0&sync_timestamp=1637116849434&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fraw-body%2Fdownload%2Fraw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + resolved "https://registry.npmmirror.com/raw-body/download/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" integrity sha1-oc5vucm8NWylLoklarWQWeE9AzI= dependencies: bytes "3.1.0" @@ -6202,7 +6152,7 @@ raw-body@2.4.0: rc@^1.2.8: version "1.2.8" - resolved "https://registry.npm.taobao.org/rc/download/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + resolved "https://registry.nlark.com/rc/download/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha1-zZJL9SAKB1uDwYjNa54hG3/A0+0= dependencies: deep-extend "^0.6.0" @@ -6217,7 +6167,7 @@ react-cool-onclickoutside@^1.6.2: react-dev-utils@12.0.0-next.47: version "12.0.0-next.47" - resolved "https://registry.npmmirror.com/react-dev-utils/download/react-dev-utils-12.0.0-next.47.tgz?cache=0&sync_timestamp=1633372689551&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-dev-utils%2Fdownload%2Freact-dev-utils-12.0.0-next.47.tgz#e55c31a05eb30cfd69ca516e8b87d61724e880fb" + resolved "https://registry.npmmirror.com/react-dev-utils/download/react-dev-utils-12.0.0-next.47.tgz#e55c31a05eb30cfd69ca516e8b87d61724e880fb" integrity sha1-5VwxoF6zDP1pylFui4fWFyTogPs= dependencies: "@babel/code-frame" "^7.10.4" @@ -6256,12 +6206,12 @@ react-dom@^17.0.1: react-error-overlay@7.0.0-next.54+1465357b: version "7.0.0-next.54" - resolved "https://registry.npmmirror.com/react-error-overlay/download/react-error-overlay-7.0.0-next.54.tgz?cache=0&sync_timestamp=1633372711322&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-error-overlay%2Fdownload%2Freact-error-overlay-7.0.0-next.54.tgz#c1eb5ab86aee15e9552e6d97897b08f2bd06d140" + resolved "https://registry.npmmirror.com/react-error-overlay/download/react-error-overlay-7.0.0-next.54.tgz?cache=0&sync_timestamp=1633373332600&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-error-overlay%2Fdownload%2Freact-error-overlay-7.0.0-next.54.tgz#c1eb5ab86aee15e9552e6d97897b08f2bd06d140" integrity sha1-wetauGruFelVLm2XiXsI8r0G0UA= react-error-overlay@^6.0.9: version "6.0.9" - resolved "https://registry.npmmirror.com/react-error-overlay/download/react-error-overlay-6.0.9.tgz?cache=0&sync_timestamp=1633372711322&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-error-overlay%2Fdownload%2Freact-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a" + resolved "https://registry.npmmirror.com/react-error-overlay/download/react-error-overlay-6.0.9.tgz?cache=0&sync_timestamp=1633373332600&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-error-overlay%2Fdownload%2Freact-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a" integrity sha1-PHQwEMk1lgjDdezWvHbzXZOZWwo= react-fast-compare@^3.1.1: @@ -6271,7 +6221,7 @@ react-fast-compare@^3.1.1: react-helmet@^6.1.0: version "6.1.0" - resolved "https://registry.nlark.com/react-helmet/download/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726" + resolved "https://registry.npm.taobao.org/react-helmet/download/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726" integrity sha1-p1DVFlyxPPIT5EdHUCZS55RGhyY= dependencies: object-assign "^4.1.1" @@ -6293,14 +6243,14 @@ react-loadable-ssr-addon-v5-slorber@^1.0.1: react-router-config@^5.1.1: version "5.1.1" - resolved "https://registry.npm.taobao.org/react-router-config/download/react-router-config-5.1.1.tgz#0f4263d1a80c6b2dc7b9c1902c9526478194a988" + resolved "https://registry.nlark.com/react-router-config/download/react-router-config-5.1.1.tgz#0f4263d1a80c6b2dc7b9c1902c9526478194a988" integrity sha1-D0Jj0agMay3HucGQLJUmR4GUqYg= dependencies: "@babel/runtime" "^7.1.2" react-router-dom@^5.2.0: version "5.3.0" - resolved "https://registry.npmmirror.com/react-router-dom/download/react-router-dom-5.3.0.tgz?cache=0&sync_timestamp=1636499761778&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-router-dom%2Fdownload%2Freact-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363" + resolved "https://registry.npmmirror.com/react-router-dom/download/react-router-dom-5.3.0.tgz?cache=0&sync_timestamp=1636500332816&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-router-dom%2Fdownload%2Freact-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363" integrity sha1-2hv7U1oOiacSqTuX3Xb0etHzI2M= dependencies: "@babel/runtime" "^7.12.13" @@ -6313,7 +6263,7 @@ react-router-dom@^5.2.0: react-router@5.2.1, react-router@^5.2.0: version "5.2.1" - resolved "https://registry.npmmirror.com/react-router/download/react-router-5.2.1.tgz?cache=0&sync_timestamp=1636499760632&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-router%2Fdownload%2Freact-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d" + resolved "https://registry.npmmirror.com/react-router/download/react-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d" integrity sha1-TS5OnVrpQlCRhFuNvG2dJ2I5d00= dependencies: "@babel/runtime" "^7.12.13" @@ -6329,7 +6279,7 @@ react-router@5.2.1, react-router@^5.2.0: react-side-effect@^2.1.0: version "2.1.1" - resolved "https://registry.nlark.com/react-side-effect/download/react-side-effect-2.1.1.tgz#66c5701c3e7560ab4822a4ee2742dee215d72eb3" + resolved "https://registry.npm.taobao.org/react-side-effect/download/react-side-effect-2.1.1.tgz#66c5701c3e7560ab4822a4ee2742dee215d72eb3" integrity sha1-ZsVwHD51YKtIIqTuJ0Le4hXXLrM= react@^17.0.1: @@ -6342,7 +6292,7 @@ react@^17.0.1: read-cache@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/read-cache/download/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" + resolved "https://registry.npm.taobao.org/read-cache/download/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q= dependencies: pify "^2.3.0" @@ -6371,7 +6321,7 @@ readable-stream@^3.0.6, readable-stream@^3.1.1: readdirp@~3.6.0: version "3.6.0" - resolved "https://registry.nlark.com/readdirp/download/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + resolved "https://registry.npm.taobao.org/readdirp/download/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" integrity sha1-dKNwvYVxFuJFspzJc0DNQxoCpsc= dependencies: picomatch "^2.2.1" @@ -6383,21 +6333,21 @@ reading-time@^1.5.0: rechoir@^0.6.2: version "0.6.2" - resolved "https://registry.nlark.com/rechoir/download/rechoir-0.6.2.tgz?cache=0&sync_timestamp=1627101677944&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frechoir%2Fdownload%2Frechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" + resolved "https://registry.nlark.com/rechoir/download/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= dependencies: resolve "^1.1.6" recursive-readdir@^2.2.2: version "2.2.2" - resolved "https://registry.nlark.com/recursive-readdir/download/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f" + resolved "https://registry.npm.taobao.org/recursive-readdir/download/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f" integrity sha1-mUb7MnThYo3m42svZxSVO0hFCU8= dependencies: minimatch "3.0.4" regenerate-unicode-properties@^9.0.0: version "9.0.0" - resolved "https://registry.nlark.com/regenerate-unicode-properties/download/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" + resolved "https://registry.nlark.com/regenerate-unicode-properties/download/regenerate-unicode-properties-9.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerate-unicode-properties%2Fdownload%2Fregenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" integrity sha1-VNCccRXh9T3CMUqXSzLBw0Tv4yY= dependencies: regenerate "^1.4.2" @@ -6429,7 +6379,7 @@ regexp.prototype.flags@^1.2.0: regexpu-core@^4.5.4, regexpu-core@^4.7.1: version "4.8.0" - resolved "https://registry.nlark.com/regexpu-core/download/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" + resolved "https://registry.nlark.com/regexpu-core/download/regexpu-core-4.8.0.tgz?cache=0&sync_timestamp=1631619103170&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregexpu-core%2Fdownload%2Fregexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" integrity sha1-5WBbo2G2excYR4UBMnUC9EeamPA= dependencies: regenerate "^1.4.2" @@ -6441,21 +6391,21 @@ regexpu-core@^4.5.4, regexpu-core@^4.7.1: registry-auth-token@^4.0.0: version "4.2.1" - resolved "https://registry.nlark.com/registry-auth-token/download/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" + resolved "https://registry.npm.taobao.org/registry-auth-token/download/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" integrity sha1-bXtABkQZGJcszV/tzUHcMix5slA= dependencies: rc "^1.2.8" registry-url@^5.0.0: version "5.1.0" - resolved "https://registry.npm.taobao.org/registry-url/download/registry-url-5.1.0.tgz?cache=0&sync_timestamp=1618682318998&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregistry-url%2Fdownload%2Fregistry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + resolved "https://registry.npm.taobao.org/registry-url/download/registry-url-5.1.0.tgz?cache=0&sync_timestamp=1618681893788&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregistry-url%2Fdownload%2Fregistry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" integrity sha1-6YM0tQ1UNLgRNrROxjjZwgCcUAk= dependencies: rc "^1.2.8" regjsgen@^0.5.2: version "0.5.2" - resolved "https://registry.npmmirror.com/regjsgen/download/regjsgen-0.5.2.tgz?cache=0&sync_timestamp=1633097458876&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fregjsgen%2Fdownload%2Fregjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" + resolved "https://registry.npmmirror.com/regjsgen/download/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" integrity sha1-kv8pX7He7L9uzaslQ9IH6RqjNzM= regjsparser@^0.7.0: @@ -6467,7 +6417,7 @@ regjsparser@^0.7.0: rehype-parse@^6.0.2: version "6.0.2" - resolved "https://registry.nlark.com/rehype-parse/download/rehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" + resolved "https://registry.nlark.com/rehype-parse/download/rehype-parse-6.0.2.tgz?cache=0&sync_timestamp=1630413716153&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frehype-parse%2Fdownload%2Frehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" integrity sha1-rrP91oCF+feW8dMTeuK4WphAaWQ= dependencies: hast-util-from-parse5 "^5.0.0" @@ -6490,7 +6440,7 @@ remark-admonitions@^1.2.1: remark-emoji@^2.1.0: version "2.2.0" - resolved "https://registry.npmmirror.com/remark-emoji/download/remark-emoji-2.2.0.tgz?cache=0&sync_timestamp=1636025412972&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-emoji%2Fdownload%2Fremark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" + resolved "https://registry.npmmirror.com/remark-emoji/download/remark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" integrity sha1-HHAgkKFSXaW4DhWo+WPvLII2ysc= dependencies: emoticon "^3.2.0" @@ -6518,7 +6468,7 @@ remark-mdx-remove-imports@^1.6.22: remark-mdx@1.6.22: version "1.6.22" - resolved "https://registry.npmmirror.com/remark-mdx/download/remark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd" + resolved "https://registry.npmmirror.com/remark-mdx/download/remark-mdx-1.6.22.tgz?cache=0&sync_timestamp=1637012565094&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-mdx%2Fdownload%2Fremark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd" integrity sha1-BqjasH3P3VfzNzr3+GvQ6ZIQi70= dependencies: "@babel/core" "7.12.9" @@ -6532,7 +6482,7 @@ remark-mdx@1.6.22: remark-parse@8.0.3: version "8.0.3" - resolved "https://registry.npmmirror.com/remark-parse/download/remark-parse-8.0.3.tgz?cache=0&sync_timestamp=1637259967297&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-parse%2Fdownload%2Fremark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1" + resolved "https://registry.npmmirror.com/remark-parse/download/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1" integrity sha1-nGKqOzW3mkhkVMaQRykGB19Ax+E= dependencies: ccount "^1.0.0" @@ -6554,7 +6504,7 @@ remark-parse@8.0.3: remark-squeeze-paragraphs@4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/remark-squeeze-paragraphs/download/remark-squeeze-paragraphs-4.0.0.tgz?cache=0&sync_timestamp=1635765426012&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-squeeze-paragraphs%2Fdownload%2Fremark-squeeze-paragraphs-4.0.0.tgz#76eb0e085295131c84748c8e43810159c5653ead" + resolved "https://registry.npmmirror.com/remark-squeeze-paragraphs/download/remark-squeeze-paragraphs-4.0.0.tgz#76eb0e085295131c84748c8e43810159c5653ead" integrity sha1-dusOCFKVExyEdIyOQ4EBWcVlPq0= dependencies: mdast-squeeze-paragraphs "^4.0.0" @@ -6572,7 +6522,7 @@ renderkid@^3.0.0: repeat-string@^1.5.4: version "1.6.1" - resolved "https://registry.npm.taobao.org/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + resolved "https://registry.nlark.com/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= require-from-string@^2.0.2: @@ -6592,22 +6542,22 @@ requires-port@^1.0.0: resolve-from@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz?cache=0&sync_timestamp=1622605305717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fresolve-from%2Fdownload%2Fresolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + resolved "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY= resolve-from@^5.0.0: version "5.0.0" - resolved "https://registry.nlark.com/resolve-from/download/resolve-from-5.0.0.tgz?cache=0&sync_timestamp=1622605305717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fresolve-from%2Fdownload%2Fresolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + resolved "https://registry.nlark.com/resolve-from/download/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha1-w1IlhD3493bfIcV1V7wIfp39/Gk= resolve-pathname@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/resolve-pathname/download/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" + resolved "https://registry.npm.taobao.org/resolve-pathname/download/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" integrity sha1-mdAiJNPPJjaJvsuzk7xWAxMCXc0= resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2: version "1.20.0" - resolved "https://registry.nlark.com/resolve/download/resolve-1.20.0.tgz?cache=0&sync_timestamp=1631633008759&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fresolve%2Fdownload%2Fresolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha1-YpoBP7P3B1XW8LeTXMHCxTeLGXU= dependencies: is-core-module "^2.2.0" @@ -6615,7 +6565,7 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2 responselike@^1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/responselike/download/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + resolved "https://registry.npm.taobao.org/responselike/download/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= dependencies: lowercase-keys "^1.0.0" @@ -6627,7 +6577,7 @@ retry@^0.13.1: reusify@^1.0.4: version "1.0.4" - resolved "https://registry.nlark.com/reusify/download/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + resolved "https://registry.npm.taobao.org/reusify/download/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha1-kNo4Kx4SbvwCFG6QhFqI2xKSXXY= rimraf@^3.0.0, rimraf@^3.0.2: @@ -6644,26 +6594,26 @@ rtl-detect@^1.0.4: run-parallel@^1.1.9: version "1.2.0" - resolved "https://registry.npm.taobao.org/run-parallel/download/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + resolved "https://registry.nlark.com/run-parallel/download/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" integrity sha1-ZtE2jae9+SHrnZW9GpIp5/IaQ+4= dependencies: queue-microtask "^1.2.2" rxjs@^7.1.0: version "7.4.0" - resolved "https://registry.npmmirror.com/rxjs/download/rxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68" + resolved "https://registry.npmmirror.com/rxjs/download/rxjs-7.4.0.tgz?cache=0&sync_timestamp=1633556708772&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Frxjs%2Fdownload%2Frxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68" integrity sha1-oSpE1+6/AW9f8kQbh/KMmlHOvGg= dependencies: tslib "~2.1.0" safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" - resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.1.2.tgz?cache=0&sync_timestamp=1618847044058&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsafe-buffer%2Fdownload%2Fsafe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha1-mR7GnSluAxN0fVm9/St0XDX4go0= safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: version "5.2.1" - resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.2.1.tgz?cache=0&sync_timestamp=1618847044058&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsafe-buffer%2Fdownload%2Fsafe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha1-Hq+fqb2x/dTsdfWPnNtOa3gn7sY= "safer-buffer@>= 2.1.2 < 3": @@ -6673,7 +6623,7 @@ safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: sax@^1.2.4, sax@~1.2.4: version "1.2.4" - resolved "https://registry.npm.taobao.org/sax/download/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + resolved "https://registry.nlark.com/sax/download/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha1-KBYjTiN4vdxOU1T6tcqold9xANk= scheduler@^0.20.2: @@ -6686,7 +6636,7 @@ scheduler@^0.20.2: schema-utils@2.7.0: version "2.7.0" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" integrity sha1-FxUfdtjq5n+793lgwzxnatn078c= dependencies: "@types/json-schema" "^7.0.4" @@ -6695,7 +6645,7 @@ schema-utils@2.7.0: schema-utils@^2.6.5: version "2.7.1" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha1-HKTzLRskxZDCA7jnpQvw6kzTlNc= dependencies: "@types/json-schema" "^7.0.5" @@ -6704,7 +6654,7 @@ schema-utils@^2.6.5: schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: version "3.1.1" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-3.1.1.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-3.1.1.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" integrity sha1-vHTEtraZXB2I92qLd76nIZ4MgoE= dependencies: "@types/json-schema" "^7.0.8" @@ -6713,7 +6663,7 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: schema-utils@^4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-4.0.0.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-4.0.0.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== dependencies: "@types/json-schema" "^7.0.9" @@ -6723,7 +6673,7 @@ schema-utils@^4.0.0: section-matter@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/section-matter/download/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167" + resolved "https://registry.npm.taobao.org/section-matter/download/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167" integrity sha1-6QQZU1BngOwB1Z8pKhnHuFC4QWc= dependencies: extend-shallow "^2.0.1" @@ -6743,36 +6693,36 @@ selfsigned@^1.10.11: semver-diff@^3.1.1: version "3.1.1" - resolved "https://registry.nlark.com/semver-diff/download/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" + resolved "https://registry.nlark.com/semver-diff/download/semver-diff-3.1.1.tgz?cache=0&sync_timestamp=1620044887257&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver-diff%2Fdownload%2Fsemver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" integrity sha1-Bfd85Z8yXgDicGr9Z7tQbdscoys= dependencies: semver "^6.3.0" semver@7.0.0: version "7.0.0" - resolved "https://registry.npm.taobao.org/semver/download/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + resolved "https://registry.nlark.com/semver/download/semver-7.0.0.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha1-XzyjV2HkfgWyBsba/yz4FPAxa44= semver@^5.4.1: version "5.7.1" - resolved "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + resolved "https://registry.nlark.com/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha1-qVT5Ma66UI0we78Gnv8MAclhFvc= semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" - resolved "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + resolved "https://registry.nlark.com/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0= semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.5" - resolved "https://registry.npm.taobao.org/semver/download/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + resolved "https://registry.nlark.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc= dependencies: lru-cache "^6.0.0" send@0.17.1: version "0.17.1" - resolved "https://registry.nlark.com/send/download/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" + resolved "https://registry.nlark.com/send/download/send-0.17.1.tgz?cache=0&sync_timestamp=1618846901933&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsend%2Fdownload%2Fsend-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" integrity sha1-wdiwWfeQD3Rm3Uk4vcROEd2zdsg= dependencies: debug "2.6.9" @@ -6791,7 +6741,7 @@ send@0.17.1: serialize-javascript@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/serialize-javascript/download/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + resolved "https://registry.nlark.com/serialize-javascript/download/serialize-javascript-6.0.0.tgz?cache=0&sync_timestamp=1624284111898&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" integrity sha1-765diPRdeSQUHai1w6en5mP+/rg= dependencies: randombytes "^2.1.0" @@ -6812,7 +6762,7 @@ serve-handler@^6.1.3: serve-index@^1.9.1: version "1.9.1" - resolved "https://registry.nlark.com/serve-index/download/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" + resolved "https://registry.npm.taobao.org/serve-index/download/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= dependencies: accepts "~1.3.4" @@ -6835,31 +6785,31 @@ serve-static@1.14.1: setprototypeof@1.1.0: version "1.1.0" - resolved "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" + resolved "https://registry.nlark.com/setprototypeof/download/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" integrity sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY= setprototypeof@1.1.1: version "1.1.1" - resolved "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + resolved "https://registry.nlark.com/setprototypeof/download/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha1-fpWsskqpL1iF4KvvW6ExMw1K5oM= shallow-clone@^3.0.0: version "3.0.1" - resolved "https://registry.nlark.com/shallow-clone/download/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + resolved "https://registry.npm.taobao.org/shallow-clone/download/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" integrity sha1-jymBrZJTH1UDWwH7IwdppA4C76M= dependencies: kind-of "^6.0.2" shebang-command@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/shebang-command/download/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + resolved "https://registry.nlark.com/shebang-command/download/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" integrity sha1-zNCvT4g1+9wmW4JGGq8MNmY/NOo= dependencies: shebang-regex "^3.0.0" shebang-regex@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/shebang-regex/download/shebang-regex-3.0.0.tgz?cache=0&sync_timestamp=1628896299850&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fshebang-regex%2Fdownload%2Fshebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + resolved "https://registry.nlark.com/shebang-regex/download/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha1-rhbxZE2HPsrYQ7AwexQzYtTEIXI= shell-quote@^1.7.2: @@ -6878,7 +6828,7 @@ shelljs@^0.8.4: side-channel@^1.0.4: version "1.0.4" - resolved "https://registry.nlark.com/side-channel/download/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + resolved "https://registry.npm.taobao.org/side-channel/download/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" integrity sha1-785cj9wQTudRslxY1CkAEfpeos8= dependencies: call-bind "^1.0.0" @@ -6887,7 +6837,7 @@ side-channel@^1.0.4: signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.6" - resolved "https://registry.npmmirror.com/signal-exit/download/signal-exit-3.0.6.tgz?cache=0&sync_timestamp=1637255687504&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsignal-exit%2Fdownload%2Fsignal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + resolved "https://registry.npmmirror.com/signal-exit/download/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== sirv@^1.0.7: @@ -6901,7 +6851,7 @@ sirv@^1.0.7: sisteransi@^1.0.5: version "1.0.5" - resolved "https://registry.nlark.com/sisteransi/download/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" + resolved "https://registry.npm.taobao.org/sisteransi/download/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" integrity sha1-E01oEpd1ZDfMBcoBNw06elcQde0= slash@^3.0.0: @@ -6911,7 +6861,7 @@ slash@^3.0.0: sockjs@^0.3.21: version "0.3.21" - resolved "https://registry.nlark.com/sockjs/download/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417" + resolved "https://registry.npm.taobao.org/sockjs/download/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417" integrity sha1-s0/7mOeWkwtgoM+hGQTWozmn1Bc= dependencies: faye-websocket "^0.11.3" @@ -6925,17 +6875,17 @@ sort-css-media-queries@2.0.4: source-list-map@^2.0.0: version "2.0.1" - resolved "https://registry.npm.taobao.org/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" + resolved "https://registry.nlark.com/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha1-OZO9hzv8SEecyp6jpUeDXHwVSzQ= source-map-js@^1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/source-map-js/download/source-map-js-1.0.1.tgz?cache=0&sync_timestamp=1636400772640&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-js%2Fdownload%2Fsource-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" + resolved "https://registry.npmmirror.com/source-map-js/download/source-map-js-1.0.1.tgz?cache=0&sync_timestamp=1636400753943&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-js%2Fdownload%2Fsource-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA== source-map-support@~0.5.20: version "0.5.21" - resolved "https://registry.npmmirror.com/source-map-support/download/source-map-support-0.5.21.tgz?cache=0&sync_timestamp=1637320322789&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-support%2Fdownload%2Fsource-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + resolved "https://registry.npmmirror.com/source-map-support/download/source-map-support-0.5.21.tgz?cache=0&sync_timestamp=1637320298732&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-support%2Fdownload%2Fsource-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" @@ -6943,32 +6893,32 @@ source-map-support@~0.5.20: source-map@^0.5.0: version "0.5.7" - resolved "https://registry.nlark.com/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" - resolved "https://registry.nlark.com/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM= source-map@~0.7.2: version "0.7.3" - resolved "https://registry.nlark.com/source-map/download/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha1-UwL4FpAxc1ImVECS5kmB91F1A4M= sourcemap-codec@^1.4.4: version "1.4.8" - resolved "https://registry.nlark.com/sourcemap-codec/download/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" + resolved "https://registry.npm.taobao.org/sourcemap-codec/download/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" integrity sha1-6oBL2UhXQC5pktBaOO8a41qatMQ= space-separated-tokens@^1.0.0: version "1.1.5" - resolved "https://registry.npmmirror.com/space-separated-tokens/download/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899" + resolved "https://registry.nlark.com/space-separated-tokens/download/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899" integrity sha1-hfMsPRDZaCAH6RdBTdxcJtGqaJk= spdy-transport@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/spdy-transport/download/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" + resolved "https://registry.nlark.com/spdy-transport/download/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" integrity sha1-ANSGOmQArXXfkzYaFghgXl3NzzE= dependencies: debug "^4.1.0" @@ -6980,7 +6930,7 @@ spdy-transport@^3.0.0: spdy@^4.0.2: version "4.0.2" - resolved "https://registry.npm.taobao.org/spdy/download/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" + resolved "https://registry.nlark.com/spdy/download/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" integrity sha1-t09GYgOj7aRSwCSSuR+56EonZ3s= dependencies: debug "^4.1.0" @@ -6991,7 +6941,7 @@ spdy@^4.0.2: sprintf-js@~1.0.2: version "1.0.3" - resolved "https://registry.nlark.com/sprintf-js/download/sprintf-js-1.0.3.tgz?cache=0&sync_timestamp=1618847174560&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsprintf-js%2Fdownload%2Fsprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + resolved "https://registry.nlark.com/sprintf-js/download/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= stable@^0.1.8: @@ -7001,29 +6951,29 @@ stable@^0.1.8: state-toggle@^1.0.0: version "1.0.3" - resolved "https://registry.nlark.com/state-toggle/download/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" + resolved "https://registry.npm.taobao.org/state-toggle/download/state-toggle-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstate-toggle%2Fdownload%2Fstate-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" integrity sha1-4SOxaojhQxObCcaFIiG8mBWRff4= "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" - resolved "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + resolved "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz?cache=0&sync_timestamp=1609654090567&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstatuses%2Fdownload%2Fstatuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= std-env@^2.2.1: version "2.3.1" - resolved "https://registry.npmmirror.com/std-env/download/std-env-2.3.1.tgz?cache=0&sync_timestamp=1636125537684&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-2.3.1.tgz#d42271908819c243f8defc77a140fc1fcee336a1" + resolved "https://registry.npmmirror.com/std-env/download/std-env-2.3.1.tgz?cache=0&sync_timestamp=1636124771178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-2.3.1.tgz#d42271908819c243f8defc77a140fc1fcee336a1" integrity sha1-1CJxkIgZwkP43vx3oUD8H87jNqE= dependencies: ci-info "^3.1.1" std-env@^3.0.1: version "3.0.1" - resolved "https://registry.npmmirror.com/std-env/download/std-env-3.0.1.tgz?cache=0&sync_timestamp=1636125537684&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" + resolved "https://registry.npmmirror.com/std-env/download/std-env-3.0.1.tgz?cache=0&sync_timestamp=1636124771178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" integrity sha1-vEy8DkOGEBl+NMLXnD3zC0kfUYI= string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.2: version "4.2.3" - resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz?cache=0&sync_timestamp=1632421309919&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstring-width%2Fdownload%2Fstring-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha1-JpxxF9J7Ba0uU2gwqOyJXvnG0BA= dependencies: emoji-regex "^8.0.0" @@ -7040,7 +6990,7 @@ string.prototype.trimend@^1.0.4: string.prototype.trimstart@^1.0.4: version "1.0.4" - resolved "https://registry.npm.taobao.org/string.prototype.trimstart/download/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + resolved "https://registry.npm.taobao.org/string.prototype.trimstart/download/string.prototype.trimstart-1.0.4.tgz?cache=0&sync_timestamp=1614127232940&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring.prototype.trimstart%2Fdownload%2Fstring.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" integrity sha1-s2OZr0qymZtMnGSL16P7K7Jv7u0= dependencies: call-bind "^1.0.2" @@ -7062,7 +7012,7 @@ string_decoder@~1.1.1: stringify-object@^3.3.0: version "3.3.0" - resolved "https://registry.nlark.com/stringify-object/download/stringify-object-3.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstringify-object%2Fdownload%2Fstringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" + resolved "https://registry.nlark.com/stringify-object/download/stringify-object-3.3.0.tgz?cache=0&sync_timestamp=1629673547261&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstringify-object%2Fdownload%2Fstringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" integrity sha1-cDBlrvyhkwDTzoivT1s5VtdVZik= dependencies: get-own-enumerable-property-symbols "^3.0.0" @@ -7071,14 +7021,14 @@ stringify-object@^3.3.0: strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" - resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-6.0.1.tgz?cache=0&sync_timestamp=1632432619223&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha1-nibGPTD1NEPpSJSVshBdN7Z6hdk= dependencies: ansi-regex "^5.0.1" strip-ansi@^7.0.0: version "7.0.1" - resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-7.0.1.tgz?cache=0&sync_timestamp=1632432619223&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" + resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" integrity sha1-YXQKCM42th5Q5lZT8HBg0ACXX7I= dependencies: ansi-regex "^6.0.1" @@ -7090,7 +7040,7 @@ strip-bom-string@^1.0.0: strip-final-newline@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/strip-final-newline/download/strip-final-newline-2.0.0.tgz?cache=0&sync_timestamp=1620046435959&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstrip-final-newline%2Fdownload%2Fstrip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + resolved "https://registry.nlark.com/strip-final-newline/download/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha1-ibhS+y/L6Tb29LMYevsKEsGrWK0= strip-json-comments@~2.0.1: @@ -7100,14 +7050,14 @@ strip-json-comments@~2.0.1: style-to-object@0.3.0, style-to-object@^0.3.0: version "0.3.0" - resolved "https://registry.npm.taobao.org/style-to-object/download/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" + resolved "https://registry.nlark.com/style-to-object/download/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" integrity sha1-sbeQ0gWZHMeDgBlnIUl57hmnbkY= dependencies: inline-style-parser "0.1.1" stylehacks@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/stylehacks/download/stylehacks-5.0.1.tgz?cache=0&sync_timestamp=1621449652268&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstylehacks%2Fdownload%2Fstylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" + resolved "https://registry.nlark.com/stylehacks/download/stylehacks-5.0.1.tgz?cache=0&sync_timestamp=1621449595596&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstylehacks%2Fdownload%2Fstylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" integrity sha1-Mj7FVBmFIJhoBjiMf9rrw40sBvs= dependencies: browserslist "^4.16.0" @@ -7141,7 +7091,7 @@ svg-parser@^2.0.2: svgo@^1.2.2: version "1.3.2" - resolved "https://registry.npmmirror.com/svgo/download/svgo-1.3.2.tgz?cache=0&sync_timestamp=1635850398965&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsvgo%2Fdownload%2Fsvgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" + resolved "https://registry.npmmirror.com/svgo/download/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" integrity sha1-ttxRHAYzRsnkFbgeQ0ARRbltQWc= dependencies: chalk "^2.4.1" @@ -7160,7 +7110,7 @@ svgo@^1.2.2: svgo@^2.7.0: version "2.8.0" - resolved "https://registry.npmmirror.com/svgo/download/svgo-2.8.0.tgz?cache=0&sync_timestamp=1635850398965&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsvgo%2Fdownload%2Fsvgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" + resolved "https://registry.npmmirror.com/svgo/download/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" integrity sha1-T/gMzmcQ3CeV8MfHQQHmdkz8zSQ= dependencies: "@trysound/sax" "0.2.0" @@ -7210,7 +7160,7 @@ tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0: terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.4: version "5.2.5" - resolved "https://registry.npmmirror.com/terser-webpack-plugin/download/terser-webpack-plugin-5.2.5.tgz?cache=0&sync_timestamp=1636385924926&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-5.2.5.tgz#ce65b9880a0c36872555c4874f45bbdb02ee32c9" + resolved "https://registry.npmmirror.com/terser-webpack-plugin/download/terser-webpack-plugin-5.2.5.tgz?cache=0&sync_timestamp=1636385968704&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-5.2.5.tgz#ce65b9880a0c36872555c4874f45bbdb02ee32c9" integrity sha512-3luOVHku5l0QBeYS8r4CdHYWEGMmIj3H1U64jgkdZzECcSOJAyJ9TjuqcQZvw1Y+4AOBN9SeYJPJmFn2cM4/2g== dependencies: jest-worker "^27.0.6" @@ -7221,7 +7171,7 @@ terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.4: terser@^5.10.0, terser@^5.7.2: version "5.10.0" - resolved "https://registry.npmmirror.com/terser/download/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" + resolved "https://registry.npmmirror.com/terser/download/terser-5.10.0.tgz?cache=0&sync_timestamp=1636988229781&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fterser%2Fdownload%2Fterser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA== dependencies: commander "^2.20.0" @@ -7230,7 +7180,7 @@ terser@^5.10.0, terser@^5.7.2: text-table@^0.2.0: version "0.2.0" - resolved "https://registry.nlark.com/text-table/download/text-table-0.2.0.tgz?cache=0&sync_timestamp=1618847142316&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftext-table%2Fdownload%2Ftext-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + resolved "https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= thunky@^1.0.2: @@ -7240,17 +7190,17 @@ thunky@^1.0.2: timsort@^0.3.0: version "0.3.0" - resolved "https://registry.nlark.com/timsort/download/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" + resolved "https://registry.npm.taobao.org/timsort/download/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= tiny-invariant@^1.0.2: version "1.2.0" - resolved "https://registry.npmmirror.com/tiny-invariant/download/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" + resolved "https://registry.npmmirror.com/tiny-invariant/download/tiny-invariant-1.2.0.tgz?cache=0&sync_timestamp=1635822367356&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftiny-invariant%2Fdownload%2Ftiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" integrity sha1-oRQfhrZyqRSMcul4oZpzublKFak= tiny-warning@^1.0.0, tiny-warning@^1.0.3: version "1.0.3" - resolved "https://registry.nlark.com/tiny-warning/download/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" + resolved "https://registry.npm.taobao.org/tiny-warning/download/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" integrity sha1-lKMNtFPfTGQ9D9VmBg1gqHXYR1Q= tmp@^0.2.1: @@ -7279,7 +7229,7 @@ to-regex-range@^5.0.1: toidentifier@1.0.0: version "1.0.0" - resolved "https://registry.npmmirror.com/toidentifier/download/toidentifier-1.0.0.tgz?cache=0&sync_timestamp=1636938512912&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftoidentifier%2Fdownload%2Ftoidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + resolved "https://registry.npmmirror.com/toidentifier/download/toidentifier-1.0.0.tgz?cache=0&sync_timestamp=1636938467744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftoidentifier%2Fdownload%2Ftoidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha1-fhvjRw8ed5SLxD2Uo8j013UrpVM= totalist@^1.0.0: @@ -7289,12 +7239,12 @@ totalist@^1.0.0: trim-trailing-lines@^1.0.0: version "1.1.4" - resolved "https://registry.nlark.com/trim-trailing-lines/download/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0" + resolved "https://registry.npm.taobao.org/trim-trailing-lines/download/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0" integrity sha1-vUq77HzIgEYvELLItc4djR7HwsA= trim@0.0.1: version "0.0.1" - resolved "https://registry.nlark.com/trim/download/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" + resolved "https://registry.npm.taobao.org/trim/download/trim-0.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftrim%2Fdownload%2Ftrim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0= trough@^1.0.0: @@ -7304,12 +7254,12 @@ trough@^1.0.0: tslib@^2.0.3, tslib@^2.3.1: version "2.3.1" - resolved "https://registry.nlark.com/tslib/download/tslib-2.3.1.tgz?cache=0&sync_timestamp=1628722556410&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftslib%2Fdownload%2Ftslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + resolved "https://registry.nlark.com/tslib/download/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha1-6KM1rdXOrlGqJh0ypJAVjvBC7wE= tslib@~2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/tslib/download/tslib-2.1.0.tgz?cache=0&sync_timestamp=1628722556410&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftslib%2Fdownload%2Ftslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" + resolved "https://registry.nlark.com/tslib/download/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" integrity sha1-2mCGDxwuyqVwOrfTm8Bba/mIuXo= type-fest@^0.20.2: @@ -7327,7 +7277,7 @@ type-is@~1.6.17, type-is@~1.6.18: typedarray-to-buffer@^3.1.5: version "3.1.5" - resolved "https://registry.nlark.com/typedarray-to-buffer/download/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + resolved "https://registry.npm.taobao.org/typedarray-to-buffer/download/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" integrity sha1-qX7nqf9CaRufeD/xvFES/j/KkIA= dependencies: is-typedarray "^1.0.0" @@ -7339,7 +7289,7 @@ typescript@^4.3.5: unbox-primitive@^1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/unbox-primitive/download/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + resolved "https://registry.npm.taobao.org/unbox-primitive/download/unbox-primitive-1.0.1.tgz?cache=0&sync_timestamp=1616706302651&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funbox-primitive%2Fdownload%2Funbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" integrity sha1-CF4hViXsMWJXTciFmr7nilmxRHE= dependencies: function-bind "^1.1.1" @@ -7349,7 +7299,7 @@ unbox-primitive@^1.0.1: unherit@^1.0.4: version "1.1.3" - resolved "https://registry.nlark.com/unherit/download/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" + resolved "https://registry.nlark.com/unherit/download/unherit-1.1.3.tgz?cache=0&sync_timestamp=1626423419302&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funherit%2Fdownload%2Funherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" integrity sha1-bJtQPytBsmIzDIDpHIYUq9qmnCI= dependencies: inherits "^2.0.0" @@ -7357,12 +7307,12 @@ unherit@^1.0.4: unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" + resolved "https://registry.nlark.com/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631615505724&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-canonical-property-names-ecmascript%2Fdownload%2Funicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" integrity sha1-MBrNxSVjFnDTn2FG4Od/9rvevdw= unicode-match-property-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-match-property-ecmascript/download/unicode-match-property-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618601397&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-ecmascript%2Fdownload%2Funicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" + resolved "https://registry.nlark.com/unicode-match-property-ecmascript/download/unicode-match-property-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618607567&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-ecmascript%2Fdownload%2Funicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" integrity sha1-VP0W4OyxZ88Ezx91a9zJLrp5dsM= dependencies: unicode-canonical-property-names-ecmascript "^2.0.0" @@ -7370,17 +7320,17 @@ unicode-match-property-ecmascript@^2.0.0: unicode-match-property-value-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-match-property-value-ecmascript/download/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" + resolved "https://registry.nlark.com/unicode-match-property-value-ecmascript/download/unicode-match-property-value-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618107717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-value-ecmascript%2Fdownload%2Funicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" integrity sha1-GgGqVyR8FMVouJd1pUk4eIGJpxQ= unicode-property-aliases-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-property-aliases-ecmascript/download/unicode-property-aliases-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631609367398&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-property-aliases-ecmascript%2Fdownload%2Funicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" + resolved "https://registry.nlark.com/unicode-property-aliases-ecmascript/download/unicode-property-aliases-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631609408629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-property-aliases-ecmascript%2Fdownload%2Funicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" integrity sha1-CjbLmlhcT2q9Ua0d7dsoXBZSl8g= unified@9.2.0: version "9.2.0" - resolved "https://registry.npmmirror.com/unified/download/unified-9.2.0.tgz?cache=0&sync_timestamp=1637256247526&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" + resolved "https://registry.npmmirror.com/unified/download/unified-9.2.0.tgz?cache=0&sync_timestamp=1637256334405&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" integrity sha1-Z6YsYnxAWJ7eu/YPU+39TYIgJ/g= dependencies: bail "^1.0.0" @@ -7392,7 +7342,7 @@ unified@9.2.0: unified@^8.4.2: version "8.4.2" - resolved "https://registry.npmmirror.com/unified/download/unified-8.4.2.tgz?cache=0&sync_timestamp=1637256247526&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" + resolved "https://registry.npmmirror.com/unified/download/unified-8.4.2.tgz?cache=0&sync_timestamp=1637256334405&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" integrity sha1-E61YtKQ3+qJ1GkpMahb2gMUA//E= dependencies: bail "^1.0.0" @@ -7403,19 +7353,19 @@ unified@^8.4.2: unique-string@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/unique-string/download/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" + resolved "https://registry.nlark.com/unique-string/download/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" integrity sha1-OcZFH4GvsnSd4rIz4/fF6IQ72J0= dependencies: crypto-random-string "^2.0.0" unist-builder@2.0.3, unist-builder@^2.0.0: version "2.0.3" - resolved "https://registry.nlark.com/unist-builder/download/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436" + resolved "https://registry.nlark.com/unist-builder/download/unist-builder-2.0.3.tgz?cache=0&sync_timestamp=1618816093327&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-builder%2Fdownload%2Funist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436" integrity sha1-d2SHEbXYavCULzNDl6M8XpFRZDY= unist-util-generated@^1.0.0: version "1.1.6" - resolved "https://registry.npm.taobao.org/unist-util-generated/download/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" + resolved "https://registry.nlark.com/unist-util-generated/download/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" integrity sha1-WrUfaJ4pkqRyvrGzXyzn/y8yTUs= unist-util-is@^4.0.0: @@ -7425,12 +7375,12 @@ unist-util-is@^4.0.0: unist-util-position@^3.0.0: version "3.1.0" - resolved "https://registry.nlark.com/unist-util-position/download/unist-util-position-3.1.0.tgz?cache=0&sync_timestamp=1620915237724&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-position%2Fdownload%2Funist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" + resolved "https://registry.nlark.com/unist-util-position/download/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" integrity sha1-HELuYwH41S9H0U9iu9t5ZXH6LUc= unist-util-remove-position@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/unist-util-remove-position/download/unist-util-remove-position-2.0.1.tgz?cache=0&sync_timestamp=1627848251490&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-remove-position%2Fdownload%2Funist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" + resolved "https://registry.nlark.com/unist-util-remove-position/download/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" integrity sha1-XRnKef26cSMBmZsrc1U8qPOzUsw= dependencies: unist-util-visit "^2.0.0" @@ -7451,7 +7401,7 @@ unist-util-remove@^2.0.0: unist-util-stringify-position@^2.0.0: version "2.0.3" - resolved "https://registry.nlark.com/unist-util-stringify-position/download/unist-util-stringify-position-2.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-stringify-position%2Fdownload%2Funist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" + resolved "https://registry.nlark.com/unist-util-stringify-position/download/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" integrity sha1-zOO/oc34W6c3XR1bF73Eytqb2do= dependencies: "@types/unist" "^2.0.2" @@ -7466,7 +7416,7 @@ unist-util-visit-parents@^3.0.0: unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist-util-visit@^2.0.2, unist-util-visit@^2.0.3: version "2.0.3" - resolved "https://registry.npmmirror.com/unist-util-visit/download/unist-util-visit-2.0.3.tgz?cache=0&sync_timestamp=1632405961713&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funist-util-visit%2Fdownload%2Funist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" + resolved "https://registry.npmmirror.com/unist-util-visit/download/unist-util-visit-2.0.3.tgz?cache=0&sync_timestamp=1632405194557&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funist-util-visit%2Fdownload%2Funist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" integrity sha1-w3A4kxRt9HIDu4qXla9H17lxIIw= dependencies: "@types/unist" "^2.0.0" @@ -7475,7 +7425,7 @@ unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist- universalify@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/universalify/download/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + resolved "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz?cache=0&sync_timestamp=1603180004159&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc= unpipe@1.0.0, unpipe@~1.0.0: @@ -7485,12 +7435,12 @@ unpipe@1.0.0, unpipe@~1.0.0: unquote@~1.1.1: version "1.1.1" - resolved "https://registry.nlark.com/unquote/download/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" + resolved "https://registry.npm.taobao.org/unquote/download/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ= update-notifier@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/update-notifier/download/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" + resolved "https://registry.npm.taobao.org/update-notifier/download/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" integrity sha1-SrDXx/NqIx3XMWz3cpMT8CFNmtk= dependencies: boxen "^5.0.0" @@ -7510,7 +7460,7 @@ update-notifier@^5.1.0: uri-js@^4.2.2: version "4.4.1" - resolved "https://registry.nlark.com/uri-js/download/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + resolved "https://registry.npm.taobao.org/uri-js/download/uri-js-4.4.1.tgz?cache=0&sync_timestamp=1610237641463&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Furi-js%2Fdownload%2Furi-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" integrity sha1-mxpSWVIlhZ5V9mnZKPiMbFfyp34= dependencies: punycode "^2.1.0" @@ -7526,14 +7476,14 @@ url-loader@^4.1.1: url-parse-lax@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/url-parse-lax/download/url-parse-lax-3.0.0.tgz?cache=0&sync_timestamp=1628547550655&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl-parse-lax%2Fdownload%2Furl-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + resolved "https://registry.nlark.com/url-parse-lax/download/url-parse-lax-3.0.0.tgz?cache=0&sync_timestamp=1628548236896&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl-parse-lax%2Fdownload%2Furl-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= dependencies: prepend-http "^2.0.0" url@^0.11.0: version "0.11.0" - resolved "https://registry.nlark.com/url/download/url-0.11.0.tgz?cache=0&sync_timestamp=1618846783692&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl%2Fdownload%2Furl-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" + resolved "https://registry.nlark.com/url/download/url-0.11.0.tgz?cache=0&sync_timestamp=1618846952693&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl%2Fdownload%2Furl-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= dependencies: punycode "1.3.2" @@ -7541,7 +7491,7 @@ url@^0.11.0: util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" - resolved "https://registry.nlark.com/util-deprecate/download/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + resolved "https://registry.npm.taobao.org/util-deprecate/download/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= util.promisify@~1.0.0: @@ -7566,7 +7516,7 @@ utility-types@^3.10.0: utils-merge@1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/utils-merge/download/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + resolved "https://registry.npm.taobao.org/utils-merge/download/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= uuid@^3.4.0: @@ -7576,7 +7526,7 @@ uuid@^3.4.0: value-equal@^1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/value-equal/download/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" + resolved "https://registry.npm.taobao.org/value-equal/download/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" integrity sha1-Hgt5THNMXAyt4XnEN9NW2TGjTWw= vary@~1.1.2: @@ -7591,7 +7541,7 @@ vfile-location@^3.0.0, vfile-location@^3.2.0: vfile-message@^2.0.0: version "2.0.4" - resolved "https://registry.nlark.com/vfile-message/download/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" + resolved "https://registry.nlark.com/vfile-message/download/vfile-message-2.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvfile-message%2Fdownload%2Fvfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" integrity sha1-W0O4gXHUCerlhHfRPyPdQdUsNxo= dependencies: "@types/unist" "^2.0.0" @@ -7599,7 +7549,7 @@ vfile-message@^2.0.0: vfile@^4.0.0: version "4.2.1" - resolved "https://registry.npmmirror.com/vfile/download/vfile-4.2.1.tgz?cache=0&sync_timestamp=1635657951041&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvfile%2Fdownload%2Fvfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624" + resolved "https://registry.npmmirror.com/vfile/download/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624" integrity sha1-A/Hc4o/GJcYlvGUUNQ+9sA+p5iQ= dependencies: "@types/unist" "^2.0.0" @@ -7640,7 +7590,7 @@ web-namespaces@^1.0.0, web-namespaces@^1.1.2: webpack-bundle-analyzer@^4.4.2: version "4.5.0" - resolved "https://registry.npmmirror.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-4.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-bundle-analyzer%2Fdownload%2Fwebpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" + resolved "https://registry.npmmirror.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" integrity sha1-Gw7qKUfnNSh1Sm+a8+kbK24PedU= dependencies: acorn "^8.0.4" @@ -7655,7 +7605,7 @@ webpack-bundle-analyzer@^4.4.2: webpack-dev-middleware@^5.2.1: version "5.2.2" - resolved "https://registry.npmmirror.com/webpack-dev-middleware/download/webpack-dev-middleware-5.2.2.tgz?cache=0&sync_timestamp=1637165508298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-dev-middleware%2Fdownload%2Fwebpack-dev-middleware-5.2.2.tgz#eb5193faa5479ca1086b9f7bed68b89c731bff62" + resolved "https://registry.npmmirror.com/webpack-dev-middleware/download/webpack-dev-middleware-5.2.2.tgz?cache=0&sync_timestamp=1637165517894&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-dev-middleware%2Fdownload%2Fwebpack-dev-middleware-5.2.2.tgz#eb5193faa5479ca1086b9f7bed68b89c731bff62" integrity sha512-DjZyYrsHhkikAFNvSNKrpnziXukU1EChFAh9j4LAm6ndPLPW8cN0KhM7T+RAiOqsQ6ABfQ8hoKIs9IWMTjov+w== dependencies: colorette "^2.0.10" @@ -7697,7 +7647,7 @@ webpack-dev-server@^4.4.0: webpack-merge@^5.8.0: version "5.8.0" - resolved "https://registry.nlark.com/webpack-merge/download/webpack-merge-5.8.0.tgz?cache=0&sync_timestamp=1623054906070&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwebpack-merge%2Fdownload%2Fwebpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" + resolved "https://registry.nlark.com/webpack-merge/download/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" integrity sha1-Kznb8ir4d3atdEw5AiNzHTCmj2E= dependencies: clone-deep "^4.0.1" @@ -7705,7 +7655,7 @@ webpack-merge@^5.8.0: webpack-sources@^1.1.0, webpack-sources@^1.4.3: version "1.4.3" - resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1636982763649&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" + resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1636982701357&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha1-7t2OwLko+/HL/plOItLYkPMwqTM= dependencies: source-list-map "^2.0.0" @@ -7713,7 +7663,7 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.3: webpack-sources@^3.2.2: version "3.2.2" - resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-3.2.2.tgz?cache=0&sync_timestamp=1636982763649&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260" + resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-3.2.2.tgz?cache=0&sync_timestamp=1636982701357&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260" integrity sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw== webpack@^5.61.0: @@ -7748,7 +7698,7 @@ webpack@^5.61.0: webpackbar@^5.0.0-3: version "5.0.2" - resolved "https://registry.npmmirror.com/webpackbar/download/webpackbar-5.0.2.tgz?cache=0&sync_timestamp=1636125538348&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpackbar%2Fdownload%2Fwebpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" + resolved "https://registry.npmmirror.com/webpackbar/download/webpackbar-5.0.2.tgz?cache=0&sync_timestamp=1636124846959&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpackbar%2Fdownload%2Fwebpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" integrity sha1-091GYhHHOFJ0HfyEK3VW3LwrBXA= dependencies: chalk "^4.1.0" @@ -7767,7 +7717,7 @@ websocket-driver@>=0.5.1, websocket-driver@^0.7.4: websocket-extensions@>=0.1.1: version "0.1.4" - resolved "https://registry.npm.taobao.org/websocket-extensions/download/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + resolved "https://registry.nlark.com/websocket-extensions/download/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha1-f4RzvIOd/YdgituV1+sHUhFXikI= which-boxed-primitive@^1.0.2: @@ -7797,19 +7747,19 @@ which@^2.0.1: widest-line@^3.1.0: version "3.1.0" - resolved "https://registry.npmmirror.com/widest-line/download/widest-line-3.1.0.tgz?cache=0&sync_timestamp=1634023966185&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwidest-line%2Fdownload%2Fwidest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" + resolved "https://registry.npmmirror.com/widest-line/download/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" integrity sha1-gpIzO79my0X/DeFgOxNreuFJbso= dependencies: string-width "^4.0.0" wildcard@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/wildcard/download/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" + resolved "https://registry.npm.taobao.org/wildcard/download/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" integrity sha1-p30g5SAMb6qsl55LOq3Hs91/j+w= wrap-ansi@^7.0.0: version "7.0.0" - resolved "https://registry.nlark.com/wrap-ansi/download/wrap-ansi-7.0.0.tgz?cache=0&sync_timestamp=1631557201275&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwrap-ansi%2Fdownload%2Fwrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + resolved "https://registry.nlark.com/wrap-ansi/download/wrap-ansi-7.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwrap-ansi%2Fdownload%2Fwrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha1-Z+FFz/UQpqaYS98RUpEdadLrnkM= dependencies: ansi-styles "^4.0.0" @@ -7855,20 +7805,20 @@ xml-js@^1.6.11: xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2: version "4.0.2" - resolved "https://registry.nlark.com/xtend/download/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + resolved "https://registry.npm.taobao.org/xtend/download/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q= yallist@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/yallist/download/yallist-4.0.0.tgz?cache=0&sync_timestamp=1622604530774&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fyallist%2Fdownload%2Fyallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + resolved "https://registry.nlark.com/yallist/download/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI= yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: version "1.10.2" - resolved "https://registry.npmmirror.com/yaml/download/yaml-1.10.2.tgz?cache=0&sync_timestamp=1636797252827&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyaml%2Fdownload%2Fyaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + resolved "https://registry.npmmirror.com/yaml/download/yaml-1.10.2.tgz?cache=0&sync_timestamp=1636797186957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyaml%2Fdownload%2Fyaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha1-IwHF/78StGfejaIzOkWeKeeSDks= zwitch@^1.0.0: version "1.0.5" - resolved "https://registry.npm.taobao.org/zwitch/download/zwitch-1.0.5.tgz?cache=0&sync_timestamp=1617357655901&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fzwitch%2Fdownload%2Fzwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" + resolved "https://registry.npm.taobao.org/zwitch/download/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" integrity sha1-0R1zgf/tFrdC9q97PyI9XNn+mSA= From 534119eaf0bb059ef18eaa39a2fca13b3c586c67 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 2 Dec 2021 15:12:36 +0800 Subject: [PATCH 056/174] :construction_worker: fix api docs build error --- .github/workflows/release-plugin-docs.yml | 6 +++++- .github/workflows/release.yml | 1 + .github/workflows/website-deploy.yml | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-plugin-docs.yml b/.github/workflows/release-plugin-docs.yml index a575c7e2..fbc226a1 100644 --- a/.github/workflows/release-plugin-docs.yml +++ b/.github/workflows/release-plugin-docs.yml @@ -34,9 +34,13 @@ jobs: - uses: Gr1N/setup-poetry@v4 - - name: Build Docs + - name: Install and build run: | + poetry install -E all + poetry run sphinx-build -M markdown ./docs_build ./build + cp -r ./build/markdown/* ./website/docs/api/ yarn install + yarn prettier yarn build:plugin --out-dir ../packages/nonebot-plugin-docs/nonebot_plugin_docs/dist - name: Publish Package diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c8f20111..75443deb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,6 +53,7 @@ jobs: - name: Archive Files run: | yarn install + yarn prettier yarn archive $(poetry version -s) - name: Push Tag and Release to PyPI diff --git a/.github/workflows/website-deploy.yml b/.github/workflows/website-deploy.yml index 628e8f1a..3da67e69 100644 --- a/.github/workflows/website-deploy.yml +++ b/.github/workflows/website-deploy.yml @@ -51,6 +51,7 @@ jobs: poetry run sphinx-build -M markdown ./docs_build ./build cp -r ./build/markdown/* ./website/docs/api/ yarn install + yarn prettier yarn build - name: Get Branch Name From 226fc0feb363ad144f2554acfa376185dd48cfe0 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 2 Dec 2021 20:52:39 +0800 Subject: [PATCH 057/174] :bug: fix http2 for fastapi --- nonebot/drivers/fastapi.py | 198 ++++++++++++++++++------------------- 1 file changed, 99 insertions(+), 99 deletions(-) diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index ec579f51..3b355e3f 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -13,7 +13,7 @@ FastAPI 驱动适配 import asyncio import logging from dataclasses import dataclass -from typing import List, Union, Callable, Optional, Awaitable, cast +from typing import List, Union, TypeVar, Callable, Optional, Awaitable, cast import httpx import uvicorn @@ -40,6 +40,7 @@ from nonebot.drivers import ( HTTPPollingSetup, ) +S = TypeVar("S", bound=Union[HTTPPollingSetup, WebSocketSetup]) HTTPPOLLING_SETUP = Union[HTTPPollingSetup, Callable[[], Awaitable[HTTPPollingSetup]]] WEBSOCKET_SETUP = Union[WebSocketSetup, Callable[[], Awaitable[WebSocketSetup]]] @@ -408,90 +409,98 @@ class FullDriver(ForwardDriver, Driver): if not task.done(): task.cancel() - async def _http_loop(self, setup: HTTPPOLLING_SETUP): - async def _build_request(setup: HTTPPollingSetup) -> Optional[HTTPRequest]: - url = httpx.URL(setup.url) - if not url.netloc: - logger.opt(colors=True).error( - f"Error parsing url {escape_tag(str(url))}" - ) - return - return HTTPRequest( - setup.http_version, - url.scheme, - url.path, - url.query, - {**setup.headers, "host": url.netloc.decode("ascii")}, - setup.method, - setup.body, + async def _prepare_setup( + self, setup: Union[S, Callable[[], Awaitable[S]]] + ) -> Optional[S]: + try: + if callable(setup): + return await setup() + else: + return setup + except Exception as e: + logger.opt(colors=True, exception=e).error( + "Error while parsing setup " + f"{escape_tag(repr(setup))}." ) + return - bot: Optional[Bot] = None - request: Optional[HTTPRequest] = None - setup_: Optional[HTTPPollingSetup] = None - - logger.opt(colors=True).info( - f"Start http polling for {escape_tag(setup.adapter.upper())} " - f"Bot {escape_tag(setup.self_id)}" + def _build_http_request(self, setup: HTTPPollingSetup) -> Optional[HTTPRequest]: + url = httpx.URL(setup.url) + if not url.netloc: + logger.opt(colors=True).error( + f"Error parsing url {escape_tag(str(url))}" + ) + return + return HTTPRequest( + setup.http_version, + url.scheme, + url.path, + url.query, + setup.headers, + setup.method, + setup.body, ) + async def _http_loop(self, _setup: HTTPPOLLING_SETUP): + + http2: bool = False + bot: Optional[Bot] = None + request: Optional[HTTPRequest] = None + client: Optional[httpx.AsyncClient] = None + + # FIXME: seperate const values from setup (self_id, adapter) + # logger.opt(colors=True).info( + # f"Start http polling for {escape_tag(_setup.adapter.upper())} " + # f"Bot {escape_tag(_setup.self_id)}" + # ) + try: - async with httpx.AsyncClient(http2=True, follow_redirects=True) as session: - while not self.shutdown.is_set(): + while not self.shutdown.is_set(): - try: - if callable(setup): - setup_ = await setup() - else: - setup_ = setup - except Exception as e: - logger.opt(colors=True, exception=e).error( - "Error while parsing setup " - f"{escape_tag(repr(setup))}." - ) - await asyncio.sleep(3) - continue + setup = await self._prepare_setup(_setup) + if not setup: + await asyncio.sleep(3) + continue + request = self._build_http_request(setup) + if not request: + await asyncio.sleep(setup.poll_interval) + continue - setup_ = cast(HTTPPollingSetup, setup_) + if not client: + client = httpx.AsyncClient(http2=http2, follow_redirects=True) + elif http2 != (setup.http_version == "2"): + await client.aclose() + client = httpx.AsyncClient(http2=http2, follow_redirects=True) + http2 = setup.http_version == "2" - if not bot: - request = await _build_request(setup_) - if not request: - return - BotClass = self._adapters[setup.adapter] - bot = BotClass(setup.self_id, request) - self._bot_connect(bot) - elif callable(setup): - request = await _build_request(setup_) - if not request: - await asyncio.sleep(setup_.poll_interval) - continue - bot.request = request + if not bot: + BotClass = self._adapters[setup.adapter] + bot = BotClass(setup.self_id, request) + self._bot_connect(bot) + else: + bot.request = request - request = cast(HTTPRequest, request) - headers = request.headers - - logger.debug( - f"Bot {setup_.self_id} from adapter {setup_.adapter} request {setup_.url}" + logger.debug( + f"Bot {setup.self_id} from adapter {setup.adapter} request {setup.url}" + ) + try: + response = await client.request( + request.method, + setup.url, + content=request.body, + headers=request.headers, + timeout=30.0, + ) + response.raise_for_status() + data = response.read() + asyncio.create_task(bot.handle_message(data)) + except httpx.HTTPError as e: + logger.opt(colors=True, exception=e).error( + f"Error occurred while requesting {escape_tag(setup.url)}. " + "Try to reconnect..." ) - try: - response = await session.request( - request.method, - setup_.url, - content=request.body, - headers=headers, - timeout=30.0, - ) - response.raise_for_status() - data = response.read() - asyncio.create_task(bot.handle_message(data)) - except httpx.HTTPError as e: - logger.opt(colors=True, exception=e).error( - f"Error occurred while requesting {escape_tag(setup_.url)}. " - "Try to reconnect..." - ) - await asyncio.sleep(setup_.poll_interval) + await asyncio.sleep(setup.poll_interval) except asyncio.CancelledError: pass @@ -503,50 +512,43 @@ class FullDriver(ForwardDriver, Driver): finally: if bot: self._bot_disconnect(bot) + if client: + await client.aclose() - async def _ws_loop(self, setup: WEBSOCKET_SETUP): + async def _ws_loop(self, _setup: WEBSOCKET_SETUP): bot: Optional[Bot] = None try: while True: - try: - if callable(setup): - setup_ = await setup() - else: - setup_ = setup - except Exception as e: - logger.opt(colors=True, exception=e).error( - "Error while parsing setup " - f"{escape_tag(repr(setup))}." - ) + setup = await self._prepare_setup(_setup) + if not setup: await asyncio.sleep(3) continue - url = httpx.URL(setup_.url) + url = httpx.URL(setup.url) if not url.netloc: logger.opt(colors=True).error( f"Error parsing url {escape_tag(str(url))}" ) return - headers = setup_.headers.copy() logger.debug( - f"Bot {setup_.self_id} from adapter {setup_.adapter} connecting to {url}" + f"Bot {setup.self_id} from adapter {setup.adapter} connecting to {url}" ) try: - connection = Connect(setup_.url, extra_headers=headers) + connection = Connect(setup.url, extra_headers=setup.headers) async with connection as ws: logger.opt(colors=True).info( - f"WebSocket Connection to {escape_tag(setup_.adapter.upper())} " - f"Bot {escape_tag(setup_.self_id)} succeeded!" + f"WebSocket Connection to {escape_tag(setup.adapter.upper())} " + f"Bot {escape_tag(setup.self_id)} succeeded!" ) request = WebSocket( - "1.1", url.scheme, url.path, url.query, headers, ws + "1.1", url.scheme, url.path, url.query, setup.headers, ws ) - BotClass = self._adapters[setup_.adapter] - bot = BotClass(setup_.self_id, request) + BotClass = self._adapters[setup.adapter] + bot = BotClass(setup.self_id, request) self._bot_connect(bot) while not self.shutdown.is_set(): # use try except instead of "request.closed" because of queued message @@ -569,12 +571,10 @@ class FullDriver(ForwardDriver, Driver): self._bot_disconnect(bot) bot = None - if not setup_.reconnect: - logger.info( - f"WebSocket reconnect disabled for bot {setup_.self_id}" - ) + if not setup.reconnect: + logger.info(f"WebSocket reconnect disabled for bot {setup.self_id}") break - await asyncio.sleep(setup_.reconnect_interval) + await asyncio.sleep(setup.reconnect_interval) except asyncio.CancelledError: pass From 2ce305da2a248d3993d94577b0dd3232dca45000 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 3 Dec 2021 16:21:24 +0800 Subject: [PATCH 058/174] :memo: update homepage --- CHANGELOG.md | 3 + docs_build/README.rst | 31 +- docs_build/nonebot.rst | 8 - website/docs/README.md | 15 - website/docs/README.mdx | 7 + website/docusaurus.config.js | 6 +- website/src/components/Hero.tsx | 101 ++ website/src/{pages => css}/index.module.css | 0 website/src/pages/index.tsx | 105 +- website/tailwind.config.js | 29 +- yarn.lock | 1264 +++++++++---------- 11 files changed, 872 insertions(+), 697 deletions(-) create mode 100644 CHANGELOG.md delete mode 100644 docs_build/nonebot.rst delete mode 100644 website/docs/README.md create mode 100644 website/docs/README.mdx create mode 100644 website/src/components/Hero.tsx rename website/src/{pages => css}/index.module.css (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..950890b6 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,3 @@ +# Changelog + +See [changelog.md](./website/src/pages/changelog.md) or diff --git a/docs_build/README.rst b/docs_build/README.rst index ca5d7948..a7cb1be7 100644 --- a/docs_build/README.rst +++ b/docs_build/README.rst @@ -1,29 +1,12 @@ \-\-\- +sidebar_position: 1 id: index -slug: /api/ +slug: /api \-\-\- -NoneBot Api Reference -===================== +NoneBot 模块 +=============== -:模块索引: - - `nonebot <./nonebot.md>`_ - - `nonebot.config <./config.md>`_ - - `nonebot.plugin <./plugin.md>`_ - - `nonebot.message <./message.md>`_ - - `nonebot.matcher <./matcher.md>`_ - - `nonebot.handler <./handler.md>`_ - - `nonebot.rule <./rule.md>`_ - - `nonebot.permission <./permission.md>`_ - - `nonebot.log <./log.md>`_ - - `nonebot.utils <./utils.md>`_ - - `nonebot.typing <./typing.md>`_ - - `nonebot.exception <./exception.md>`_ - - `nonebot.drivers <./drivers/README.md>`_ - - `nonebot.drivers.fastapi <./drivers/fastapi.md>`_ - - `nonebot.drivers.quart <./drivers/quart.md>`_ - - `nonebot.drivers.aiohttp <./drivers/aiohttp.md>`_ - - `nonebot.adapters <./adapters/README.md>`_ - - `nonebot.adapters.ding <./adapters/ding.md>`_ - - `nonebot.adapters.mirai <./adapters/mirai.md>`_ - - `nonebot.adapters.feishu <./adapters/feishu.md>`_ +.. automodule:: nonebot + :members: + :show-inheritance: diff --git a/docs_build/nonebot.rst b/docs_build/nonebot.rst deleted file mode 100644 index 4c7ef92b..00000000 --- a/docs_build/nonebot.rst +++ /dev/null @@ -1,8 +0,0 @@ - - -NoneBot 模块 -=============== - -.. automodule:: nonebot - :members: - :show-inheritance: diff --git a/website/docs/README.md b/website/docs/README.md deleted file mode 100644 index 1ee526fb..00000000 --- a/website/docs/README.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -home: true -heroImage: /logo.png -tagline: 跨平台 Python 异步机器人框架 -actionText: 开始使用 -actionLink: guide/ -features: - - title: 简洁 - details: 提供极其简洁易懂的 API，使你可以毫无压力地开始验证你的绝佳创意，只需编写最少量的代码，即可实现丰富的功能。 - - title: 易于扩展 - details: 精心设计的消息处理流程使得你可以很方便地将原型扩充为具有大量实用功能的完整聊天机器人，并持续保证扩展性。 - - title: 高性能 - details: 采用异步 I/O，利用 WebSocket 进行通信，以获得极高的性能；同时，支持使用多账号同时接入，减少业务宕机的可能。 -footer: MIT Licensed | Copyright © 2018 - 2021 NoneBot Team ---- diff --git a/website/docs/README.mdx b/website/docs/README.mdx new file mode 100644 index 00000000..8e3c943b --- /dev/null +++ b/website/docs/README.mdx @@ -0,0 +1,7 @@ +--- +slug: / +--- + +import { Redirect } from "@docusaurus/router"; + +; diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index c71bc13e..21b26d84 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -142,9 +142,9 @@ const config = { apiKey: "ef449608d0ad6e81b9efd05db6367040", indexName: "nonebot", contextualSearch: true, - searchParameters: { - facetFilters: ["lang:zh-CN"], - }, + // searchParameters: { + // facetFilters: ["lang:zh-CN"], + // }, }, tailwindConfig: require("./tailwind.config"), customCss: [require.resolve("./src/css/custom.css")], diff --git a/website/src/components/Hero.tsx b/website/src/components/Hero.tsx new file mode 100644 index 00000000..489459ba --- /dev/null +++ b/website/src/components/Hero.tsx @@ -0,0 +1,101 @@ +import React, { PropsWithChildren } from "react"; + +import Link from "@docusaurus/Link"; +import useDocusaurusContext from "@docusaurus/useDocusaurusContext"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import Logo from "@theme/Logo"; + +export function Hero(): JSX.Element { + const { siteConfig } = useDocusaurusContext(); + + return ( +
+
+ +

+ None + Bot +

+

+ {siteConfig.tagline} +

+
+ + 开始使用 + +
+
+
+
+ +
+
+
+ ); +} + +export type Feature = { + readonly title: string; + readonly tagline?: string; + readonly description?: string; + readonly annotaion?: string; +}; + +export function HeroFeature(props: PropsWithChildren): JSX.Element { + const { title, tagline, description, annotaion, children } = props; + + return ( + <> +

+ {tagline} +

+

+ {title} +

+

{description}

+ {children} +

{annotaion}

+ + ); +} + +export function HeroFeatureSingle( + props: PropsWithChildren +): JSX.Element { + return ( +
+ +
+ ); +} + +export function HeroFeatureDouble( + props: PropsWithChildren<{ features: [Feature, Feature] }> +): JSX.Element { + const { + features: [feature1, feature2], + children, + } = props; + + let children1, children2; + if (Array.isArray(children) && children.length === 2) { + [children1, children2] = children; + } + + return ( +
+
+ +
+
+ +
+
+ ); +} diff --git a/website/src/pages/index.module.css b/website/src/css/index.module.css similarity index 100% rename from website/src/pages/index.module.css rename to website/src/css/index.module.css diff --git a/website/src/pages/index.tsx b/website/src/pages/index.tsx index 0167b54b..3b4cf010 100644 --- a/website/src/pages/index.tsx +++ b/website/src/pages/index.tsx @@ -1,30 +1,107 @@ -import Hero, { HeroFeatureSingle } from "@theme/Hero"; +import clsx from "clsx"; +import React from "react"; import CodeBlock from "@theme/CodeBlock"; +import { HeroFeatureDouble, HeroFeatureSingle } from "@theme/Hero"; import Layout from "@theme/Layout"; -import React from "react"; -import clsx from "clsx"; -import styles from "./index.module.css"; + +import { Hero, HeroFeature } from "../components/Hero"; +import type { Feature } from "../components/Hero"; +import styles from "../css/index.module.css"; export default function Home() { - const feature = { + const feature: Feature = { title: "Develop", tagline: "fast to code", description: "仅需两步，即可开始编写你的机器人", }; + const features: [Feature, Feature] = [ + { + title: "Plugin", + tagline: "build bot with plugins", + description: "插件化开发，模块化管理", + }, + { + title: "Multi-Platform", + tagline: "write once run everywhere", + description: "支持多种平台，以及多样的事件响应方式", + }, + ]; return ( - - - {"pip install nb-cli\nnb create"} - - +
+ + + {[ + "$ pip install nb-cli", + "$ nb", + // "d8b db .d88b. d8b db d88888b d8888b. .d88b. d888888b", + // "888o 88 .8P Y8. 888o 88 88' 88 `8D .8P Y8. `~~88~~'", + // "88V8o 88 88 88 88V8o 88 88ooooo 88oooY' 88 88 88", + // "88 V8o88 88 88 88 V8o88 88~~~~~ 88~~~b. 88 88 88", + // "88 V888 `8b d8' 88 V888 88. 88 8D `8b d8' 88", + // "VP V8P `Y88P' VP V8P Y88888P Y8888P' `Y88P' YP", + "[?] What do you want to do?", + "❯ Create a New Project", + " Run the Bot in Current Folder", + " Create a New NoneBot Plugin", + " List All Published Plugins", + " ...", + ].join("\n")} + + +
+
+
+ + + {[ + "import nonebot", + "# 加载一个插件", + 'nonebot.load_plugin("path.to.your.plugin")', + "# 从文件夹加载插件", + 'nonebot.load_plugins("plugins")', + "# 从配置文件加载多个插件", + 'nonebot.load_from_json("plugins.json")', + 'nonebot.load_from_toml("pyproject.toml")', + ].join("\n")} + + +
+
+ + + {[ + "import nonebot", + "# OneBot", + "from nonebot.adapters.onebot.v11 import Bot as OneBot", + "# 钉钉", + "from nonebot.adapters.ding import Bot as DingBot", + "driver = nonebot.get_driver()", + 'driver.register_adapter("onebot", OneBot)', + 'driver.register_adapter("ding", DingBot)', + ].join("\n")} + + +
+
); } diff --git a/website/tailwind.config.js b/website/tailwind.config.js index f053ebf7..2ef873be 100644 --- a/website/tailwind.config.js +++ b/website/tailwind.config.js @@ -1 +1,28 @@ -module.exports = {}; +module.exports = { + // content: [ + // `${__dirname}/src/**/*.{js,jsx,ts,tsx}`, + // `${__dirname}/docs/**/*.{js,jsx,ts,tsx}`, + // ], + theme: { + extend: { + nonepress: { + light: { + theme: { + DEFAULT: "#ea5252", + }, + }, + dark: { + theme: { + DEFAULT: "#ea5252", + }, + }, + }, + colors: { + hero: "#ea5252", + light: { + DEFAULT: "#fffdfd", + }, + }, + }, + }, +}; diff --git a/yarn.lock b/yarn.lock index 7624b66b..e86e807d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4,7 +4,7 @@ "@algolia/autocomplete-core@1.2.2": version "1.2.2" - resolved "https://registry.npmmirror.com/@algolia/autocomplete-core/download/@algolia/autocomplete-core-1.2.2.tgz#c121e70c78fd0175c989a219918124ad7758e48b" + resolved "https://registry.npmmirror.com/@algolia/autocomplete-core/download/@algolia/autocomplete-core-1.2.2.tgz?cache=0&sync_timestamp=1635931001143&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40algolia%2Fautocomplete-core%2Fdownload%2F%40algolia%2Fautocomplete-core-1.2.2.tgz#c121e70c78fd0175c989a219918124ad7758e48b" integrity sha1-wSHnDHj9AXXJiaIZkYEkrXdY5Is= dependencies: "@algolia/autocomplete-shared" "1.2.2" @@ -127,14 +127,14 @@ "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.8.3": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/code-frame/download/@babel/code-frame-7.16.0.tgz?cache=0&sync_timestamp=1635560657003&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcode-frame%2Fdownload%2F%40babel%2Fcode-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" + resolved "https://registry.npmmirror.com/@babel/code-frame/download/@babel/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" integrity sha1-DfyAMJvuyEEeZecGRhxAiwu5tDE= dependencies: "@babel/highlight" "^7.16.0" "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.0", "@babel/compat-data@^7.16.4": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/compat-data/download/@babel/compat-data-7.16.4.tgz?cache=0&sync_timestamp=1637102860099&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcompat-data%2Fdownload%2F%40babel%2Fcompat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" + resolved "https://registry.npmmirror.com/@babel/compat-data/download/@babel/compat-data-7.16.4.tgz?cache=0&sync_timestamp=1637102917946&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcompat-data%2Fdownload%2F%40babel%2Fcompat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q== "@babel/core@7.12.9": @@ -191,14 +191,14 @@ "@babel/helper-annotate-as-pure@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" + resolved "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.16.0.tgz?cache=0&sync_timestamp=1635560850385&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-annotate-as-pure%2Fdownload%2F%40babel%2Fhelper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" integrity sha1-mh8OvNpT2aLQAQjEzqzmpdXx8I0= dependencies: "@babel/types" "^7.16.0" "@babel/helper-builder-binary-assignment-operator-visitor@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/download/@babel/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz#f1a686b92da794020c26582eb852e9accd0d7882" + resolved "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/download/@babel/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz?cache=0&sync_timestamp=1635567279113&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-builder-binary-assignment-operator-visitor%2Fdownload%2F%40babel%2Fhelper-builder-binary-assignment-operator-visitor-7.16.0.tgz#f1a686b92da794020c26582eb852e9accd0d7882" integrity sha1-8aaGuS2nlAIMJlguuFLprM0NeII= dependencies: "@babel/helper-explode-assignable-expression" "^7.16.0" @@ -206,7 +206,7 @@ "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.0", "@babel/helper-compilation-targets@^7.16.3": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/download/@babel/helper-compilation-targets-7.16.3.tgz?cache=0&sync_timestamp=1636496295030&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-compilation-targets%2Fdownload%2F%40babel%2Fhelper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" + resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/download/@babel/helper-compilation-targets-7.16.3.tgz?cache=0&sync_timestamp=1636494857717&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-compilation-targets%2Fdownload%2F%40babel%2Fhelper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA== dependencies: "@babel/compat-data" "^7.16.0" @@ -216,7 +216,7 @@ "@babel/helper-create-class-features-plugin@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/download/@babel/helper-create-class-features-plugin-7.16.0.tgz#090d4d166b342a03a9fec37ef4fd5aeb9c7c6a4b" + resolved "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/download/@babel/helper-create-class-features-plugin-7.16.0.tgz?cache=0&sync_timestamp=1635560843669&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-create-class-features-plugin%2Fdownload%2F%40babel%2Fhelper-create-class-features-plugin-7.16.0.tgz#090d4d166b342a03a9fec37ef4fd5aeb9c7c6a4b" integrity sha1-CQ1NFms0KgOp/sN+9P1a65x8aks= dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -228,7 +228,7 @@ "@babel/helper-create-regexp-features-plugin@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/download/@babel/helper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" + resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/download/@babel/helper-create-regexp-features-plugin-7.16.0.tgz?cache=0&sync_timestamp=1635567006236&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-create-regexp-features-plugin%2Fdownload%2F%40babel%2Fhelper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" integrity sha1-BrI0jON/zMT14Y3NjXUFPyp8RP8= dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -236,7 +236,7 @@ "@babel/helper-define-polyfill-provider@^0.3.0": version "0.3.0" - resolved "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/download/@babel/helper-define-polyfill-provider-0.3.0.tgz?cache=0&sync_timestamp=1636799795992&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-define-polyfill-provider%2Fdownload%2F%40babel%2Fhelper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971" + resolved "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/download/@babel/helper-define-polyfill-provider-0.3.0.tgz?cache=0&sync_timestamp=1636802677759&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-define-polyfill-provider%2Fdownload%2F%40babel%2Fhelper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971" integrity sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg== dependencies: "@babel/helper-compilation-targets" "^7.13.0" @@ -250,14 +250,14 @@ "@babel/helper-explode-assignable-expression@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-explode-assignable-expression/download/@babel/helper-explode-assignable-expression-7.16.0.tgz?cache=0&sync_timestamp=1635567269941&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-explode-assignable-expression%2Fdownload%2F%40babel%2Fhelper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778" + resolved "https://registry.npmmirror.com/@babel/helper-explode-assignable-expression/download/@babel/helper-explode-assignable-expression-7.16.0.tgz?cache=0&sync_timestamp=1635567281113&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-explode-assignable-expression%2Fdownload%2F%40babel%2Fhelper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778" integrity sha1-dTAXM3oV9G+cCfZ0z/EM7pudd3g= dependencies: "@babel/types" "^7.16.0" "@babel/helper-function-name@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-function-name/download/@babel/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481" + resolved "https://registry.npmmirror.com/@babel/helper-function-name/download/@babel/helper-function-name-7.16.0.tgz?cache=0&sync_timestamp=1635560848914&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-function-name%2Fdownload%2F%40babel%2Fhelper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481" integrity sha1-t90Hl9ALv+5PB+nE6lsOMMi7FIE= dependencies: "@babel/helper-get-function-arity" "^7.16.0" @@ -266,28 +266,28 @@ "@babel/helper-get-function-arity@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-get-function-arity/download/@babel/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa" + resolved "https://registry.npmmirror.com/@babel/helper-get-function-arity/download/@babel/helper-get-function-arity-7.16.0.tgz?cache=0&sync_timestamp=1635561476993&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-get-function-arity%2Fdownload%2F%40babel%2Fhelper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa" integrity sha1-AIjHSGspqctdlIsaHeRttm4InPo= dependencies: "@babel/types" "^7.16.0" "@babel/helper-hoist-variables@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-hoist-variables/download/@babel/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" + resolved "https://registry.npmmirror.com/@babel/helper-hoist-variables/download/@babel/helper-hoist-variables-7.16.0.tgz?cache=0&sync_timestamp=1635560848430&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-hoist-variables%2Fdownload%2F%40babel%2Fhelper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" integrity sha1-TJAjwvHe9+KP9G/B2802o5vqqBo= dependencies: "@babel/types" "^7.16.0" "@babel/helper-member-expression-to-functions@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/download/@babel/helper-member-expression-to-functions-7.16.0.tgz#29287040efd197c77636ef75188e81da8bccd5a4" + resolved "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/download/@babel/helper-member-expression-to-functions-7.16.0.tgz?cache=0&sync_timestamp=1635560912738&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-member-expression-to-functions%2Fdownload%2F%40babel%2Fhelper-member-expression-to-functions-7.16.0.tgz#29287040efd197c77636ef75188e81da8bccd5a4" integrity sha1-KShwQO/Rl8d2Nu91GI6B2ovM1aQ= dependencies: "@babel/types" "^7.16.0" "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-module-imports/download/@babel/helper-module-imports-7.16.0.tgz?cache=0&sync_timestamp=1635560941965&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-module-imports%2Fdownload%2F%40babel%2Fhelper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" + resolved "https://registry.npmmirror.com/@babel/helper-module-imports/download/@babel/helper-module-imports-7.16.0.tgz?cache=0&sync_timestamp=1635561425184&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-module-imports%2Fdownload%2F%40babel%2Fhelper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" integrity sha1-kFOOYLZy7PG0SPX09UM9N+eaPsM= dependencies: "@babel/types" "^7.16.0" @@ -308,24 +308,24 @@ "@babel/helper-optimise-call-expression@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-optimise-call-expression/download/@babel/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338" + resolved "https://registry.npmmirror.com/@babel/helper-optimise-call-expression/download/@babel/helper-optimise-call-expression-7.16.0.tgz?cache=0&sync_timestamp=1635560849413&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-optimise-call-expression%2Fdownload%2F%40babel%2Fhelper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338" integrity sha1-zs2xRdcMVAlrFWT46fEM19GTszg= dependencies: "@babel/types" "^7.16.0" "@babel/helper-plugin-utils@7.10.4": version "7.10.4" - resolved "https://registry.nlark.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.10.4.tgz?cache=0&sync_timestamp=1623280296194&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-plugin-utils%2Fdownload%2F%40babel%2Fhelper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" + resolved "https://registry.nlark.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" integrity sha1-L3WoMSadT2d95JmG3/WZJ1M883U= "@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.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": version "7.14.5" - resolved "https://registry.nlark.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.14.5.tgz?cache=0&sync_timestamp=1623280296194&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-plugin-utils%2Fdownload%2F%40babel%2Fhelper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" + resolved "https://registry.nlark.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" integrity sha1-WsgizpfuxGdBq3ClF5ceRDpwxak= "@babel/helper-remap-async-to-generator@^7.16.0", "@babel/helper-remap-async-to-generator@^7.16.4": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/download/@babel/helper-remap-async-to-generator-7.16.4.tgz?cache=0&sync_timestamp=1637103399116&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-remap-async-to-generator%2Fdownload%2F%40babel%2Fhelper-remap-async-to-generator-7.16.4.tgz#5d7902f61349ff6b963e07f06a389ce139fbfe6e" + resolved "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/download/@babel/helper-remap-async-to-generator-7.16.4.tgz?cache=0&sync_timestamp=1637103423365&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-remap-async-to-generator%2Fdownload%2F%40babel%2Fhelper-remap-async-to-generator-7.16.4.tgz#5d7902f61349ff6b963e07f06a389ce139fbfe6e" integrity sha512-vGERmmhR+s7eH5Y/cp8PCVzj4XEjerq8jooMfxFdA5xVtAk9Sh4AQsrWgiErUEBjtGrBtOFKDUcWQFW4/dFwMA== dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -334,7 +334,7 @@ "@babel/helper-replace-supers@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-replace-supers/download/@babel/helper-replace-supers-7.16.0.tgz#73055e8d3cf9bcba8ddb55cad93fedc860f68f17" + resolved "https://registry.npmmirror.com/@babel/helper-replace-supers/download/@babel/helper-replace-supers-7.16.0.tgz?cache=0&sync_timestamp=1635560847493&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-replace-supers%2Fdownload%2F%40babel%2Fhelper-replace-supers-7.16.0.tgz#73055e8d3cf9bcba8ddb55cad93fedc860f68f17" integrity sha1-cwVejTz5vLqN21XK2T/tyGD2jxc= dependencies: "@babel/helper-member-expression-to-functions" "^7.16.0" @@ -344,28 +344,28 @@ "@babel/helper-simple-access@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-simple-access/download/@babel/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" + resolved "https://registry.npmmirror.com/@babel/helper-simple-access/download/@babel/helper-simple-access-7.16.0.tgz?cache=0&sync_timestamp=1635560847012&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-simple-access%2Fdownload%2F%40babel%2Fhelper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" integrity sha1-IdaidiDjg+N1NM9sELugGab5BRc= dependencies: "@babel/types" "^7.16.0" "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/download/@babel/helper-skip-transparent-expression-wrappers-7.16.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-skip-transparent-expression-wrappers%2Fdownload%2F%40babel%2Fhelper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" + resolved "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/download/@babel/helper-skip-transparent-expression-wrappers-7.16.0.tgz?cache=0&sync_timestamp=1635567004674&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-skip-transparent-expression-wrappers%2Fdownload%2F%40babel%2Fhelper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" integrity sha1-DuM4gHAUfDrgUeSH7KPrsOLouwk= dependencies: "@babel/types" "^7.16.0" "@babel/helper-split-export-declaration@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-split-export-declaration/download/@babel/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" + resolved "https://registry.npmmirror.com/@babel/helper-split-export-declaration/download/@babel/helper-split-export-declaration-7.16.0.tgz?cache=0&sync_timestamp=1635560847983&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-split-export-declaration%2Fdownload%2F%40babel%2Fhelper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" integrity sha1-KWcvQ2Y+k23zcKrrIr7ds7rsdDg= dependencies: "@babel/types" "^7.16.0" "@babel/helper-validator-identifier@^7.15.7": version "7.15.7" - resolved "https://registry.nlark.com/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.15.7.tgz?cache=0&sync_timestamp=1631920857390&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-validator-identifier%2Fdownload%2F%40babel%2Fhelper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" + resolved "https://registry.nlark.com/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.15.7.tgz?cache=0&sync_timestamp=1631920000984&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-validator-identifier%2Fdownload%2F%40babel%2Fhelper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" integrity sha1-Ig35k7/pBKSmsCq08zhaXr9uI4k= "@babel/helper-validator-option@^7.14.5": @@ -375,7 +375,7 @@ "@babel/helper-wrap-function@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-wrap-function/download/@babel/helper-wrap-function-7.16.0.tgz?cache=0&sync_timestamp=1635567238019&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-wrap-function%2Fdownload%2F%40babel%2Fhelper-wrap-function-7.16.0.tgz#b3cf318afce774dfe75b86767cd6d68f3482e57c" + resolved "https://registry.npmmirror.com/@babel/helper-wrap-function/download/@babel/helper-wrap-function-7.16.0.tgz?cache=0&sync_timestamp=1635567280414&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-wrap-function%2Fdownload%2F%40babel%2Fhelper-wrap-function-7.16.0.tgz#b3cf318afce774dfe75b86767cd6d68f3482e57c" integrity sha1-s88xivzndN/nW4Z2fNbWjzSC5Xw= dependencies: "@babel/helper-function-name" "^7.16.0" @@ -385,7 +385,7 @@ "@babel/helpers@^7.12.5", "@babel/helpers@^7.16.0": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/helpers/download/@babel/helpers-7.16.3.tgz?cache=0&sync_timestamp=1636496293613&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelpers%2Fdownload%2F%40babel%2Fhelpers-7.16.3.tgz#27fc64f40b996e7074dc73128c3e5c3e7f55c43c" + resolved "https://registry.npmmirror.com/@babel/helpers/download/@babel/helpers-7.16.3.tgz?cache=0&sync_timestamp=1636494884812&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelpers%2Fdownload%2F%40babel%2Fhelpers-7.16.3.tgz#27fc64f40b996e7074dc73128c3e5c3e7f55c43c" integrity sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w== dependencies: "@babel/template" "^7.16.0" @@ -394,7 +394,7 @@ "@babel/highlight@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/highlight/download/@babel/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" + resolved "https://registry.npmmirror.com/@babel/highlight/download/@babel/highlight-7.16.0.tgz?cache=0&sync_timestamp=1635560845502&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhighlight%2Fdownload%2F%40babel%2Fhighlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" integrity sha1-bOsysspLj182H7f9gh4/3fShclo= dependencies: "@babel/helper-validator-identifier" "^7.15.7" @@ -403,7 +403,7 @@ "@babel/parser@^7.12.16", "@babel/parser@^7.12.7", "@babel/parser@^7.16.0", "@babel/parser@^7.16.3": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/parser/download/@babel/parser-7.16.4.tgz?cache=0&sync_timestamp=1637102852943&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fparser%2Fdownload%2F%40babel%2Fparser-7.16.4.tgz#d5f92f57cf2c74ffe9b37981c0e72fee7311372e" + resolved "https://registry.npmmirror.com/@babel/parser/download/@babel/parser-7.16.4.tgz?cache=0&sync_timestamp=1637102910055&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fparser%2Fdownload%2F%40babel%2Fparser-7.16.4.tgz#d5f92f57cf2c74ffe9b37981c0e72fee7311372e" integrity sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.2": @@ -424,7 +424,7 @@ "@babel/plugin-proposal-async-generator-functions@^7.16.4": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-async-generator-functions/download/@babel/plugin-proposal-async-generator-functions-7.16.4.tgz?cache=0&sync_timestamp=1637103399235&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-proposal-async-generator-functions%2Fdownload%2F%40babel%2Fplugin-proposal-async-generator-functions-7.16.4.tgz#e606eb6015fec6fa5978c940f315eae4e300b081" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-async-generator-functions/download/@babel/plugin-proposal-async-generator-functions-7.16.4.tgz?cache=0&sync_timestamp=1637103364027&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-proposal-async-generator-functions%2Fdownload%2F%40babel%2Fplugin-proposal-async-generator-functions-7.16.4.tgz#e606eb6015fec6fa5978c940f315eae4e300b081" integrity sha512-/CUekqaAaZCQHleSK/9HajvcD/zdnJiKRiuUFq8ITE+0HsPzquf53cpFiqAwl/UfmJbR6n5uGPQSPdrmKOvHHg== dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -450,7 +450,7 @@ "@babel/plugin-proposal-dynamic-import@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-dynamic-import/download/@babel/plugin-proposal-dynamic-import-7.16.0.tgz?cache=0&sync_timestamp=1635566469916&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-proposal-dynamic-import%2Fdownload%2F%40babel%2Fplugin-proposal-dynamic-import-7.16.0.tgz#783eca61d50526202f9b296095453977e88659f1" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-dynamic-import/download/@babel/plugin-proposal-dynamic-import-7.16.0.tgz#783eca61d50526202f9b296095453977e88659f1" integrity sha1-eD7KYdUFJiAvmylglUU5d+iGWfE= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -561,35 +561,35 @@ "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" - resolved "https://registry.nlark.com/@babel/plugin-syntax-async-generators/download/@babel/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-async-generators/download/@babel/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" integrity sha1-qYP7Gusuw/btBCohD2QOkOeG/g0= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-class-properties@^7.12.13": version "7.12.13" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-class-properties/download/@babel/plugin-syntax-class-properties-7.12.13.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-syntax-class-properties%2Fdownload%2F%40babel%2Fplugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + resolved "https://registry.nlark.com/@babel/plugin-syntax-class-properties/download/@babel/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" integrity sha1-tcmHJ0xKOoK4lxR5aTGmtTVErhA= dependencies: "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-class-static-block@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-class-static-block/download/@babel/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" + resolved "https://registry.nlark.com/@babel/plugin-syntax-class-static-block/download/@babel/plugin-syntax-class-static-block-7.14.5.tgz?cache=0&sync_timestamp=1623280461402&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-class-static-block%2Fdownload%2F%40babel%2Fplugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" integrity sha1-GV34mxRrS3izv4l/16JXyEZZ1AY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-dynamic-import@^7.8.3": version "7.8.3" - resolved "https://registry.nlark.com/@babel/plugin-syntax-dynamic-import/download/@babel/plugin-syntax-dynamic-import-7.8.3.tgz?cache=0&sync_timestamp=1618847125283&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-dynamic-import%2Fdownload%2F%40babel%2Fplugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-dynamic-import/download/@babel/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" integrity sha1-Yr+Ysto80h1iYVT8lu5bPLaOrLM= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-export-namespace-from@^7.8.3": version "7.8.3" - resolved "https://registry.nlark.com/@babel/plugin-syntax-export-namespace-from/download/@babel/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-export-namespace-from/download/@babel/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" integrity sha1-AolkqbqA28CUyRXEh618TnpmRlo= dependencies: "@babel/helper-plugin-utils" "^7.8.3" @@ -631,49 +631,49 @@ "@babel/plugin-syntax-numeric-separator@^7.10.4": version "7.10.4" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-numeric-separator/download/@babel/plugin-syntax-numeric-separator-7.10.4.tgz?cache=0&sync_timestamp=1593522054358&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-syntax-numeric-separator%2Fdownload%2F%40babel%2Fplugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-numeric-separator/download/@babel/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" integrity sha1-ubBws+M1cM2f0Hun+pHA3Te5r5c= dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-object-rest-spread@7.8.3", "@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3": version "7.8.3" - resolved "https://registry.nlark.com/@babel/plugin-syntax-object-rest-spread/download/@babel/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-object-rest-spread/download/@babel/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" integrity sha1-YOIl7cvZimQDMqLnLdPmbxr1WHE= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-optional-catch-binding@^7.8.3": version "7.8.3" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-optional-catch-binding/download/@babel/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + resolved "https://registry.nlark.com/@babel/plugin-syntax-optional-catch-binding/download/@babel/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" integrity sha1-YRGiZbz7Ag6579D9/X0mQCue1sE= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-optional-chaining@^7.8.3": version "7.8.3" - resolved "https://registry.nlark.com/@babel/plugin-syntax-optional-chaining/download/@babel/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-optional-chaining/download/@babel/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" integrity sha1-T2nCq5UWfgGAzVM2YT+MV4j31Io= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-private-property-in-object@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-private-property-in-object/download/@babel/plugin-syntax-private-property-in-object-7.14.5.tgz?cache=0&sync_timestamp=1623280423879&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-private-property-in-object%2Fdownload%2F%40babel%2Fplugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" + resolved "https://registry.nlark.com/@babel/plugin-syntax-private-property-in-object/download/@babel/plugin-syntax-private-property-in-object-7.14.5.tgz?cache=0&sync_timestamp=1623280462994&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-private-property-in-object%2Fdownload%2F%40babel%2Fplugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" integrity sha1-DcZnHsDqIrbpShEU+FeXDNOd4a0= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-top-level-await@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-top-level-await/download/@babel/plugin-syntax-top-level-await-7.14.5.tgz?cache=0&sync_timestamp=1623280427172&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-top-level-await%2Fdownload%2F%40babel%2Fplugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" + resolved "https://registry.nlark.com/@babel/plugin-syntax-top-level-await/download/@babel/plugin-syntax-top-level-await-7.14.5.tgz?cache=0&sync_timestamp=1623280464882&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-top-level-await%2Fdownload%2F%40babel%2Fplugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" integrity sha1-wc/a3DWmRiQAAfBhOCR7dBw02Uw= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-syntax-typescript/download/@babel/plugin-syntax-typescript-7.16.0.tgz#2feeb13d9334cc582ea9111d3506f773174179bb" + resolved "https://registry.npmmirror.com/@babel/plugin-syntax-typescript/download/@babel/plugin-syntax-typescript-7.16.0.tgz?cache=0&sync_timestamp=1635561095296&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-syntax-typescript%2Fdownload%2F%40babel%2Fplugin-syntax-typescript-7.16.0.tgz#2feeb13d9334cc582ea9111d3506f773174179bb" integrity sha1-L+6xPZM0zFguqREdNQb3cxdBebs= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -696,21 +696,21 @@ "@babel/plugin-transform-block-scoped-functions@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/download/@babel/plugin-transform-block-scoped-functions-7.16.0.tgz?cache=0&sync_timestamp=1635567466710&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-block-scoped-functions%2Fdownload%2F%40babel%2Fplugin-transform-block-scoped-functions-7.16.0.tgz#c618763233ad02847805abcac4c345ce9de7145d" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/download/@babel/plugin-transform-block-scoped-functions-7.16.0.tgz#c618763233ad02847805abcac4c345ce9de7145d" integrity sha1-xhh2MjOtAoR4BavKxMNFzp3nFF0= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-block-scoping@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/download/@babel/plugin-transform-block-scoping-7.16.0.tgz?cache=0&sync_timestamp=1635567471555&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-block-scoping%2Fdownload%2F%40babel%2Fplugin-transform-block-scoping-7.16.0.tgz#bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/download/@babel/plugin-transform-block-scoping-7.16.0.tgz#bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16" integrity sha1-vPQz+0gv6MPTtOimaxxKjnfTfBY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-classes@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-classes/download/@babel/plugin-transform-classes-7.16.0.tgz?cache=0&sync_timestamp=1635566945526&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-classes%2Fdownload%2F%40babel%2Fplugin-transform-classes-7.16.0.tgz#54cf5ff0b2242c6573d753cd4bfc7077a8b282f5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-classes/download/@babel/plugin-transform-classes-7.16.0.tgz?cache=0&sync_timestamp=1635566985814&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-classes%2Fdownload%2F%40babel%2Fplugin-transform-classes-7.16.0.tgz#54cf5ff0b2242c6573d753cd4bfc7077a8b282f5" integrity sha1-VM9f8LIkLGVz11PNS/xwd6iygvU= dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -723,21 +723,21 @@ "@babel/plugin-transform-computed-properties@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-computed-properties/download/@babel/plugin-transform-computed-properties-7.16.0.tgz?cache=0&sync_timestamp=1635567483688&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-computed-properties%2Fdownload%2F%40babel%2Fplugin-transform-computed-properties-7.16.0.tgz#e0c385507d21e1b0b076d66bed6d5231b85110b7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-computed-properties/download/@babel/plugin-transform-computed-properties-7.16.0.tgz?cache=0&sync_timestamp=1635566987282&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-computed-properties%2Fdownload%2F%40babel%2Fplugin-transform-computed-properties-7.16.0.tgz#e0c385507d21e1b0b076d66bed6d5231b85110b7" integrity sha1-4MOFUH0h4bCwdtZr7W1SMbhRELc= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-destructuring@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/download/@babel/plugin-transform-destructuring-7.16.0.tgz?cache=0&sync_timestamp=1635567488550&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-destructuring%2Fdownload%2F%40babel%2Fplugin-transform-destructuring-7.16.0.tgz#ad3d7e74584ad5ea4eadb1e6642146c590dee33c" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/download/@babel/plugin-transform-destructuring-7.16.0.tgz?cache=0&sync_timestamp=1635566986610&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-destructuring%2Fdownload%2F%40babel%2Fplugin-transform-destructuring-7.16.0.tgz#ad3d7e74584ad5ea4eadb1e6642146c590dee33c" integrity sha1-rT1+dFhK1epOrbHmZCFGxZDe4zw= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-dotall-regex@^7.16.0", "@babel/plugin-transform-dotall-regex@^7.4.4": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-dotall-regex/download/@babel/plugin-transform-dotall-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566946960&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-dotall-regex%2Fdownload%2F%40babel%2Fplugin-transform-dotall-regex-7.16.0.tgz#50bab00c1084b6162d0a58a818031cf57798e06f" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-dotall-regex/download/@babel/plugin-transform-dotall-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566988439&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-dotall-regex%2Fdownload%2F%40babel%2Fplugin-transform-dotall-regex-7.16.0.tgz#50bab00c1084b6162d0a58a818031cf57798e06f" integrity sha1-ULqwDBCEthYtClioGAMc9XeY4G8= dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.0" @@ -745,14 +745,14 @@ "@babel/plugin-transform-duplicate-keys@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/download/@babel/plugin-transform-duplicate-keys-7.16.0.tgz?cache=0&sync_timestamp=1635567498133&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-duplicate-keys%2Fdownload%2F%40babel%2Fplugin-transform-duplicate-keys-7.16.0.tgz#8bc2e21813e3e89e5e5bf3b60aa5fc458575a176" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/download/@babel/plugin-transform-duplicate-keys-7.16.0.tgz?cache=0&sync_timestamp=1635566987876&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-duplicate-keys%2Fdownload%2F%40babel%2Fplugin-transform-duplicate-keys-7.16.0.tgz#8bc2e21813e3e89e5e5bf3b60aa5fc458575a176" integrity sha1-i8LiGBPj6J5eW/O2CqX8RYV1oXY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-exponentiation-operator@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/download/@babel/plugin-transform-exponentiation-operator-7.16.0.tgz?cache=0&sync_timestamp=1635567503871&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-exponentiation-operator%2Fdownload%2F%40babel%2Fplugin-transform-exponentiation-operator-7.16.0.tgz#a180cd2881e3533cef9d3901e48dad0fbeff4be4" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/download/@babel/plugin-transform-exponentiation-operator-7.16.0.tgz?cache=0&sync_timestamp=1635566989126&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-exponentiation-operator%2Fdownload%2F%40babel%2Fplugin-transform-exponentiation-operator-7.16.0.tgz#a180cd2881e3533cef9d3901e48dad0fbeff4be4" integrity sha1-oYDNKIHjUzzvnTkB5I2tD77/S+Q= dependencies: "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.0" @@ -760,14 +760,14 @@ "@babel/plugin-transform-for-of@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-for-of/download/@babel/plugin-transform-for-of-7.16.0.tgz?cache=0&sync_timestamp=1635566911464&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-for-of%2Fdownload%2F%40babel%2Fplugin-transform-for-of-7.16.0.tgz#f7abaced155260e2461359bbc7c7248aca5e6bd2" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-for-of/download/@babel/plugin-transform-for-of-7.16.0.tgz?cache=0&sync_timestamp=1635566989689&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-for-of%2Fdownload%2F%40babel%2Fplugin-transform-for-of-7.16.0.tgz#f7abaced155260e2461359bbc7c7248aca5e6bd2" integrity sha1-96us7RVSYOJGE1m7x8ckispea9I= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-function-name@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-function-name/download/@babel/plugin-transform-function-name-7.16.0.tgz?cache=0&sync_timestamp=1635566947920&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-function-name%2Fdownload%2F%40babel%2Fplugin-transform-function-name-7.16.0.tgz#02e3699c284c6262236599f751065c5d5f1f400e" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-function-name/download/@babel/plugin-transform-function-name-7.16.0.tgz?cache=0&sync_timestamp=1635566990298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-function-name%2Fdownload%2F%40babel%2Fplugin-transform-function-name-7.16.0.tgz#02e3699c284c6262236599f751065c5d5f1f400e" integrity sha1-AuNpnChMYmIjZZn3UQZcXV8fQA4= dependencies: "@babel/helper-function-name" "^7.16.0" @@ -775,7 +775,7 @@ "@babel/plugin-transform-literals@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-literals/download/@babel/plugin-transform-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566912041&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-literals%2Fdownload%2F%40babel%2Fplugin-transform-literals-7.16.0.tgz#79711e670ffceb31bd298229d50f3621f7980cac" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-literals/download/@babel/plugin-transform-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566990751&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-literals%2Fdownload%2F%40babel%2Fplugin-transform-literals-7.16.0.tgz#79711e670ffceb31bd298229d50f3621f7980cac" integrity sha1-eXEeZw/86zG9KYIp1Q82IfeYDKw= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -789,7 +789,7 @@ "@babel/plugin-transform-modules-amd@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/download/@babel/plugin-transform-modules-amd-7.16.0.tgz?cache=0&sync_timestamp=1635566912764&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-amd%2Fdownload%2F%40babel%2Fplugin-transform-modules-amd-7.16.0.tgz#09abd41e18dcf4fd479c598c1cef7bd39eb1337e" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/download/@babel/plugin-transform-modules-amd-7.16.0.tgz?cache=0&sync_timestamp=1635566992517&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-amd%2Fdownload%2F%40babel%2Fplugin-transform-modules-amd-7.16.0.tgz#09abd41e18dcf4fd479c598c1cef7bd39eb1337e" integrity sha1-CavUHhjc9P1HnFmMHO97056xM34= dependencies: "@babel/helper-module-transforms" "^7.16.0" @@ -798,7 +798,7 @@ "@babel/plugin-transform-modules-commonjs@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/download/@babel/plugin-transform-modules-commonjs-7.16.0.tgz?cache=0&sync_timestamp=1635566912532&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-commonjs%2Fdownload%2F%40babel%2Fplugin-transform-modules-commonjs-7.16.0.tgz#add58e638c8ddc4875bd9a9ecb5c594613f6c922" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/download/@babel/plugin-transform-modules-commonjs-7.16.0.tgz?cache=0&sync_timestamp=1635566992001&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-commonjs%2Fdownload%2F%40babel%2Fplugin-transform-modules-commonjs-7.16.0.tgz#add58e638c8ddc4875bd9a9ecb5c594613f6c922" integrity sha1-rdWOY4yN3Eh1vZqey1xZRhP2ySI= dependencies: "@babel/helper-module-transforms" "^7.16.0" @@ -808,7 +808,7 @@ "@babel/plugin-transform-modules-systemjs@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/download/@babel/plugin-transform-modules-systemjs-7.16.0.tgz?cache=0&sync_timestamp=1635566949693&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-systemjs%2Fdownload%2F%40babel%2Fplugin-transform-modules-systemjs-7.16.0.tgz#a92cf240afeb605f4ca16670453024425e421ea4" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/download/@babel/plugin-transform-modules-systemjs-7.16.0.tgz?cache=0&sync_timestamp=1635566993126&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-systemjs%2Fdownload%2F%40babel%2Fplugin-transform-modules-systemjs-7.16.0.tgz#a92cf240afeb605f4ca16670453024425e421ea4" integrity sha1-qSzyQK/rYF9MoWZwRTAkQl5CHqQ= dependencies: "@babel/helper-hoist-variables" "^7.16.0" @@ -819,7 +819,7 @@ "@babel/plugin-transform-modules-umd@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/download/@babel/plugin-transform-modules-umd-7.16.0.tgz?cache=0&sync_timestamp=1635566950831&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-umd%2Fdownload%2F%40babel%2Fplugin-transform-modules-umd-7.16.0.tgz#195f26c2ad6d6a391b70880effce18ce625e06a7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/download/@babel/plugin-transform-modules-umd-7.16.0.tgz?cache=0&sync_timestamp=1635567544568&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-umd%2Fdownload%2F%40babel%2Fplugin-transform-modules-umd-7.16.0.tgz#195f26c2ad6d6a391b70880effce18ce625e06a7" integrity sha1-GV8mwq1tajkbcIgO/84YzmJeBqc= dependencies: "@babel/helper-module-transforms" "^7.16.0" @@ -827,21 +827,21 @@ "@babel/plugin-transform-named-capturing-groups-regex@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-named-capturing-groups-regex/download/@babel/plugin-transform-named-capturing-groups-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566951624&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-named-capturing-groups-regex%2Fdownload%2F%40babel%2Fplugin-transform-named-capturing-groups-regex-7.16.0.tgz#d3db61cc5d5b97986559967cd5ea83e5c32096ca" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-named-capturing-groups-regex/download/@babel/plugin-transform-named-capturing-groups-regex-7.16.0.tgz?cache=0&sync_timestamp=1635567550482&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-named-capturing-groups-regex%2Fdownload%2F%40babel%2Fplugin-transform-named-capturing-groups-regex-7.16.0.tgz#d3db61cc5d5b97986559967cd5ea83e5c32096ca" integrity sha1-09thzF1bl5hlWZZ81eqD5cMglso= dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.0" "@babel/plugin-transform-new-target@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-new-target/download/@babel/plugin-transform-new-target-7.16.0.tgz?cache=0&sync_timestamp=1635566913480&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-new-target%2Fdownload%2F%40babel%2Fplugin-transform-new-target-7.16.0.tgz#af823ab576f752215a49937779a41ca65825ab35" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-new-target/download/@babel/plugin-transform-new-target-7.16.0.tgz?cache=0&sync_timestamp=1635567556261&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-new-target%2Fdownload%2F%40babel%2Fplugin-transform-new-target-7.16.0.tgz#af823ab576f752215a49937779a41ca65825ab35" integrity sha1-r4I6tXb3UiFaSZN3eaQcplglqzU= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-object-super@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-object-super/download/@babel/plugin-transform-object-super-7.16.0.tgz?cache=0&sync_timestamp=1635566951968&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-object-super%2Fdownload%2F%40babel%2Fplugin-transform-object-super-7.16.0.tgz#fb20d5806dc6491a06296ac14ea8e8d6fedda72b" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-object-super/download/@babel/plugin-transform-object-super-7.16.0.tgz?cache=0&sync_timestamp=1635566995485&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-object-super%2Fdownload%2F%40babel%2Fplugin-transform-object-super-7.16.0.tgz#fb20d5806dc6491a06296ac14ea8e8d6fedda72b" integrity sha1-+yDVgG3GSRoGKWrBTqjo1v7dpys= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -849,28 +849,28 @@ "@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.16.0", "@babel/plugin-transform-parameters@^7.16.3": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-parameters/download/@babel/plugin-transform-parameters-7.16.3.tgz?cache=0&sync_timestamp=1636496296752&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-parameters%2Fdownload%2F%40babel%2Fplugin-transform-parameters-7.16.3.tgz#fa9e4c874ee5223f891ee6fa8d737f4766d31d15" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-parameters/download/@babel/plugin-transform-parameters-7.16.3.tgz?cache=0&sync_timestamp=1636494867938&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-parameters%2Fdownload%2F%40babel%2Fplugin-transform-parameters-7.16.3.tgz#fa9e4c874ee5223f891ee6fa8d737f4766d31d15" integrity sha512-3MaDpJrOXT1MZ/WCmkOFo7EtmVVC8H4EUZVrHvFOsmwkk4lOjQj8rzv8JKUZV4YoQKeoIgk07GO+acPU9IMu/w== dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-property-literals@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/download/@babel/plugin-transform-property-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566914424&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-property-literals%2Fdownload%2F%40babel%2Fplugin-transform-property-literals-7.16.0.tgz#a95c552189a96a00059f6776dc4e00e3690c78d1" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/download/@babel/plugin-transform-property-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566996767&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-property-literals%2Fdownload%2F%40babel%2Fplugin-transform-property-literals-7.16.0.tgz#a95c552189a96a00059f6776dc4e00e3690c78d1" integrity sha1-qVxVIYmpagAFn2d23E4A42kMeNE= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-react-constant-elements@^7.12.1": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-constant-elements/download/@babel/plugin-transform-react-constant-elements-7.16.0.tgz?cache=0&sync_timestamp=1635739052504&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-react-constant-elements%2Fdownload%2F%40babel%2Fplugin-transform-react-constant-elements-7.16.0.tgz#1483b894b8e6ef0709d260532fbd4db9fc27a0e6" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-constant-elements/download/@babel/plugin-transform-react-constant-elements-7.16.0.tgz#1483b894b8e6ef0709d260532fbd4db9fc27a0e6" integrity sha1-FIO4lLjm7wcJ0mBTL71NufwnoOY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-react-display-name@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-display-name/download/@babel/plugin-transform-react-display-name-7.16.0.tgz#9a0ad8aa8e8790883a7bd2736f66229a58125676" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-display-name/download/@babel/plugin-transform-react-display-name-7.16.0.tgz?cache=0&sync_timestamp=1635578747884&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-react-display-name%2Fdownload%2F%40babel%2Fplugin-transform-react-display-name-7.16.0.tgz#9a0ad8aa8e8790883a7bd2736f66229a58125676" integrity sha1-mgrYqo6HkIg6e9Jzb2YimlgSVnY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -884,7 +884,7 @@ "@babel/plugin-transform-react-jsx@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-jsx/download/@babel/plugin-transform-react-jsx-7.16.0.tgz#55b797d4960c3de04e07ad1c0476e2bc6a4889f1" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-jsx/download/@babel/plugin-transform-react-jsx-7.16.0.tgz?cache=0&sync_timestamp=1635578748013&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-react-jsx%2Fdownload%2F%40babel%2Fplugin-transform-react-jsx-7.16.0.tgz#55b797d4960c3de04e07ad1c0476e2bc6a4889f1" integrity sha1-VbeX1JYMPeBOB60cBHbivGpIifE= dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -903,21 +903,21 @@ "@babel/plugin-transform-regenerator@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/download/@babel/plugin-transform-regenerator-7.16.0.tgz?cache=0&sync_timestamp=1635566914723&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-regenerator%2Fdownload%2F%40babel%2Fplugin-transform-regenerator-7.16.0.tgz#eaee422c84b0232d03aea7db99c97deeaf6125a4" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/download/@babel/plugin-transform-regenerator-7.16.0.tgz?cache=0&sync_timestamp=1635566997626&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-regenerator%2Fdownload%2F%40babel%2Fplugin-transform-regenerator-7.16.0.tgz#eaee422c84b0232d03aea7db99c97deeaf6125a4" integrity sha1-6u5CLISwIy0Drqfbmcl97q9hJaQ= dependencies: regenerator-transform "^0.14.2" "@babel/plugin-transform-reserved-words@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/download/@babel/plugin-transform-reserved-words-7.16.0.tgz?cache=0&sync_timestamp=1635566914972&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-reserved-words%2Fdownload%2F%40babel%2Fplugin-transform-reserved-words-7.16.0.tgz#fff4b9dcb19e12619394bda172d14f2d04c0379c" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/download/@babel/plugin-transform-reserved-words-7.16.0.tgz?cache=0&sync_timestamp=1635566998298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-reserved-words%2Fdownload%2F%40babel%2Fplugin-transform-reserved-words-7.16.0.tgz#fff4b9dcb19e12619394bda172d14f2d04c0379c" integrity sha1-//S53LGeEmGTlL2hctFPLQTAN5w= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-runtime@^7.15.0": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-runtime/download/@babel/plugin-transform-runtime-7.16.4.tgz?cache=0&sync_timestamp=1637102846932&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-runtime%2Fdownload%2F%40babel%2Fplugin-transform-runtime-7.16.4.tgz#f9ba3c7034d429c581e1bd41b4952f3db3c2c7e8" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-runtime/download/@babel/plugin-transform-runtime-7.16.4.tgz?cache=0&sync_timestamp=1637103539571&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-runtime%2Fdownload%2F%40babel%2Fplugin-transform-runtime-7.16.4.tgz#f9ba3c7034d429c581e1bd41b4952f3db3c2c7e8" integrity sha512-pru6+yHANMTukMtEZGC4fs7XPwg35v8sj5CIEmE+gEkFljFiVJxEWxx/7ZDkTK+iZRYo1bFXBtfIN95+K3cJ5A== dependencies: "@babel/helper-module-imports" "^7.16.0" @@ -929,14 +929,14 @@ "@babel/plugin-transform-shorthand-properties@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/download/@babel/plugin-transform-shorthand-properties-7.16.0.tgz?cache=0&sync_timestamp=1635566916554&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-shorthand-properties%2Fdownload%2F%40babel%2Fplugin-transform-shorthand-properties-7.16.0.tgz#090372e3141f7cc324ed70b3daf5379df2fa384d" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/download/@babel/plugin-transform-shorthand-properties-7.16.0.tgz?cache=0&sync_timestamp=1635566998907&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-shorthand-properties%2Fdownload%2F%40babel%2Fplugin-transform-shorthand-properties-7.16.0.tgz#090372e3141f7cc324ed70b3daf5379df2fa384d" integrity sha1-CQNy4xQffMMk7XCz2vU3nfL6OE0= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-spread@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-spread/download/@babel/plugin-transform-spread-7.16.0.tgz?cache=0&sync_timestamp=1635566916819&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-spread%2Fdownload%2F%40babel%2Fplugin-transform-spread-7.16.0.tgz#d21ca099bbd53ab307a8621e019a7bd0f40cdcfb" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-spread/download/@babel/plugin-transform-spread-7.16.0.tgz?cache=0&sync_timestamp=1635566999392&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-spread%2Fdownload%2F%40babel%2Fplugin-transform-spread-7.16.0.tgz#d21ca099bbd53ab307a8621e019a7bd0f40cdcfb" integrity sha1-0hygmbvVOrMHqGIeAZp70PQM3Ps= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -944,21 +944,21 @@ "@babel/plugin-transform-sticky-regex@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-sticky-regex/download/@babel/plugin-transform-sticky-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566917052&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-sticky-regex%2Fdownload%2F%40babel%2Fplugin-transform-sticky-regex-7.16.0.tgz#c35ea31a02d86be485f6aa510184b677a91738fd" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-sticky-regex/download/@babel/plugin-transform-sticky-regex-7.16.0.tgz?cache=0&sync_timestamp=1635567000017&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-sticky-regex%2Fdownload%2F%40babel%2Fplugin-transform-sticky-regex-7.16.0.tgz#c35ea31a02d86be485f6aa510184b677a91738fd" integrity sha1-w16jGgLYa+SF9qpRAYS2d6kXOP0= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-template-literals@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/download/@babel/plugin-transform-template-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566917280&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-template-literals%2Fdownload%2F%40babel%2Fplugin-transform-template-literals-7.16.0.tgz#a8eced3a8e7b8e2d40ec4ec4548a45912630d302" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/download/@babel/plugin-transform-template-literals-7.16.0.tgz?cache=0&sync_timestamp=1635567001190&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-template-literals%2Fdownload%2F%40babel%2Fplugin-transform-template-literals-7.16.0.tgz#a8eced3a8e7b8e2d40ec4ec4548a45912630d302" integrity sha1-qOztOo57ji1A7E7EVIpFkSYw0wI= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-typeof-symbol@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/download/@babel/plugin-transform-typeof-symbol-7.16.0.tgz?cache=0&sync_timestamp=1635566920452&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-typeof-symbol%2Fdownload%2F%40babel%2Fplugin-transform-typeof-symbol-7.16.0.tgz#8b19a244c6f8c9d668dca6a6f754ad6ead1128f2" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/download/@babel/plugin-transform-typeof-symbol-7.16.0.tgz?cache=0&sync_timestamp=1635567001690&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-typeof-symbol%2Fdownload%2F%40babel%2Fplugin-transform-typeof-symbol-7.16.0.tgz#8b19a244c6f8c9d668dca6a6f754ad6ead1128f2" integrity sha1-ixmiRMb4ydZo3Kam91Stbq0RKPI= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -974,14 +974,14 @@ "@babel/plugin-transform-unicode-escapes@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/download/@babel/plugin-transform-unicode-escapes-7.16.0.tgz?cache=0&sync_timestamp=1635566920674&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-unicode-escapes%2Fdownload%2F%40babel%2Fplugin-transform-unicode-escapes-7.16.0.tgz#1a354064b4c45663a32334f46fa0cf6100b5b1f3" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/download/@babel/plugin-transform-unicode-escapes-7.16.0.tgz?cache=0&sync_timestamp=1635567002111&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-unicode-escapes%2Fdownload%2F%40babel%2Fplugin-transform-unicode-escapes-7.16.0.tgz#1a354064b4c45663a32334f46fa0cf6100b5b1f3" integrity sha1-GjVAZLTEVmOjIzT0b6DPYQC1sfM= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-unicode-regex@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-regex/download/@babel/plugin-transform-unicode-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566921655&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-unicode-regex%2Fdownload%2F%40babel%2Fplugin-transform-unicode-regex-7.16.0.tgz#293b80950177c8c85aede87cef280259fb995402" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-regex/download/@babel/plugin-transform-unicode-regex-7.16.0.tgz?cache=0&sync_timestamp=1635567002690&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-unicode-regex%2Fdownload%2F%40babel%2Fplugin-transform-unicode-regex-7.16.0.tgz#293b80950177c8c85aede87cef280259fb995402" integrity sha1-KTuAlQF3yMha7eh87ygCWfuZVAI= dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.0" @@ -989,7 +989,7 @@ "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.15.6": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/preset-env/download/@babel/preset-env-7.16.4.tgz?cache=0&sync_timestamp=1637103615805&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-env%2Fdownload%2F%40babel%2Fpreset-env-7.16.4.tgz#4f6ec33b2a3fe72d6bfdcdf3859500232563a2e3" + resolved "https://registry.npmmirror.com/@babel/preset-env/download/@babel/preset-env-7.16.4.tgz?cache=0&sync_timestamp=1637103547851&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-env%2Fdownload%2F%40babel%2Fpreset-env-7.16.4.tgz#4f6ec33b2a3fe72d6bfdcdf3859500232563a2e3" integrity sha512-v0QtNd81v/xKj4gNKeuAerQ/azeNn/G1B1qMLeXOcV8+4TWlD2j3NV1u8q29SDFBXx/NBq5kyEAO+0mpRgacjA== dependencies: "@babel/compat-data" "^7.16.4" @@ -1069,7 +1069,7 @@ "@babel/preset-modules@^0.1.5": version "0.1.5" - resolved "https://registry.npmmirror.com/@babel/preset-modules/download/@babel/preset-modules-0.1.5.tgz?cache=0&sync_timestamp=1635094844477&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-modules%2Fdownload%2F%40babel%2Fpreset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" + resolved "https://registry.npmmirror.com/@babel/preset-modules/download/@babel/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" integrity sha1-75Odbn8miCfhhBY43G/5VRXhFdk= dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -1092,7 +1092,7 @@ "@babel/preset-typescript@^7.12.16": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/preset-typescript/download/@babel/preset-typescript-7.16.0.tgz#b0b4f105b855fb3d631ec036cdc9d1ffd1fa5eac" + resolved "https://registry.npmmirror.com/@babel/preset-typescript/download/@babel/preset-typescript-7.16.0.tgz?cache=0&sync_timestamp=1635578507981&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-typescript%2Fdownload%2F%40babel%2Fpreset-typescript-7.16.0.tgz#b0b4f105b855fb3d631ec036cdc9d1ffd1fa5eac" integrity sha1-sLTxBbhV+z1jHsA2zcnR/9H6Xqw= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -1101,7 +1101,7 @@ "@babel/runtime-corejs3@^7.15.4": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/runtime-corejs3/download/@babel/runtime-corejs3-7.16.3.tgz#1e25de4fa994c57c18e5fdda6cc810dac70f5590" + resolved "https://registry.npmmirror.com/@babel/runtime-corejs3/download/@babel/runtime-corejs3-7.16.3.tgz?cache=0&sync_timestamp=1636494859987&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fruntime-corejs3%2Fdownload%2F%40babel%2Fruntime-corejs3-7.16.3.tgz#1e25de4fa994c57c18e5fdda6cc810dac70f5590" integrity sha512-IAdDC7T0+wEB4y2gbIL0uOXEYpiZEeuFUTVbdGq+UwCcF35T/tS8KrmMomEwEc5wBbyfH3PJVpTSUqrhPDXFcQ== dependencies: core-js-pure "^3.19.0" @@ -1109,7 +1109,7 @@ "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.15.4", "@babel/runtime@^7.8.4": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/runtime/download/@babel/runtime-7.16.3.tgz?cache=0&sync_timestamp=1636494920863&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5" + resolved "https://registry.npmmirror.com/@babel/runtime/download/@babel/runtime-7.16.3.tgz?cache=0&sync_timestamp=1636494819594&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5" integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ== dependencies: regenerator-runtime "^0.13.4" @@ -1125,7 +1125,7 @@ "@babel/traverse@^7.12.13", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.16.3": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/traverse/download/@babel/traverse-7.16.3.tgz?cache=0&sync_timestamp=1636496295750&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Ftraverse%2Fdownload%2F%40babel%2Ftraverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787" + resolved "https://registry.npmmirror.com/@babel/traverse/download/@babel/traverse-7.16.3.tgz?cache=0&sync_timestamp=1636494921751&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Ftraverse%2Fdownload%2F%40babel%2Ftraverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787" integrity sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag== dependencies: "@babel/code-frame" "^7.16.0" @@ -1140,7 +1140,7 @@ "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.16.0", "@babel/types@^7.4.4": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/types/download/@babel/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" + resolved "https://registry.npmmirror.com/@babel/types/download/@babel/types-7.16.0.tgz?cache=0&sync_timestamp=1635560842991&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Ftypes%2Fdownload%2F%40babel%2Ftypes-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" integrity sha1-2zsxOAT5aq3Qt3bEgj4SetZyibo= dependencies: "@babel/helper-validator-identifier" "^7.15.7" @@ -1468,7 +1468,7 @@ "@hapi/hoek@^9.0.0": version "9.2.1" - resolved "https://registry.npmmirror.com/@hapi/hoek/download/@hapi/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" + resolved "https://registry.npmmirror.com/@hapi/hoek/download/@hapi/hoek-9.2.1.tgz?cache=0&sync_timestamp=1632777883600&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40hapi%2Fhoek%2Fdownload%2F%40hapi%2Fhoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" integrity sha1-lVEUKhmAUDdSU2tQUP2Z9KfxOxc= "@hapi/topo@^5.0.0": @@ -1480,7 +1480,7 @@ "@mdx-js/mdx@1.6.22", "@mdx-js/mdx@^1.6.21": version "1.6.22" - resolved "https://registry.npmmirror.com/@mdx-js/mdx/download/@mdx-js/mdx-1.6.22.tgz?cache=0&sync_timestamp=1637010128219&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40mdx-js%2Fmdx%2Fdownload%2F%40mdx-js%2Fmdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" + resolved "https://registry.npmmirror.com/@mdx-js/mdx/download/@mdx-js/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" integrity sha1-inIxV7+Q548X3A8nmVOY5scx8bo= dependencies: "@babel/core" "7.12.9" @@ -1505,7 +1505,7 @@ "@mdx-js/react@1.6.22", "@mdx-js/react@^1.6.21": version "1.6.22" - resolved "https://registry.npmmirror.com/@mdx-js/react/download/@mdx-js/react-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573" + resolved "https://registry.npmmirror.com/@mdx-js/react/download/@mdx-js/react-1.6.22.tgz?cache=0&sync_timestamp=1637010066448&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40mdx-js%2Freact%2Fdownload%2F%40mdx-js%2Freact-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573" integrity sha1-rgm0dE/dx0cU7p+dbxembnfENXM= "@mdx-js/runtime@^1.6.22": @@ -1519,12 +1519,12 @@ "@mdx-js/util@1.6.22": version "1.6.22" - resolved "https://registry.npm.taobao.org/@mdx-js/util/download/@mdx-js/util-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40mdx-js%2Futil%2Fdownload%2F%40mdx-js%2Futil-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" + resolved "https://registry.npm.taobao.org/@mdx-js/util/download/@mdx-js/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" integrity sha1-IZ39ia5bl6iAHwFTI/+kti9FcYs= "@nodelib/fs.scandir@2.1.5": version "2.1.5" - resolved "https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz?cache=0&sync_timestamp=1622792738877&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.scandir%2Fdownload%2F%40nodelib%2Ffs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + resolved "https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" integrity sha1-dhnC6yGyVIP20WdUi0z9WnSIw9U= dependencies: "@nodelib/fs.stat" "2.0.5" @@ -1532,12 +1532,12 @@ "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" - resolved "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&sync_timestamp=1622792616417&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + resolved "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha1-W9Jir5Tp0lvR5xsF3u1Eh2oiLos= "@nodelib/fs.walk@^1.2.3": version "1.2.8" - resolved "https://registry.nlark.com/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + resolved "https://registry.nlark.com/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.8.tgz?cache=0&sync_timestamp=1625769815389&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.walk%2Fdownload%2F%40nodelib%2Ffs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" integrity sha1-6Vc36LtnRt3t9pxVaVNJTxlv5po= dependencies: "@nodelib/fs.scandir" "2.1.5" @@ -1545,12 +1545,12 @@ "@polka/url@^1.0.0-next.20": version "1.0.0-next.21" - resolved "https://registry.npmmirror.com/@polka/url/download/@polka/url-1.0.0-next.21.tgz?cache=0&sync_timestamp=1633093101880&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40polka%2Furl%2Fdownload%2F%40polka%2Furl-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" + resolved "https://registry.npmmirror.com/@polka/url/download/@polka/url-1.0.0-next.21.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40polka%2Furl%2Fdownload%2F%40polka%2Furl-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha1-XeWiOFo1MJQn9gEZkrVEUU1VmqE= "@seznam/compose-react-refs@^1.0.6": version "1.0.6" - resolved "https://registry.npm.taobao.org/@seznam/compose-react-refs/download/@seznam/compose-react-refs-1.0.6.tgz#6ec4e70bdd6e32f8e70b4100f27267cf306bd8df" + resolved "https://registry.nlark.com/@seznam/compose-react-refs/download/@seznam/compose-react-refs-1.0.6.tgz#6ec4e70bdd6e32f8e70b4100f27267cf306bd8df" integrity sha1-bsTnC91uMvjnC0EA8nJnzzBr2N8= "@sideway/address@^4.1.3": @@ -1562,7 +1562,7 @@ "@sideway/formula@^3.0.0": version "3.0.0" - resolved "https://registry.npm.taobao.org/@sideway/formula/download/@sideway/formula-3.0.0.tgz?cache=0&sync_timestamp=1603525579815&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40sideway%2Fformula%2Fdownload%2F%40sideway%2Fformula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" + resolved "https://registry.npm.taobao.org/@sideway/formula/download/@sideway/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" integrity sha1-/hWK7jLmvV3oUES+YVvAhHigoTw= "@sideway/pinpoint@^2.0.0": @@ -1691,7 +1691,7 @@ "@szmarczak/http-timer@^1.1.2": version "1.1.2" - resolved "https://registry.nlark.com/@szmarczak/http-timer/download/@szmarczak/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" + resolved "https://registry.nlark.com/@szmarczak/http-timer/download/@szmarczak/http-timer-1.1.2.tgz?cache=0&sync_timestamp=1629502165113&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40szmarczak%2Fhttp-timer%2Fdownload%2F%40szmarczak%2Fhttp-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" integrity sha1-sWZeLEYaLNkvTBu/UNVFTeDUtCE= dependencies: defer-to-connect "^1.0.1" @@ -1713,7 +1713,7 @@ "@tsconfig/docusaurus@^1.0.4": version "1.0.4" - resolved "https://registry.npmmirror.com/@tsconfig/docusaurus/download/@tsconfig/docusaurus-1.0.4.tgz#fc40f87a672568678d83533dd4031a09d75877ca" + resolved "https://registry.nlark.com/@tsconfig/docusaurus/download/@tsconfig/docusaurus-1.0.4.tgz#fc40f87a672568678d83533dd4031a09d75877ca" integrity sha1-/ED4emclaGeNg1M91AMaCddYd8o= "@types/cssnano@^4.0.1": @@ -1741,7 +1741,7 @@ "@types/estree@*", "@types/estree@^0.0.50": version "0.0.50" - resolved "https://registry.npmmirror.com/@types/estree/download/@types/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" + resolved "https://registry.npmmirror.com/@types/estree/download/@types/estree-0.0.50.tgz?cache=0&sync_timestamp=1637264753186&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Festree%2Fdownload%2F%40types%2Festree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" integrity sha1-Hgyqk2TT/M0pMcPtlv2+ql1MyoM= "@types/github-slugger@^1.3.0": @@ -1768,14 +1768,14 @@ "@types/http-proxy@^1.17.5": version "1.17.7" - resolved "https://registry.npmmirror.com/@types/http-proxy/download/@types/http-proxy-1.17.7.tgz#30ea85cc2c868368352a37f0d0d3581e24834c6f" + resolved "https://registry.npmmirror.com/@types/http-proxy/download/@types/http-proxy-1.17.7.tgz?cache=0&sync_timestamp=1637266134966&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fhttp-proxy%2Fdownload%2F%40types%2Fhttp-proxy-1.17.7.tgz#30ea85cc2c868368352a37f0d0d3581e24834c6f" integrity sha1-MOqFzCyGg2g1Kjfw0NNYHiSDTG8= dependencies: "@types/node" "*" "@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.9" - resolved "https://registry.npmmirror.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz?cache=0&sync_timestamp=1637266073261&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fjson-schema%2Fdownload%2F%40types%2Fjson-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + resolved "https://registry.npmmirror.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha1-l+3JA36gw4WFMgsolk3eOznkZg0= "@types/mdast@^3.0.0": @@ -1802,24 +1802,24 @@ "@types/prop-types@*": version "15.7.4" - resolved "https://registry.npmmirror.com/@types/prop-types/download/@types/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + resolved "https://registry.npmmirror.com/@types/prop-types/download/@types/prop-types-15.7.4.tgz?cache=0&sync_timestamp=1637270164807&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fprop-types%2Fdownload%2F%40types%2Fprop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" integrity sha1-/PcgXCXf95Xuea8eMNosl5CAjxE= "@types/q@^1.5.1": version "1.5.5" - resolved "https://registry.npmmirror.com/@types/q/download/@types/q-1.5.5.tgz?cache=0&sync_timestamp=1637268455272&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fq%2Fdownload%2F%40types%2Fq-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" + resolved "https://registry.npmmirror.com/@types/q/download/@types/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" integrity sha1-daKo59irSyMEFFBdkjNdHctTpt8= "@types/react-helmet@*": version "6.1.4" - resolved "https://registry.npmmirror.com/@types/react-helmet/download/@types/react-helmet-6.1.4.tgz#3e54a3eb37ba7fb34ffafc64f425be4e68df03b9" + resolved "https://registry.npmmirror.com/@types/react-helmet/download/@types/react-helmet-6.1.4.tgz?cache=0&sync_timestamp=1637270334903&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Freact-helmet%2Fdownload%2F%40types%2Freact-helmet-6.1.4.tgz#3e54a3eb37ba7fb34ffafc64f425be4e68df03b9" integrity sha1-PlSj6ze6f7NP+vxk9CW+TmjfA7k= dependencies: "@types/react" "*" "@types/react-router-config@*": version "5.0.3" - resolved "https://registry.nlark.com/@types/react-router-config/download/@types/react-router-config-5.0.3.tgz?cache=0&sync_timestamp=1629709123097&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Freact-router-config%2Fdownload%2F%40types%2Freact-router-config-5.0.3.tgz#72a53561bcb5e13b82c576527b818fa2579591c7" + resolved "https://registry.nlark.com/@types/react-router-config/download/@types/react-router-config-5.0.3.tgz?cache=0&sync_timestamp=1629709032056&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Freact-router-config%2Fdownload%2F%40types%2Freact-router-config-5.0.3.tgz#72a53561bcb5e13b82c576527b818fa2579591c7" integrity sha1-cqU1Yby14TuCxXZSe4GPoleVkcc= dependencies: "@types/history" "*" @@ -1828,7 +1828,7 @@ "@types/react-router-dom@*": version "5.3.2" - resolved "https://registry.npmmirror.com/@types/react-router-dom/download/@types/react-router-dom-5.3.2.tgz?cache=0&sync_timestamp=1637449508387&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Freact-router-dom%2Fdownload%2F%40types%2Freact-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee" + resolved "https://registry.npmmirror.com/@types/react-router-dom/download/@types/react-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee" integrity sha1-69jhRc8FbbXGbrHaxjxy9S6FQu4= dependencies: "@types/history" "*" @@ -1854,22 +1854,22 @@ "@types/retry@^0.12.0": version "0.12.1" - resolved "https://registry.npmmirror.com/@types/retry/download/@types/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" + resolved "https://registry.npmmirror.com/@types/retry/download/@types/retry-0.12.1.tgz?cache=0&sync_timestamp=1637270319130&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fretry%2Fdownload%2F%40types%2Fretry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" integrity sha1-2PHA0Nwjr61twWqemToIZXdLQGU= "@types/scheduler@*": version "0.16.2" - resolved "https://registry.npmmirror.com/@types/scheduler/download/@types/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + resolved "https://registry.npmmirror.com/@types/scheduler/download/@types/scheduler-0.16.2.tgz?cache=0&sync_timestamp=1637270322974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fscheduler%2Fdownload%2F%40types%2Fscheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" integrity sha1-GmL4lSVyPd4kuhsBsJK/XfitTTk= "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3": version "2.0.6" - resolved "https://registry.npmmirror.com/@types/unist/download/@types/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" + resolved "https://registry.npmmirror.com/@types/unist/download/@types/unist-2.0.6.tgz?cache=0&sync_timestamp=1637272115806&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Funist%2Fdownload%2F%40types%2Funist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" integrity sha1-JQp7FsO5H2cqJFUuxkZ47rHToI0= "@webassemblyjs/ast@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.1.tgz?cache=0&sync_timestamp=1625473420080&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fast%2Fdownload%2F%40webassemblyjs%2Fast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" + resolved "https://registry.nlark.com/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.1.tgz?cache=0&sync_timestamp=1625473466238&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fast%2Fdownload%2F%40webassemblyjs%2Fast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" integrity sha1-K/12fq4aaZb0Mv9+jX/HVnnAtqc= dependencies: "@webassemblyjs/helper-numbers" "1.11.1" @@ -1877,17 +1877,17 @@ "@webassemblyjs/floating-point-hex-parser@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" + resolved "https://registry.nlark.com/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.11.1.tgz?cache=0&sync_timestamp=1625473463638&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Ffloating-point-hex-parser%2Fdownload%2F%40webassemblyjs%2Ffloating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" integrity sha1-9sYacF8P16auyqToGY8j2dwXnk8= "@webassemblyjs/helper-api-error@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.11.1.tgz?cache=0&sync_timestamp=1625473412127&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-api-error%2Fdownload%2F%40webassemblyjs%2Fhelper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" + resolved "https://registry.nlark.com/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" integrity sha1-GmMZLYeI5cASgAump6RscFKI/RY= "@webassemblyjs/helper-buffer@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.11.1.tgz?cache=0&sync_timestamp=1625473414638&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-buffer%2Fdownload%2F%40webassemblyjs%2Fhelper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" + resolved "https://registry.nlark.com/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" integrity sha1-gyqQDrREiEzemnytRn+BUA9eWrU= "@webassemblyjs/helper-numbers@1.11.1": @@ -1901,12 +1901,12 @@ "@webassemblyjs/helper-wasm-bytecode@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.11.1.tgz?cache=0&sync_timestamp=1625473415013&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-wasm-bytecode%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" + resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.11.1.tgz?cache=0&sync_timestamp=1625473463016&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-wasm-bytecode%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" integrity sha1-8ygkHkHnsZnQsgwY6IQpxEMyleE= "@webassemblyjs/helper-wasm-section@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-section/download/@webassemblyjs/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" + resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-section/download/@webassemblyjs/helper-wasm-section-1.11.1.tgz?cache=0&sync_timestamp=1625473466570&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-wasm-section%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" integrity sha1-Ie4GWntjXzGec48N1zv72igcCXo= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -1930,12 +1930,12 @@ "@webassemblyjs/utf8@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.11.1.tgz?cache=0&sync_timestamp=1625473462317&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Futf8%2Fdownload%2F%40webassemblyjs%2Futf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" + resolved "https://registry.nlark.com/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" integrity sha1-0fi3ZDaefG5rrjUOhU3smlnwo/8= "@webassemblyjs/wasm-edit@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.11.1.tgz?cache=0&sync_timestamp=1625473490556&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-edit%2Fdownload%2F%40webassemblyjs%2Fwasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.11.1.tgz?cache=0&sync_timestamp=1625473468202&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-edit%2Fdownload%2F%40webassemblyjs%2Fwasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" integrity sha1-rSBuv0v5WgWM6YgKjAksXeyBk9Y= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -1949,7 +1949,7 @@ "@webassemblyjs/wasm-gen@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.11.1.tgz?cache=0&sync_timestamp=1625473361759&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-gen%2Fdownload%2F%40webassemblyjs%2Fwasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" integrity sha1-hsXqMEhJdZt9iMR6MvTwOa48j3Y= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -1982,7 +1982,7 @@ "@webassemblyjs/wast-printer@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wast-printer/download/@webassemblyjs/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" + resolved "https://registry.nlark.com/@webassemblyjs/wast-printer/download/@webassemblyjs/wast-printer-1.11.1.tgz?cache=0&sync_timestamp=1625473465901&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwast-printer%2Fdownload%2F%40webassemblyjs%2Fwast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" integrity sha1-0Mc77ajuxUJvEK6O9VzuXnCEwvA= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -1990,7 +1990,7 @@ "@xtuc/ieee754@^1.2.0": version "1.2.0" - resolved "https://registry.nlark.com/@xtuc/ieee754/download/@xtuc/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + resolved "https://registry.npm.taobao.org/@xtuc/ieee754/download/@xtuc/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" integrity sha1-7vAUoxRa5Hehy8AM0eVSM23Ot5A= "@xtuc/long@4.2.2": @@ -2013,7 +2013,7 @@ acorn-dynamic-import@^4.0.0: acorn-import-assertions@^1.7.6: version "1.8.0" - resolved "https://registry.npmmirror.com/acorn-import-assertions/download/acorn-import-assertions-1.8.0.tgz?cache=0&sync_timestamp=1633349407828&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Facorn-import-assertions%2Fdownload%2Facorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" + resolved "https://registry.npmmirror.com/acorn-import-assertions/download/acorn-import-assertions-1.8.0.tgz?cache=0&sync_timestamp=1633349301882&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Facorn-import-assertions%2Fdownload%2Facorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" integrity sha1-uitZOc5iwjjbbZPYHJsRGym4Vek= acorn-jsx@^5.0.1: @@ -2032,12 +2032,12 @@ acorn-node@^1.6.1: acorn-walk@^7.0.0: version "7.2.0" - resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-7.2.0.tgz?cache=0&sync_timestamp=1630916608758&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-7.2.0.tgz?cache=0&sync_timestamp=1630916588767&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha1-DeiJpgEgOQmw++B7iTjcIdLpZ7w= acorn-walk@^8.0.0: version "8.2.0" - resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-8.2.0.tgz?cache=0&sync_timestamp=1630916608758&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-8.2.0.tgz?cache=0&sync_timestamp=1630916588767&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha1-dBIQ8uJCZFRQiFOi9E0KuDt/acE= acorn@^6.1.1: @@ -2062,7 +2062,7 @@ address@^1.0.1, address@^1.1.2: aggregate-error@^3.0.0: version "3.1.0" - resolved "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.1.0.tgz?cache=0&sync_timestamp=1618681553608&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faggregate-error%2Fdownload%2Faggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + resolved "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.1.0.tgz?cache=0&sync_timestamp=1618681496448&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faggregate-error%2Fdownload%2Faggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" integrity sha1-kmcP9Q9TWb23o+DUDQ7DDFc3aHo= dependencies: clean-stack "^2.0.0" @@ -2077,19 +2077,19 @@ ajv-formats@^2.1.1: ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: version "3.5.2" - resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1637523824664&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha1-MfKdpatuANHC0yms97WSlhTVAU0= ajv-keywords@^5.0.0: version "5.1.0" - resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-5.1.0.tgz?cache=0&sync_timestamp=1637523824664&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== dependencies: fast-deep-equal "^3.1.3" ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" - resolved "https://registry.npmmirror.com/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1637522259668&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + resolved "https://registry.npmmirror.com/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1637522408530&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha1-uvWmLoArB9l3A0WG+MO69a3ybfQ= dependencies: fast-deep-equal "^3.1.1" @@ -2099,7 +2099,7 @@ ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: ajv@^8.0.0, ajv@^8.8.0: version "8.8.2" - resolved "https://registry.npmmirror.com/ajv/download/ajv-8.8.2.tgz?cache=0&sync_timestamp=1637522259668&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb" + resolved "https://registry.npmmirror.com/ajv/download/ajv-8.8.2.tgz?cache=0&sync_timestamp=1637522408530&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb" integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw== dependencies: fast-deep-equal "^3.1.1" @@ -2116,7 +2116,7 @@ algoliasearch-helper@^3.5.5: algoliasearch@^4.0.0, algoliasearch@^4.11.0: version "4.11.0" - resolved "https://registry.npmmirror.com/algoliasearch/download/algoliasearch-4.11.0.tgz?cache=0&sync_timestamp=1634738335372&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Falgoliasearch%2Fdownload%2Falgoliasearch-4.11.0.tgz#234befb3ac355c094077f0edf3777240b1ee013c" + resolved "https://registry.npmmirror.com/algoliasearch/download/algoliasearch-4.11.0.tgz?cache=0&sync_timestamp=1634739569076&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Falgoliasearch%2Fdownload%2Falgoliasearch-4.11.0.tgz#234befb3ac355c094077f0edf3777240b1ee013c" integrity sha1-I0vvs6w1XAlAd/Dt83dyQLHuATw= dependencies: "@algolia/cache-browser-local-storage" "4.11.0" @@ -2141,7 +2141,7 @@ alphanum-sort@^1.0.2: ansi-align@^3.0.0: version "3.0.1" - resolved "https://registry.npmmirror.com/ansi-align/download/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" + resolved "https://registry.npmmirror.com/ansi-align/download/ansi-align-3.0.1.tgz?cache=0&sync_timestamp=1632743737823&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fansi-align%2Fdownload%2Fansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" integrity sha1-DN8S4RGs53OobpofrRIlxDyxmlk= dependencies: string-width "^4.1.0" @@ -2153,12 +2153,12 @@ ansi-html-community@^0.0.8: ansi-regex@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-5.0.1.tgz?cache=0&sync_timestamp=1631634988487&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-regex%2Fdownload%2Fansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha1-CCyyyJyf6GWaMRpTvWpNxTAdswQ= ansi-regex@^6.0.1: version "6.0.1" - resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-6.0.1.tgz?cache=0&sync_timestamp=1631634988487&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-regex%2Fdownload%2Fansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" integrity sha1-MYPjj66aZdfLXlOUXNWJfQJgoGo= ansi-styles@^3.2.1: @@ -2177,7 +2177,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: anymatch@~3.1.2: version "3.1.2" - resolved "https://registry.nlark.com/anymatch/download/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + resolved "https://registry.npm.taobao.org/anymatch/download/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" integrity sha1-wFV8CWrzLxBhmPT04qODU343hxY= dependencies: normalize-path "^3.0.0" @@ -2185,19 +2185,19 @@ anymatch@~3.1.2: arg@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/arg/download/arg-5.0.1.tgz?cache=0&sync_timestamp=1629166537485&other_urls=https%3A%2F%2Fregistry.nlark.com%2Farg%2Fdownload%2Farg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb" + resolved "https://registry.nlark.com/arg/download/arg-5.0.1.tgz?cache=0&sync_timestamp=1629167279295&other_urls=https%3A%2F%2Fregistry.nlark.com%2Farg%2Fdownload%2Farg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb" integrity sha1-6wyaj3d4bK0q+P8rhiiZhC17ats= argparse@^1.0.7: version "1.0.10" - resolved "https://registry.nlark.com/argparse/download/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + resolved "https://registry.npm.taobao.org/argparse/download/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE= dependencies: sprintf-js "~1.0.2" argparse@^2.0.1: version "2.0.1" - resolved "https://registry.nlark.com/argparse/download/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + resolved "https://registry.npm.taobao.org/argparse/download/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha1-JG9Q88p4oyQPbJl+ipvR6sSeSzg= array-flatten@1.1.1: @@ -2212,7 +2212,7 @@ array-flatten@^2.1.0: array-union@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/array-union/download/array-union-2.1.0.tgz?cache=0&sync_timestamp=1614624262896&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Farray-union%2Fdownload%2Farray-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + resolved "https://registry.npm.taobao.org/array-union/download/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha1-t5hCCtvrHego2ErNii4j0+/oXo0= async@^2.6.2: @@ -2224,7 +2224,7 @@ async@^2.6.2: at-least-node@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/at-least-node/download/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + resolved "https://registry.npm.taobao.org/at-least-node/download/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha1-YCzUtG6EStTv/JKoARo8RuAjjcI= autoprefixer@^10.3.1, autoprefixer@^10.3.5, autoprefixer@^10.3.7: @@ -2241,14 +2241,14 @@ autoprefixer@^10.3.1, autoprefixer@^10.3.5, autoprefixer@^10.3.7: axios@^0.21.1: version "0.21.4" - resolved "https://registry.npmmirror.com/axios/download/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" + resolved "https://registry.npmmirror.com/axios/download/axios-0.21.4.tgz?cache=0&sync_timestamp=1635214905768&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Faxios%2Fdownload%2Faxios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" integrity sha1-xnuQ3AVo5cHPKwuFjEO6KOLtpXU= dependencies: follow-redirects "^1.14.0" babel-loader@^8.2.2: version "8.2.3" - resolved "https://registry.npmmirror.com/babel-loader/download/babel-loader-8.2.3.tgz?cache=0&sync_timestamp=1634769533620&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-loader%2Fdownload%2Fbabel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" + resolved "https://registry.npmmirror.com/babel-loader/download/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" integrity sha1-iYa0Dxpkys/LS4QpMgCF72ixNC0= dependencies: find-cache-dir "^3.3.1" @@ -2258,7 +2258,7 @@ babel-loader@^8.2.2: babel-plugin-apply-mdx-type-prop@1.6.22: version "1.6.22" - resolved "https://registry.npm.taobao.org/babel-plugin-apply-mdx-type-prop/download/babel-plugin-apply-mdx-type-prop-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-apply-mdx-type-prop%2Fdownload%2Fbabel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b" + resolved "https://registry.npm.taobao.org/babel-plugin-apply-mdx-type-prop/download/babel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b" integrity sha1-0hbo/Q3pHePxR47zIx4FRGvIcFs= dependencies: "@babel/helper-plugin-utils" "7.10.4" @@ -2266,28 +2266,28 @@ babel-plugin-apply-mdx-type-prop@1.6.22: babel-plugin-dynamic-import-node@2.3.0: version "2.3.0" - resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.0.tgz?cache=0&sync_timestamp=1618846958717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" + resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.0.tgz?cache=0&sync_timestamp=1618846790496&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" integrity sha1-8A9Qe9qjw+P/bn5emNkKesq5b38= dependencies: object.assign "^4.1.0" babel-plugin-dynamic-import-node@^2.3.3: version "2.3.3" - resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.3.tgz?cache=0&sync_timestamp=1618846958717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" + resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.3.tgz?cache=0&sync_timestamp=1618846790496&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" integrity sha1-hP2hnJduxcbe/vV/lCez3vZuF6M= dependencies: object.assign "^4.1.0" babel-plugin-extract-import-names@1.6.22: version "1.6.22" - resolved "https://registry.npm.taobao.org/babel-plugin-extract-import-names/download/babel-plugin-extract-import-names-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-extract-import-names%2Fdownload%2Fbabel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc" + resolved "https://registry.npm.taobao.org/babel-plugin-extract-import-names/download/babel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc" integrity sha1-3l+aKOsS8+sleL90RyIE5m0aE9w= dependencies: "@babel/helper-plugin-utils" "7.10.4" babel-plugin-polyfill-corejs2@^0.3.0: version "0.3.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/download/babel-plugin-polyfill-corejs2-0.3.0.tgz?cache=0&sync_timestamp=1636799843170&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs2%2Fdownload%2Fbabel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/download/babel-plugin-polyfill-corejs2-0.3.0.tgz?cache=0&sync_timestamp=1636802678201&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs2%2Fdownload%2Fbabel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd" integrity sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA== dependencies: "@babel/compat-data" "^7.13.11" @@ -2296,7 +2296,7 @@ babel-plugin-polyfill-corejs2@^0.3.0: babel-plugin-polyfill-corejs3@^0.4.0: version "0.4.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/download/babel-plugin-polyfill-corejs3-0.4.0.tgz?cache=0&sync_timestamp=1636799842810&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs3%2Fdownload%2Fbabel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/download/babel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087" integrity sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.0" @@ -2304,24 +2304,24 @@ babel-plugin-polyfill-corejs3@^0.4.0: babel-plugin-polyfill-regenerator@^0.3.0: version "0.3.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/download/babel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/download/babel-plugin-polyfill-regenerator-0.3.0.tgz?cache=0&sync_timestamp=1636802677257&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-regenerator%2Fdownload%2Fbabel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be" integrity sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.0" bail@^1.0.0: version "1.0.5" - resolved "https://registry.npmmirror.com/bail/download/bail-1.0.5.tgz?cache=0&sync_timestamp=1636274632406&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbail%2Fdownload%2Fbail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" + resolved "https://registry.npmmirror.com/bail/download/bail-1.0.5.tgz?cache=0&sync_timestamp=1636274668154&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbail%2Fdownload%2Fbail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" integrity sha1-tvoTNASjksvB+MS/Y/WVM1Hnp3Y= balanced-match@^1.0.0: version "1.0.2" - resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.2.tgz?cache=0&sync_timestamp=1617714233441&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbalanced-match%2Fdownload%2Fbalanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4= batch@0.6.1: version "0.6.1" - resolved "https://registry.nlark.com/batch/download/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" + resolved "https://registry.npm.taobao.org/batch/download/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= big.js@^5.2.2: @@ -2331,17 +2331,17 @@ big.js@^5.2.2: binary-extensions@^2.0.0: version "2.2.0" - resolved "https://registry.nlark.com/binary-extensions/download/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + resolved "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha1-dfUC7q+f/eQvyYgpZFvk6na9ni0= bluebird@^3.7.1: version "3.7.2" - resolved "https://registry.npm.taobao.org/bluebird/download/bluebird-3.7.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbluebird%2Fdownload%2Fbluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + resolved "https://registry.npm.taobao.org/bluebird/download/bluebird-3.7.2.tgz?cache=0&sync_timestamp=1615984338230&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbluebird%2Fdownload%2Fbluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha1-nyKcFb4nJFT/qXOs4NvueaGww28= body-parser@1.19.0: version "1.19.0" - resolved "https://registry.npm.taobao.org/body-parser/download/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + resolved "https://registry.npm.taobao.org/body-parser/download/body-parser-1.19.0.tgz?cache=0&sync_timestamp=1615984442879&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbody-parser%2Fdownload%2Fbody-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" integrity sha1-lrJwnlfJxOCab9Zqj9l5hE9p8Io= dependencies: bytes "3.1.0" @@ -2369,12 +2369,12 @@ bonjour@^3.5.0: boolbase@^1.0.0, boolbase@~1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/boolbase/download/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + resolved "https://registry.npm.taobao.org/boolbase/download/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= boxen@^5.0.0, boxen@^5.0.1: version "5.1.2" - resolved "https://registry.npmmirror.com/boxen/download/boxen-5.1.2.tgz?cache=0&sync_timestamp=1634028659618&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fboxen%2Fdownload%2Fboxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" + resolved "https://registry.npmmirror.com/boxen/download/boxen-5.1.2.tgz?cache=0&sync_timestamp=1634028569091&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fboxen%2Fdownload%2Fboxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" integrity sha1-eIy2hvyDwfSG36ikDGj8K4MdK1A= dependencies: ansi-align "^3.0.0" @@ -2388,7 +2388,7 @@ boxen@^5.0.0, boxen@^5.0.1: brace-expansion@^1.1.7: version "1.1.11" - resolved "https://registry.nlark.com/brace-expansion/download/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + resolved "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" integrity sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0= dependencies: balanced-match "^1.0.0" @@ -2396,14 +2396,14 @@ brace-expansion@^1.1.7: braces@^3.0.1, braces@~3.0.2: version "3.0.2" - resolved "https://registry.nlark.com/braces/download/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + resolved "https://registry.npm.taobao.org/braces/download/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha1-NFThpGLujVmeI23zNs2epPiv4Qc= dependencies: fill-range "^7.0.1" browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.18.1: version "4.18.1" - resolved "https://registry.npmmirror.com/browserslist/download/browserslist-4.18.1.tgz?cache=0&sync_timestamp=1636994462878&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbrowserslist%2Fdownload%2Fbrowserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f" + resolved "https://registry.npmmirror.com/browserslist/download/browserslist-4.18.1.tgz?cache=0&sync_timestamp=1636994406288&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbrowserslist%2Fdownload%2Fbrowserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f" integrity sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ== dependencies: caniuse-lite "^1.0.30001280" @@ -2427,7 +2427,7 @@ buble-jsx-only@^0.19.8: buffer-from@^1.0.0: version "1.1.2" - resolved "https://registry.nlark.com/buffer-from/download/buffer-from-1.1.2.tgz?cache=0&sync_timestamp=1627578450949&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbuffer-from%2Fdownload%2Fbuffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + resolved "https://registry.nlark.com/buffer-from/download/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha1-KxRqb9cugLT1XSVfNe1Zo6mkG9U= buffer-indexof@^1.0.0: @@ -2437,17 +2437,17 @@ buffer-indexof@^1.0.0: bytes@3.0.0: version "3.0.0" - resolved "https://registry.npmmirror.com/bytes/download/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + resolved "https://registry.npmmirror.com/bytes/download/bytes-3.0.0.tgz?cache=0&sync_timestamp=1637015063162&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbytes%2Fdownload%2Fbytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= bytes@3.1.0: version "3.1.0" - resolved "https://registry.npmmirror.com/bytes/download/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + resolved "https://registry.npmmirror.com/bytes/download/bytes-3.1.0.tgz?cache=0&sync_timestamp=1637015063162&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbytes%2Fdownload%2Fbytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha1-9s95M6Ng4FiPqf3oVlHNx/gF0fY= cacheable-request@^6.0.0: version "6.1.0" - resolved "https://registry.nlark.com/cacheable-request/download/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" + resolved "https://registry.nlark.com/cacheable-request/download/cacheable-request-6.1.0.tgz?cache=0&sync_timestamp=1623237504263&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcacheable-request%2Fdownload%2Fcacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" integrity sha1-IP+4vRYrpL4R6VZ9gj22UQUsqRI= dependencies: clone-response "^1.0.2" @@ -2460,7 +2460,7 @@ cacheable-request@^6.0.0: call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/call-bind/download/call-bind-1.0.2.tgz?cache=0&sync_timestamp=1610403020286&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcall-bind%2Fdownload%2Fcall-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + resolved "https://registry.npm.taobao.org/call-bind/download/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha1-sdTonmiBGcPJqQOtMKuy9qkZvjw= dependencies: function-bind "^1.1.1" @@ -2468,12 +2468,12 @@ call-bind@^1.0.0, call-bind@^1.0.2: callsites@^3.0.0: version "3.1.0" - resolved "https://registry.nlark.com/callsites/download/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + resolved "https://registry.nlark.com/callsites/download/callsites-3.1.0.tgz?cache=0&sync_timestamp=1628464722297&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcallsites%2Fdownload%2Fcallsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha1-s2MKvYlDQy9Us/BRkjjjPNffL3M= camel-case@^4.1.2: version "4.1.2" - resolved "https://registry.nlark.com/camel-case/download/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" + resolved "https://registry.npm.taobao.org/camel-case/download/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" integrity sha1-lygHKpVPgFIoIlpt7qazhGHhvVo= dependencies: pascal-case "^3.1.2" @@ -2486,7 +2486,7 @@ camelcase-css@2.0.1, camelcase-css@^2.0.1: camelcase@^6.2.0: version "6.2.1" - resolved "https://registry.npmmirror.com/camelcase/download/camelcase-6.2.1.tgz?cache=0&sync_timestamp=1636945130104&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" + resolved "https://registry.npmmirror.com/camelcase/download/camelcase-6.2.1.tgz?cache=0&sync_timestamp=1636945141024&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== caniuse-api@^3.0.0: @@ -2500,13 +2500,13 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001280: - version "1.0.30001283" - resolved "https://registry.npmmirror.com/caniuse-lite/download/caniuse-lite-1.0.30001283.tgz#8573685bdae4d733ef18f78d44ba0ca5fe9e896b" - integrity sha512-9RoKo841j1GQFSJz/nCXOj0sD7tHBtlowjYlrqIUS812x9/emfBLBt6IyMz1zIaYc/eRL8Cs6HPUVi2Hzq4sIg== + version "1.0.30001284" + resolved "https://registry.npmmirror.com/caniuse-lite/download/caniuse-lite-1.0.30001284.tgz#d3653929ded898cd0c1f09a56fd8ca6952df4fca" + integrity sha512-t28SKa7g6kiIQi6NHeOcKrOrGMzCRrXvlasPwWC26TH2QNdglgzQIRUuJ0cR3NeQPH+5jpuveeeSFDLm2zbkEw== ccount@^1.0.0, ccount@^1.0.3: version "1.1.0" - resolved "https://registry.npm.taobao.org/ccount/download/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043" + resolved "https://registry.npmmirror.com/ccount/download/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043" integrity sha1-JGaH3rtgFHNRMb6KurLZOJj40EM= chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: @@ -2528,22 +2528,22 @@ chalk@^4.1.0, chalk@^4.1.2: character-entities-legacy@^1.0.0: version "1.1.4" - resolved "https://registry.npmmirror.com/character-entities-legacy/download/character-entities-legacy-1.1.4.tgz?cache=0&sync_timestamp=1635911807340&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities-legacy%2Fdownload%2Fcharacter-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" + resolved "https://registry.npmmirror.com/character-entities-legacy/download/character-entities-legacy-1.1.4.tgz?cache=0&sync_timestamp=1635911965002&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities-legacy%2Fdownload%2Fcharacter-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" integrity sha1-lLwYRdznClu50uzHSHJWYSk9j8E= character-entities@^1.0.0: version "1.2.4" - resolved "https://registry.npmmirror.com/character-entities/download/character-entities-1.2.4.tgz?cache=0&sync_timestamp=1635868930605&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities%2Fdownload%2Fcharacter-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" + resolved "https://registry.npmmirror.com/character-entities/download/character-entities-1.2.4.tgz?cache=0&sync_timestamp=1635869130345&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities%2Fdownload%2Fcharacter-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" integrity sha1-4Sw5Obfq9OWxXnrUxeKOHUjFsWs= character-reference-invalid@^1.0.0: version "1.1.4" - resolved "https://registry.npmmirror.com/character-reference-invalid/download/character-reference-invalid-1.1.4.tgz?cache=0&sync_timestamp=1636446304022&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-reference-invalid%2Fdownload%2Fcharacter-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" + resolved "https://registry.npmmirror.com/character-reference-invalid/download/character-reference-invalid-1.1.4.tgz?cache=0&sync_timestamp=1636446564128&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-reference-invalid%2Fdownload%2Fcharacter-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" integrity sha1-CDMpzaDq4nKrPbvzfpo4LBOvFWA= cheerio@^0.22.0: version "0.22.0" - resolved "https://registry.nlark.com/cheerio/download/cheerio-0.22.0.tgz?cache=0&sync_timestamp=1623167648923&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcheerio%2Fdownload%2Fcheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" + resolved "https://registry.nlark.com/cheerio/download/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4= dependencies: css-select "~1.2.0" @@ -2580,7 +2580,7 @@ chokidar@^3.4.2, chokidar@^3.5.2: chrome-trace-event@^1.0.2: version "1.0.3" - resolved "https://registry.nlark.com/chrome-trace-event/download/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + resolved "https://registry.npm.taobao.org/chrome-trace-event/download/chrome-trace-event-1.0.3.tgz?cache=0&sync_timestamp=1617906586875&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchrome-trace-event%2Fdownload%2Fchrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" integrity sha1-EBXs7UdB4V0GZkqVfbv1DQQeJqw= ci-info@^2.0.0: @@ -2595,7 +2595,7 @@ ci-info@^3.1.1: clean-css@^5.1.5, clean-css@^5.2.2: version "5.2.2" - resolved "https://registry.npmmirror.com/clean-css/download/clean-css-5.2.2.tgz?cache=0&sync_timestamp=1634992314911&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fclean-css%2Fdownload%2Fclean-css-5.2.2.tgz#d3a7c6ee2511011e051719838bdcf8314dc4548d" + resolved "https://registry.npmmirror.com/clean-css/download/clean-css-5.2.2.tgz?cache=0&sync_timestamp=1634992859960&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fclean-css%2Fdownload%2Fclean-css-5.2.2.tgz#d3a7c6ee2511011e051719838bdcf8314dc4548d" integrity sha1-06fG7iURAR4FFxmDi9z4MU3EVI0= dependencies: source-map "~0.6.0" @@ -2607,12 +2607,12 @@ clean-stack@^2.0.0: cli-boxes@^2.2.1: version "2.2.1" - resolved "https://registry.nlark.com/cli-boxes/download/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" + resolved "https://registry.npm.taobao.org/cli-boxes/download/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha1-3dUDXSUJT84iDpyrQKRYQKRAMY8= clone-deep@^4.0.1: version "4.0.1" - resolved "https://registry.nlark.com/clone-deep/download/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + resolved "https://registry.npm.taobao.org/clone-deep/download/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" integrity sha1-wZ/Zvbv4WUK0/ZechNz31fB8I4c= dependencies: is-plain-object "^2.0.4" @@ -2642,7 +2642,7 @@ coa@^2.0.2: collapse-white-space@^1.0.2: version "1.0.6" - resolved "https://registry.npm.taobao.org/collapse-white-space/download/collapse-white-space-1.0.6.tgz?cache=0&sync_timestamp=1615196586817&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcollapse-white-space%2Fdownload%2Fcollapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287" + resolved "https://registry.npm.taobao.org/collapse-white-space/download/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287" integrity sha1-5jYpwAFmZXkgYNu+t5xCI50sUoc= color-convert@^1.9.0: @@ -2676,7 +2676,7 @@ colord@^2.9.1: colorette@^2.0.10: version "2.0.16" - resolved "https://registry.npmmirror.com/colorette/download/colorette-2.0.16.tgz?cache=0&sync_timestamp=1633673160250&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcolorette%2Fdownload%2Fcolorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" + resolved "https://registry.npmmirror.com/colorette/download/colorette-2.0.16.tgz?cache=0&sync_timestamp=1633673138036&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcolorette%2Fdownload%2Fcolorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" integrity sha1-cTua+E/bAAE58EVGvUqT9ipQhdo= combine-promises@^1.1.0: @@ -2691,27 +2691,27 @@ comma-separated-tokens@^1.0.0: commander@^2.20.0: version "2.20.3" - resolved "https://registry.npmmirror.com/commander/download/commander-2.20.3.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + resolved "https://registry.npmmirror.com/commander/download/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha1-/UhehMA+tIgcIHIrpIA16FMa6zM= commander@^5.1.0: version "5.1.0" - resolved "https://registry.npmmirror.com/commander/download/commander-5.1.0.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" + resolved "https://registry.npmmirror.com/commander/download/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha1-Rqu9FlL44Fm92u+Zu9yyrZzxea4= commander@^7.2.0: version "7.2.0" - resolved "https://registry.npmmirror.com/commander/download/commander-7.2.0.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + resolved "https://registry.npmmirror.com/commander/download/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha1-o2y1fQtQHOEI5NIFWaFQo5HZerc= commander@^8.3.0: version "8.3.0" - resolved "https://registry.npmmirror.com/commander/download/commander-8.3.0.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" + resolved "https://registry.npmmirror.com/commander/download/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha1-SDfqGy2me5xhamevuw+v7lZ7ymY= commondir@^1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/commondir/download/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + resolved "https://registry.npm.taobao.org/commondir/download/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= compressible@~2.0.16: @@ -2723,7 +2723,7 @@ compressible@~2.0.16: compression@^1.7.4: version "1.7.4" - resolved "https://registry.nlark.com/compression/download/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" + resolved "https://registry.npm.taobao.org/compression/download/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" integrity sha1-lVI+/xcMpXwpoMpB5v4TH0Hlu48= dependencies: accepts "~1.3.5" @@ -2753,7 +2753,7 @@ configstore@^5.0.1: connect-history-api-fallback@^1.6.0: version "1.6.0" - resolved "https://registry.npm.taobao.org/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" + resolved "https://registry.nlark.com/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz?cache=0&sync_timestamp=1618847040596&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fconnect-history-api-fallback%2Fdownload%2Fconnect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha1-izIIk1kwjRERFdgcrT/Oq4iPl7w= consola@^2.15.3: @@ -2763,31 +2763,31 @@ consola@^2.15.3: content-disposition@0.5.2: version "0.5.2" - resolved "https://registry.nlark.com/content-disposition/download/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" + resolved "https://registry.npm.taobao.org/content-disposition/download/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ= content-disposition@0.5.3: version "0.5.3" - resolved "https://registry.nlark.com/content-disposition/download/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" + resolved "https://registry.npm.taobao.org/content-disposition/download/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" integrity sha1-4TDK9+cnkIfFYWwgB9BIVpiYT70= dependencies: safe-buffer "5.1.2" content-type@~1.0.4: version "1.0.4" - resolved "https://registry.nlark.com/content-type/download/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + resolved "https://registry.npm.taobao.org/content-type/download/content-type-1.0.4.tgz?cache=0&sync_timestamp=1615984448548&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcontent-type%2Fdownload%2Fcontent-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha1-4TjMdeBAxyexlm/l5fjJruJW/js= convert-source-map@^1.7.0: version "1.8.0" - resolved "https://registry.nlark.com/convert-source-map/download/convert-source-map-1.8.0.tgz?cache=0&sync_timestamp=1624045420970&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fconvert-source-map%2Fdownload%2Fconvert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + resolved "https://registry.nlark.com/convert-source-map/download/convert-source-map-1.8.0.tgz?cache=0&sync_timestamp=1624045304679&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fconvert-source-map%2Fdownload%2Fconvert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" integrity sha1-8zc8MtIbTXgN2ABFFGhPt5HKQ2k= dependencies: safe-buffer "~5.1.1" cookie-signature@1.0.6: version "1.0.6" - resolved "https://registry.nlark.com/cookie-signature/download/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + resolved "https://registry.npm.taobao.org/cookie-signature/download/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= cookie@0.4.0: @@ -2797,12 +2797,12 @@ cookie@0.4.0: copy-text-to-clipboard@^3.0.1: version "3.0.1" - resolved "https://registry.nlark.com/copy-text-to-clipboard/download/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c" + resolved "https://registry.npm.taobao.org/copy-text-to-clipboard/download/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c" integrity sha1-jL+PkOCkfxLkokdDc2Jl0Ve85pw= copy-webpack-plugin@^9.0.1: version "9.1.0" - resolved "https://registry.npmmirror.com/copy-webpack-plugin/download/copy-webpack-plugin-9.1.0.tgz?cache=0&sync_timestamp=1637161372227&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcopy-webpack-plugin%2Fdownload%2Fcopy-webpack-plugin-9.1.0.tgz#2d2c460c4c4695ec0a58afb2801a1205256c4e6b" + resolved "https://registry.npmmirror.com/copy-webpack-plugin/download/copy-webpack-plugin-9.1.0.tgz#2d2c460c4c4695ec0a58afb2801a1205256c4e6b" integrity sha512-rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA== dependencies: fast-glob "^3.2.7" @@ -2837,7 +2837,7 @@ core-util-is@~1.0.0: cosmiconfig@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-6.0.0.tgz?cache=0&sync_timestamp=1629586119976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" + resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-6.0.0.tgz?cache=0&sync_timestamp=1629585969900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" integrity sha1-2k/uhTxS9rHmk19BwaL8UL1KmYI= dependencies: "@types/parse-json" "^4.0.0" @@ -2848,7 +2848,7 @@ cosmiconfig@^6.0.0: cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: version "7.0.1" - resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz?cache=0&sync_timestamp=1629586119976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz?cache=0&sync_timestamp=1629585969900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" integrity sha1-cU11ZSLKzoZ4Z8y0R0xdAbuuXW0= dependencies: "@types/parse-json" "^4.0.0" @@ -2859,14 +2859,14 @@ cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: cross-env@^7.0.3: version "7.0.3" - resolved "https://registry.nlark.com/cross-env/download/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + resolved "https://registry.npm.taobao.org/cross-env/download/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" integrity sha1-hlJkspZ33AFbqEGJGJZd0jL8VM8= dependencies: cross-spawn "^7.0.1" cross-spawn@^7.0.1, cross-spawn@^7.0.3: version "7.0.3" - resolved "https://registry.nlark.com/cross-spawn/download/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + resolved "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-7.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcross-spawn%2Fdownload%2Fcross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha1-9zqFudXUHQRVUcF34ogtSshXKKY= dependencies: path-key "^3.1.0" @@ -2875,19 +2875,19 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.3: crypto-random-string@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/crypto-random-string/download/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" + resolved "https://registry.npm.taobao.org/crypto-random-string/download/crypto-random-string-2.0.0.tgz?cache=0&sync_timestamp=1617610467993&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcrypto-random-string%2Fdownload%2Fcrypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha1-7yp6lm7BEIM4g2m6oC6+rSKbMNU= css-declaration-sorter@^6.0.3: version "6.1.3" - resolved "https://registry.nlark.com/css-declaration-sorter/download/css-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2" + resolved "https://registry.nlark.com/css-declaration-sorter/download/css-declaration-sorter-6.1.3.tgz?cache=0&sync_timestamp=1630965563343&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcss-declaration-sorter%2Fdownload%2Fcss-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2" integrity sha1-6YUuTPlAunn1CdlCWxN9H5RDjcI= dependencies: timsort "^0.3.0" css-loader@^5.1.1: version "5.2.7" - resolved "https://registry.npmmirror.com/css-loader/download/css-loader-5.2.7.tgz?cache=0&sync_timestamp=1635967924209&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-loader%2Fdownload%2Fcss-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" + resolved "https://registry.npmmirror.com/css-loader/download/css-loader-5.2.7.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-loader%2Fdownload%2Fcss-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" integrity sha1-m58RHt9vsr5dxiUlZEy8nCMgZK4= dependencies: icss-utils "^5.1.0" @@ -2952,7 +2952,7 @@ css-select@~1.2.0: css-tree@1.0.0-alpha.37: version "1.0.0-alpha.37" - resolved "https://registry.nlark.com/css-tree/download/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" + resolved "https://registry.npm.taobao.org/css-tree/download/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" integrity sha1-mL69YsTB2flg7DQM+fdSLjBwmiI= dependencies: mdn-data "2.0.4" @@ -2960,7 +2960,7 @@ css-tree@1.0.0-alpha.37: css-tree@^1.1.2, css-tree@^1.1.3: version "1.1.3" - resolved "https://registry.nlark.com/css-tree/download/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" + resolved "https://registry.npm.taobao.org/css-tree/download/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" integrity sha1-60hw+2/XcHMn7JXC/yqwm16NuR0= dependencies: mdn-data "2.0.14" @@ -2968,22 +2968,22 @@ css-tree@^1.1.2, css-tree@^1.1.3: css-what@2.1: version "2.1.3" - resolved "https://registry.npmmirror.com/css-what/download/css-what-2.1.3.tgz?cache=0&sync_timestamp=1633863955744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-what%2Fdownload%2Fcss-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" + resolved "https://registry.npmmirror.com/css-what/download/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" integrity sha1-ptdgRXM2X+dGhsPzEcVlE9iChfI= css-what@^3.2.1: version "3.4.2" - resolved "https://registry.npmmirror.com/css-what/download/css-what-3.4.2.tgz?cache=0&sync_timestamp=1633863955744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-what%2Fdownload%2Fcss-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" + resolved "https://registry.npmmirror.com/css-what/download/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" integrity sha1-6nAm/LAXd+295SEk4h8yfnrpUOQ= css-what@^5.0.0: version "5.1.0" - resolved "https://registry.npmmirror.com/css-what/download/css-what-5.1.0.tgz?cache=0&sync_timestamp=1633863955744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-what%2Fdownload%2Fcss-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" + resolved "https://registry.npmmirror.com/css-what/download/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" integrity sha1-P3tweq32M7r2LCzrhXm1RbtA9/4= cssesc@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/cssesc/download/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + resolved "https://registry.npm.taobao.org/cssesc/download/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4= cssnano-preset-advanced@^5.1.4: @@ -3050,7 +3050,7 @@ cssnano@^5.0.6, cssnano@^5.0.8: csso@^4.0.2, csso@^4.2.0: version "4.2.0" - resolved "https://registry.nlark.com/csso/download/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" + resolved "https://registry.npm.taobao.org/csso/download/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" integrity sha1-6jpWE0bo3J9UbW/r7dUBh884lSk= dependencies: css-tree "^1.1.2" @@ -3083,14 +3083,14 @@ debug@^4.1.0, debug@^4.1.1: decompress-response@^3.3.0: version "3.3.0" - resolved "https://registry.npm.taobao.org/decompress-response/download/decompress-response-3.3.0.tgz?cache=0&sync_timestamp=1613125280468&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdecompress-response%2Fdownload%2Fdecompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" + resolved "https://registry.npm.taobao.org/decompress-response/download/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= dependencies: mimic-response "^1.0.0" deep-equal@^1.0.1: version "1.1.1" - resolved "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz?cache=0&sync_timestamp=1606860754950&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeep-equal%2Fdownload%2Fdeep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + resolved "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" integrity sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o= dependencies: is-arguments "^1.0.4" @@ -3102,12 +3102,12 @@ deep-equal@^1.0.1: deep-extend@^0.6.0: version "0.6.0" - resolved "https://registry.nlark.com/deep-extend/download/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + resolved "https://registry.npm.taobao.org/deep-extend/download/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha1-xPp8lUBKF6nD6Mp+FTcxK3NjMKw= deepmerge@^4.2.2: version "4.2.2" - resolved "https://registry.nlark.com/deepmerge/download/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + resolved "https://registry.npm.taobao.org/deepmerge/download/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha1-RNLqNnm49NT/ujPwPYZfwee/SVU= default-gateway@^6.0.3: @@ -3124,7 +3124,7 @@ defer-to-connect@^1.0.1: define-lazy-prop@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/define-lazy-prop/download/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + resolved "https://registry.npm.taobao.org/define-lazy-prop/download/define-lazy-prop-2.0.0.tgz?cache=0&sync_timestamp=1618387627365&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdefine-lazy-prop%2Fdownload%2Fdefine-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha1-P3rkIRKbyqrJvHSQXJigAJ7J7n8= define-properties@^1.1.3: @@ -3141,7 +3141,7 @@ defined@^1.0.0: del@^6.0.0: version "6.0.0" - resolved "https://registry.npm.taobao.org/del/download/del-6.0.0.tgz?cache=0&sync_timestamp=1618321540358&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdel%2Fdownload%2Fdel-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" + resolved "https://registry.npm.taobao.org/del/download/del-6.0.0.tgz?cache=0&sync_timestamp=1615984345486&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdel%2Fdownload%2Fdel-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" integrity sha1-C0DQMyzqdD8WFPgYvk/rcXcUyVI= dependencies: globby "^11.0.1" @@ -3155,24 +3155,24 @@ del@^6.0.0: depd@~1.1.2: version "1.1.2" - resolved "https://registry.nlark.com/depd/download/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + resolved "https://registry.npm.taobao.org/depd/download/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= destroy@~1.0.4: version "1.0.4" - resolved "https://registry.nlark.com/destroy/download/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + resolved "https://registry.npm.taobao.org/destroy/download/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= detab@2.0.4: version "2.0.4" - resolved "https://registry.nlark.com/detab/download/detab-2.0.4.tgz?cache=0&sync_timestamp=1629724300992&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdetab%2Fdownload%2Fdetab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43" + resolved "https://registry.nlark.com/detab/download/detab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43" integrity sha1-uSeJIGmv9AX7uaGG/pekSpKpS0M= dependencies: repeat-string "^1.5.4" detect-node@^2.0.4: version "2.1.0" - resolved "https://registry.nlark.com/detect-node/download/detect-node-2.1.0.tgz?cache=0&sync_timestamp=1621146902208&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdetect-node%2Fdownload%2Fdetect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + resolved "https://registry.nlark.com/detect-node/download/detect-node-2.1.0.tgz?cache=0&sync_timestamp=1621146954463&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdetect-node%2Fdownload%2Fdetect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha1-yccHdaScPQO8LAbZpzvlUPl4+LE= detect-port-alt@^1.1.6: @@ -3185,7 +3185,7 @@ detect-port-alt@^1.1.6: detect-port@^1.3.0: version "1.3.0" - resolved "https://registry.nlark.com/detect-port/download/detect-port-1.3.0.tgz#d9c40e9accadd4df5cac6a782aefd014d573d1f1" + resolved "https://registry.npm.taobao.org/detect-port/download/detect-port-1.3.0.tgz?cache=0&sync_timestamp=1615984907558&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdetect-port%2Fdownload%2Fdetect-port-1.3.0.tgz#d9c40e9accadd4df5cac6a782aefd014d573d1f1" integrity sha1-2cQOmsyt1N9crGp4Ku/QFNVz0fE= dependencies: address "^1.0.1" @@ -3202,7 +3202,7 @@ detective@^5.2.0: didyoumean@^1.2.2: version "1.2.2" - resolved "https://registry.nlark.com/didyoumean/download/didyoumean-1.2.2.tgz?cache=0&sync_timestamp=1624543452248&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdidyoumean%2Fdownload%2Fdidyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" + resolved "https://registry.nlark.com/didyoumean/download/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" integrity sha1-mJNG/+noObRVXs9WZu3qDT6K0Dc= dir-glob@^3.0.1: @@ -3219,12 +3219,12 @@ dlv@^1.1.3: dns-equal@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/dns-equal/download/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" + resolved "https://registry.nlark.com/dns-equal/download/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= dns-packet@^1.3.1: version "1.3.4" - resolved "https://registry.nlark.com/dns-packet/download/dns-packet-1.3.4.tgz?cache=0&sync_timestamp=1625480066754&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdns-packet%2Fdownload%2Fdns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" + resolved "https://registry.nlark.com/dns-packet/download/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" integrity sha1-40VQZYJKJQe6iGxVqJljuxB97G8= dependencies: ip "^1.1.0" @@ -3232,25 +3232,25 @@ dns-packet@^1.3.1: dns-txt@^2.0.2: version "2.0.2" - resolved "https://registry.nlark.com/dns-txt/download/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" + resolved "https://registry.npm.taobao.org/dns-txt/download/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= dependencies: buffer-indexof "^1.0.0" docusaurus-preset-nonepress@canary: - version "0.0.0-111" - resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-111.tgz#c0c56f353789875391c7c6c91bb86651d4e93a4a" - integrity sha512-uVQlfzpO4m1xxQk3X22oqDXz+uyw3faBjLzGYshhkGMhyC66prx2Bxlz8SdKIjeFuBjLAazcTDEPER333R8n3Q== + version "0.0.0-113" + resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-113.tgz#8ed150a551c02f52cc9dba4c97a7d97c37e20a92" + integrity sha512-2TGTjzGAwuK0WzSokf7M2792yrMIY64pAX6IJfZcuFAe2u+GOTms4b4aaJecXo9Q6DTyvhSaRqppLEo0BSILZw== dependencies: "@docusaurus/core" "2.0.0-beta.9" "@docusaurus/plugin-content-docs" "2.0.0-beta.9" "@docusaurus/plugin-content-pages" "2.0.0-beta.9" - docusaurus-theme-nonepress "0.0.0-111" + docusaurus-theme-nonepress "0.0.0-113" -docusaurus-theme-nonepress@0.0.0-111: - version "0.0.0-111" - resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-111.tgz#e0cd2633402a9b211e77341d51f89eeaff9dee3d" - integrity sha512-T1188L+nkjSAHNMt6r2QtRBW7PN2N7XIScXlY3lAuQ2kyQVcFyW8aaxxYplJeJ0nyn0n+2Bxg2TdYaubQvqA8Q== +docusaurus-theme-nonepress@0.0.0-113: + version "0.0.0-113" + resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-113.tgz#1f59c962da80e4fae395342273be01391a8c5382" + integrity sha512-qtcchxgpAvi61VklufkaqrpFdd+3xpCbsn256PRhDmbsa9+NINybmuU+OV3u6nlx0VhSpWdBN4uwPozC9Ptsgw== dependencies: "@docsearch/react" "^3.0.0-alpha.39" "@docusaurus/core" "2.0.0-beta.9" @@ -3321,12 +3321,12 @@ dom-serializer@~0.1.0: domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: version "1.3.1" - resolved "https://registry.nlark.com/domelementtype/download/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" + resolved "https://registry.npm.taobao.org/domelementtype/download/domelementtype-1.3.1.tgz?cache=0&sync_timestamp=1617298545989&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomelementtype%2Fdownload%2Fdomelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha1-0EjESzew0Qp/Kj1f7j9DM9eQSB8= domelementtype@^2.0.1, domelementtype@^2.2.0: version "2.2.0" - resolved "https://registry.nlark.com/domelementtype/download/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + resolved "https://registry.npm.taobao.org/domelementtype/download/domelementtype-2.2.0.tgz?cache=0&sync_timestamp=1617298545989&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomelementtype%2Fdownload%2Fdomelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" integrity sha1-mgtsJ4LtahxzI9QiZxg9+b2LHVc= domhandler@^2.3.0: @@ -3345,7 +3345,7 @@ domhandler@^4.0.0, domhandler@^4.2.0: domutils@1.5.1: version "1.5.1" - resolved "https://registry.nlark.com/domutils/download/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" + resolved "https://registry.nlark.com/domutils/download/domutils-1.5.1.tgz?cache=0&sync_timestamp=1630106606599&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdomutils%2Fdownload%2Fdomutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8= dependencies: dom-serializer "0" @@ -3353,7 +3353,7 @@ domutils@1.5.1: domutils@^1.5.1, domutils@^1.7.0: version "1.7.0" - resolved "https://registry.nlark.com/domutils/download/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" + resolved "https://registry.nlark.com/domutils/download/domutils-1.7.0.tgz?cache=0&sync_timestamp=1630106606599&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdomutils%2Fdownload%2Fdomutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" integrity sha1-Vuo0HoNOBuZ0ivehyyXaZ+qfjCo= dependencies: dom-serializer "0" @@ -3361,7 +3361,7 @@ domutils@^1.5.1, domutils@^1.7.0: domutils@^2.5.2, domutils@^2.6.0: version "2.8.0" - resolved "https://registry.nlark.com/domutils/download/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" + resolved "https://registry.nlark.com/domutils/download/domutils-2.8.0.tgz?cache=0&sync_timestamp=1630106606599&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdomutils%2Fdownload%2Fdomutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" integrity sha1-RDfe9dtuLR9dbuhZvZXKfQIEgTU= dependencies: dom-serializer "^1.0.1" @@ -3378,7 +3378,7 @@ dot-case@^3.0.4: dot-prop@^5.2.0: version "5.3.0" - resolved "https://registry.npm.taobao.org/dot-prop/download/dot-prop-5.3.0.tgz?cache=0&sync_timestamp=1605778245785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdot-prop%2Fdownload%2Fdot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + resolved "https://registry.npm.taobao.org/dot-prop/download/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" integrity sha1-kMzOcIzZzYLMTcjD3dmr3VWyDog= dependencies: is-obj "^2.0.0" @@ -3390,7 +3390,7 @@ duplexer3@^0.1.4: duplexer@^0.1.1, duplexer@^0.1.2: version "0.1.2" - resolved "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fduplexer%2Fdownload%2Fduplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" + resolved "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha1-Or5DrvODX4rgd9E23c4PJ2sEAOY= ee-first@1.1.1: @@ -3399,40 +3399,40 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.896: - version "1.4.8" - resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.8.tgz#e1b7752ac1a75e39b5dd90cc7e29ea08b351c484" - integrity sha512-Cu5+dbg55+1E3ohlsa8HT0s4b8D0gBewXEGG8s5wBl8ynWv60VuvYW25GpsOeTVXpulhyU/U8JYZH+yxASSJBQ== + version "1.4.10" + resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.10.tgz#5f44ae6f6725b1949d6e8d34352f80d4c1880734" + integrity sha512-tFgA40Iq2oy4k2PnZrLJowbgpij+lD6ZLxkw8Ht1NKTYyN8dvSvC5xlo8X0WW2jqhKSzITrbr5mpB4/AZ/8OUA== emoji-regex@^8.0.0: version "8.0.0" - resolved "https://registry.npmmirror.com/emoji-regex/download/emoji-regex-8.0.0.tgz?cache=0&sync_timestamp=1632751333727&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Femoji-regex%2Fdownload%2Femoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + resolved "https://registry.npmmirror.com/emoji-regex/download/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha1-6Bj9ac5cz8tARZT4QpY79TFkzDc= emojis-list@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/emojis-list/download/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + resolved "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" integrity sha1-VXBmIEatKeLpFucariYKvf9Pang= emoticon@^3.2.0: version "3.2.0" - resolved "https://registry.npmmirror.com/emoticon/download/emoticon-3.2.0.tgz?cache=0&sync_timestamp=1636290949842&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Femoticon%2Fdownload%2Femoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f" + resolved "https://registry.npmmirror.com/emoticon/download/emoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f" integrity sha1-wAjKfXYg+sdC/hv0r4/4/tFUrn8= encodeurl@~1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/encodeurl/download/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + resolved "https://registry.npm.taobao.org/encodeurl/download/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= end-of-stream@^1.1.0: version "1.4.4" - resolved "https://registry.nlark.com/end-of-stream/download/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + resolved "https://registry.npm.taobao.org/end-of-stream/download/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" integrity sha1-WuZKX0UFe682JuwU2gyl5LJDHrA= dependencies: once "^1.4.0" enhanced-resolve@^5.8.3: version "5.8.3" - resolved "https://registry.nlark.com/enhanced-resolve/download/enhanced-resolve-5.8.3.tgz?cache=0&sync_timestamp=1632130840337&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" + resolved "https://registry.nlark.com/enhanced-resolve/download/enhanced-resolve-5.8.3.tgz?cache=0&sync_timestamp=1632130769099&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" integrity sha1-bVUtRlzOBCP1s9cYUR6lOCansvA= dependencies: graceful-fs "^4.2.4" @@ -3457,7 +3457,7 @@ error-ex@^1.3.1: es-abstract@^1.17.2, es-abstract@^1.19.1: version "1.19.1" - resolved "https://registry.npmmirror.com/es-abstract/download/es-abstract-1.19.1.tgz?cache=0&sync_timestamp=1633234313248&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-abstract%2Fdownload%2Fes-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" + resolved "https://registry.npmmirror.com/es-abstract/download/es-abstract-1.19.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-abstract%2Fdownload%2Fes-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" integrity sha1-1IhXlodpFpWd547aoN9FZicRXsM= dependencies: call-bind "^1.0.2" @@ -3483,7 +3483,7 @@ es-abstract@^1.17.2, es-abstract@^1.19.1: es-module-lexer@^0.9.0: version "0.9.3" - resolved "https://registry.npmmirror.com/es-module-lexer/download/es-module-lexer-0.9.3.tgz?cache=0&sync_timestamp=1633646154044&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-module-lexer%2Fdownload%2Fes-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" + resolved "https://registry.npmmirror.com/es-module-lexer/download/es-module-lexer-0.9.3.tgz?cache=0&sync_timestamp=1633649003753&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-module-lexer%2Fdownload%2Fes-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" integrity sha1-bxPbAMw4QXE32vdDZvU1yOtDjxk= es-to-primitive@^1.2.1: @@ -3502,32 +3502,32 @@ escalade@^3.1.1: escape-goat@^2.0.0: version "2.1.1" - resolved "https://registry.npm.taobao.org/escape-goat/download/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" + resolved "https://registry.npm.taobao.org/escape-goat/download/escape-goat-2.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fescape-goat%2Fdownload%2Fescape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" integrity sha1-Gy3HcANnbEV+x2Cy3GjttkgYhnU= escape-html@^1.0.3, escape-html@~1.0.3: version "1.0.3" - resolved "https://registry.nlark.com/escape-html/download/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + resolved "https://registry.npm.taobao.org/escape-html/download/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= escape-string-regexp@^1.0.5: version "1.0.5" - resolved "https://registry.nlark.com/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + resolved "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz?cache=0&sync_timestamp=1618677243201&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fescape-string-regexp%2Fdownload%2Fescape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= escape-string-regexp@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/escape-string-regexp/download/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + resolved "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-2.0.0.tgz?cache=0&sync_timestamp=1618677243201&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fescape-string-regexp%2Fdownload%2Fescape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha1-owME6Z2qMuI7L9IPUbq9B8/8o0Q= escape-string-regexp@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/escape-string-regexp/download/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + resolved "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-4.0.0.tgz?cache=0&sync_timestamp=1618677243201&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fescape-string-regexp%2Fdownload%2Fescape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha1-FLqDpdNz49MR5a/KKc9b+tllvzQ= eslint-scope@5.1.1: version "5.1.1" - resolved "https://registry.npmmirror.com/eslint-scope/download/eslint-scope-5.1.1.tgz?cache=0&sync_timestamp=1637466913662&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Feslint-scope%2Fdownload%2Feslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + resolved "https://registry.npmmirror.com/eslint-scope/download/eslint-scope-5.1.1.tgz?cache=0&sync_timestamp=1637466929956&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Feslint-scope%2Fdownload%2Feslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha1-54blmmbLkrP2wfsNUIqrF0hI9Iw= dependencies: esrecurse "^4.3.0" @@ -3535,7 +3535,7 @@ eslint-scope@5.1.1: esprima@^4.0.0: version "4.0.1" - resolved "https://registry.nlark.com/esprima/download/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + resolved "https://registry.npm.taobao.org/esprima/download/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha1-E7BM2z5sXRnfkatph6hpVhmwqnE= esrecurse@^4.3.0: @@ -3547,17 +3547,17 @@ esrecurse@^4.3.0: estraverse@^4.1.1: version "4.3.0" - resolved "https://registry.npmmirror.com/estraverse/download/estraverse-4.3.0.tgz?cache=0&sync_timestamp=1635237716974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + resolved "https://registry.npmmirror.com/estraverse/download/estraverse-4.3.0.tgz?cache=0&sync_timestamp=1635237907922&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha1-OYrT88WiSUi+dyXoPRGn3ijNvR0= estraverse@^5.2.0: version "5.3.0" - resolved "https://registry.npmmirror.com/estraverse/download/estraverse-5.3.0.tgz?cache=0&sync_timestamp=1635237716974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + resolved "https://registry.npmmirror.com/estraverse/download/estraverse-5.3.0.tgz?cache=0&sync_timestamp=1635237907922&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" integrity sha1-LupSkHAvJquP5TcDcP+GyWXSESM= esutils@^2.0.2: version "2.0.3" - resolved "https://registry.npm.taobao.org/esutils/download/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + resolved "https://registry.nlark.com/esutils/download/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q= eta@^1.12.3: @@ -3567,34 +3567,34 @@ eta@^1.12.3: etag@~1.8.1: version "1.8.1" - resolved "https://registry.nlark.com/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + resolved "https://registry.npm.taobao.org/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= eval@^0.1.4: version "0.1.6" - resolved "https://registry.npm.taobao.org/eval/download/eval-0.1.6.tgz#9620d7d8c85515e97e6b47c5814f46ae381cb3cc" + resolved "https://registry.nlark.com/eval/download/eval-0.1.6.tgz#9620d7d8c85515e97e6b47c5814f46ae381cb3cc" integrity sha1-liDX2MhVFel+a0fFgU9Grjgcs8w= dependencies: require-like ">= 0.1.1" eventemitter3@^4.0.0: version "4.0.7" - resolved "https://registry.nlark.com/eventemitter3/download/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + resolved "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha1-Lem2j2Uo1WRO9cWVJqG0oHMGFp8= events@^1.1.1: version "1.1.1" - resolved "https://registry.npmmirror.com/events/download/events-1.1.1.tgz?cache=0&sync_timestamp=1636449286836&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fevents%2Fdownload%2Fevents-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" + resolved "https://registry.npmmirror.com/events/download/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= events@^3.2.0: version "3.3.0" - resolved "https://registry.npmmirror.com/events/download/events-3.3.0.tgz?cache=0&sync_timestamp=1636449286836&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fevents%2Fdownload%2Fevents-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + resolved "https://registry.npmmirror.com/events/download/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha1-Mala0Kkk4tLEGagTrrLE6HjqdAA= execa@^5.0.0: version "5.1.1" - resolved "https://registry.npmmirror.com/execa/download/execa-5.1.1.tgz?cache=0&sync_timestamp=1637147188673&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fexeca%2Fdownload%2Fexeca-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + resolved "https://registry.npmmirror.com/execa/download/execa-5.1.1.tgz?cache=0&sync_timestamp=1637147207309&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fexeca%2Fdownload%2Fexeca-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" integrity sha1-+ArZy/Qpj3vR1MlVXCHpN0HEEd0= dependencies: cross-spawn "^7.0.3" @@ -3609,7 +3609,7 @@ execa@^5.0.0: express@^4.17.1: version "4.17.1" - resolved "https://registry.nlark.com/express/download/express-4.17.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fexpress%2Fdownload%2Fexpress-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + resolved "https://registry.npm.taobao.org/express/download/express-4.17.1.tgz?cache=0&sync_timestamp=1615984406685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fexpress%2Fdownload%2Fexpress-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" integrity sha1-RJH8OGBc9R+GKdOcK10Cb5ikwTQ= dependencies: accepts "~1.3.7" @@ -3645,7 +3645,7 @@ express@^4.17.1: extend-shallow@^2.0.1: version "2.0.1" - resolved "https://registry.nlark.com/extend-shallow/download/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + resolved "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= dependencies: is-extendable "^0.1.0" @@ -3657,7 +3657,7 @@ extend@^3.0.0: fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" - resolved "https://registry.nlark.com/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + resolved "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU= fast-glob@^3.1.1, fast-glob@^3.2.7: @@ -3673,12 +3673,12 @@ fast-glob@^3.1.1, fast-glob@^3.2.7: fast-json-stable-stringify@^2.0.0: version "2.1.0" - resolved "https://registry.nlark.com/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + resolved "https://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM= fast-url-parser@1.1.3: version "1.1.3" - resolved "https://registry.nlark.com/fast-url-parser/download/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" + resolved "https://registry.npm.taobao.org/fast-url-parser/download/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" integrity sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0= dependencies: punycode "^1.3.2" @@ -3706,7 +3706,7 @@ feed@^4.2.2: file-loader@^6.2.0: version "6.2.0" - resolved "https://registry.nlark.com/file-loader/download/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" + resolved "https://registry.npm.taobao.org/file-loader/download/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" integrity sha1-uu98+OGEDfMl5DkLRISHlIDuvk0= dependencies: loader-utils "^2.0.0" @@ -3714,7 +3714,7 @@ file-loader@^6.2.0: filesize@^6.1.0: version "6.4.0" - resolved "https://registry.npmmirror.com/filesize/download/filesize-6.4.0.tgz?cache=0&sync_timestamp=1635763993879&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffilesize%2Fdownload%2Ffilesize-6.4.0.tgz#914f50471dd66fdca3cefe628bd0cde4ef769bcd" + resolved "https://registry.npmmirror.com/filesize/download/filesize-6.4.0.tgz#914f50471dd66fdca3cefe628bd0cde4ef769bcd" integrity sha1-kU9QRx3Wb9yjzv5ii9DN5O92m80= fill-range@^7.0.1: @@ -3726,7 +3726,7 @@ fill-range@^7.0.1: finalhandler@~1.1.2: version "1.1.2" - resolved "https://registry.nlark.com/finalhandler/download/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + resolved "https://registry.npm.taobao.org/finalhandler/download/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" integrity sha1-t+fQAP/RGTjQ/bBTUG9uur6fWH0= dependencies: debug "2.6.9" @@ -3739,7 +3739,7 @@ finalhandler@~1.1.2: find-cache-dir@^3.3.1: version "3.3.2" - resolved "https://registry.nlark.com/find-cache-dir/download/find-cache-dir-3.3.2.tgz?cache=0&sync_timestamp=1630259965392&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffind-cache-dir%2Fdownload%2Ffind-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + resolved "https://registry.nlark.com/find-cache-dir/download/find-cache-dir-3.3.2.tgz?cache=0&sync_timestamp=1630260009898&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffind-cache-dir%2Fdownload%2Ffind-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" integrity sha1-swxbbv8HMHMa6pu9nb7L2AJW1ks= dependencies: commondir "^1.0.1" @@ -3748,14 +3748,14 @@ find-cache-dir@^3.3.1: find-up@^3.0.0: version "3.0.0" - resolved "https://registry.npmmirror.com/find-up/download/find-up-3.0.0.tgz?cache=0&sync_timestamp=1633620747957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffind-up%2Fdownload%2Ffind-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + resolved "https://registry.npmmirror.com/find-up/download/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" integrity sha1-SRafHXmTQwZG2mHsxa41XCHJe3M= dependencies: locate-path "^3.0.0" find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" - resolved "https://registry.npmmirror.com/find-up/download/find-up-4.1.0.tgz?cache=0&sync_timestamp=1633620747957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffind-up%2Fdownload%2Ffind-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + resolved "https://registry.npmmirror.com/find-up/download/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" integrity sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk= dependencies: locate-path "^5.0.0" @@ -3821,12 +3821,12 @@ fs-extra@^9.0.0: fs-monkey@1.0.3: version "1.0.3" - resolved "https://registry.npm.taobao.org/fs-monkey/download/fs-monkey-1.0.3.tgz?cache=0&sync_timestamp=1617593422622&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-monkey%2Fdownload%2Ffs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" + resolved "https://registry.npm.taobao.org/fs-monkey/download/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" integrity sha1-rjrJLVO7Mo7+DpodlUH2rY1I4tM= fs.realpath@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/fs.realpath/download/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + resolved "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= fsevents@~2.3.2: @@ -3836,12 +3836,12 @@ fsevents@~2.3.2: function-bind@^1.1.1: version "1.1.1" - resolved "https://registry.nlark.com/function-bind/download/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + resolved "https://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0= gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2: version "1.0.0-beta.2" - resolved "https://registry.nlark.com/gensync/download/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + resolved "https://registry.npm.taobao.org/gensync/download/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha1-MqbudsPX9S1GsrGuXZP+qFgKJeA= get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: @@ -3855,7 +3855,7 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: get-own-enumerable-property-symbols@^3.0.0: version "3.0.2" - resolved "https://registry.npm.taobao.org/get-own-enumerable-property-symbols/download/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" + resolved "https://registry.nlark.com/get-own-enumerable-property-symbols/download/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" integrity sha1-tf3nfyLL4185C04ImSLFC85u9mQ= get-stream@^4.1.0: @@ -3887,26 +3887,26 @@ get-symbol-description@^1.0.0: github-slugger@^1.4.0: version "1.4.0" - resolved "https://registry.nlark.com/github-slugger/download/github-slugger-1.4.0.tgz?cache=0&sync_timestamp=1629817837468&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fgithub-slugger%2Fdownload%2Fgithub-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" + resolved "https://registry.nlark.com/github-slugger/download/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" integrity sha1-IG65bNsi7lb9xToo1aMCM4RjRE4= glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" - resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-5.1.2.tgz?cache=0&sync_timestamp=1632954501757&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha1-hpgyxYA0/mikCTwX3BXoNA2EAcQ= dependencies: is-glob "^4.0.1" glob-parent@^6.0.1, glob-parent@^6.0.2: version "6.0.2" - resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-6.0.2.tgz?cache=0&sync_timestamp=1632954501757&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" integrity sha1-bSN9mQg5UMeSkPJMdkKj3poo+eM= dependencies: is-glob "^4.0.3" glob-to-regexp@^0.4.1: version "0.4.1" - resolved "https://registry.nlark.com/glob-to-regexp/download/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + resolved "https://registry.npm.taobao.org/glob-to-regexp/download/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha1-x1KXCHyFG5pXi9IX3VmpL1n+VG4= glob@^7.0.0, glob@^7.1.3, glob@^7.1.6: @@ -3923,21 +3923,21 @@ glob@^7.0.0, glob@^7.1.3, glob@^7.1.6: global-dirs@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/global-dirs/download/global-dirs-3.0.0.tgz?cache=0&sync_timestamp=1610454716901&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobal-dirs%2Fdownload%2Fglobal-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" + resolved "https://registry.npm.taobao.org/global-dirs/download/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" integrity sha1-cKdv6E6jFas3sfVXbL3n1I73JoY= dependencies: ini "2.0.0" global-modules@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/global-modules/download/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" + resolved "https://registry.npm.taobao.org/global-modules/download/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" integrity sha1-mXYFrSNF8n9RU5vqJldEISFcd4A= dependencies: global-prefix "^3.0.0" global-prefix@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/global-prefix/download/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" + resolved "https://registry.npm.taobao.org/global-prefix/download/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" integrity sha1-/IX3MGTfafUEIfR/iD/luRO6m5c= dependencies: ini "^1.3.5" @@ -4010,32 +4010,32 @@ gzip-size@^6.0.0: handle-thing@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/handle-thing/download/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" + resolved "https://registry.npm.taobao.org/handle-thing/download/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" integrity sha1-hX95zjWVgMNA1DCBzGSJcNC7I04= has-bigints@^1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/has-bigints/download/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + resolved "https://registry.npm.taobao.org/has-bigints/download/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" integrity sha1-ZP5qywIGc+O3jbA1pa9pqp0HsRM= has-flag@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/has-flag/download/has-flag-3.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + resolved "https://registry.nlark.com/has-flag/download/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= has-flag@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + resolved "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s= has-symbols@^1.0.1, has-symbols@^1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.2.tgz?cache=0&sync_timestamp=1614443557459&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhas-symbols%2Fdownload%2Fhas-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + resolved "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha1-Fl0wcMADCXUqEjakeTMeOsVvFCM= has-tostringtag@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/has-tostringtag/download/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + resolved "https://registry.nlark.com/has-tostringtag/download/has-tostringtag-1.0.0.tgz?cache=0&sync_timestamp=1628196402801&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-tostringtag%2Fdownload%2Fhas-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" integrity sha1-fhM4GKfTlHNPlB5zw9P5KR5liyU= dependencies: has-symbols "^1.0.2" @@ -4047,7 +4047,7 @@ has-yarn@^2.1.0: has@^1.0.3: version "1.0.3" - resolved "https://registry.nlark.com/has/download/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + resolved "https://registry.npm.taobao.org/has/download/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" integrity sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y= dependencies: function-bind "^1.1.1" @@ -4067,7 +4067,7 @@ hast-to-hyperscript@^9.0.0: hast-util-from-parse5@^5.0.0: version "5.0.3" - resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" + resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-5.0.3.tgz?cache=0&sync_timestamp=1627032098094&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-util-from-parse5%2Fdownload%2Fhast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" integrity sha1-MIncDuLM9uyLxBaRm1GlSlieCXw= dependencies: ccount "^1.0.3" @@ -4078,7 +4078,7 @@ hast-util-from-parse5@^5.0.0: hast-util-from-parse5@^6.0.0: version "6.0.1" - resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" + resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-6.0.1.tgz?cache=0&sync_timestamp=1627032098094&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-util-from-parse5%2Fdownload%2Fhast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" integrity sha1-VU40q97qJax29b2VCh8BgOCzvCo= dependencies: "@types/parse5" "^5.0.0" @@ -4095,7 +4095,7 @@ hast-util-parse-selector@^2.0.0: hast-util-raw@6.0.1: version "6.0.1" - resolved "https://registry.npmmirror.com/hast-util-raw/download/hast-util-raw-6.0.1.tgz?cache=0&sync_timestamp=1636450214370&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhast-util-raw%2Fdownload%2Fhast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977" + resolved "https://registry.npmmirror.com/hast-util-raw/download/hast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977" integrity sha1-lzsVkwt1Kae2aYTJgUi0ZSaIWXc= dependencies: "@types/hast" "^2.0.0" @@ -4122,7 +4122,7 @@ hast-util-to-parse5@^6.0.0: hastscript@^5.0.0: version "5.1.2" - resolved "https://registry.nlark.com/hastscript/download/hastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a" + resolved "https://registry.nlark.com/hastscript/download/hastscript-5.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhastscript%2Fdownload%2Fhastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a" integrity sha1-veLC5W0Exi3SToxd8ojQUKNV+4o= dependencies: comma-separated-tokens "^1.0.0" @@ -4132,7 +4132,7 @@ hastscript@^5.0.0: hastscript@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/hastscript/download/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" + resolved "https://registry.nlark.com/hastscript/download/hastscript-6.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhastscript%2Fdownload%2Fhastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" integrity sha1-6HaNfqxWw/3qyKkoMNWOgR5b9kA= dependencies: "@types/hast" "^2.0.0" @@ -4143,7 +4143,7 @@ hastscript@^6.0.0: he@^1.2.0: version "1.2.0" - resolved "https://registry.nlark.com/he/download/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + resolved "https://registry.npm.taobao.org/he/download/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha1-hK5l+n6vsWX922FWauFLrwVmTw8= history@^4.9.0: @@ -4160,7 +4160,7 @@ history@^4.9.0: hoist-non-react-statics@^3.1.0: version "3.3.2" - resolved "https://registry.nlark.com/hoist-non-react-statics/download/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" + resolved "https://registry.npm.taobao.org/hoist-non-react-statics/download/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha1-7OCsr3HWLClpwuxZ/v9CpLGoW0U= dependencies: react-is "^16.7.0" @@ -4177,12 +4177,12 @@ hpack.js@^2.1.6: html-entities@^2.3.2: version "2.3.2" - resolved "https://registry.npm.taobao.org/html-entities/download/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" + resolved "https://registry.nlark.com/html-entities/download/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" integrity sha1-dgtARoXLHXlOT0t0QzLjsA3P5Ig= html-minifier-terser@^6.0.2: version "6.1.0" - resolved "https://registry.npmmirror.com/html-minifier-terser/download/html-minifier-terser-6.1.0.tgz?cache=0&sync_timestamp=1637572739623&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtml-minifier-terser%2Fdownload%2Fhtml-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab" + resolved "https://registry.npmmirror.com/html-minifier-terser/download/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab" integrity sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw== dependencies: camel-case "^4.1.2" @@ -4195,17 +4195,17 @@ html-minifier-terser@^6.0.2: html-tags@^3.1.0: version "3.1.0" - resolved "https://registry.nlark.com/html-tags/download/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" + resolved "https://registry.npm.taobao.org/html-tags/download/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" integrity sha1-e15vfmZen7QfMAB+2eDUHpf7IUA= html-void-elements@^1.0.0: version "1.0.5" - resolved "https://registry.nlark.com/html-void-elements/download/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483" + resolved "https://registry.npmmirror.com/html-void-elements/download/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483" integrity sha1-zpFZSU6G2V5FeVsWbCAhws/KRIM= html-webpack-plugin@^5.4.0: version "5.5.0" - resolved "https://registry.npmmirror.com/html-webpack-plugin/download/html-webpack-plugin-5.5.0.tgz?cache=0&sync_timestamp=1635212582127&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtml-webpack-plugin%2Fdownload%2Fhtml-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" + resolved "https://registry.npmmirror.com/html-webpack-plugin/download/html-webpack-plugin-5.5.0.tgz?cache=0&sync_timestamp=1635212553430&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtml-webpack-plugin%2Fdownload%2Fhtml-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" integrity sha1-w5EZNvV2gcH59Ni2jBWM2d/lL1A= dependencies: "@types/html-minifier-terser" "^6.0.0" @@ -4216,7 +4216,7 @@ html-webpack-plugin@^5.4.0: htmlparser2@^3.9.1: version "3.10.1" - resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-3.10.1.tgz?cache=0&sync_timestamp=1636640841489&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" + resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-3.10.1.tgz?cache=0&sync_timestamp=1636641539121&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" integrity sha1-vWedw/WYl7ajS7EHSchVu1OpOS8= dependencies: domelementtype "^1.3.1" @@ -4228,7 +4228,7 @@ htmlparser2@^3.9.1: htmlparser2@^6.1.0: version "6.1.0" - resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-6.1.0.tgz?cache=0&sync_timestamp=1636640841489&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" + resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-6.1.0.tgz?cache=0&sync_timestamp=1636641539121&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" integrity sha1-xNditsM3GgXb5l6UrkOp+EX7j7c= dependencies: domelementtype "^2.0.1" @@ -4248,7 +4248,7 @@ http-deceiver@^1.2.7: http-errors@1.7.2: version "1.7.2" - resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.7.2.tgz?cache=0&sync_timestamp=1636932216570&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.7.2.tgz?cache=0&sync_timestamp=1636932154238&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" integrity sha1-T1ApzxMjnzEDblsuVSkrz7zIXI8= dependencies: depd "~1.1.2" @@ -4259,7 +4259,7 @@ http-errors@1.7.2: http-errors@~1.6.2: version "1.6.3" - resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.6.3.tgz?cache=0&sync_timestamp=1636932216570&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" + resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.6.3.tgz?cache=0&sync_timestamp=1636932154238&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= dependencies: depd "~1.1.2" @@ -4269,7 +4269,7 @@ http-errors@~1.6.2: http-errors@~1.7.2: version "1.7.3" - resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.7.3.tgz?cache=0&sync_timestamp=1636932216570&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.7.3.tgz?cache=0&sync_timestamp=1636932154238&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" integrity sha1-bGGeT5xgMIw4UZSYwU+7EKrOuwY= dependencies: depd "~1.1.2" @@ -4285,7 +4285,7 @@ http-parser-js@>=0.5.1: http-proxy-middleware@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/http-proxy-middleware/download/http-proxy-middleware-2.0.1.tgz?cache=0&sync_timestamp=1625172260511&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhttp-proxy-middleware%2Fdownload%2Fhttp-proxy-middleware-2.0.1.tgz#7ef3417a479fb7666a571e09966c66a39bd2c15f" + resolved "https://registry.nlark.com/http-proxy-middleware/download/http-proxy-middleware-2.0.1.tgz#7ef3417a479fb7666a571e09966c66a39bd2c15f" integrity sha1-fvNBekeft2ZqVx4Jlmxmo5vSwV8= dependencies: "@types/http-proxy" "^1.17.5" @@ -4296,7 +4296,7 @@ http-proxy-middleware@^2.0.0: http-proxy@^1.18.1: version "1.18.1" - resolved "https://registry.npm.taobao.org/http-proxy/download/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + resolved "https://registry.nlark.com/http-proxy/download/http-proxy-1.18.1.tgz?cache=0&sync_timestamp=1618847045732&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhttp-proxy%2Fdownload%2Fhttp-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" integrity sha1-QBVB8FNIhLv5UmAzTnL4juOXZUk= dependencies: eventemitter3 "^4.0.0" @@ -4305,7 +4305,7 @@ http-proxy@^1.18.1: human-signals@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/human-signals/download/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + resolved "https://registry.nlark.com/human-signals/download/human-signals-2.1.0.tgz?cache=0&sync_timestamp=1624364695595&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhuman-signals%2Fdownload%2Fhuman-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha1-3JH8ukLk0G5Kuu0zs+ejwC9RTqA= iconv-lite@0.4.24: @@ -4317,12 +4317,12 @@ iconv-lite@0.4.24: icss-utils@^5.0.0, icss-utils@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/icss-utils/download/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + resolved "https://registry.npm.taobao.org/icss-utils/download/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" integrity sha1-xr5oWKvQE9do6YNmrkfiXViHsa4= ignore@^5.1.4: version "5.1.9" - resolved "https://registry.npmmirror.com/ignore/download/ignore-5.1.9.tgz?cache=0&sync_timestamp=1635926740448&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fignore%2Fdownload%2Fignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb" + resolved "https://registry.npmmirror.com/ignore/download/ignore-5.1.9.tgz?cache=0&sync_timestamp=1635926632542&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fignore%2Fdownload%2Fignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb" integrity sha1-nsGly+jhRG7GDUQgBg1Dqm5zgvs= immer@^9.0.6: @@ -4332,14 +4332,14 @@ immer@^9.0.6: import-cwd@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/import-cwd/download/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92" + resolved "https://registry.npm.taobao.org/import-cwd/download/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92" integrity sha1-IIRVR3GAFRJuqbNna3WS+4vUz5I= dependencies: import-from "^3.0.0" import-fresh@^3.1.0, import-fresh@^3.2.1, import-fresh@^3.2.2, import-fresh@^3.3.0: version "3.3.0" - resolved "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz?cache=0&sync_timestamp=1608469579940&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimport-fresh%2Fdownload%2Fimport-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + resolved "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha1-NxYsJfy566oublPVtNiM4X2eDCs= dependencies: parent-module "^1.0.0" @@ -4354,17 +4354,17 @@ import-from@^3.0.0: import-lazy@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/import-lazy/download/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + resolved "https://registry.nlark.com/import-lazy/download/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= imurmurhash@^0.1.4: version "0.1.4" - resolved "https://registry.nlark.com/imurmurhash/download/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + resolved "https://registry.npm.taobao.org/imurmurhash/download/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= indent-string@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/indent-string/download/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + resolved "https://registry.npm.taobao.org/indent-string/download/indent-string-4.0.0.tgz?cache=0&sync_timestamp=1618679561483&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Findent-string%2Fdownload%2Findent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha1-Yk+PRJfWGbLZdoUx1Y9BIoVNclE= inflight@^1.0.4: @@ -4387,12 +4387,12 @@ inherits@2.0.3: ini@2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/ini/download/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" + resolved "https://registry.npm.taobao.org/ini/download/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" integrity sha1-5f1Vbs3VcmvpePoQAYYurLCpS8U= ini@^1.3.5, ini@~1.3.0: version "1.3.8" - resolved "https://registry.nlark.com/ini/download/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + resolved "https://registry.npm.taobao.org/ini/download/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha1-op2kJbSIBvNHZ6Tvzjlyaa8oQyw= inline-style-parser@0.1.1: @@ -4402,7 +4402,7 @@ inline-style-parser@0.1.1: internal-slot@^1.0.3: version "1.0.3" - resolved "https://registry.nlark.com/internal-slot/download/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + resolved "https://registry.npm.taobao.org/internal-slot/download/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" integrity sha1-c0fjB97uovqsKsYgXUvH00ln9Zw= dependencies: get-intrinsic "^1.1.0" @@ -4411,12 +4411,12 @@ internal-slot@^1.0.3: interpret@^1.0.0: version "1.4.0" - resolved "https://registry.nlark.com/interpret/download/interpret-1.4.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Finterpret%2Fdownload%2Finterpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + resolved "https://registry.npm.taobao.org/interpret/download/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha1-Zlq4vE2iendKQFhOgS4+D6RbGh4= ip@^1.1.0: version "1.1.5" - resolved "https://registry.nlark.com/ip/download/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" + resolved "https://registry.npm.taobao.org/ip/download/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= ipaddr.js@1.9.1: @@ -4431,7 +4431,7 @@ ipaddr.js@^2.0.1: is-absolute-url@^3.0.3: version "3.0.3" - resolved "https://registry.nlark.com/is-absolute-url/download/is-absolute-url-3.0.3.tgz?cache=0&sync_timestamp=1628691816236&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-absolute-url%2Fdownload%2Fis-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" + resolved "https://registry.nlark.com/is-absolute-url/download/is-absolute-url-3.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-absolute-url%2Fdownload%2Fis-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" integrity sha1-lsaiK2ojkpsR6gr7GDbDatSl1pg= is-alphabetical@1.0.4, is-alphabetical@^1.0.0: @@ -4449,7 +4449,7 @@ is-alphanumerical@^1.0.0: is-arguments@^1.0.4: version "1.1.1" - resolved "https://registry.nlark.com/is-arguments/download/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + resolved "https://registry.nlark.com/is-arguments/download/is-arguments-1.1.1.tgz?cache=0&sync_timestamp=1628201919104&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-arguments%2Fdownload%2Fis-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" integrity sha1-FbP4j9oB8ql/7ITKdhpWDxI++ps= dependencies: call-bind "^1.0.2" @@ -4469,14 +4469,14 @@ is-bigint@^1.0.1: is-binary-path@~2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/is-binary-path/download/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + resolved "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" integrity sha1-6h9/O4DwZCNug0cPhsCcJU+0Wwk= dependencies: binary-extensions "^2.0.0" is-boolean-object@^1.1.0: version "1.1.2" - resolved "https://registry.nlark.com/is-boolean-object/download/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + resolved "https://registry.nlark.com/is-boolean-object/download/is-boolean-object-1.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-boolean-object%2Fdownload%2Fis-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" integrity sha1-XG3CACRt2TIa5LiFoRS7H3X2Nxk= dependencies: call-bind "^1.0.2" @@ -4484,43 +4484,43 @@ is-boolean-object@^1.1.0: is-buffer@^2.0.0: version "2.0.5" - resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.5.tgz?cache=0&sync_timestamp=1604429876103&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-buffer%2Fdownload%2Fis-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" + resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha1-68JS5ADSL/jXf6CYiIIaJKZYwZE= is-callable@^1.1.4, is-callable@^1.2.4: version "1.2.4" - resolved "https://registry.nlark.com/is-callable/download/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + resolved "https://registry.nlark.com/is-callable/download/is-callable-1.2.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-callable%2Fdownload%2Fis-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha1-RzAdWN0CWUB4ZVR4U99tYf5HGUU= is-ci@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/is-ci/download/is-ci-2.0.0.tgz?cache=0&sync_timestamp=1635261114993&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-ci%2Fdownload%2Fis-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + resolved "https://registry.npmmirror.com/is-ci/download/is-ci-2.0.0.tgz?cache=0&sync_timestamp=1635261984879&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-ci%2Fdownload%2Fis-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" integrity sha1-a8YzQYGBDgS1wis9WJ/cpVAmQEw= dependencies: ci-info "^2.0.0" is-core-module@^2.2.0: version "2.8.0" - resolved "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" + resolved "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz?cache=0&sync_timestamp=1634236731601&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-core-module%2Fdownload%2Fis-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" integrity sha1-AyEzbD0JJeSX/Zf12VyxFKXM1Ug= dependencies: has "^1.0.3" is-date-object@^1.0.1: version "1.0.5" - resolved "https://registry.nlark.com/is-date-object/download/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + resolved "https://registry.nlark.com/is-date-object/download/is-date-object-1.0.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-date-object%2Fdownload%2Fis-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" integrity sha1-CEHVU25yTCVZe/bqYuG9OCmN8x8= dependencies: has-tostringtag "^1.0.0" is-decimal@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-decimal/download/is-decimal-1.0.4.tgz?cache=0&sync_timestamp=1636008960795&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-decimal%2Fdownload%2Fis-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" + resolved "https://registry.npmmirror.com/is-decimal/download/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" integrity sha1-ZaOllYocW2OnBuGzM9fNn2MNP6U= is-docker@^2.0.0, is-docker@^2.1.1: version "2.2.1" - resolved "https://registry.nlark.com/is-docker/download/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + resolved "https://registry.nlark.com/is-docker/download/is-docker-2.2.1.tgz?cache=0&sync_timestamp=1630451108035&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-docker%2Fdownload%2Fis-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha1-M+6r4jz+hvFL3kQIoCwM+4U6zao= is-extendable@^0.1.0: @@ -4530,29 +4530,29 @@ is-extendable@^0.1.0: is-extglob@^2.1.1: version "2.1.1" - resolved "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + resolved "https://registry.nlark.com/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= is-fullwidth-code-point@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/is-fullwidth-code-point/download/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + resolved "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0= is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" - resolved "https://registry.npmmirror.com/is-glob/download/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + resolved "https://registry.npmmirror.com/is-glob/download/is-glob-4.0.3.tgz?cache=0&sync_timestamp=1632934512076&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-glob%2Fdownload%2Fis-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha1-ZPYeQsu7LuwgcanawLKLoeZdUIQ= dependencies: is-extglob "^2.1.1" is-hexadecimal@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-hexadecimal/download/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" + resolved "https://registry.npmmirror.com/is-hexadecimal/download/is-hexadecimal-1.0.4.tgz?cache=0&sync_timestamp=1636011905161&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-hexadecimal%2Fdownload%2Fis-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" integrity sha1-zDXJdYjaS9Saju3WvECC1E3LI6c= is-installed-globally@^0.4.0: version "0.4.0" - resolved "https://registry.npm.taobao.org/is-installed-globally/download/is-installed-globally-0.4.0.tgz?cache=0&sync_timestamp=1610875398433&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-installed-globally%2Fdownload%2Fis-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" + resolved "https://registry.npm.taobao.org/is-installed-globally/download/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" integrity sha1-mg/UB5ScMPhutpWe8beZTtC3tSA= dependencies: global-dirs "^3.0.0" @@ -4560,7 +4560,7 @@ is-installed-globally@^0.4.0: is-negative-zero@^2.0.1: version "2.0.1" - resolved "https://registry.nlark.com/is-negative-zero/download/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" + resolved "https://registry.npm.taobao.org/is-negative-zero/download/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" integrity sha1-PedGwY3aIxkkGlNnWQjY92bxHCQ= is-npm@^5.0.0: @@ -4582,12 +4582,12 @@ is-number@^7.0.0: is-obj@^1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/is-obj/download/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + resolved "https://registry.npm.taobao.org/is-obj/download/is-obj-1.0.1.tgz?cache=0&sync_timestamp=1618600919478&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-obj%2Fdownload%2Fis-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= is-obj@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/is-obj/download/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + resolved "https://registry.npm.taobao.org/is-obj/download/is-obj-2.0.0.tgz?cache=0&sync_timestamp=1618600919478&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-obj%2Fdownload%2Fis-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha1-Rz+wXZc3BeP9liBUUBjKjiLvSYI= is-path-cwd@^2.2.0: @@ -4602,12 +4602,12 @@ is-path-inside@^3.0.2: is-plain-obj@^2.0.0: version "2.1.0" - resolved "https://registry.nlark.com/is-plain-obj/download/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" + resolved "https://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" integrity sha1-ReQuN/zPH0Dajl927iFRWEDAkoc= is-plain-obj@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/is-plain-obj/download/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" + resolved "https://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" integrity sha1-r28uoUrFpkYYOlu9tbqrvBVq2dc= is-plain-object@^2.0.4: @@ -4619,7 +4619,7 @@ is-plain-object@^2.0.4: is-regex@^1.0.4, is-regex@^1.1.4: version "1.1.4" - resolved "https://registry.nlark.com/is-regex/download/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + resolved "https://registry.nlark.com/is-regex/download/is-regex-1.1.4.tgz?cache=0&sync_timestamp=1628221853554&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-regex%2Fdownload%2Fis-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" integrity sha1-7vVmPNWfpMCuM5UFMj32hUuxWVg= dependencies: call-bind "^1.0.2" @@ -4627,7 +4627,7 @@ is-regex@^1.0.4, is-regex@^1.1.4: is-regexp@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/is-regexp/download/is-regexp-1.0.0.tgz?cache=0&sync_timestamp=1617816768041&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-regexp%2Fdownload%2Fis-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" + resolved "https://registry.nlark.com/is-regexp/download/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= is-resolvable@^1.1.0: @@ -4637,7 +4637,7 @@ is-resolvable@^1.1.0: is-root@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/is-root/download/is-root-2.1.0.tgz?cache=0&sync_timestamp=1617783382597&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-root%2Fdownload%2Fis-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" + resolved "https://registry.npm.taobao.org/is-root/download/is-root-2.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-root%2Fdownload%2Fis-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" integrity sha1-gJ4YEpzxEpZEMCpPhUQDXVGYSpw= is-shared-array-buffer@^1.0.1: @@ -4659,7 +4659,7 @@ is-string@^1.0.5, is-string@^1.0.7: is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" - resolved "https://registry.nlark.com/is-symbol/download/is-symbol-1.0.4.tgz?cache=0&sync_timestamp=1620501182675&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-symbol%2Fdownload%2Fis-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + resolved "https://registry.nlark.com/is-symbol/download/is-symbol-1.0.4.tgz?cache=0&sync_timestamp=1620501174327&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-symbol%2Fdownload%2Fis-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" integrity sha1-ptrJO2NbBjymhyI23oiRClevE5w= dependencies: has-symbols "^1.0.2" @@ -4678,44 +4678,44 @@ is-weakref@^1.0.1: is-whitespace-character@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-whitespace-character/download/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7" + resolved "https://registry.npmmirror.com/is-whitespace-character/download/is-whitespace-character-1.0.4.tgz?cache=0&sync_timestamp=1636008961129&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-whitespace-character%2Fdownload%2Fis-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7" integrity sha1-CFjt2UqVWUx8ndC1wXTsbkXuSqc= is-word-character@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-word-character/download/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230" + resolved "https://registry.npmmirror.com/is-word-character/download/is-word-character-1.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-word-character%2Fdownload%2Fis-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230" integrity sha1-zg5zIW+YWZBgWS9i/zE1TdvrAjA= is-wsl@^2.1.1, is-wsl@^2.2.0: version "2.2.0" - resolved "https://registry.npm.taobao.org/is-wsl/download/is-wsl-2.2.0.tgz?cache=0&sync_timestamp=1592843177178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-wsl%2Fdownload%2Fis-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + resolved "https://registry.npm.taobao.org/is-wsl/download/is-wsl-2.2.0.tgz?cache=0&sync_timestamp=1615984417335&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-wsl%2Fdownload%2Fis-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" integrity sha1-dKTHbnfKn9P5MvKQwX6jJs0VcnE= dependencies: is-docker "^2.0.0" is-yarn-global@^0.3.0: version "0.3.0" - resolved "https://registry.nlark.com/is-yarn-global/download/is-yarn-global-0.3.0.tgz?cache=0&sync_timestamp=1619356824740&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-yarn-global%2Fdownload%2Fis-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" + resolved "https://registry.nlark.com/is-yarn-global/download/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" integrity sha1-1QLTOCWQ6jAEiTdGdUyJE5lz4jI= isarray@0.0.1: version "0.0.1" - resolved "https://registry.nlark.com/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + resolved "https://registry.npm.taobao.org/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= isarray@~1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + resolved "https://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= isexe@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + resolved "https://registry.nlark.com/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= isobject@^3.0.1: version "3.0.1" - resolved "https://registry.nlark.com/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + resolved "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= jest-worker@^27.0.2, jest-worker@^27.0.6: @@ -4740,12 +4740,12 @@ joi@^17.4.0, joi@^17.4.2: "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/js-tokens/download/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + resolved "https://registry.nlark.com/js-tokens/download/js-tokens-4.0.0.tgz?cache=0&sync_timestamp=1619345098261&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-tokens%2Fdownload%2Fjs-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha1-GSA/tZmR35jjoocFDUZHzerzJJk= js-yaml@^3.13.1: version "3.14.1" - resolved "https://registry.nlark.com/js-yaml/download/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + resolved "https://registry.npm.taobao.org/js-yaml/download/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha1-2ugS/bOCX6MGYJqHFzg8UMNqBTc= dependencies: argparse "^1.0.7" @@ -4753,19 +4753,19 @@ js-yaml@^3.13.1: js-yaml@^4.0.0: version "4.1.0" - resolved "https://registry.nlark.com/js-yaml/download/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + resolved "https://registry.npm.taobao.org/js-yaml/download/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" integrity sha1-wftl+PUBeQHN0slRhkuhhFihBgI= dependencies: argparse "^2.0.1" jsesc@^2.5.1: version "2.5.2" - resolved "https://registry.nlark.com/jsesc/download/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + resolved "https://registry.npm.taobao.org/jsesc/download/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha1-gFZNLkg9rPbo7yCWUKZ98/DCg6Q= jsesc@~0.5.0: version "0.5.0" - resolved "https://registry.nlark.com/jsesc/download/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + resolved "https://registry.npm.taobao.org/jsesc/download/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= json-buffer@3.0.0: @@ -4775,7 +4775,7 @@ json-buffer@3.0.0: json-parse-better-errors@^1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/json-parse-better-errors/download/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + resolved "https://registry.npm.taobao.org/json-parse-better-errors/download/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk= json-parse-even-better-errors@^2.3.0: @@ -4809,7 +4809,7 @@ json5@^2.1.2: jsonfile@^6.0.1: version "6.1.0" - resolved "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + resolved "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" integrity sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4= dependencies: universalify "^2.0.0" @@ -4825,34 +4825,34 @@ keyv@^3.0.0: kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.3" - resolved "https://registry.nlark.com/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + resolved "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0= kleur@^3.0.3: version "3.0.3" - resolved "https://registry.nlark.com/kleur/download/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" + resolved "https://registry.npm.taobao.org/kleur/download/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha1-p5yezIbuHOP6YgbRIWxQHxR/wH4= klona@^2.0.5: version "2.0.5" - resolved "https://registry.npmmirror.com/klona/download/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" + resolved "https://registry.npmmirror.com/klona/download/klona-2.0.5.tgz?cache=0&sync_timestamp=1635386077088&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fklona%2Fdownload%2Fklona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" integrity sha1-0WZXTZAHY5XZljqnqSj6u412r7w= latest-version@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/latest-version/download/latest-version-5.1.0.tgz?cache=0&sync_timestamp=1626951682795&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flatest-version%2Fdownload%2Flatest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + resolved "https://registry.nlark.com/latest-version/download/latest-version-5.1.0.tgz?cache=0&sync_timestamp=1626951703884&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flatest-version%2Fdownload%2Flatest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" integrity sha1-EZ3+kI/jjRXfpD7NE/oS7Igy+s4= dependencies: package-json "^6.3.0" leven@^3.1.0: version "3.1.0" - resolved "https://registry.nlark.com/leven/download/leven-3.1.0.tgz?cache=0&sync_timestamp=1628597917913&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fleven%2Fdownload%2Fleven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + resolved "https://registry.nlark.com/leven/download/leven-3.1.0.tgz?cache=0&sync_timestamp=1628597847220&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fleven%2Fdownload%2Fleven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" integrity sha1-d4kd6DQGTMy6gq54QrtrFKE+1/I= lilconfig@^2.0.3: version "2.0.4" - resolved "https://registry.npmmirror.com/lilconfig/download/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" + resolved "https://registry.npmmirror.com/lilconfig/download/lilconfig-2.0.4.tgz?cache=0&sync_timestamp=1636150747257&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flilconfig%2Fdownload%2Flilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" integrity sha1-9FB9BD1wWLOAtqj1y3vNSzTO4II= lines-and-columns@^1.1.6: @@ -4862,12 +4862,12 @@ lines-and-columns@^1.1.6: loader-runner@^4.2.0: version "4.2.0" - resolved "https://registry.nlark.com/loader-runner/download/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" + resolved "https://registry.npm.taobao.org/loader-runner/download/loader-runner-4.2.0.tgz?cache=0&sync_timestamp=1610027852811&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floader-runner%2Fdownload%2Floader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" integrity sha1-1wIjgNZtFMX7HUlriYZOvP1Hg4Q= loader-utils@^1.4.0: version "1.4.0" - resolved "https://registry.npmmirror.com/loader-utils/download/loader-utils-1.4.0.tgz?cache=0&sync_timestamp=1636687889409&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + resolved "https://registry.npmmirror.com/loader-utils/download/loader-utils-1.4.0.tgz?cache=0&sync_timestamp=1636687952505&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" integrity sha1-xXm140yzSxp07cbB+za/o3HVphM= dependencies: big.js "^5.2.2" @@ -4876,7 +4876,7 @@ loader-utils@^1.4.0: loader-utils@^2.0.0: version "2.0.2" - resolved "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz?cache=0&sync_timestamp=1636687889409&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" + resolved "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz?cache=0&sync_timestamp=1636687952505&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" integrity sha1-1uO0+4GHByGuTghoqxHdY4NowSk= dependencies: big.js "^5.2.2" @@ -4885,7 +4885,7 @@ loader-utils@^2.0.0: locate-path@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/locate-path/download/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + resolved "https://registry.nlark.com/locate-path/download/locate-path-3.0.0.tgz?cache=0&sync_timestamp=1629895618224&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flocate-path%2Fdownload%2Flocate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" integrity sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4= dependencies: p-locate "^3.0.0" @@ -4893,7 +4893,7 @@ locate-path@^3.0.0: locate-path@^5.0.0: version "5.0.0" - resolved "https://registry.nlark.com/locate-path/download/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + resolved "https://registry.nlark.com/locate-path/download/locate-path-5.0.0.tgz?cache=0&sync_timestamp=1629895618224&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flocate-path%2Fdownload%2Flocate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" integrity sha1-Gvujlq/WdqbUJQTQpno6frn2KqA= dependencies: p-locate "^4.1.0" @@ -4910,12 +4910,12 @@ lodash.bind@^4.1.4: lodash.castarray@^4.4.0: version "4.4.0" - resolved "https://registry.npm.taobao.org/lodash.castarray/download/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" + resolved "https://registry.nlark.com/lodash.castarray/download/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU= lodash.debounce@^4.0.8: version "4.0.8" - resolved "https://registry.nlark.com/lodash.debounce/download/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + resolved "https://registry.npm.taobao.org/lodash.debounce/download/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= lodash.defaults@^4.0.1: @@ -4925,12 +4925,12 @@ lodash.defaults@^4.0.1: lodash.filter@^4.4.0: version "4.6.0" - resolved "https://registry.npm.taobao.org/lodash.filter/download/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" + resolved "https://registry.nlark.com/lodash.filter/download/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4= lodash.flatten@^4.2.0: version "4.4.0" - resolved "https://registry.npm.taobao.org/lodash.flatten/download/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" + resolved "https://registry.nlark.com/lodash.flatten/download/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= lodash.foreach@^4.3.0: @@ -4950,7 +4950,7 @@ lodash.map@^4.4.0: lodash.memoize@^4.1.2: version "4.1.2" - resolved "https://registry.nlark.com/lodash.memoize/download/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + resolved "https://registry.npm.taobao.org/lodash.memoize/download/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= lodash.merge@^4.4.0, lodash.merge@^4.6.2: @@ -4985,36 +4985,36 @@ lodash.uniq@4.5.0, lodash.uniq@^4.5.0: lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" - resolved "https://registry.nlark.com/lodash/download/lodash-4.17.21.tgz?cache=0&sync_timestamp=1618847150612&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flodash%2Fdownload%2Flodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + resolved "https://registry.npm.taobao.org/lodash/download/lodash-4.17.21.tgz?cache=0&sync_timestamp=1615982514995&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw= loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" - resolved "https://registry.nlark.com/loose-envify/download/loose-envify-1.4.0.tgz?cache=0&sync_timestamp=1627566748051&other_urls=https%3A%2F%2Fregistry.nlark.com%2Floose-envify%2Fdownload%2Floose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + resolved "https://registry.nlark.com/loose-envify/download/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8= dependencies: js-tokens "^3.0.0 || ^4.0.0" lower-case@^2.0.2: version "2.0.2" - resolved "https://registry.npm.taobao.org/lower-case/download/lower-case-2.0.2.tgz?cache=0&sync_timestamp=1606867514181&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flower-case%2Fdownload%2Flower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" + resolved "https://registry.npm.taobao.org/lower-case/download/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" integrity sha1-b6I3xj29xKgsoP2ILkci3F5jTig= dependencies: tslib "^2.0.3" lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-1.0.1.tgz?cache=0&sync_timestamp=1634552902598&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flowercase-keys%2Fdownload%2Flowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" integrity sha1-b54wtHCE2XGnyCD/FabFFnt0wm8= lowercase-keys@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-2.0.0.tgz?cache=0&sync_timestamp=1634552902598&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flowercase-keys%2Fdownload%2Flowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha1-JgPni3tLAAbLyi+8yKMgJVislHk= lru-cache@^6.0.0: version "6.0.0" - resolved "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + resolved "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz?cache=0&sync_timestamp=1615982572805&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flru-cache%2Fdownload%2Flru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" integrity sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ= dependencies: yallist "^4.0.0" @@ -5028,14 +5028,14 @@ magic-string@^0.25.3: make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" - resolved "https://registry.nlark.com/make-dir/download/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + resolved "https://registry.npm.taobao.org/make-dir/download/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha1-QV6WcEazp/HRhSd9hKpYIDcmoT8= dependencies: semver "^6.0.0" markdown-escapes@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/markdown-escapes/download/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" + resolved "https://registry.npmmirror.com/markdown-escapes/download/markdown-escapes-1.0.4.tgz?cache=0&sync_timestamp=1635887464232&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmarkdown-escapes%2Fdownload%2Fmarkdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" integrity sha1-yVQV70UUmddgK5EJXzyOiXX3hTU= mdast-squeeze-paragraphs@^4.0.0: @@ -5054,7 +5054,7 @@ mdast-util-definitions@^4.0.0: mdast-util-to-hast@10.0.1: version "10.0.1" - resolved "https://registry.npmmirror.com/mdast-util-to-hast/download/mdast-util-to-hast-10.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmdast-util-to-hast%2Fdownload%2Fmdast-util-to-hast-10.0.1.tgz#0cfc82089494c52d46eb0e3edb7a4eb2aea021eb" + resolved "https://registry.npmmirror.com/mdast-util-to-hast/download/mdast-util-to-hast-10.0.1.tgz#0cfc82089494c52d46eb0e3edb7a4eb2aea021eb" integrity sha1-DPyCCJSUxS1G6w4+23pOsq6gIes= dependencies: "@types/mdast" "^3.0.0" @@ -5068,7 +5068,7 @@ mdast-util-to-hast@10.0.1: mdast-util-to-string@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/mdast-util-to-string/download/mdast-util-to-string-2.0.0.tgz?cache=0&sync_timestamp=1619426190900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-util-to-string%2Fdownload%2Fmdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" + resolved "https://registry.nlark.com/mdast-util-to-string/download/mdast-util-to-string-2.0.0.tgz?cache=0&sync_timestamp=1619426294961&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-util-to-string%2Fdownload%2Fmdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" integrity sha1-uM/mpxPhCRy1tyj8SIhaR2f4uXs= mdn-data@2.0.14: @@ -5088,7 +5088,7 @@ mdurl@^1.0.0: media-typer@0.3.0: version "0.3.0" - resolved "https://registry.nlark.com/media-typer/download/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + resolved "https://registry.npm.taobao.org/media-typer/download/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= memfs@^3.1.2, memfs@^3.2.2: @@ -5100,12 +5100,12 @@ memfs@^3.1.2, memfs@^3.2.2: merge-descriptors@1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/merge-descriptors/download/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + resolved "https://registry.npm.taobao.org/merge-descriptors/download/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= merge-stream@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/merge-stream/download/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + resolved "https://registry.npm.taobao.org/merge-stream/download/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha1-UoI2KaFN0AyXcPtq1H3GMQ8sH2A= merge2@^1.3.0: @@ -5115,12 +5115,12 @@ merge2@^1.3.0: methods@~1.1.2: version "1.1.2" - resolved "https://registry.nlark.com/methods/download/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + resolved "https://registry.npm.taobao.org/methods/download/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= micromatch@^4.0.2, micromatch@^4.0.4: version "4.0.4" - resolved "https://registry.nlark.com/micromatch/download/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + resolved "https://registry.npm.taobao.org/micromatch/download/micromatch-4.0.4.tgz?cache=0&sync_timestamp=1618054787196&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmicromatch%2Fdownload%2Fmicromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" integrity sha1-iW1Rnf6dsl/OlM63pQCRm/iB6/k= dependencies: braces "^3.0.1" @@ -5128,24 +5128,24 @@ micromatch@^4.0.2, micromatch@^4.0.4: mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": version "1.51.0" - resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.51.0.tgz?cache=0&sync_timestamp=1636425932298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.51.0.tgz?cache=0&sync_timestamp=1636425960744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== mime-db@~1.33.0: version "1.33.0" - resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.33.0.tgz?cache=0&sync_timestamp=1636425932298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" + resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.33.0.tgz?cache=0&sync_timestamp=1636425960744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" integrity sha1-o0kgUKXLm2NFBUHjnZeI0icng9s= mime-types@2.1.18: version "2.1.18" - resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.18.tgz?cache=0&sync_timestamp=1636432275511&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" + resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.18.tgz?cache=0&sync_timestamp=1636432342687&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" integrity sha1-bzI/YKg9ERRvgx/xH9ZuL+VQO7g= dependencies: mime-db "~1.33.0" mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24: version "2.1.34" - resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.34.tgz?cache=0&sync_timestamp=1636432275511&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" + resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.34.tgz?cache=0&sync_timestamp=1636432342687&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== dependencies: mime-db "1.51.0" @@ -5157,7 +5157,7 @@ mime@1.6.0: mimic-fn@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/mimic-fn/download/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + resolved "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs= mimic-response@^1.0.0, mimic-response@^1.0.1: @@ -5167,7 +5167,7 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: mini-create-react-context@^0.4.0: version "0.4.1" - resolved "https://registry.nlark.com/mini-create-react-context/download/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" + resolved "https://registry.npm.taobao.org/mini-create-react-context/download/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" integrity sha1-ByFxVhv9ySLaCKYMIZekl8wtHV4= dependencies: "@babel/runtime" "^7.12.1" @@ -5175,7 +5175,7 @@ mini-create-react-context@^0.4.0: mini-css-extract-plugin@^1.6.0: version "1.6.2" - resolved "https://registry.npmmirror.com/mini-css-extract-plugin/download/mini-css-extract-plugin-1.6.2.tgz?cache=0&sync_timestamp=1637170529830&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" + resolved "https://registry.npmmirror.com/mini-css-extract-plugin/download/mini-css-extract-plugin-1.6.2.tgz?cache=0&sync_timestamp=1637170561761&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" integrity sha1-gxcrT9gS+PxKCdb20W+ST1OZDKg= dependencies: loader-utils "^2.0.0" @@ -5184,7 +5184,7 @@ mini-css-extract-plugin@^1.6.0: minimalistic-assert@^1.0.0: version "1.0.1" - resolved "https://registry.nlark.com/minimalistic-assert/download/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" + resolved "https://registry.npm.taobao.org/minimalistic-assert/download/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha1-LhlN4ERibUoQ5/f7wAznPoPk1cc= minimatch@3.0.4, minimatch@^3.0.4: @@ -5238,7 +5238,7 @@ multicast-dns-service-types@^1.1.0: multicast-dns@^6.0.1: version "6.2.3" - resolved "https://registry.npmmirror.com/multicast-dns/download/multicast-dns-6.2.3.tgz?cache=0&sync_timestamp=1633354862495&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmulticast-dns%2Fdownload%2Fmulticast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" + resolved "https://registry.npmmirror.com/multicast-dns/download/multicast-dns-6.2.3.tgz?cache=0&sync_timestamp=1633354925402&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmulticast-dns%2Fdownload%2Fmulticast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" integrity sha1-oOx72QVcQoL3kMPIL04o2zsxsik= dependencies: dns-packet "^1.3.1" @@ -5261,7 +5261,7 @@ neo-async@^2.6.2: no-case@^3.0.4: version "3.0.4" - resolved "https://registry.nlark.com/no-case/download/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" + resolved "https://registry.npm.taobao.org/no-case/download/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" integrity sha1-02H9XJgA9VhVGoNp/A3NRmK2Ek0= dependencies: lower-case "^2.0.2" @@ -5269,39 +5269,39 @@ no-case@^3.0.4: node-emoji@^1.10.0: version "1.11.0" - resolved "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz?cache=0&sync_timestamp=1628672555671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-emoji%2Fdownload%2Fnode-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" + resolved "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" integrity sha1-aaAVDmlG4vEV6dfqTfeXHiYoMBw= dependencies: lodash "^4.17.21" node-forge@^0.10.0: version "0.10.0" - resolved "https://registry.npm.taobao.org/node-forge/download/node-forge-0.10.0.tgz?cache=0&sync_timestamp=1599010726129&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-forge%2Fdownload%2Fnode-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" + resolved "https://registry.nlark.com/node-forge/download/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha1-Mt6ir7Ppkm8C7lzoeUkCaRpna/M= node-releases@^2.0.1: version "2.0.1" - resolved "https://registry.npmmirror.com/node-releases/download/node-releases-2.0.1.tgz?cache=0&sync_timestamp=1634806914912&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnode-releases%2Fdownload%2Fnode-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" + resolved "https://registry.npmmirror.com/node-releases/download/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" integrity sha1-PR05XyBPHy8ppUNYuftnh2WtL8U= normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/normalize-path/download/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + resolved "https://registry.nlark.com/normalize-path/download/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU= normalize-range@^0.1.2: version "0.1.2" - resolved "https://registry.nlark.com/normalize-range/download/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" + resolved "https://registry.npm.taobao.org/normalize-range/download/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= normalize-url@^4.1.0: version "4.5.1" - resolved "https://registry.nlark.com/normalize-url/download/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + resolved "https://registry.nlark.com/normalize-url/download/normalize-url-4.5.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnormalize-url%2Fdownload%2Fnormalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" integrity sha1-DdkM8SiO4dExO4cIHJpZMu5IUYo= normalize-url@^6.0.1: version "6.1.0" - resolved "https://registry.nlark.com/normalize-url/download/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + resolved "https://registry.nlark.com/normalize-url/download/normalize-url-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnormalize-url%2Fdownload%2Fnormalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" integrity sha1-QNCIW1Nd7/4/MUe+yHfQX+TFZoo= npm-run-path@^4.0.1: @@ -5318,14 +5318,14 @@ nprogress@^0.2.0: nth-check@^1.0.2, nth-check@~1.0.1: version "1.0.2" - resolved "https://registry.nlark.com/nth-check/download/nth-check-1.0.2.tgz?cache=0&sync_timestamp=1631793617973&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" + resolved "https://registry.nlark.com/nth-check/download/nth-check-1.0.2.tgz?cache=0&sync_timestamp=1631793807802&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" integrity sha1-sr0pXDfj3VijvwcAN2Zjuk2c8Fw= dependencies: boolbase "~1.0.0" nth-check@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/nth-check/download/nth-check-2.0.1.tgz?cache=0&sync_timestamp=1631793617973&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" + resolved "https://registry.nlark.com/nth-check/download/nth-check-2.0.1.tgz?cache=0&sync_timestamp=1631793807802&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" integrity sha1-Lv4WL1w9oGoolZ+9PbddvuqfD8I= dependencies: boolbase "^1.0.0" @@ -5342,12 +5342,12 @@ object-hash@^2.2.0: object-inspect@^1.11.0, object-inspect@^1.9.0: version "1.11.0" - resolved "https://registry.nlark.com/object-inspect/download/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" + resolved "https://registry.nlark.com/object-inspect/download/object-inspect-1.11.0.tgz?cache=0&sync_timestamp=1626120241132&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fobject-inspect%2Fdownload%2Fobject-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" integrity sha1-nc6xRs7dQUig2eUauI00z1CZIrE= object-is@^1.0.1: version "1.1.5" - resolved "https://registry.nlark.com/object-is/download/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + resolved "https://registry.npm.taobao.org/object-is/download/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" integrity sha1-ud7qpfx/GEag+uzc7sE45XePU6w= dependencies: call-bind "^1.0.2" @@ -5355,7 +5355,7 @@ object-is@^1.0.1: object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" - resolved "https://registry.nlark.com/object-keys/download/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + resolved "https://registry.npm.taobao.org/object-keys/download/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha1-HEfyct8nfzsdrwYWd9nILiMixg4= object.assign@^4.1.0, object.assign@^4.1.2: @@ -5370,7 +5370,7 @@ object.assign@^4.1.0, object.assign@^4.1.2: object.getownpropertydescriptors@^2.1.0: version "2.1.3" - resolved "https://registry.npmmirror.com/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.1.3.tgz?cache=0&sync_timestamp=1633321822200&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" + resolved "https://registry.npmmirror.com/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.1.3.tgz?cache=0&sync_timestamp=1633321729644&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" integrity sha1-siPPOOF/77l6Y8EMkd9yzLOG354= dependencies: call-bind "^1.0.2" @@ -5379,7 +5379,7 @@ object.getownpropertydescriptors@^2.1.0: object.values@^1.1.0: version "1.1.5" - resolved "https://registry.npmmirror.com/object.values/download/object.values-1.1.5.tgz?cache=0&sync_timestamp=1633326898457&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.values%2Fdownload%2Fobject.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" + resolved "https://registry.npmmirror.com/object.values/download/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" integrity sha1-lZ9j486e8QhyAzMIITHkpFm3Fqw= dependencies: call-bind "^1.0.2" @@ -5388,7 +5388,7 @@ object.values@^1.1.0: obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" - resolved "https://registry.npm.taobao.org/obuf/download/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" + resolved "https://registry.nlark.com/obuf/download/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha1-Cb6jND1BhZ69RGKS0RydTbYZCE4= on-finished@~2.3.0: @@ -5412,7 +5412,7 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: onetime@^5.1.2: version "5.1.2" - resolved "https://registry.nlark.com/onetime/download/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + resolved "https://registry.npm.taobao.org/onetime/download/onetime-5.1.2.tgz?cache=0&sync_timestamp=1617889724435&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fonetime%2Fdownload%2Fonetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha1-0Oluu1awdHbfHdnEgG5SN5hcpF4= dependencies: mimic-fn "^2.1.0" @@ -5441,12 +5441,12 @@ opener@^1.5.2: p-cancelable@^1.0.0: version "1.1.0" - resolved "https://registry.nlark.com/p-cancelable/download/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" + resolved "https://registry.nlark.com/p-cancelable/download/p-cancelable-1.1.0.tgz?cache=0&sync_timestamp=1622467988667&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-cancelable%2Fdownload%2Fp-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" integrity sha1-0HjRWjr0CSIMiG8dmgyi5EGrJsw= p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" - resolved "https://registry.nlark.com/p-limit/download/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + resolved "https://registry.nlark.com/p-limit/download/p-limit-2.3.0.tgz?cache=0&sync_timestamp=1628812721654&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-limit%2Fdownload%2Fp-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" integrity sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE= dependencies: p-try "^2.0.0" @@ -5467,14 +5467,14 @@ p-locate@^4.1.0: p-map@^4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/p-map/download/p-map-4.0.0.tgz?cache=0&sync_timestamp=1635931861684&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-map%2Fdownload%2Fp-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + resolved "https://registry.npmmirror.com/p-map/download/p-map-4.0.0.tgz?cache=0&sync_timestamp=1635931906744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-map%2Fdownload%2Fp-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" integrity sha1-uy+Vpe2i7BaOySdOBqdHw+KQTSs= dependencies: aggregate-error "^3.0.0" p-retry@^4.5.0: version "4.6.1" - resolved "https://registry.npmmirror.com/p-retry/download/p-retry-4.6.1.tgz?cache=0&sync_timestamp=1635967027504&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-retry%2Fdownload%2Fp-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" + resolved "https://registry.npmmirror.com/p-retry/download/p-retry-4.6.1.tgz?cache=0&sync_timestamp=1635967279748&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-retry%2Fdownload%2Fp-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" integrity sha1-j83dXN96Z6CRGpzy7w5d9/YCMWw= dependencies: "@types/retry" "^0.12.0" @@ -5482,12 +5482,12 @@ p-retry@^4.5.0: p-try@^2.0.0: version "2.2.0" - resolved "https://registry.npmmirror.com/p-try/download/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + resolved "https://registry.npmmirror.com/p-try/download/p-try-2.2.0.tgz?cache=0&sync_timestamp=1633364506847&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-try%2Fdownload%2Fp-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha1-yyhoVA4xPWHeWPr741zpAE1VQOY= package-json@^6.3.0: version "6.5.0" - resolved "https://registry.nlark.com/package-json/download/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" + resolved "https://registry.nlark.com/package-json/download/package-json-6.5.0.tgz?cache=0&sync_timestamp=1624549851966&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpackage-json%2Fdownload%2Fpackage-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" integrity sha1-b+7ayjXnVyWHbQsOZJdGl/7RRbA= dependencies: got "^9.6.0" @@ -5497,7 +5497,7 @@ package-json@^6.3.0: param-case@^3.0.4: version "3.0.4" - resolved "https://registry.nlark.com/param-case/download/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" + resolved "https://registry.npm.taobao.org/param-case/download/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" integrity sha1-fRf+SqEr3jTUp32RrPtiGcqtAcU= dependencies: dot-case "^3.0.4" @@ -5539,17 +5539,17 @@ parse-numeric-range@^1.2.0: parse5@^5.0.0: version "5.1.1" - resolved "https://registry.nlark.com/parse5/download/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" + resolved "https://registry.npm.taobao.org/parse5/download/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" integrity sha1-9o5OW6GFKsLK3AD0VV//bCq7YXg= parse5@^6.0.0: version "6.0.1" - resolved "https://registry.nlark.com/parse5/download/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + resolved "https://registry.npm.taobao.org/parse5/download/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha1-4aHAhcVps9wIMhGE8Zo5zCf3wws= parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" - resolved "https://registry.npm.taobao.org/parseurl/download/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + resolved "https://registry.npm.taobao.org/parseurl/download/parseurl-1.3.3.tgz?cache=0&sync_timestamp=1615984376007&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparseurl%2Fdownload%2Fparseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ= pascal-case@^3.1.2: @@ -5572,7 +5572,7 @@ path-exists@^4.0.0: path-is-absolute@^1.0.0: version "1.0.1" - resolved "https://registry.nlark.com/path-is-absolute/download/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + resolved "https://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= path-is-inside@1.0.2: @@ -5582,7 +5582,7 @@ path-is-inside@1.0.2: path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" - resolved "https://registry.nlark.com/path-key/download/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + resolved "https://registry.npm.taobao.org/path-key/download/path-key-3.1.1.tgz?cache=0&sync_timestamp=1617971632960&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpath-key%2Fdownload%2Fpath-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha1-WB9q3mWMu6ZaDTOA3ndTKVBU83U= path-parse@^1.0.6: @@ -5592,34 +5592,34 @@ path-parse@^1.0.6: path-to-regexp@0.1.7: version "0.1.7" - resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + resolved "https://registry.npmmirror.com/path-to-regexp/download/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= path-to-regexp@2.2.1: version "2.2.1" - resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" + resolved "https://registry.npmmirror.com/path-to-regexp/download/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" integrity sha1-kLYXAloWOBqHm8gqONTovesrz0U= path-to-regexp@^1.7.0: version "1.8.0" - resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" + resolved "https://registry.npmmirror.com/path-to-regexp/download/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" integrity sha1-iHs7qdhDk+h6CgufTLdWGYtTVIo= dependencies: isarray "0.0.1" path-type@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/path-type/download/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + resolved "https://registry.npm.taobao.org/path-type/download/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs= picocolors@^0.2.1: version "0.2.1" - resolved "https://registry.npmmirror.com/picocolors/download/picocolors-0.2.1.tgz?cache=0&sync_timestamp=1634093378416&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" + resolved "https://registry.npmmirror.com/picocolors/download/picocolors-0.2.1.tgz?cache=0&sync_timestamp=1634093415681&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" integrity sha1-VwZw95NkaFHRuhNZlpYqutWHhZ8= picocolors@^1.0.0: version "1.0.0" - resolved "https://registry.npmmirror.com/picocolors/download/picocolors-1.0.0.tgz?cache=0&sync_timestamp=1634093378416&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + resolved "https://registry.npmmirror.com/picocolors/download/picocolors-1.0.0.tgz?cache=0&sync_timestamp=1634093415681&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha1-y1vcdP8/UYkiNur3nWi8RFZKuBw= picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: @@ -5629,24 +5629,24 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: pify@^2.3.0: version "2.3.0" - resolved "https://registry.nlark.com/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + resolved "https://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= pify@^4.0.1: version "4.0.1" - resolved "https://registry.nlark.com/pify/download/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + resolved "https://registry.npm.taobao.org/pify/download/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE= pkg-dir@^4.1.0: version "4.2.0" - resolved "https://registry.npmmirror.com/pkg-dir/download/pkg-dir-4.2.0.tgz?cache=0&sync_timestamp=1633498133295&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-dir%2Fdownload%2Fpkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + resolved "https://registry.npmmirror.com/pkg-dir/download/pkg-dir-4.2.0.tgz?cache=0&sync_timestamp=1633498116014&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-dir%2Fdownload%2Fpkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" integrity sha1-8JkTPfft5CLoHR2ESCcO6z5CYfM= dependencies: find-up "^4.0.0" pkg-up@^3.1.0: version "3.1.0" - resolved "https://registry.npmmirror.com/pkg-up/download/pkg-up-3.1.0.tgz?cache=0&sync_timestamp=1636035118070&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-up%2Fdownload%2Fpkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" + resolved "https://registry.npmmirror.com/pkg-up/download/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" integrity sha1-EA7CNcwVDk/UJRlBJZaihRKg3vU= dependencies: find-up "^3.0.0" @@ -5662,7 +5662,7 @@ portfinder@^1.0.28: postcss-calc@^8.0.0: version "8.0.0" - resolved "https://registry.nlark.com/postcss-calc/download/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a" + resolved "https://registry.npm.taobao.org/postcss-calc/download/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a" integrity sha1-oFuHqs0TJ0Cl2wlGKjYSRT5d+Qo= dependencies: postcss-selector-parser "^6.0.2" @@ -5670,7 +5670,7 @@ postcss-calc@^8.0.0: postcss-colormin@^5.2.1: version "5.2.1" - resolved "https://registry.npmmirror.com/postcss-colormin/download/postcss-colormin-5.2.1.tgz?cache=0&sync_timestamp=1635857516973&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-colormin%2Fdownload%2Fpostcss-colormin-5.2.1.tgz#6e444a806fd3c578827dbad022762df19334414d" + resolved "https://registry.npmmirror.com/postcss-colormin/download/postcss-colormin-5.2.1.tgz#6e444a806fd3c578827dbad022762df19334414d" integrity sha1-bkRKgG/TxXiCfbrQInYt8ZM0QU0= dependencies: browserslist "^4.16.6" @@ -5680,41 +5680,41 @@ postcss-colormin@^5.2.1: postcss-convert-values@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-convert-values/download/postcss-convert-values-5.0.2.tgz?cache=0&sync_timestamp=1635857664165&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-convert-values%2Fdownload%2Fpostcss-convert-values-5.0.2.tgz#879b849dc3677c7d6bc94b6a2c1a3f0808798059" + resolved "https://registry.npmmirror.com/postcss-convert-values/download/postcss-convert-values-5.0.2.tgz#879b849dc3677c7d6bc94b6a2c1a3f0808798059" integrity sha1-h5uEncNnfH1ryUtqLBo/CAh5gFk= dependencies: postcss-value-parser "^4.1.0" postcss-discard-comments@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-comments/download/postcss-discard-comments-5.0.1.tgz?cache=0&sync_timestamp=1621449592883&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-comments%2Fdownload%2Fpostcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" + resolved "https://registry.nlark.com/postcss-discard-comments/download/postcss-discard-comments-5.0.1.tgz?cache=0&sync_timestamp=1621449558287&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-comments%2Fdownload%2Fpostcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" integrity sha1-nq5LdHz3YNMfJEfCfwYZ1XGJAf4= postcss-discard-duplicates@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-duplicates/download/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" + resolved "https://registry.nlark.com/postcss-discard-duplicates/download/postcss-discard-duplicates-5.0.1.tgz?cache=0&sync_timestamp=1621449558296&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-duplicates%2Fdownload%2Fpostcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" integrity sha1-aPfMZFj+a6suRsn1WuUoafaA5m0= postcss-discard-empty@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-empty/download/postcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8" + resolved "https://registry.nlark.com/postcss-discard-empty/download/postcss-discard-empty-5.0.1.tgz?cache=0&sync_timestamp=1621449733074&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-empty%2Fdownload%2Fpostcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8" integrity sha1-7hNsOeJ9XS7U2g7l7QK8ip+L9tg= postcss-discard-overridden@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-overridden/download/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" + resolved "https://registry.nlark.com/postcss-discard-overridden/download/postcss-discard-overridden-5.0.1.tgz?cache=0&sync_timestamp=1621449732464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-overridden%2Fdownload%2Fpostcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" integrity sha1-RUtB9wcwC5gQmnUAXKSrD/J0OsY= postcss-discard-unused@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-unused/download/postcss-discard-unused-5.0.1.tgz#63e35a74a154912f93d4e75a1e6ff3cc146f934b" + resolved "https://registry.nlark.com/postcss-discard-unused/download/postcss-discard-unused-5.0.1.tgz?cache=0&sync_timestamp=1621449732186&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-unused%2Fdownload%2Fpostcss-discard-unused-5.0.1.tgz#63e35a74a154912f93d4e75a1e6ff3cc146f934b" integrity sha1-Y+NadKFUkS+T1OdaHm/zzBRvk0s= dependencies: postcss-selector-parser "^6.0.5" postcss-import@^14.0.2: version "14.0.2" - resolved "https://registry.nlark.com/postcss-import/download/postcss-import-14.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-import%2Fdownload%2Fpostcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1" + resolved "https://registry.nlark.com/postcss-import/download/postcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1" integrity sha1-YO/3fmvpLntn/kaex5fZQkyuGqE= dependencies: postcss-value-parser "^4.0.0" @@ -5723,7 +5723,7 @@ postcss-import@^14.0.2: postcss-js@^3.0.3: version "3.0.3" - resolved "https://registry.nlark.com/postcss-js/download/postcss-js-3.0.3.tgz#2f0bd370a2e8599d45439f6970403b5873abda33" + resolved "https://registry.npm.taobao.org/postcss-js/download/postcss-js-3.0.3.tgz#2f0bd370a2e8599d45439f6970403b5873abda33" integrity sha1-LwvTcKLoWZ1FQ59pcEA7WHOr2jM= dependencies: camelcase-css "^2.0.1" @@ -5757,7 +5757,7 @@ postcss-merge-idents@^5.0.1: postcss-merge-longhand@^5.0.4: version "5.0.4" - resolved "https://registry.npmmirror.com/postcss-merge-longhand/download/postcss-merge-longhand-5.0.4.tgz#41f4f3270282ea1a145ece078b7679f0cef21c32" + resolved "https://registry.npmmirror.com/postcss-merge-longhand/download/postcss-merge-longhand-5.0.4.tgz?cache=0&sync_timestamp=1637084835421&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-longhand%2Fdownload%2Fpostcss-merge-longhand-5.0.4.tgz#41f4f3270282ea1a145ece078b7679f0cef21c32" integrity sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw== dependencies: postcss-value-parser "^4.1.0" @@ -5765,7 +5765,7 @@ postcss-merge-longhand@^5.0.4: postcss-merge-rules@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-merge-rules/download/postcss-merge-rules-5.0.3.tgz?cache=0&sync_timestamp=1637085394901&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-rules%2Fdownload%2Fpostcss-merge-rules-5.0.3.tgz#b5cae31f53129812a77e3eb1eeee448f8cf1a1db" + resolved "https://registry.npmmirror.com/postcss-merge-rules/download/postcss-merge-rules-5.0.3.tgz?cache=0&sync_timestamp=1637085530842&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-rules%2Fdownload%2Fpostcss-merge-rules-5.0.3.tgz#b5cae31f53129812a77e3eb1eeee448f8cf1a1db" integrity sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg== dependencies: browserslist "^4.16.6" @@ -5775,7 +5775,7 @@ postcss-merge-rules@^5.0.3: postcss-minify-font-values@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-minify-font-values/download/postcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf" + resolved "https://registry.nlark.com/postcss-minify-font-values/download/postcss-minify-font-values-5.0.1.tgz?cache=0&sync_timestamp=1621449734134&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-minify-font-values%2Fdownload%2Fpostcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf" integrity sha1-qQzvv9qgdb09uqGzNYi7TcJord8= dependencies: postcss-value-parser "^4.1.0" @@ -5791,7 +5791,7 @@ postcss-minify-gradients@^5.0.3: postcss-minify-params@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-minify-params/download/postcss-minify-params-5.0.2.tgz#1b644da903473fbbb18fbe07b8e239883684b85c" + resolved "https://registry.npmmirror.com/postcss-minify-params/download/postcss-minify-params-5.0.2.tgz?cache=0&sync_timestamp=1637084835630&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-minify-params%2Fdownload%2Fpostcss-minify-params-5.0.2.tgz#1b644da903473fbbb18fbe07b8e239883684b85c" integrity sha512-qJAPuBzxO1yhLad7h2Dzk/F7n1vPyfHfCCh5grjGfjhi1ttCnq4ZXGIW77GSrEbh9Hus9Lc/e/+tB4vh3/GpDg== dependencies: alphanum-sort "^1.0.2" @@ -5801,7 +5801,7 @@ postcss-minify-params@^5.0.2: postcss-minify-selectors@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/postcss-minify-selectors/download/postcss-minify-selectors-5.1.0.tgz?cache=0&sync_timestamp=1621449593365&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-minify-selectors%2Fdownload%2Fpostcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" + resolved "https://registry.nlark.com/postcss-minify-selectors/download/postcss-minify-selectors-5.1.0.tgz?cache=0&sync_timestamp=1621449558355&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-minify-selectors%2Fdownload%2Fpostcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" integrity sha1-Q4XIRdOXn/FgKRd0Uj/6VOr9WlQ= dependencies: alphanum-sort "^1.0.2" @@ -5814,7 +5814,7 @@ postcss-modules-extract-imports@^3.0.0: postcss-modules-local-by-default@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/postcss-modules-local-by-default/download/postcss-modules-local-by-default-4.0.0.tgz?cache=0&sync_timestamp=1602587625149&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-local-by-default%2Fdownload%2Fpostcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" + resolved "https://registry.npm.taobao.org/postcss-modules-local-by-default/download/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" integrity sha1-67tU+uFZjuz99pGgKz/zs5ClpRw= dependencies: icss-utils "^5.0.0" @@ -5830,26 +5830,26 @@ postcss-modules-scope@^3.0.0: postcss-modules-values@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/postcss-modules-values/download/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + resolved "https://registry.npm.taobao.org/postcss-modules-values/download/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" integrity sha1-18Xn5ow7s8myfL9Iyguz/7RgLJw= dependencies: icss-utils "^5.0.0" postcss-nested@5.0.6: version "5.0.6" - resolved "https://registry.nlark.com/postcss-nested/download/postcss-nested-5.0.6.tgz?cache=0&sync_timestamp=1627468122159&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-nested%2Fdownload%2Fpostcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" + resolved "https://registry.nlark.com/postcss-nested/download/postcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" integrity sha1-RmND9/yNPUavPn26P81H0FKpRbw= dependencies: postcss-selector-parser "^6.0.6" postcss-normalize-charset@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-charset/download/postcss-normalize-charset-5.0.1.tgz?cache=0&sync_timestamp=1621449593655&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-charset%2Fdownload%2Fpostcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" + resolved "https://registry.nlark.com/postcss-normalize-charset/download/postcss-normalize-charset-5.0.1.tgz?cache=0&sync_timestamp=1621449558308&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-charset%2Fdownload%2Fpostcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" integrity sha1-EhVZ0b68VayNJK839nvU2p79kdA= postcss-normalize-display-values@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-display-values/download/postcss-normalize-display-values-5.0.1.tgz?cache=0&sync_timestamp=1621449599414&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-display-values%2Fdownload%2Fpostcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" + resolved "https://registry.nlark.com/postcss-normalize-display-values/download/postcss-normalize-display-values-5.0.1.tgz?cache=0&sync_timestamp=1621449652268&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-display-values%2Fdownload%2Fpostcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" integrity sha1-YmULllmBqVXf/ugzY0U9uC9q0f0= dependencies: cssnano-utils "^2.0.1" @@ -5864,7 +5864,7 @@ postcss-normalize-positions@^5.0.1: postcss-normalize-repeat-style@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-repeat-style/download/postcss-normalize-repeat-style-5.0.1.tgz?cache=0&sync_timestamp=1621449596114&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-repeat-style%2Fdownload%2Fpostcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" + resolved "https://registry.nlark.com/postcss-normalize-repeat-style/download/postcss-normalize-repeat-style-5.0.1.tgz?cache=0&sync_timestamp=1621449651580&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-repeat-style%2Fdownload%2Fpostcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" integrity sha1-y8DeE4O1f1u2Hd1qhGU7XoZlsrU= dependencies: cssnano-utils "^2.0.1" @@ -5872,14 +5872,14 @@ postcss-normalize-repeat-style@^5.0.1: postcss-normalize-string@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-string/download/postcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0" + resolved "https://registry.nlark.com/postcss-normalize-string/download/postcss-normalize-string-5.0.1.tgz?cache=0&sync_timestamp=1621449646930&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-string%2Fdownload%2Fpostcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0" integrity sha1-2er6pN94x6O5c640bvDkfFVJhbA= dependencies: postcss-value-parser "^4.1.0" postcss-normalize-timing-functions@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-timing-functions/download/postcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c" + resolved "https://registry.nlark.com/postcss-normalize-timing-functions/download/postcss-normalize-timing-functions-5.0.1.tgz?cache=0&sync_timestamp=1621449827577&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-timing-functions%2Fdownload%2Fpostcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c" integrity sha1-juQRA7kTBCnGy7pzaTK3XF4ssIw= dependencies: cssnano-utils "^2.0.1" @@ -5887,7 +5887,7 @@ postcss-normalize-timing-functions@^5.0.1: postcss-normalize-unicode@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-unicode/download/postcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37" + resolved "https://registry.nlark.com/postcss-normalize-unicode/download/postcss-normalize-unicode-5.0.1.tgz?cache=0&sync_timestamp=1621449825612&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-unicode%2Fdownload%2Fpostcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37" integrity sha1-gtZy1kikEYFKpb865WU3nM2fXjc= dependencies: browserslist "^4.16.0" @@ -5895,7 +5895,7 @@ postcss-normalize-unicode@^5.0.1: postcss-normalize-url@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-normalize-url/download/postcss-normalize-url-5.0.3.tgz#42eca6ede57fe69075fab0f88ac8e48916ef931c" + resolved "https://registry.npmmirror.com/postcss-normalize-url/download/postcss-normalize-url-5.0.3.tgz?cache=0&sync_timestamp=1637084835796&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-normalize-url%2Fdownload%2Fpostcss-normalize-url-5.0.3.tgz#42eca6ede57fe69075fab0f88ac8e48916ef931c" integrity sha512-qWiUMbvkRx3kc1Dp5opzUwc7MBWZcSDK2yofCmdvFBCpx+zFPkxBC1FASQ59Pt+flYfj/nTZSkmF56+XG5elSg== dependencies: is-absolute-url "^3.0.3" @@ -5904,14 +5904,14 @@ postcss-normalize-url@^5.0.3: postcss-normalize-whitespace@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-whitespace/download/postcss-normalize-whitespace-5.0.1.tgz?cache=0&sync_timestamp=1621449593892&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-whitespace%2Fdownload%2Fpostcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" + resolved "https://registry.nlark.com/postcss-normalize-whitespace/download/postcss-normalize-whitespace-5.0.1.tgz?cache=0&sync_timestamp=1621449646853&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-whitespace%2Fdownload%2Fpostcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" integrity sha1-sLQLW8rINYX/B+rS2vLc++7vjpo= dependencies: postcss-value-parser "^4.1.0" postcss-ordered-values@^5.0.2: version "5.0.2" - resolved "https://registry.nlark.com/postcss-ordered-values/download/postcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" + resolved "https://registry.nlark.com/postcss-ordered-values/download/postcss-ordered-values-5.0.2.tgz?cache=0&sync_timestamp=1623330460500&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-ordered-values%2Fdownload%2Fpostcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" integrity sha1-HzUUJpd74A4PdlsxZK11PayO0EQ= dependencies: cssnano-utils "^2.0.1" @@ -5919,7 +5919,7 @@ postcss-ordered-values@^5.0.2: postcss-reduce-idents@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-reduce-idents/download/postcss-reduce-idents-5.0.1.tgz#99b49ce8ee6f9c179447671cc9693e198e877bb7" + resolved "https://registry.nlark.com/postcss-reduce-idents/download/postcss-reduce-idents-5.0.1.tgz?cache=0&sync_timestamp=1621449563205&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-reduce-idents%2Fdownload%2Fpostcss-reduce-idents-5.0.1.tgz#99b49ce8ee6f9c179447671cc9693e198e877bb7" integrity sha1-mbSc6O5vnBeUR2ccyWk+GY6He7c= dependencies: postcss-value-parser "^4.1.0" @@ -5942,7 +5942,7 @@ postcss-reduce-transforms@^5.0.1: postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6: version "6.0.6" - resolved "https://registry.nlark.com/postcss-selector-parser/download/postcss-selector-parser-6.0.6.tgz?cache=0&sync_timestamp=1620752924836&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-selector-parser%2Fdownload%2Fpostcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" + resolved "https://registry.nlark.com/postcss-selector-parser/download/postcss-selector-parser-6.0.6.tgz?cache=0&sync_timestamp=1620752939806&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-selector-parser%2Fdownload%2Fpostcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" integrity sha1-LFu6gXSsL2mBq2MaQqsO5UrzMuo= dependencies: cssesc "^3.0.0" @@ -5957,7 +5957,7 @@ postcss-sort-media-queries@^4.1.0: postcss-svgo@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-svgo/download/postcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30" + resolved "https://registry.npmmirror.com/postcss-svgo/download/postcss-svgo-5.0.3.tgz?cache=0&sync_timestamp=1635857761721&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-svgo%2Fdownload%2Fpostcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30" integrity sha1-2UUYV1bl36rgf57bDTyuf/efmzA= dependencies: postcss-value-parser "^4.1.0" @@ -5965,7 +5965,7 @@ postcss-svgo@^5.0.3: postcss-unique-selectors@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-unique-selectors/download/postcss-unique-selectors-5.0.2.tgz#5d6893daf534ae52626708e0d62250890108c0c1" + resolved "https://registry.npmmirror.com/postcss-unique-selectors/download/postcss-unique-selectors-5.0.2.tgz?cache=0&sync_timestamp=1637084835538&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-unique-selectors%2Fdownload%2Fpostcss-unique-selectors-5.0.2.tgz#5d6893daf534ae52626708e0d62250890108c0c1" integrity sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA== dependencies: alphanum-sort "^1.0.2" @@ -5978,7 +5978,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^ postcss-zindex@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-zindex/download/postcss-zindex-5.0.1.tgz#c585724beb69d356af8c7e68847b28d6298ece03" + resolved "https://registry.nlark.com/postcss-zindex/download/postcss-zindex-5.0.1.tgz?cache=0&sync_timestamp=1621449734732&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-zindex%2Fdownload%2Fpostcss-zindex-5.0.1.tgz#c585724beb69d356af8c7e68847b28d6298ece03" integrity sha1-xYVyS+tp01avjH5ohHso1imOzgM= "postcss@5 - 7": @@ -6000,7 +6000,7 @@ postcss@^8.1.6, postcss@^8.2.15, postcss@^8.3.5, postcss@^8.3.7: prepend-http@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/prepend-http/download/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + resolved "https://registry.nlark.com/prepend-http/download/prepend-http-2.0.0.tgz?cache=0&sync_timestamp=1628547439455&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fprepend-http%2Fdownload%2Fprepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= prettier@^2.5.0: @@ -6028,7 +6028,7 @@ prism-react-renderer@^1.2.1: prismjs@^1.23.0: version "1.25.0" - resolved "https://registry.nlark.com/prismjs/download/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756" + resolved "https://registry.npmmirror.com/prismjs/download/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756" integrity sha1-b4It8b2tllc0sxCzFaIzFc+Zl1Y= process-nextick-args@~2.0.0: @@ -6038,7 +6038,7 @@ process-nextick-args@~2.0.0: prompts@^2.4.0, prompts@^2.4.1: version "2.4.2" - resolved "https://registry.npmmirror.com/prompts/download/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" + resolved "https://registry.npmmirror.com/prompts/download/prompts-2.4.2.tgz?cache=0&sync_timestamp=1633642560605&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fprompts%2Fdownload%2Fprompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" integrity sha1-e1fnOzpIAprRDr1E90sBcipMsGk= dependencies: kleur "^3.0.3" @@ -6046,7 +6046,7 @@ prompts@^2.4.0, prompts@^2.4.1: prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" - resolved "https://registry.nlark.com/prop-types/download/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" + resolved "https://registry.npm.taobao.org/prop-types/download/prop-types-15.7.2.tgz?cache=0&sync_timestamp=1615984425557&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fprop-types%2Fdownload%2Fprop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha1-UsQedbjIfnK52TYOAga5ncv/psU= dependencies: loose-envify "^1.4.0" @@ -6055,14 +6055,14 @@ prop-types@^15.6.2, prop-types@^15.7.2: property-information@^5.0.0, property-information@^5.3.0: version "5.6.0" - resolved "https://registry.npmmirror.com/property-information/download/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69" + resolved "https://registry.npmmirror.com/property-information/download/property-information-5.6.0.tgz?cache=0&sync_timestamp=1636733749352&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fproperty-information%2Fdownload%2Fproperty-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69" integrity sha1-YWdVRfsjAC8kXGVA7EYHfU2j7Wk= dependencies: xtend "^4.0.0" proxy-addr@~2.0.5: version "2.0.7" - resolved "https://registry.nlark.com/proxy-addr/download/proxy-addr-2.0.7.tgz?cache=0&sync_timestamp=1622509170257&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fproxy-addr%2Fdownload%2Fproxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + resolved "https://registry.nlark.com/proxy-addr/download/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" integrity sha1-8Z/mnOqzEe65S0LnDowgcPm6ECU= dependencies: forwarded "0.2.0" @@ -6070,7 +6070,7 @@ proxy-addr@~2.0.5: pump@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/pump/download/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + resolved "https://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" integrity sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ= dependencies: end-of-stream "^1.1.0" @@ -6078,17 +6078,17 @@ pump@^3.0.0: punycode@1.3.2: version "1.3.2" - resolved "https://registry.nlark.com/punycode/download/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + resolved "https://registry.npm.taobao.org/punycode/download/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= punycode@^1.3.2: version "1.4.1" - resolved "https://registry.nlark.com/punycode/download/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + resolved "https://registry.npm.taobao.org/punycode/download/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= punycode@^2.1.0: version "2.1.1" - resolved "https://registry.nlark.com/punycode/download/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + resolved "https://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha1-tYsBCsQMIsVldhbI0sLALHv0eew= pupa@^2.1.1: @@ -6100,12 +6100,12 @@ pupa@^2.1.1: q@^1.1.2: version "1.5.1" - resolved "https://registry.nlark.com/q/download/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" + resolved "https://registry.npm.taobao.org/q/download/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= qs@6.7.0: version "6.7.0" - resolved "https://registry.nlark.com/qs/download/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" + resolved "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz?cache=0&sync_timestamp=1616385315895&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqs%2Fdownload%2Fqs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha1-QdwaAV49WB8WIXdr4xr7KHapsbw= querystring@0.2.0: @@ -6115,34 +6115,34 @@ querystring@0.2.0: queue-microtask@^1.2.2: version "1.2.3" - resolved "https://registry.nlark.com/queue-microtask/download/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + resolved "https://registry.npm.taobao.org/queue-microtask/download/queue-microtask-1.2.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqueue-microtask%2Fdownload%2Fqueue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" integrity sha1-SSkii7xyTfrEPg77BYyve2z7YkM= quick-lru@^5.1.1: version "5.1.1" - resolved "https://registry.npmmirror.com/quick-lru/download/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + resolved "https://registry.npmmirror.com/quick-lru/download/quick-lru-5.1.1.tgz?cache=0&sync_timestamp=1637478663596&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fquick-lru%2Fdownload%2Fquick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" integrity sha1-NmST5rPkKjpoheLpnRj4D7eoyTI= randombytes@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/randombytes/download/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + resolved "https://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" integrity sha1-32+ENy8CcNxlzfYpE0mrekc9Tyo= dependencies: safe-buffer "^5.1.0" range-parser@1.2.0: version "1.2.0" - resolved "https://registry.nlark.com/range-parser/download/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" + resolved "https://registry.npm.taobao.org/range-parser/download/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4= range-parser@^1.2.1, range-parser@~1.2.1: version "1.2.1" - resolved "https://registry.nlark.com/range-parser/download/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + resolved "https://registry.npm.taobao.org/range-parser/download/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE= raw-body@2.4.0: version "2.4.0" - resolved "https://registry.npmmirror.com/raw-body/download/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + resolved "https://registry.npmmirror.com/raw-body/download/raw-body-2.4.0.tgz?cache=0&sync_timestamp=1637116875777&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fraw-body%2Fdownload%2Fraw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" integrity sha1-oc5vucm8NWylLoklarWQWeE9AzI= dependencies: bytes "3.1.0" @@ -6152,7 +6152,7 @@ raw-body@2.4.0: rc@^1.2.8: version "1.2.8" - resolved "https://registry.nlark.com/rc/download/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + resolved "https://registry.npm.taobao.org/rc/download/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha1-zZJL9SAKB1uDwYjNa54hG3/A0+0= dependencies: deep-extend "^0.6.0" @@ -6167,7 +6167,7 @@ react-cool-onclickoutside@^1.6.2: react-dev-utils@12.0.0-next.47: version "12.0.0-next.47" - resolved "https://registry.npmmirror.com/react-dev-utils/download/react-dev-utils-12.0.0-next.47.tgz#e55c31a05eb30cfd69ca516e8b87d61724e880fb" + resolved "https://registry.npmmirror.com/react-dev-utils/download/react-dev-utils-12.0.0-next.47.tgz?cache=0&sync_timestamp=1633373304881&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-dev-utils%2Fdownload%2Freact-dev-utils-12.0.0-next.47.tgz#e55c31a05eb30cfd69ca516e8b87d61724e880fb" integrity sha1-5VwxoF6zDP1pylFui4fWFyTogPs= dependencies: "@babel/code-frame" "^7.10.4" @@ -6206,17 +6206,17 @@ react-dom@^17.0.1: react-error-overlay@7.0.0-next.54+1465357b: version "7.0.0-next.54" - resolved "https://registry.npmmirror.com/react-error-overlay/download/react-error-overlay-7.0.0-next.54.tgz?cache=0&sync_timestamp=1633373332600&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-error-overlay%2Fdownload%2Freact-error-overlay-7.0.0-next.54.tgz#c1eb5ab86aee15e9552e6d97897b08f2bd06d140" + resolved "https://registry.npmmirror.com/react-error-overlay/download/react-error-overlay-7.0.0-next.54.tgz?cache=0&sync_timestamp=1633373304252&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-error-overlay%2Fdownload%2Freact-error-overlay-7.0.0-next.54.tgz#c1eb5ab86aee15e9552e6d97897b08f2bd06d140" integrity sha1-wetauGruFelVLm2XiXsI8r0G0UA= react-error-overlay@^6.0.9: version "6.0.9" - resolved "https://registry.npmmirror.com/react-error-overlay/download/react-error-overlay-6.0.9.tgz?cache=0&sync_timestamp=1633373332600&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-error-overlay%2Fdownload%2Freact-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a" + resolved "https://registry.npmmirror.com/react-error-overlay/download/react-error-overlay-6.0.9.tgz?cache=0&sync_timestamp=1633373304252&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-error-overlay%2Fdownload%2Freact-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a" integrity sha1-PHQwEMk1lgjDdezWvHbzXZOZWwo= react-fast-compare@^3.1.1: version "3.2.0" - resolved "https://registry.nlark.com/react-fast-compare/download/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" + resolved "https://registry.npmmirror.com/react-fast-compare/download/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" integrity sha1-ZBqdqBtqYyDycOiXJPtFoLOeQ7s= react-helmet@^6.1.0: @@ -6243,14 +6243,14 @@ react-loadable-ssr-addon-v5-slorber@^1.0.1: react-router-config@^5.1.1: version "5.1.1" - resolved "https://registry.nlark.com/react-router-config/download/react-router-config-5.1.1.tgz#0f4263d1a80c6b2dc7b9c1902c9526478194a988" + resolved "https://registry.npm.taobao.org/react-router-config/download/react-router-config-5.1.1.tgz#0f4263d1a80c6b2dc7b9c1902c9526478194a988" integrity sha1-D0Jj0agMay3HucGQLJUmR4GUqYg= dependencies: "@babel/runtime" "^7.1.2" react-router-dom@^5.2.0: version "5.3.0" - resolved "https://registry.npmmirror.com/react-router-dom/download/react-router-dom-5.3.0.tgz?cache=0&sync_timestamp=1636500332816&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-router-dom%2Fdownload%2Freact-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363" + resolved "https://registry.npmmirror.com/react-router-dom/download/react-router-dom-5.3.0.tgz?cache=0&sync_timestamp=1636499761778&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-router-dom%2Fdownload%2Freact-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363" integrity sha1-2hv7U1oOiacSqTuX3Xb0etHzI2M= dependencies: "@babel/runtime" "^7.12.13" @@ -6263,7 +6263,7 @@ react-router-dom@^5.2.0: react-router@5.2.1, react-router@^5.2.0: version "5.2.1" - resolved "https://registry.npmmirror.com/react-router/download/react-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d" + resolved "https://registry.npmmirror.com/react-router/download/react-router-5.2.1.tgz?cache=0&sync_timestamp=1636499760632&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-router%2Fdownload%2Freact-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d" integrity sha1-TS5OnVrpQlCRhFuNvG2dJ2I5d00= dependencies: "@babel/runtime" "^7.12.13" @@ -6299,7 +6299,7 @@ read-cache@^1.0.0: readable-stream@^2.0.1: version "2.3.7" - resolved "https://registry.nlark.com/readable-stream/download/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + resolved "https://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha1-Hsoc9xGu+BTAT2IlKjamL2yyO1c= dependencies: core-util-is "~1.0.0" @@ -6312,7 +6312,7 @@ readable-stream@^2.0.1: readable-stream@^3.0.6, readable-stream@^3.1.1: version "3.6.0" - resolved "https://registry.nlark.com/readable-stream/download/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + resolved "https://registry.npm.taobao.org/readable-stream/download/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha1-M3u9o63AcGvT4CRCaihtS0sskZg= dependencies: inherits "^2.0.3" @@ -6333,7 +6333,7 @@ reading-time@^1.5.0: rechoir@^0.6.2: version "0.6.2" - resolved "https://registry.nlark.com/rechoir/download/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" + resolved "https://registry.nlark.com/rechoir/download/rechoir-0.6.2.tgz?cache=0&sync_timestamp=1627101702123&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frechoir%2Fdownload%2Frechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= dependencies: resolve "^1.1.6" @@ -6347,14 +6347,14 @@ recursive-readdir@^2.2.2: regenerate-unicode-properties@^9.0.0: version "9.0.0" - resolved "https://registry.nlark.com/regenerate-unicode-properties/download/regenerate-unicode-properties-9.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerate-unicode-properties%2Fdownload%2Fregenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" + resolved "https://registry.nlark.com/regenerate-unicode-properties/download/regenerate-unicode-properties-9.0.0.tgz?cache=0&sync_timestamp=1631617161322&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerate-unicode-properties%2Fdownload%2Fregenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" integrity sha1-VNCccRXh9T3CMUqXSzLBw0Tv4yY= dependencies: regenerate "^1.4.2" regenerate@^1.4.2: version "1.4.2" - resolved "https://registry.nlark.com/regenerate/download/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" + resolved "https://registry.npm.taobao.org/regenerate/download/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha1-uTRtiCfo9aMve6KWN9OYtpAUhIo= regenerator-runtime@^0.13.4: @@ -6371,7 +6371,7 @@ regenerator-transform@^0.14.2: regexp.prototype.flags@^1.2.0: version "1.3.1" - resolved "https://registry.nlark.com/regexp.prototype.flags/download/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" + resolved "https://registry.npm.taobao.org/regexp.prototype.flags/download/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" integrity sha1-fvNSro0VnnWMDq3Kb4/LTu8HviY= dependencies: call-bind "^1.0.2" @@ -6379,7 +6379,7 @@ regexp.prototype.flags@^1.2.0: regexpu-core@^4.5.4, regexpu-core@^4.7.1: version "4.8.0" - resolved "https://registry.nlark.com/regexpu-core/download/regexpu-core-4.8.0.tgz?cache=0&sync_timestamp=1631619103170&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregexpu-core%2Fdownload%2Fregexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" + resolved "https://registry.nlark.com/regexpu-core/download/regexpu-core-4.8.0.tgz?cache=0&sync_timestamp=1631619113277&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregexpu-core%2Fdownload%2Fregexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" integrity sha1-5WBbo2G2excYR4UBMnUC9EeamPA= dependencies: regenerate "^1.4.2" @@ -6398,14 +6398,14 @@ registry-auth-token@^4.0.0: registry-url@^5.0.0: version "5.1.0" - resolved "https://registry.npm.taobao.org/registry-url/download/registry-url-5.1.0.tgz?cache=0&sync_timestamp=1618681893788&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregistry-url%2Fdownload%2Fregistry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + resolved "https://registry.npm.taobao.org/registry-url/download/registry-url-5.1.0.tgz?cache=0&sync_timestamp=1618682318998&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregistry-url%2Fdownload%2Fregistry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" integrity sha1-6YM0tQ1UNLgRNrROxjjZwgCcUAk= dependencies: rc "^1.2.8" regjsgen@^0.5.2: version "0.5.2" - resolved "https://registry.npmmirror.com/regjsgen/download/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" + resolved "https://registry.npmmirror.com/regjsgen/download/regjsgen-0.5.2.tgz?cache=0&sync_timestamp=1633097440621&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fregjsgen%2Fdownload%2Fregjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" integrity sha1-kv8pX7He7L9uzaslQ9IH6RqjNzM= regjsparser@^0.7.0: @@ -6417,7 +6417,7 @@ regjsparser@^0.7.0: rehype-parse@^6.0.2: version "6.0.2" - resolved "https://registry.nlark.com/rehype-parse/download/rehype-parse-6.0.2.tgz?cache=0&sync_timestamp=1630413716153&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frehype-parse%2Fdownload%2Frehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" + resolved "https://registry.nlark.com/rehype-parse/download/rehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" integrity sha1-rrP91oCF+feW8dMTeuK4WphAaWQ= dependencies: hast-util-from-parse5 "^5.0.0" @@ -6426,12 +6426,12 @@ rehype-parse@^6.0.2: relateurl@^0.2.7: version "0.2.7" - resolved "https://registry.nlark.com/relateurl/download/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" + resolved "https://registry.npm.taobao.org/relateurl/download/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= remark-admonitions@^1.2.1: version "1.2.1" - resolved "https://registry.npm.taobao.org/remark-admonitions/download/remark-admonitions-1.2.1.tgz#87caa1a442aa7b4c0cafa04798ed58a342307870" + resolved "https://registry.nlark.com/remark-admonitions/download/remark-admonitions-1.2.1.tgz#87caa1a442aa7b4c0cafa04798ed58a342307870" integrity sha1-h8qhpEKqe0wMr6BHmO1Yo0IweHA= dependencies: rehype-parse "^6.0.2" @@ -6440,7 +6440,7 @@ remark-admonitions@^1.2.1: remark-emoji@^2.1.0: version "2.2.0" - resolved "https://registry.npmmirror.com/remark-emoji/download/remark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" + resolved "https://registry.npmmirror.com/remark-emoji/download/remark-emoji-2.2.0.tgz?cache=0&sync_timestamp=1636044582007&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-emoji%2Fdownload%2Fremark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" integrity sha1-HHAgkKFSXaW4DhWo+WPvLII2ysc= dependencies: emoticon "^3.2.0" @@ -6468,7 +6468,7 @@ remark-mdx-remove-imports@^1.6.22: remark-mdx@1.6.22: version "1.6.22" - resolved "https://registry.npmmirror.com/remark-mdx/download/remark-mdx-1.6.22.tgz?cache=0&sync_timestamp=1637012565094&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-mdx%2Fdownload%2Fremark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd" + resolved "https://registry.npmmirror.com/remark-mdx/download/remark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd" integrity sha1-BqjasH3P3VfzNzr3+GvQ6ZIQi70= dependencies: "@babel/core" "7.12.9" @@ -6482,7 +6482,7 @@ remark-mdx@1.6.22: remark-parse@8.0.3: version "8.0.3" - resolved "https://registry.npmmirror.com/remark-parse/download/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1" + resolved "https://registry.npmmirror.com/remark-parse/download/remark-parse-8.0.3.tgz?cache=0&sync_timestamp=1637259967297&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-parse%2Fdownload%2Fremark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1" integrity sha1-nGKqOzW3mkhkVMaQRykGB19Ax+E= dependencies: ccount "^1.0.0" @@ -6522,32 +6522,32 @@ renderkid@^3.0.0: repeat-string@^1.5.4: version "1.6.1" - resolved "https://registry.nlark.com/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + resolved "https://registry.npm.taobao.org/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= require-from-string@^2.0.2: version "2.0.2" - resolved "https://registry.nlark.com/require-from-string/download/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + resolved "https://registry.npm.taobao.org/require-from-string/download/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha1-iaf92TgmEmcxjq/hT5wy5ZjDaQk= "require-like@>= 0.1.1": version "0.1.2" - resolved "https://registry.npm.taobao.org/require-like/download/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa" + resolved "https://registry.nlark.com/require-like/download/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa" integrity sha1-rW8wwTvs15cBDEaK+ndcDAprR/o= requires-port@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/requires-port/download/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + resolved "https://registry.npm.taobao.org/requires-port/download/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= resolve-from@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + resolved "https://registry.npm.taobao.org/resolve-from/download/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY= resolve-from@^5.0.0: version "5.0.0" - resolved "https://registry.nlark.com/resolve-from/download/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + resolved "https://registry.npm.taobao.org/resolve-from/download/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha1-w1IlhD3493bfIcV1V7wIfp39/Gk= resolve-pathname@^3.0.0: @@ -6557,7 +6557,7 @@ resolve-pathname@^3.0.0: resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2: version "1.20.0" - resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.20.0.tgz?cache=0&sync_timestamp=1615982599966&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fresolve%2Fdownload%2Fresolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha1-YpoBP7P3B1XW8LeTXMHCxTeLGXU= dependencies: is-core-module "^2.2.0" @@ -6565,7 +6565,7 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2 responselike@^1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/responselike/download/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + resolved "https://registry.nlark.com/responselike/download/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= dependencies: lowercase-keys "^1.0.0" @@ -6594,31 +6594,31 @@ rtl-detect@^1.0.4: run-parallel@^1.1.9: version "1.2.0" - resolved "https://registry.nlark.com/run-parallel/download/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + resolved "https://registry.npm.taobao.org/run-parallel/download/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" integrity sha1-ZtE2jae9+SHrnZW9GpIp5/IaQ+4= dependencies: queue-microtask "^1.2.2" rxjs@^7.1.0: version "7.4.0" - resolved "https://registry.npmmirror.com/rxjs/download/rxjs-7.4.0.tgz?cache=0&sync_timestamp=1633556708772&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Frxjs%2Fdownload%2Frxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68" + resolved "https://registry.npmmirror.com/rxjs/download/rxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68" integrity sha1-oSpE1+6/AW9f8kQbh/KMmlHOvGg= dependencies: tslib "~2.1.0" safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" - resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + resolved "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha1-mR7GnSluAxN0fVm9/St0XDX4go0= safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: version "5.2.1" - resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + resolved "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha1-Hq+fqb2x/dTsdfWPnNtOa3gn7sY= "safer-buffer@>= 2.1.2 < 3": version "2.1.2" - resolved "https://registry.nlark.com/safer-buffer/download/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + resolved "https://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo= sax@^1.2.4, sax@~1.2.4: @@ -6636,7 +6636,7 @@ scheduler@^0.20.2: schema-utils@2.7.0: version "2.7.0" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" integrity sha1-FxUfdtjq5n+793lgwzxnatn078c= dependencies: "@types/json-schema" "^7.0.4" @@ -6645,7 +6645,7 @@ schema-utils@2.7.0: schema-utils@^2.6.5: version "2.7.1" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha1-HKTzLRskxZDCA7jnpQvw6kzTlNc= dependencies: "@types/json-schema" "^7.0.5" @@ -6654,7 +6654,7 @@ schema-utils@^2.6.5: schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: version "3.1.1" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-3.1.1.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-3.1.1.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" integrity sha1-vHTEtraZXB2I92qLd76nIZ4MgoE= dependencies: "@types/json-schema" "^7.0.8" @@ -6663,7 +6663,7 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: schema-utils@^4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-4.0.0.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-4.0.0.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== dependencies: "@types/json-schema" "^7.0.9" @@ -6693,36 +6693,36 @@ selfsigned@^1.10.11: semver-diff@^3.1.1: version "3.1.1" - resolved "https://registry.nlark.com/semver-diff/download/semver-diff-3.1.1.tgz?cache=0&sync_timestamp=1620044887257&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver-diff%2Fdownload%2Fsemver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" + resolved "https://registry.nlark.com/semver-diff/download/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" integrity sha1-Bfd85Z8yXgDicGr9Z7tQbdscoys= dependencies: semver "^6.3.0" semver@7.0.0: version "7.0.0" - resolved "https://registry.nlark.com/semver/download/semver-7.0.0.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + resolved "https://registry.npm.taobao.org/semver/download/semver-7.0.0.tgz?cache=0&sync_timestamp=1616463641178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha1-XzyjV2HkfgWyBsba/yz4FPAxa44= semver@^5.4.1: version "5.7.1" - resolved "https://registry.nlark.com/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + resolved "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1616463641178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha1-qVT5Ma66UI0we78Gnv8MAclhFvc= semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" - resolved "https://registry.nlark.com/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + resolved "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1616463641178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0= semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.5" - resolved "https://registry.nlark.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + resolved "https://registry.npm.taobao.org/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1616463641178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc= dependencies: lru-cache "^6.0.0" send@0.17.1: version "0.17.1" - resolved "https://registry.nlark.com/send/download/send-0.17.1.tgz?cache=0&sync_timestamp=1618846901933&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsend%2Fdownload%2Fsend-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" + resolved "https://registry.npm.taobao.org/send/download/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" integrity sha1-wdiwWfeQD3Rm3Uk4vcROEd2zdsg= dependencies: debug "2.6.9" @@ -6741,7 +6741,7 @@ send@0.17.1: serialize-javascript@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/serialize-javascript/download/serialize-javascript-6.0.0.tgz?cache=0&sync_timestamp=1624284111898&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + resolved "https://registry.nlark.com/serialize-javascript/download/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" integrity sha1-765diPRdeSQUHai1w6en5mP+/rg= dependencies: randombytes "^2.1.0" @@ -6775,7 +6775,7 @@ serve-index@^1.9.1: serve-static@1.14.1: version "1.14.1" - resolved "https://registry.nlark.com/serve-static/download/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" + resolved "https://registry.npm.taobao.org/serve-static/download/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" integrity sha1-Zm5jbcTwEPfvKZcKiKZ0MgiYsvk= dependencies: encodeurl "~1.0.2" @@ -6785,12 +6785,12 @@ serve-static@1.14.1: setprototypeof@1.1.0: version "1.1.0" - resolved "https://registry.nlark.com/setprototypeof/download/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" + resolved "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" integrity sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY= setprototypeof@1.1.1: version "1.1.1" - resolved "https://registry.nlark.com/setprototypeof/download/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + resolved "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha1-fpWsskqpL1iF4KvvW6ExMw1K5oM= shallow-clone@^3.0.0: @@ -6802,24 +6802,24 @@ shallow-clone@^3.0.0: shebang-command@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/shebang-command/download/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + resolved "https://registry.npm.taobao.org/shebang-command/download/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" integrity sha1-zNCvT4g1+9wmW4JGGq8MNmY/NOo= dependencies: shebang-regex "^3.0.0" shebang-regex@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/shebang-regex/download/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + resolved "https://registry.nlark.com/shebang-regex/download/shebang-regex-3.0.0.tgz?cache=0&sync_timestamp=1628896299850&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fshebang-regex%2Fdownload%2Fshebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha1-rhbxZE2HPsrYQ7AwexQzYtTEIXI= shell-quote@^1.7.2: version "1.7.3" - resolved "https://registry.npmmirror.com/shell-quote/download/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" + resolved "https://registry.npmmirror.com/shell-quote/download/shell-quote-1.7.3.tgz?cache=0&sync_timestamp=1634798333958&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fshell-quote%2Fdownload%2Fshell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" integrity sha1-qkDtrBcERbmkMeF7tiwLiBucQSM= shelljs@^0.8.4: version "0.8.4" - resolved "https://registry.npm.taobao.org/shelljs/download/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2" + resolved "https://registry.npm.taobao.org/shelljs/download/shelljs-0.8.4.tgz?cache=0&sync_timestamp=1615984409294&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fshelljs%2Fdownload%2Fshelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2" integrity sha1-3naE/ut2f4cWsyYHiooAh1iQ48I= dependencies: glob "^7.0.0" @@ -6837,7 +6837,7 @@ side-channel@^1.0.4: signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.6" - resolved "https://registry.npmmirror.com/signal-exit/download/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + resolved "https://registry.npmmirror.com/signal-exit/download/signal-exit-3.0.6.tgz?cache=0&sync_timestamp=1637255687504&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsignal-exit%2Fdownload%2Fsignal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== sirv@^1.0.7: @@ -6856,16 +6856,16 @@ sisteransi@^1.0.5: slash@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/slash/download/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + resolved "https://registry.npm.taobao.org/slash/download/slash-3.0.0.tgz?cache=0&sync_timestamp=1618384496016&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fslash%2Fdownload%2Fslash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha1-ZTm+hwwWWtvVJAIg2+Nh8bxNRjQ= sockjs@^0.3.21: - version "0.3.21" - resolved "https://registry.npm.taobao.org/sockjs/download/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417" - integrity sha1-s0/7mOeWkwtgoM+hGQTWozmn1Bc= + version "0.3.24" + resolved "https://registry.npmmirror.com/sockjs/download/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" + integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== dependencies: faye-websocket "^0.11.3" - uuid "^3.4.0" + uuid "^8.3.2" websocket-driver "^0.7.4" sort-css-media-queries@2.0.4: @@ -6875,17 +6875,17 @@ sort-css-media-queries@2.0.4: source-list-map@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" + resolved "https://registry.npm.taobao.org/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha1-OZO9hzv8SEecyp6jpUeDXHwVSzQ= source-map-js@^1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/source-map-js/download/source-map-js-1.0.1.tgz?cache=0&sync_timestamp=1636400753943&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-js%2Fdownload%2Fsource-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" + resolved "https://registry.npmmirror.com/source-map-js/download/source-map-js-1.0.1.tgz?cache=0&sync_timestamp=1636400772640&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-js%2Fdownload%2Fsource-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA== source-map-support@~0.5.20: version "0.5.21" - resolved "https://registry.npmmirror.com/source-map-support/download/source-map-support-0.5.21.tgz?cache=0&sync_timestamp=1637320298732&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-support%2Fdownload%2Fsource-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + resolved "https://registry.npmmirror.com/source-map-support/download/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" @@ -6893,17 +6893,17 @@ source-map-support@~0.5.20: source-map@^0.5.0: version "0.5.7" - resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + resolved "https://registry.nlark.com/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" - resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + resolved "https://registry.nlark.com/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM= source-map@~0.7.2: version "0.7.3" - resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + resolved "https://registry.nlark.com/source-map/download/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha1-UwL4FpAxc1ImVECS5kmB91F1A4M= sourcemap-codec@^1.4.4: @@ -6918,7 +6918,7 @@ space-separated-tokens@^1.0.0: spdy-transport@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/spdy-transport/download/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" + resolved "https://registry.npm.taobao.org/spdy-transport/download/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" integrity sha1-ANSGOmQArXXfkzYaFghgXl3NzzE= dependencies: debug "^4.1.0" @@ -6930,7 +6930,7 @@ spdy-transport@^3.0.0: spdy@^4.0.2: version "4.0.2" - resolved "https://registry.nlark.com/spdy/download/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" + resolved "https://registry.npm.taobao.org/spdy/download/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" integrity sha1-t09GYgOj7aRSwCSSuR+56EonZ3s= dependencies: debug "^4.1.0" @@ -6941,7 +6941,7 @@ spdy@^4.0.2: sprintf-js@~1.0.2: version "1.0.3" - resolved "https://registry.nlark.com/sprintf-js/download/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + resolved "https://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= stable@^0.1.8: @@ -6951,29 +6951,29 @@ stable@^0.1.8: state-toggle@^1.0.0: version "1.0.3" - resolved "https://registry.npm.taobao.org/state-toggle/download/state-toggle-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstate-toggle%2Fdownload%2Fstate-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" + resolved "https://registry.npm.taobao.org/state-toggle/download/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" integrity sha1-4SOxaojhQxObCcaFIiG8mBWRff4= "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" - resolved "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz?cache=0&sync_timestamp=1609654090567&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstatuses%2Fdownload%2Fstatuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + resolved "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= std-env@^2.2.1: version "2.3.1" - resolved "https://registry.npmmirror.com/std-env/download/std-env-2.3.1.tgz?cache=0&sync_timestamp=1636124771178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-2.3.1.tgz#d42271908819c243f8defc77a140fc1fcee336a1" + resolved "https://registry.npmmirror.com/std-env/download/std-env-2.3.1.tgz#d42271908819c243f8defc77a140fc1fcee336a1" integrity sha1-1CJxkIgZwkP43vx3oUD8H87jNqE= dependencies: ci-info "^3.1.1" std-env@^3.0.1: version "3.0.1" - resolved "https://registry.npmmirror.com/std-env/download/std-env-3.0.1.tgz?cache=0&sync_timestamp=1636124771178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" + resolved "https://registry.npmmirror.com/std-env/download/std-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" integrity sha1-vEy8DkOGEBl+NMLXnD3zC0kfUYI= string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.2: version "4.2.3" - resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz?cache=0&sync_timestamp=1632421309919&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstring-width%2Fdownload%2Fstring-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha1-JpxxF9J7Ba0uU2gwqOyJXvnG0BA= dependencies: emoji-regex "^8.0.0" @@ -6982,7 +6982,7 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.2: string.prototype.trimend@^1.0.4: version "1.0.4" - resolved "https://registry.nlark.com/string.prototype.trimend/download/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" + resolved "https://registry.npm.taobao.org/string.prototype.trimend/download/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" integrity sha1-51rpDClCxjUEaGwYsoe0oLGkX4A= dependencies: call-bind "^1.0.2" @@ -6990,7 +6990,7 @@ string.prototype.trimend@^1.0.4: string.prototype.trimstart@^1.0.4: version "1.0.4" - resolved "https://registry.npm.taobao.org/string.prototype.trimstart/download/string.prototype.trimstart-1.0.4.tgz?cache=0&sync_timestamp=1614127232940&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring.prototype.trimstart%2Fdownload%2Fstring.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + resolved "https://registry.npm.taobao.org/string.prototype.trimstart/download/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" integrity sha1-s2OZr0qymZtMnGSL16P7K7Jv7u0= dependencies: call-bind "^1.0.2" @@ -6998,21 +6998,21 @@ string.prototype.trimstart@^1.0.4: string_decoder@^1.1.1: version "1.3.0" - resolved "https://registry.nlark.com/string_decoder/download/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + resolved "https://registry.npm.taobao.org/string_decoder/download/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" integrity sha1-QvEUWUpGzxqOMLCoT1bHjD7awh4= dependencies: safe-buffer "~5.2.0" string_decoder@~1.1.1: version "1.1.1" - resolved "https://registry.nlark.com/string_decoder/download/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + resolved "https://registry.npm.taobao.org/string_decoder/download/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" integrity sha1-nPFhG6YmhdcDCunkujQUnDrwP8g= dependencies: safe-buffer "~5.1.0" stringify-object@^3.3.0: version "3.3.0" - resolved "https://registry.nlark.com/stringify-object/download/stringify-object-3.3.0.tgz?cache=0&sync_timestamp=1629673547261&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstringify-object%2Fdownload%2Fstringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" + resolved "https://registry.nlark.com/stringify-object/download/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" integrity sha1-cDBlrvyhkwDTzoivT1s5VtdVZik= dependencies: get-own-enumerable-property-symbols "^3.0.0" @@ -7040,7 +7040,7 @@ strip-bom-string@^1.0.0: strip-final-newline@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/strip-final-newline/download/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + resolved "https://registry.nlark.com/strip-final-newline/download/strip-final-newline-2.0.0.tgz?cache=0&sync_timestamp=1620046435959&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstrip-final-newline%2Fdownload%2Fstrip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha1-ibhS+y/L6Tb29LMYevsKEsGrWK0= strip-json-comments@~2.0.1: @@ -7050,14 +7050,14 @@ strip-json-comments@~2.0.1: style-to-object@0.3.0, style-to-object@^0.3.0: version "0.3.0" - resolved "https://registry.nlark.com/style-to-object/download/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" + resolved "https://registry.npm.taobao.org/style-to-object/download/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" integrity sha1-sbeQ0gWZHMeDgBlnIUl57hmnbkY= dependencies: inline-style-parser "0.1.1" stylehacks@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/stylehacks/download/stylehacks-5.0.1.tgz?cache=0&sync_timestamp=1621449595596&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstylehacks%2Fdownload%2Fstylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" + resolved "https://registry.nlark.com/stylehacks/download/stylehacks-5.0.1.tgz?cache=0&sync_timestamp=1621449652268&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstylehacks%2Fdownload%2Fstylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" integrity sha1-Mj7FVBmFIJhoBjiMf9rrw40sBvs= dependencies: browserslist "^4.16.0" @@ -7091,7 +7091,7 @@ svg-parser@^2.0.2: svgo@^1.2.2: version "1.3.2" - resolved "https://registry.npmmirror.com/svgo/download/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" + resolved "https://registry.npmmirror.com/svgo/download/svgo-1.3.2.tgz?cache=0&sync_timestamp=1635850398965&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsvgo%2Fdownload%2Fsvgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" integrity sha1-ttxRHAYzRsnkFbgeQ0ARRbltQWc= dependencies: chalk "^2.4.1" @@ -7110,7 +7110,7 @@ svgo@^1.2.2: svgo@^2.7.0: version "2.8.0" - resolved "https://registry.npmmirror.com/svgo/download/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" + resolved "https://registry.npmmirror.com/svgo/download/svgo-2.8.0.tgz?cache=0&sync_timestamp=1635850398965&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsvgo%2Fdownload%2Fsvgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" integrity sha1-T/gMzmcQ3CeV8MfHQQHmdkz8zSQ= dependencies: "@trysound/sax" "0.2.0" @@ -7150,17 +7150,17 @@ svgo@^2.7.0: tapable@^1.0.0: version "1.1.3" - resolved "https://registry.nlark.com/tapable/download/tapable-1.1.3.tgz?cache=0&sync_timestamp=1631526982870&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftapable%2Fdownload%2Ftapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" + resolved "https://registry.nlark.com/tapable/download/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha1-ofzMBrWNth/XpF2i2kT186Pme6I= tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0: version "2.2.1" - resolved "https://registry.nlark.com/tapable/download/tapable-2.2.1.tgz?cache=0&sync_timestamp=1631526982870&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftapable%2Fdownload%2Ftapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" + resolved "https://registry.nlark.com/tapable/download/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha1-GWenPvQGCoLxKrlq+G1S/bdu7KA= terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.4: version "5.2.5" - resolved "https://registry.npmmirror.com/terser-webpack-plugin/download/terser-webpack-plugin-5.2.5.tgz?cache=0&sync_timestamp=1636385968704&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-5.2.5.tgz#ce65b9880a0c36872555c4874f45bbdb02ee32c9" + resolved "https://registry.npmmirror.com/terser-webpack-plugin/download/terser-webpack-plugin-5.2.5.tgz?cache=0&sync_timestamp=1636386017045&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-5.2.5.tgz#ce65b9880a0c36872555c4874f45bbdb02ee32c9" integrity sha512-3luOVHku5l0QBeYS8r4CdHYWEGMmIj3H1U64jgkdZzECcSOJAyJ9TjuqcQZvw1Y+4AOBN9SeYJPJmFn2cM4/2g== dependencies: jest-worker "^27.0.6" @@ -7171,7 +7171,7 @@ terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.4: terser@^5.10.0, terser@^5.7.2: version "5.10.0" - resolved "https://registry.npmmirror.com/terser/download/terser-5.10.0.tgz?cache=0&sync_timestamp=1636988229781&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fterser%2Fdownload%2Fterser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" + resolved "https://registry.npmmirror.com/terser/download/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA== dependencies: commander "^2.20.0" @@ -7185,17 +7185,17 @@ text-table@^0.2.0: thunky@^1.0.2: version "1.1.0" - resolved "https://registry.nlark.com/thunky/download/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" + resolved "https://registry.npm.taobao.org/thunky/download/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" integrity sha1-Wrr3FKlAXbBQRzK7zNLO3Z75U30= timsort@^0.3.0: version "0.3.0" - resolved "https://registry.npm.taobao.org/timsort/download/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" + resolved "https://registry.nlark.com/timsort/download/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= tiny-invariant@^1.0.2: version "1.2.0" - resolved "https://registry.npmmirror.com/tiny-invariant/download/tiny-invariant-1.2.0.tgz?cache=0&sync_timestamp=1635822367356&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftiny-invariant%2Fdownload%2Ftiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" + resolved "https://registry.npmmirror.com/tiny-invariant/download/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" integrity sha1-oRQfhrZyqRSMcul4oZpzublKFak= tiny-warning@^1.0.0, tiny-warning@^1.0.3: @@ -7205,7 +7205,7 @@ tiny-warning@^1.0.0, tiny-warning@^1.0.3: tmp@^0.2.1: version "0.2.1" - resolved "https://registry.nlark.com/tmp/download/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + resolved "https://registry.npm.taobao.org/tmp/download/tmp-0.2.1.tgz?cache=0&sync_timestamp=1615984440866&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftmp%2Fdownload%2Ftmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" integrity sha1-hFf8MDfc9HGcJRNnoa9lAO4czxQ= dependencies: rimraf "^3.0.0" @@ -7217,19 +7217,19 @@ to-fast-properties@^2.0.0: to-readable-stream@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/to-readable-stream/download/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" + resolved "https://registry.nlark.com/to-readable-stream/download/to-readable-stream-1.0.0.tgz?cache=0&sync_timestamp=1619072442497&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fto-readable-stream%2Fdownload%2Fto-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" integrity sha1-zgqgwvPfat+FLvtASng+d8BHV3E= to-regex-range@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/to-regex-range/download/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + resolved "https://registry.npm.taobao.org/to-regex-range/download/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" integrity sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ= dependencies: is-number "^7.0.0" toidentifier@1.0.0: version "1.0.0" - resolved "https://registry.npmmirror.com/toidentifier/download/toidentifier-1.0.0.tgz?cache=0&sync_timestamp=1636938467744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftoidentifier%2Fdownload%2Ftoidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + resolved "https://registry.npmmirror.com/toidentifier/download/toidentifier-1.0.0.tgz?cache=0&sync_timestamp=1636938512912&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftoidentifier%2Fdownload%2Ftoidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha1-fhvjRw8ed5SLxD2Uo8j013UrpVM= totalist@^1.0.0: @@ -7244,7 +7244,7 @@ trim-trailing-lines@^1.0.0: trim@0.0.1: version "0.0.1" - resolved "https://registry.npm.taobao.org/trim/download/trim-0.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftrim%2Fdownload%2Ftrim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" + resolved "https://registry.npm.taobao.org/trim/download/trim-0.0.1.tgz?cache=0&sync_timestamp=1617312392149&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftrim%2Fdownload%2Ftrim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0= trough@^1.0.0: @@ -7254,12 +7254,12 @@ trough@^1.0.0: tslib@^2.0.3, tslib@^2.3.1: version "2.3.1" - resolved "https://registry.nlark.com/tslib/download/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + resolved "https://registry.nlark.com/tslib/download/tslib-2.3.1.tgz?cache=0&sync_timestamp=1628722556410&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftslib%2Fdownload%2Ftslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha1-6KM1rdXOrlGqJh0ypJAVjvBC7wE= tslib@~2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/tslib/download/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" + resolved "https://registry.nlark.com/tslib/download/tslib-2.1.0.tgz?cache=0&sync_timestamp=1628722556410&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftslib%2Fdownload%2Ftslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" integrity sha1-2mCGDxwuyqVwOrfTm8Bba/mIuXo= type-fest@^0.20.2: @@ -7289,7 +7289,7 @@ typescript@^4.3.5: unbox-primitive@^1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/unbox-primitive/download/unbox-primitive-1.0.1.tgz?cache=0&sync_timestamp=1616706302651&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funbox-primitive%2Fdownload%2Funbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + resolved "https://registry.npm.taobao.org/unbox-primitive/download/unbox-primitive-1.0.1.tgz?cache=0&sync_timestamp=1616706319488&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funbox-primitive%2Fdownload%2Funbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" integrity sha1-CF4hViXsMWJXTciFmr7nilmxRHE= dependencies: function-bind "^1.1.1" @@ -7299,7 +7299,7 @@ unbox-primitive@^1.0.1: unherit@^1.0.4: version "1.1.3" - resolved "https://registry.nlark.com/unherit/download/unherit-1.1.3.tgz?cache=0&sync_timestamp=1626423419302&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funherit%2Fdownload%2Funherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" + resolved "https://registry.nlark.com/unherit/download/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" integrity sha1-bJtQPytBsmIzDIDpHIYUq9qmnCI= dependencies: inherits "^2.0.0" @@ -7307,12 +7307,12 @@ unherit@^1.0.4: unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631615505724&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-canonical-property-names-ecmascript%2Fdownload%2Funicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" + resolved "https://registry.nlark.com/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" integrity sha1-MBrNxSVjFnDTn2FG4Od/9rvevdw= unicode-match-property-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-match-property-ecmascript/download/unicode-match-property-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618607567&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-ecmascript%2Fdownload%2Funicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" + resolved "https://registry.nlark.com/unicode-match-property-ecmascript/download/unicode-match-property-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618696521&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-ecmascript%2Fdownload%2Funicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" integrity sha1-VP0W4OyxZ88Ezx91a9zJLrp5dsM= dependencies: unicode-canonical-property-names-ecmascript "^2.0.0" @@ -7320,7 +7320,7 @@ unicode-match-property-ecmascript@^2.0.0: unicode-match-property-value-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-match-property-value-ecmascript/download/unicode-match-property-value-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618107717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-value-ecmascript%2Fdownload%2Funicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" + resolved "https://registry.nlark.com/unicode-match-property-value-ecmascript/download/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" integrity sha1-GgGqVyR8FMVouJd1pUk4eIGJpxQ= unicode-property-aliases-ecmascript@^2.0.0: @@ -7330,7 +7330,7 @@ unicode-property-aliases-ecmascript@^2.0.0: unified@9.2.0: version "9.2.0" - resolved "https://registry.npmmirror.com/unified/download/unified-9.2.0.tgz?cache=0&sync_timestamp=1637256334405&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" + resolved "https://registry.npmmirror.com/unified/download/unified-9.2.0.tgz?cache=0&sync_timestamp=1637256247526&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" integrity sha1-Z6YsYnxAWJ7eu/YPU+39TYIgJ/g= dependencies: bail "^1.0.0" @@ -7342,7 +7342,7 @@ unified@9.2.0: unified@^8.4.2: version "8.4.2" - resolved "https://registry.npmmirror.com/unified/download/unified-8.4.2.tgz?cache=0&sync_timestamp=1637256334405&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" + resolved "https://registry.npmmirror.com/unified/download/unified-8.4.2.tgz?cache=0&sync_timestamp=1637256247526&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" integrity sha1-E61YtKQ3+qJ1GkpMahb2gMUA//E= dependencies: bail "^1.0.0" @@ -7353,19 +7353,19 @@ unified@^8.4.2: unique-string@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unique-string/download/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" + resolved "https://registry.npm.taobao.org/unique-string/download/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" integrity sha1-OcZFH4GvsnSd4rIz4/fF6IQ72J0= dependencies: crypto-random-string "^2.0.0" unist-builder@2.0.3, unist-builder@^2.0.0: version "2.0.3" - resolved "https://registry.nlark.com/unist-builder/download/unist-builder-2.0.3.tgz?cache=0&sync_timestamp=1618816093327&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-builder%2Fdownload%2Funist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436" + resolved "https://registry.nlark.com/unist-builder/download/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436" integrity sha1-d2SHEbXYavCULzNDl6M8XpFRZDY= unist-util-generated@^1.0.0: version "1.1.6" - resolved "https://registry.nlark.com/unist-util-generated/download/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" + resolved "https://registry.npm.taobao.org/unist-util-generated/download/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" integrity sha1-WrUfaJ4pkqRyvrGzXyzn/y8yTUs= unist-util-is@^4.0.0: @@ -7375,40 +7375,40 @@ unist-util-is@^4.0.0: unist-util-position@^3.0.0: version "3.1.0" - resolved "https://registry.nlark.com/unist-util-position/download/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" + resolved "https://registry.nlark.com/unist-util-position/download/unist-util-position-3.1.0.tgz?cache=0&sync_timestamp=1620915237724&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-position%2Fdownload%2Funist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" integrity sha1-HELuYwH41S9H0U9iu9t5ZXH6LUc= unist-util-remove-position@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/unist-util-remove-position/download/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" + resolved "https://registry.nlark.com/unist-util-remove-position/download/unist-util-remove-position-2.0.1.tgz?cache=0&sync_timestamp=1627848251490&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-remove-position%2Fdownload%2Funist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" integrity sha1-XRnKef26cSMBmZsrc1U8qPOzUsw= dependencies: unist-util-visit "^2.0.0" unist-util-remove@2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unist-util-remove/download/unist-util-remove-2.0.0.tgz#32c2ad5578802f2ca62ab808173d505b2c898488" + resolved "https://registry.nlark.com/unist-util-remove/download/unist-util-remove-2.0.0.tgz?cache=0&sync_timestamp=1627635399225&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-remove%2Fdownload%2Funist-util-remove-2.0.0.tgz#32c2ad5578802f2ca62ab808173d505b2c898488" integrity sha1-MsKtVXiALyymKrgIFz1QWyyJhIg= dependencies: unist-util-is "^4.0.0" unist-util-remove@^2.0.0: version "2.1.0" - resolved "https://registry.nlark.com/unist-util-remove/download/unist-util-remove-2.1.0.tgz#b0b4738aa7ee445c402fda9328d604a02d010588" + resolved "https://registry.nlark.com/unist-util-remove/download/unist-util-remove-2.1.0.tgz?cache=0&sync_timestamp=1627635399225&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-remove%2Fdownload%2Funist-util-remove-2.1.0.tgz#b0b4738aa7ee445c402fda9328d604a02d010588" integrity sha1-sLRziqfuRFxAL9qTKNYEoC0BBYg= dependencies: unist-util-is "^4.0.0" unist-util-stringify-position@^2.0.0: version "2.0.3" - resolved "https://registry.nlark.com/unist-util-stringify-position/download/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" + resolved "https://registry.npm.taobao.org/unist-util-stringify-position/download/unist-util-stringify-position-2.0.3.tgz?cache=0&sync_timestamp=1618328228185&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funist-util-stringify-position%2Fdownload%2Funist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" integrity sha1-zOO/oc34W6c3XR1bF73Eytqb2do= dependencies: "@types/unist" "^2.0.2" unist-util-visit-parents@^3.0.0: version "3.1.1" - resolved "https://registry.nlark.com/unist-util-visit-parents/download/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6" + resolved "https://registry.npmmirror.com/unist-util-visit-parents/download/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6" integrity sha1-ZabOaY94prD1aqDojxOAGIbNrvY= dependencies: "@types/unist" "^2.0.0" @@ -7416,7 +7416,7 @@ unist-util-visit-parents@^3.0.0: unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist-util-visit@^2.0.2, unist-util-visit@^2.0.3: version "2.0.3" - resolved "https://registry.npmmirror.com/unist-util-visit/download/unist-util-visit-2.0.3.tgz?cache=0&sync_timestamp=1632405194557&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funist-util-visit%2Fdownload%2Funist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" + resolved "https://registry.npmmirror.com/unist-util-visit/download/unist-util-visit-2.0.3.tgz?cache=0&sync_timestamp=1632405961713&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funist-util-visit%2Fdownload%2Funist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" integrity sha1-w3A4kxRt9HIDu4qXla9H17lxIIw= dependencies: "@types/unist" "^2.0.0" @@ -7425,7 +7425,7 @@ unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist- universalify@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz?cache=0&sync_timestamp=1603180004159&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + resolved "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc= unpipe@1.0.0, unpipe@~1.0.0: @@ -7460,7 +7460,7 @@ update-notifier@^5.1.0: uri-js@^4.2.2: version "4.4.1" - resolved "https://registry.npm.taobao.org/uri-js/download/uri-js-4.4.1.tgz?cache=0&sync_timestamp=1610237641463&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Furi-js%2Fdownload%2Furi-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + resolved "https://registry.npm.taobao.org/uri-js/download/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" integrity sha1-mxpSWVIlhZ5V9mnZKPiMbFfyp34= dependencies: punycode "^2.1.0" @@ -7476,14 +7476,14 @@ url-loader@^4.1.1: url-parse-lax@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/url-parse-lax/download/url-parse-lax-3.0.0.tgz?cache=0&sync_timestamp=1628548236896&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl-parse-lax%2Fdownload%2Furl-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + resolved "https://registry.nlark.com/url-parse-lax/download/url-parse-lax-3.0.0.tgz?cache=0&sync_timestamp=1628547550655&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl-parse-lax%2Fdownload%2Furl-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= dependencies: prepend-http "^2.0.0" url@^0.11.0: version "0.11.0" - resolved "https://registry.nlark.com/url/download/url-0.11.0.tgz?cache=0&sync_timestamp=1618846952693&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl%2Fdownload%2Furl-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" + resolved "https://registry.npm.taobao.org/url/download/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= dependencies: punycode "1.3.2" @@ -7496,7 +7496,7 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: util.promisify@~1.0.0: version "1.0.1" - resolved "https://registry.nlark.com/util.promisify/download/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" + resolved "https://registry.npm.taobao.org/util.promisify/download/util.promisify-1.0.1.tgz?cache=0&sync_timestamp=1615984387069&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Futil.promisify%2Fdownload%2Futil.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" integrity sha1-a693dLgO6w91INi4HQeYKlmruu4= dependencies: define-properties "^1.1.3" @@ -7506,7 +7506,7 @@ util.promisify@~1.0.0: utila@~0.4: version "0.4.0" - resolved "https://registry.nlark.com/utila/download/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" + resolved "https://registry.npm.taobao.org/utila/download/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw= utility-types@^3.10.0: @@ -7519,10 +7519,10 @@ utils-merge@1.0.1: resolved "https://registry.npm.taobao.org/utils-merge/download/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@^3.4.0: - version "3.4.0" - resolved "https://registry.npmmirror.com/uuid/download/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha1-sj5DWK+oogL+ehAK8fX4g/AgB+4= +uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.npmmirror.com/uuid/download/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha1-gNW1ztJxu5r2xEXyGhoExgbO++I= value-equal@^1.0.1: version "1.0.1" @@ -7541,7 +7541,7 @@ vfile-location@^3.0.0, vfile-location@^3.2.0: vfile-message@^2.0.0: version "2.0.4" - resolved "https://registry.nlark.com/vfile-message/download/vfile-message-2.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvfile-message%2Fdownload%2Fvfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" + resolved "https://registry.nlark.com/vfile-message/download/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" integrity sha1-W0O4gXHUCerlhHfRPyPdQdUsNxo= dependencies: "@types/unist" "^2.0.0" @@ -7578,7 +7578,7 @@ watchpack@^2.3.0: wbuf@^1.1.0, wbuf@^1.7.3: version "1.7.3" - resolved "https://registry.nlark.com/wbuf/download/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" + resolved "https://registry.npm.taobao.org/wbuf/download/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" integrity sha1-wdjRSTFtPqhShIiVy2oL/oh7h98= dependencies: minimalistic-assert "^1.0.0" @@ -7590,7 +7590,7 @@ web-namespaces@^1.0.0, web-namespaces@^1.1.2: webpack-bundle-analyzer@^4.4.2: version "4.5.0" - resolved "https://registry.npmmirror.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" + resolved "https://registry.npmmirror.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-4.5.0.tgz?cache=0&sync_timestamp=1634019956604&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-bundle-analyzer%2Fdownload%2Fwebpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" integrity sha1-Gw7qKUfnNSh1Sm+a8+kbK24PedU= dependencies: acorn "^8.0.4" @@ -7605,7 +7605,7 @@ webpack-bundle-analyzer@^4.4.2: webpack-dev-middleware@^5.2.1: version "5.2.2" - resolved "https://registry.npmmirror.com/webpack-dev-middleware/download/webpack-dev-middleware-5.2.2.tgz?cache=0&sync_timestamp=1637165517894&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-dev-middleware%2Fdownload%2Fwebpack-dev-middleware-5.2.2.tgz#eb5193faa5479ca1086b9f7bed68b89c731bff62" + resolved "https://registry.npmmirror.com/webpack-dev-middleware/download/webpack-dev-middleware-5.2.2.tgz?cache=0&sync_timestamp=1637165508298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-dev-middleware%2Fdownload%2Fwebpack-dev-middleware-5.2.2.tgz#eb5193faa5479ca1086b9f7bed68b89c731bff62" integrity sha512-DjZyYrsHhkikAFNvSNKrpnziXukU1EChFAh9j4LAm6ndPLPW8cN0KhM7T+RAiOqsQ6ABfQ8hoKIs9IWMTjov+w== dependencies: colorette "^2.0.10" @@ -7655,7 +7655,7 @@ webpack-merge@^5.8.0: webpack-sources@^1.1.0, webpack-sources@^1.4.3: version "1.4.3" - resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1636982701357&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" + resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1636982675275&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha1-7t2OwLko+/HL/plOItLYkPMwqTM= dependencies: source-list-map "^2.0.0" @@ -7663,7 +7663,7 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.3: webpack-sources@^3.2.2: version "3.2.2" - resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-3.2.2.tgz?cache=0&sync_timestamp=1636982701357&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260" + resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-3.2.2.tgz?cache=0&sync_timestamp=1636982675275&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260" integrity sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw== webpack@^5.61.0: @@ -7698,7 +7698,7 @@ webpack@^5.61.0: webpackbar@^5.0.0-3: version "5.0.2" - resolved "https://registry.npmmirror.com/webpackbar/download/webpackbar-5.0.2.tgz?cache=0&sync_timestamp=1636124846959&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpackbar%2Fdownload%2Fwebpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" + resolved "https://registry.npmmirror.com/webpackbar/download/webpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" integrity sha1-091GYhHHOFJ0HfyEK3VW3LwrBXA= dependencies: chalk "^4.1.0" @@ -7708,7 +7708,7 @@ webpackbar@^5.0.0-3: websocket-driver@>=0.5.1, websocket-driver@^0.7.4: version "0.7.4" - resolved "https://registry.nlark.com/websocket-driver/download/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" + resolved "https://registry.npm.taobao.org/websocket-driver/download/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" integrity sha1-ia1Slbv2S0gKvLox5JU6ynBvV2A= dependencies: http-parser-js ">=0.5.1" @@ -7717,12 +7717,12 @@ websocket-driver@>=0.5.1, websocket-driver@^0.7.4: websocket-extensions@>=0.1.1: version "0.1.4" - resolved "https://registry.nlark.com/websocket-extensions/download/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + resolved "https://registry.npm.taobao.org/websocket-extensions/download/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha1-f4RzvIOd/YdgituV1+sHUhFXikI= which-boxed-primitive@^1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/which-boxed-primitive/download/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + resolved "https://registry.npm.taobao.org/which-boxed-primitive/download/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" integrity sha1-E3V7yJsgmwSf5dhkMOIc9AqJqOY= dependencies: is-bigint "^1.0.1" @@ -7733,21 +7733,21 @@ which-boxed-primitive@^1.0.2: which@^1.3.1: version "1.3.1" - resolved "https://registry.nlark.com/which/download/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + resolved "https://registry.npm.taobao.org/which/download/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo= dependencies: isexe "^2.0.0" which@^2.0.1: version "2.0.2" - resolved "https://registry.nlark.com/which/download/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + resolved "https://registry.npm.taobao.org/which/download/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha1-fGqN0KY2oDJ+ELWckobu6T8/UbE= dependencies: isexe "^2.0.0" widest-line@^3.1.0: version "3.1.0" - resolved "https://registry.npmmirror.com/widest-line/download/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" + resolved "https://registry.npmmirror.com/widest-line/download/widest-line-3.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwidest-line%2Fdownload%2Fwidest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" integrity sha1-gpIzO79my0X/DeFgOxNreuFJbso= dependencies: string-width "^4.0.0" @@ -7815,10 +7815,10 @@ yallist@^4.0.0: yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: version "1.10.2" - resolved "https://registry.npmmirror.com/yaml/download/yaml-1.10.2.tgz?cache=0&sync_timestamp=1636797186957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyaml%2Fdownload%2Fyaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + resolved "https://registry.npmmirror.com/yaml/download/yaml-1.10.2.tgz?cache=0&sync_timestamp=1636797530964&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyaml%2Fdownload%2Fyaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha1-IwHF/78StGfejaIzOkWeKeeSDks= zwitch@^1.0.0: version "1.0.5" - resolved "https://registry.npm.taobao.org/zwitch/download/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" + resolved "https://registry.npm.taobao.org/zwitch/download/zwitch-1.0.5.tgz?cache=0&sync_timestamp=1617357655901&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fzwitch%2Fdownload%2Fzwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" integrity sha1-0R1zgf/tFrdC9q97PyI9XNn+mSA= From 3c428d98c4dbda5f7357c6c42a5a5199e2383060 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 3 Dec 2021 23:30:15 +0800 Subject: [PATCH 059/174] :memo: add di docs --- nonebot/matcher.py | 43 ++++--- website/docs/advanced/README.md | 1 - website/docs/advanced/export-and-require.md | 2 - .../advanced/handler/dependency-injection.md | 108 ++++++++++++++++++ .../overload.md} | 6 +- website/docs/advanced/handler/sync-support.md | 10 ++ website/docs/advanced/permission.md | 2 - website/docs/advanced/publish-plugin.md | 2 - website/docs/advanced/runtime-hook.md | 2 - website/docs/advanced/scheduler.md | 2 - website/sidebars.js | 6 +- yarn.lock | 64 +++++------ 12 files changed, 186 insertions(+), 62 deletions(-) create mode 100644 website/docs/advanced/handler/dependency-injection.md rename website/docs/advanced/{overloaded-handlers.md => handler/overload.md} (98%) create mode 100644 website/docs/advanced/handler/sync-support.md diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 449be730..1bad8a6e 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -398,7 +398,9 @@ class Matcher(metaclass=MatcherMeta): return handler_ @classmethod - def handle(cls) -> Callable[[T_Handler], T_Handler]: + def handle( + cls, dependencies: Optional[List[DependsWrapper]] = None + ) -> Callable[[T_Handler], T_Handler]: """ :说明: @@ -406,17 +408,19 @@ class Matcher(metaclass=MatcherMeta): :参数: - * 无 + * ``dependencies: Optional[List[DependsWrapper]]``: 非参数类型依赖列表 """ def _decorator(func: T_Handler) -> T_Handler: - cls.append_handler(func) + cls.append_handler(func, dependencies=dependencies) return func return _decorator @classmethod - def receive(cls) -> Callable[[T_Handler], T_Handler]: + def receive( + cls, dependencies: Optional[List[DependsWrapper]] = None + ) -> Callable[[T_Handler], T_Handler]: """ :说明: @@ -424,7 +428,7 @@ class Matcher(metaclass=MatcherMeta): :参数: - * 无 + * ``dependencies: Optional[List[DependsWrapper]]``: 非参数类型依赖列表 """ async def _receive(state: T_State) -> Union[None, NoReturn]: @@ -434,15 +438,19 @@ class Matcher(metaclass=MatcherMeta): del state["_current_key"] raise RejectedException - def _decorator(func: T_Handler) -> T_Handler: + _dependencies = [DependsWrapper(_receive), *(dependencies or [])] - depend = DependsWrapper(_receive) + def _decorator(func: T_Handler) -> T_Handler: if cls.handlers and cls.handlers[-1].func is func: func_handler = cls.handlers[-1] - func_handler.prepend_dependency(depend) + for depend in reversed(_dependencies): + func_handler.prepend_dependency(depend) else: - cls.append_handler(func, dependencies=[depend] if cls.handlers else []) + cls.append_handler( + func, + dependencies=_dependencies if cls.handlers else dependencies, + ) return func @@ -454,6 +462,7 @@ class Matcher(metaclass=MatcherMeta): key: str, prompt: Optional[Union[str, Message, MessageSegment, MessageTemplate]] = None, args_parser: Optional[T_ArgsParser] = None, + dependencies: Optional[List[DependsWrapper]] = None, ) -> Callable[[T_Handler], T_Handler]: """ :说明: @@ -465,6 +474,7 @@ class Matcher(metaclass=MatcherMeta): * ``key: str``: 参数名 * ``prompt: Optional[Union[str, Message, MessageSegment, MessageFormatter]]``: 在参数不存在时向用户发送的消息 * ``args_parser: Optional[T_ArgsParser]``: 可选参数解析函数，空则使用默认解析函数 + * ``dependencies: Optional[List[DependsWrapper]]``: 非参数类型依赖列表 """ async def _key_getter(bot: Bot, event: Event, state: T_State): @@ -495,17 +505,20 @@ class Matcher(metaclass=MatcherMeta): state[key] = str(event.get_message()) state[f"_{key}_parsed"] = True - def _decorator(func: T_Handler) -> T_Handler: + _dependencies = [ + DependsWrapper(_key_getter), + DependsWrapper(_key_parser), + *(dependencies or []), + ] - get_depend = DependsWrapper(_key_getter) - parser_depend = DependsWrapper(_key_parser) + def _decorator(func: T_Handler) -> T_Handler: if cls.handlers and cls.handlers[-1].func is func: func_handler = cls.handlers[-1] - func_handler.prepend_dependency(parser_depend) - func_handler.prepend_dependency(get_depend) + for depend in reversed(_dependencies): + func_handler.prepend_dependency(depend) else: - cls.append_handler(func, dependencies=[get_depend, parser_depend]) + cls.append_handler(func, dependencies=_dependencies) return func diff --git a/website/docs/advanced/README.md b/website/docs/advanced/README.md index 094a5367..2d6fd630 100644 --- a/website/docs/advanced/README.md +++ b/website/docs/advanced/README.md @@ -1,5 +1,4 @@ --- -sidebar_position: 1 id: index slug: /advanced diff --git a/website/docs/advanced/export-and-require.md b/website/docs/advanced/export-and-require.md index 5bb97852..c1e7358e 100644 --- a/website/docs/advanced/export-and-require.md +++ b/website/docs/advanced/export-and-require.md @@ -1,6 +1,4 @@ --- -sidebar_position: 5 - options: menu: weight: 50 diff --git a/website/docs/advanced/handler/dependency-injection.md b/website/docs/advanced/handler/dependency-injection.md new file mode 100644 index 00000000..a19baadb --- /dev/null +++ b/website/docs/advanced/handler/dependency-injection.md @@ -0,0 +1,108 @@ +--- +sidebar_position: 3 + +options: + menu: + weight: 62 + category: advanced +--- + +# 依赖注入 + +受 [`FastApi`](https://fastapi.tiangolo.com/tutorial/dependencies/) 启发，NoneBot 同样编写了一个简易的依赖注入模块，使得开发者可以通过事件处理函数参数的类型标注来自动注入依赖。 + +## 什么是依赖注入？ + +~~交给 mix 了~~ + +## 使用依赖注入 + +以下通过一个简单的例子来说明依赖注入的使用方法： + +### 编写依赖函数 + +这里我们编写了一个简单的函数 `depend` 作为依赖函数 + +```python {7-9} +from nonebot.log import logger +from nonebot.dependencies import Depends +from nonebot import on_command, on_message + +test = on_command("123") + +def depend(state: dict): + # do something with state + return {**state, "depend": "depend"} + +@test.handle() +async def _(x: dict = Depends(depend)): + print(x) +``` + +它和普通的事件处理函数并无区别，同样可以接受 `bot`, `event` 等参数，你可以把它当作一个普通的事件处理函数但是去除了装饰器（并没有使用 `matcher.handle()` 等来进行装饰），并且它可以返回任何类型的值。 + +在这个例子中，依赖函数接受一个参数： + +- `state: dict`：当前事件处理状态字典。 + +并且返回了一个 `state` 的复制以及一个附加的键值 `depend` 。 + +### Import `Depends` + +```python {2} +from nonebot.log import logger +from nonebot.dependencies import Depends +from nonebot import on_command, on_message + +test = on_command("123") + +def depend(state: dict): + # do something with state + return {**state, "depend": "depend"} + +@test.handle() +async def _(x: dict = Depends(depend)): + print(x) +``` + +### 在事件处理函数里声明依赖函数 + +与 FastAPI 类似，你可以在函数中添加一个新的参数，并且使用 `Depends` 来声明它的依赖。 + +```python {12} +from nonebot.log import logger +from nonebot.dependencies import Depends +from nonebot import on_command, on_message + +test = on_command("123") + +def depend(state: dict): + # do something with state + return {**state, "depend": "depend"} + +@test.handle() +async def _(x: dict = Depends(depend)): + print(x) +``` + +你需要给 `Depends` 指定一个依赖函数，这个依赖函数的返回值会被作为 `x` 的值。 + +`Depends` 的首个参数即是依赖函数，或者其他 `Callable` 对象，在之后会对更多形式的依赖对象进行介绍。 + +:::tip +参数 `x` 的类型标注并不会影响事件处理函数的运行，类型检查并不会对依赖函数的返回值以及类型标注进行检查。 +::: + +当接收到事件时，NoneBot 会进行以下处理： + +1. 查询缓存，如果缓存中有相应的值，则直接返回。 +2. 准备依赖函数所需要的参数。 +3. 调用依赖函数并获得返回值。 +4. 将返回值存入缓存。 +5. 将返回值作为事件处理函数中的参数值传入。 + +## 依赖缓存 + +## Class 作为依赖 + +## Generator 作为依赖 diff --git a/website/docs/advanced/overloaded-handlers.md b/website/docs/advanced/handler/overload.md similarity index 98% rename from website/docs/advanced/overloaded-handlers.md rename to website/docs/advanced/handler/overload.md index d30211c5..a1df728a 100644 --- a/website/docs/advanced/overloaded-handlers.md +++ b/website/docs/advanced/handler/overload.md @@ -1,9 +1,9 @@ --- -sidebar_position: 6 +sidebar_position: 2 options: menu: - weight: 60 + weight: 61 category: advanced --- @@ -15,7 +15,7 @@ options: 必须要注意的是，该机制利用了 `inspect` 标准库获取到了事件处理函数的 `singnature` (签名) ，进一步获取到参数名称和类型标注。故而，我们在编写 `handler` 时，参数的名称和类型标注必须要符合 `T_Handler` 规定，详情可以参看 **指南** 中的[事件处理](../guide/creating-a-handler)。 -::: tip 提示 +:::tip 提示 如果想了解更多关于 `inspect` 标准库的信息，可以查看[官方文档](https://docs.python.org/zh-cn/3.9/library/inspect.html)。 diff --git a/website/docs/advanced/handler/sync-support.md b/website/docs/advanced/handler/sync-support.md new file mode 100644 index 00000000..54d81b6c --- /dev/null +++ b/website/docs/advanced/handler/sync-support.md @@ -0,0 +1,10 @@ +--- +sidebar_position: 1 + +options: + menu: + weight: 60 + category: advanced +--- + +# 同步支持 diff --git a/website/docs/advanced/permission.md b/website/docs/advanced/permission.md index f9d411ad..c72b4bf2 100644 --- a/website/docs/advanced/permission.md +++ b/website/docs/advanced/permission.md @@ -1,6 +1,4 @@ --- -sidebar_position: 3 - options: menu: weight: 30 diff --git a/website/docs/advanced/publish-plugin.md b/website/docs/advanced/publish-plugin.md index 9396a886..2de8293a 100644 --- a/website/docs/advanced/publish-plugin.md +++ b/website/docs/advanced/publish-plugin.md @@ -1,6 +1,4 @@ --- -sidebar_position: 7 - options: menu: weight: 70 diff --git a/website/docs/advanced/runtime-hook.md b/website/docs/advanced/runtime-hook.md index d6f1f271..cf0dd928 100644 --- a/website/docs/advanced/runtime-hook.md +++ b/website/docs/advanced/runtime-hook.md @@ -1,6 +1,4 @@ --- -sidebar_position: 4 - options: menu: weight: 40 diff --git a/website/docs/advanced/scheduler.md b/website/docs/advanced/scheduler.md index 8caf30b6..dd45a15b 100644 --- a/website/docs/advanced/scheduler.md +++ b/website/docs/advanced/scheduler.md @@ -1,6 +1,4 @@ --- -sidebar_position: 2 - options: menu: weight: 20 diff --git a/website/sidebars.js b/website/sidebars.js index 1ad12483..44577ae6 100644 --- a/website/sidebars.js +++ b/website/sidebars.js @@ -62,7 +62,11 @@ const sidebars = { "advanced/permission", "advanced/runtime-hook", "advanced/export-and-require", - "advanced/overloaded-handlers", + { + type: "category", + label: "高级事件处理", + items: [{ type: "autogenerated", dirName: "advanced/handler" }], + }, ], }, { diff --git a/yarn.lock b/yarn.lock index e86e807d..d49e543a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,24 +2,24 @@ # yarn lockfile v1 -"@algolia/autocomplete-core@1.2.2": - version "1.2.2" - resolved "https://registry.npmmirror.com/@algolia/autocomplete-core/download/@algolia/autocomplete-core-1.2.2.tgz?cache=0&sync_timestamp=1635931001143&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40algolia%2Fautocomplete-core%2Fdownload%2F%40algolia%2Fautocomplete-core-1.2.2.tgz#c121e70c78fd0175c989a219918124ad7758e48b" - integrity sha1-wSHnDHj9AXXJiaIZkYEkrXdY5Is= +"@algolia/autocomplete-core@1.5.0": + version "1.5.0" + resolved "https://registry.npmmirror.com/@algolia/autocomplete-core/download/@algolia/autocomplete-core-1.5.0.tgz?cache=0&sync_timestamp=1635931001143&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40algolia%2Fautocomplete-core%2Fdownload%2F%40algolia%2Fautocomplete-core-1.5.0.tgz#6c91c9de7748e9c103846828a58dfe92bd4d6689" + integrity sha1-bJHJ3ndI6cEDhGgopY3+kr1NZok= dependencies: - "@algolia/autocomplete-shared" "1.2.2" + "@algolia/autocomplete-shared" "1.5.0" -"@algolia/autocomplete-preset-algolia@1.2.2": - version "1.2.2" - resolved "https://registry.npmmirror.com/@algolia/autocomplete-preset-algolia/download/@algolia/autocomplete-preset-algolia-1.2.2.tgz#da734ef9e42a5f64cdad2dfc81c4e9fbf805d976" - integrity sha1-2nNO+eQqX2TNrS38gcTp+/gF2XY= +"@algolia/autocomplete-preset-algolia@1.5.0": + version "1.5.0" + resolved "https://registry.npmmirror.com/@algolia/autocomplete-preset-algolia/download/@algolia/autocomplete-preset-algolia-1.5.0.tgz#61671f09c0c77133d9baf1356719f8378c48437a" + integrity sha1-YWcfCcDHcTPZuvE1Zxn4N4xIQ3o= dependencies: - "@algolia/autocomplete-shared" "1.2.2" + "@algolia/autocomplete-shared" "1.5.0" -"@algolia/autocomplete-shared@1.2.2": - version "1.2.2" - resolved "https://registry.npmmirror.com/@algolia/autocomplete-shared/download/@algolia/autocomplete-shared-1.2.2.tgz#ff25dc308f2a296b2b9b325f1e3b57498eea3e0c" - integrity sha1-/yXcMI8qKWsrmzJfHjtXSY7qPgw= +"@algolia/autocomplete-shared@1.5.0": + version "1.5.0" + resolved "https://registry.npmmirror.com/@algolia/autocomplete-shared/download/@algolia/autocomplete-shared-1.5.0.tgz#09580bc89408a2ab5f29e312120dad68f58019bd" + integrity sha1-CVgLyJQIoqtfKeMSEg2taPWAGb0= "@algolia/cache-browser-local-storage@4.11.0": version "4.11.0" @@ -1146,19 +1146,19 @@ "@babel/helper-validator-identifier" "^7.15.7" to-fast-properties "^2.0.0" -"@docsearch/css@3.0.0-alpha.41": - version "3.0.0-alpha.41" - resolved "https://registry.npmmirror.com/@docsearch/css/download/@docsearch/css-3.0.0-alpha.41.tgz#c5c8e803541bd157ad86e764c2c1e9f1b5a68592" - integrity sha1-xcjoA1Qb0VethudkwsHp8bWmhZI= +"@docsearch/css@3.0.0-alpha.42": + version "3.0.0-alpha.42" + resolved "https://registry.npmmirror.com/@docsearch/css/download/@docsearch/css-3.0.0-alpha.42.tgz#deb6049e999d6ca9451eba4793cb5b6da28c8773" + integrity sha512-AGwI2AXUacYhVOHmYnsXoYDJKO6Ued2W+QO80GERbMLhC7GH5tfvtW5REs/s7jSdcU3vzFoxT8iPDBCh/PkrlQ== "@docsearch/react@^3.0.0-alpha.39": - version "3.0.0-alpha.41" - resolved "https://registry.npmmirror.com/@docsearch/react/download/@docsearch/react-3.0.0-alpha.41.tgz#07e85a664e85f251ce3d13153abce65a4d5997ab" - integrity sha1-B+haZk6F8lHOPRMVOrzmWk1Zl6s= + version "3.0.0-alpha.42" + resolved "https://registry.npmmirror.com/@docsearch/react/download/@docsearch/react-3.0.0-alpha.42.tgz#1d22a2b05779f24d090ff8d7ff2699e4d50dff5c" + integrity sha512-1aOslZJDxwUUcm2QRNmlEePUgL8P5fOAeFdOLDMctHQkV2iTja9/rKVbkP8FZbIUnZxuuCCn8ErLrjD/oXWOag== dependencies: - "@algolia/autocomplete-core" "1.2.2" - "@algolia/autocomplete-preset-algolia" "1.2.2" - "@docsearch/css" "3.0.0-alpha.41" + "@algolia/autocomplete-core" "1.5.0" + "@algolia/autocomplete-preset-algolia" "1.5.0" + "@docsearch/css" "3.0.0-alpha.42" algoliasearch "^4.0.0" "@docusaurus/core@2.0.0-beta.9": @@ -3238,19 +3238,19 @@ dns-txt@^2.0.2: buffer-indexof "^1.0.0" docusaurus-preset-nonepress@canary: - version "0.0.0-113" - resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-113.tgz#8ed150a551c02f52cc9dba4c97a7d97c37e20a92" - integrity sha512-2TGTjzGAwuK0WzSokf7M2792yrMIY64pAX6IJfZcuFAe2u+GOTms4b4aaJecXo9Q6DTyvhSaRqppLEo0BSILZw== + version "0.0.0-116" + resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-116.tgz#afa053d218666f6a532d76e44bba6e650657e3f0" + integrity sha512-5UmZVhR50qjahlwKl7kLy7PATKjOIxfiXvL16p9kQ0Xd57DkkoOHnueeVdVHRxDSH5Dpgje/ouX+8D/LqsugdA== dependencies: "@docusaurus/core" "2.0.0-beta.9" "@docusaurus/plugin-content-docs" "2.0.0-beta.9" "@docusaurus/plugin-content-pages" "2.0.0-beta.9" - docusaurus-theme-nonepress "0.0.0-113" + docusaurus-theme-nonepress "0.0.0-116" -docusaurus-theme-nonepress@0.0.0-113: - version "0.0.0-113" - resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-113.tgz#1f59c962da80e4fae395342273be01391a8c5382" - integrity sha512-qtcchxgpAvi61VklufkaqrpFdd+3xpCbsn256PRhDmbsa9+NINybmuU+OV3u6nlx0VhSpWdBN4uwPozC9Ptsgw== +docusaurus-theme-nonepress@0.0.0-116: + version "0.0.0-116" + resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-116.tgz#4e7b8463738c0557118c33ecadc761e9c1ef485f" + integrity sha512-9kv6LoQKe2pfKToKPLYHuT2nwF2cMAFQgRhijQg2lu4YNvXDQ/rHzSbuuBIJp/NRYZfPH3LPwEGEREOe2VXJLQ== dependencies: "@docsearch/react" "^3.0.0-alpha.39" "@docusaurus/core" "2.0.0-beta.9" From a148ef7bfe723bcfe9177f6c4a8abdd4483b55f6 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 3 Dec 2021 23:34:58 +0800 Subject: [PATCH 060/174] :memo: fix handler doc link --- website/docs/advanced/handler/overload.md | 2 +- website/docs/guide/creating-a-handler.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/docs/advanced/handler/overload.md b/website/docs/advanced/handler/overload.md index a1df728a..f232c074 100644 --- a/website/docs/advanced/handler/overload.md +++ b/website/docs/advanced/handler/overload.md @@ -13,7 +13,7 @@ options: 针对这个问题， `nonebot2` 提供一个便捷而高效的解决方案：事件处理函数重载机制。简单地说，`handler` (事件处理函数) 会根据其参数的 `type hints` ([PEP484 类型标注](https://www.python.org/dev/peps/pep-0484/)) 来对相对应的 `adapter` 和 `Event` 进行响应，并且会忽略不符合其参数类型标注的情况。 -必须要注意的是，该机制利用了 `inspect` 标准库获取到了事件处理函数的 `singnature` (签名) ，进一步获取到参数名称和类型标注。故而，我们在编写 `handler` 时，参数的名称和类型标注必须要符合 `T_Handler` 规定，详情可以参看 **指南** 中的[事件处理](../guide/creating-a-handler)。 +必须要注意的是，该机制利用了 `inspect` 标准库获取到了事件处理函数的 `singnature` (签名) ，进一步获取到参数名称和类型标注。故而，我们在编写 `handler` 时，参数的名称和类型标注必须要符合 `T_Handler` 规定，详情可以参看 **指南** 中的[事件处理](../../guide/creating-a-handler)。 :::tip 提示 diff --git a/website/docs/guide/creating-a-handler.md b/website/docs/guide/creating-a-handler.md index eb7adb73..3e0d49a4 100644 --- a/website/docs/guide/creating-a-handler.md +++ b/website/docs/guide/creating-a-handler.md @@ -130,7 +130,7 @@ async def handle(bot: Bot): - `state["_prefix"]`, `state["_suffix"]`: 存储当前 TRIE 匹配的前缀/后缀，可以通过该值获取用户命令的原始命令 :::tip 提示 -NoneBot 会对不同类型的参数进行不同的操作，详情查看 [事件处理函数重载](../advanced/overloaded-handlers.md) +NoneBot 会对不同类型的参数进行不同的操作，详情查看 [事件处理函数重载](../advanced/handler/overload.md) ::: ### 参数处理函数 args_parser From aea961b34667c68de1c877c8b218febea9303fb3 Mon Sep 17 00:00:00 2001 From: Ju4tCode <42488585+yanyongyu@users.noreply.github.com> Date: Sat, 4 Dec 2021 14:15:00 +0800 Subject: [PATCH 061/174] Update nonebot/drivers/fastapi.py --- nonebot/drivers/fastapi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index 3b355e3f..ac23081b 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -467,10 +467,10 @@ class FullDriver(ForwardDriver, Driver): continue if not client: - client = httpx.AsyncClient(http2=http2, follow_redirects=True) + client = httpx.AsyncClient(http2=setup.http_version == "2", follow_redirects=True) elif http2 != (setup.http_version == "2"): await client.aclose() - client = httpx.AsyncClient(http2=http2, follow_redirects=True) + client = httpx.AsyncClient(http2=setup.http_version == "2", follow_redirects=True) http2 = setup.http_version == "2" if not bot: From 59e139724b3523e4a15ac0841bbddac8502d4063 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sat, 4 Dec 2021 22:57:44 +0800 Subject: [PATCH 062/174] :hankey: find errors need to fix --- nonebot/dependencies/__init__.py | 1 + nonebot/message.py | 3 +++ nonebot/params.py | 1 + 3 files changed, 5 insertions(+) diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index 80db9840..8cc331cc 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -131,6 +131,7 @@ def get_dependent( return dependent +# FIXME: check param types first then run dependencies async def solve_dependencies( *, _dependent: Dependent, diff --git a/nonebot/message.py b/nonebot/message.py index f2ff0ca9..3f89b971 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -97,6 +97,9 @@ def run_postprocessor(func: T_RunPostProcessor) -> T_RunPostProcessor: return func +# FIXME: run handler with try/except skipped exception + + async def _check_matcher( priority: int, Matcher: Type[Matcher], diff --git a/nonebot/params.py b/nonebot/params.py index 484c4d21..79747ca4 100644 --- a/nonebot/params.py +++ b/nonebot/params.py @@ -31,6 +31,7 @@ class EventParam(Param): return event +# FIXME: may detect error param class StateParam(Param): @classmethod def _check(cls, name: str, param: inspect.Parameter) -> bool: From c25ee1cb568577ca9a28362176135cc61de7fa4f Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 5 Dec 2021 17:29:38 +0800 Subject: [PATCH 063/174] :zap: check param first then dependencies --- nonebot/dependencies/__init__.py | 37 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index 8cc331cc..d15a2ddc 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -131,7 +131,6 @@ def get_dependent( return dependent -# FIXME: check param types first then run dependencies async def solve_dependencies( *, _dependent: Dependent, @@ -143,6 +142,24 @@ async def solve_dependencies( values: Dict[str, Any] = {} dependency_cache = {} if _dependency_cache is None else _dependency_cache + # usual dependency + for field in _dependent.params: + field_info = field.field_info + assert isinstance(field_info, Param), "Params must be subclasses of Param" + value = field_info._solve(**params) + if value == Undefined: + value = field.get_default() + _, errs_ = field.validate(value, values, loc=(str(field_info), field.alias)) + if errs_: + logger.debug( + f"{field_info} " + f"type {type(value)} not match depends {_dependent.func} " + f"annotation {field._type_display()}, ignored" + ) + raise SkippedException + else: + values[field.name] = value + # solve sub dependencies sub_dependent: Dependent for sub_dependent in chain(_sub_dependents or tuple(), _dependent.dependencies): @@ -183,24 +200,6 @@ async def solve_dependencies( if sub_dependent.cache_key not in dependency_cache: dependency_cache[sub_dependent.cache_key] = solved - # usual dependency - for field in _dependent.params: - field_info = field.field_info - assert isinstance(field_info, Param), "Params must be subclasses of Param" - value = field_info._solve(**params) - if value == Undefined: - value = field.get_default() - _, errs_ = field.validate(value, values, loc=(str(field_info), field.alias)) - if errs_: - logger.debug( - f"{field_info} " - f"type {type(value)} not match depends {_dependent.func} " - f"annotation {field._type_display()}, ignored" - ) - raise SkippedException - else: - values[field.name] = value - return values, dependency_cache From ca4d7397f8d77c243fa609c1f69170614b45b9be Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 6 Dec 2021 00:17:52 +0800 Subject: [PATCH 064/174] :bug: add skip handle for process --- nonebot/dependencies/__init__.py | 2 +- nonebot/exception.py | 12 +++++ nonebot/matcher.py | 7 ++- nonebot/message.py | 87 +++++++++++++++++++++----------- 4 files changed, 76 insertions(+), 32 deletions(-) diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index d15a2ddc..04d91d15 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -156,7 +156,7 @@ async def solve_dependencies( f"type {type(value)} not match depends {_dependent.func} " f"annotation {field._type_display()}, ignored" ) - raise SkippedException + raise SkippedException(field, value) else: values[field.name] = value diff --git a/nonebot/exception.py b/nonebot/exception.py index 193023b7..f1e95fd6 100644 --- a/nonebot/exception.py +++ b/nonebot/exception.py @@ -8,6 +8,8 @@ from typing import Any, Optional +from pydantic.fields import ModelField + class NoneBotException(Exception): """ @@ -124,6 +126,16 @@ class SkippedException(MatcherException): 可以在 ``Handler`` 中通过 ``Matcher.skip()`` 抛出。 """ + def __init__(self, param: ModelField, value: Any): + self.param = param + self.value = value + + def __repr__(self): + return f"" + + def __str__(self): + self.__repr__() + class PausedException(MatcherException): """ diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 1bad8a6e..19c7e553 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -669,8 +669,11 @@ class Matcher(metaclass=MatcherMeta): _stack=stack, _dependency_cache=dependency_cache, ) - except SkippedException: - pass + except SkippedException as e: + logger.debug( + f"Handler {handler} param {e.param.name} value {e.value} " + f"mismatch type {e.param._type_display()}, skipped" + ) except RejectedException: self.handlers.insert(0, handler) # type: ignore diff --git a/nonebot/message.py b/nonebot/message.py index 3f89b971..b36b3049 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -8,7 +8,16 @@ NoneBot 内部处理并按优先级分发事件给所有事件响应器，提供 import asyncio from datetime import datetime from contextlib import AsyncExitStack -from typing import TYPE_CHECKING, Any, Set, Dict, Type, Optional +from typing import ( + TYPE_CHECKING, + Any, + Set, + Dict, + List, + Type, + Optional, + Coroutine, +) from nonebot import params from nonebot.log import logger @@ -16,7 +25,12 @@ from nonebot.rule import TrieRule from nonebot.handler import Handler from nonebot.utils import escape_tag from nonebot.matcher import Matcher, matchers -from nonebot.exception import NoLogException, StopPropagation, IgnoredException +from nonebot.exception import ( + NoLogException, + StopPropagation, + IgnoredException, + SkippedException, +) from nonebot.typing import ( T_State, T_DependencyCache, @@ -100,6 +114,13 @@ def run_postprocessor(func: T_RunPostProcessor) -> T_RunPostProcessor: # FIXME: run handler with try/except skipped exception +async def _run_coro_with_catch(coro: Coroutine[Any, Any, Any]) -> Any: + try: + return await coro + except SkippedException: + pass + + async def _check_matcher( priority: int, Matcher: Type[Matcher], @@ -150,13 +171,15 @@ async def _run_matcher( coros = list( map( - lambda x: x( - matcher=matcher, - bot=bot, - event=event, - state=state, - _stack=stack, - _dependency_cache=dependency_cache, + lambda x: _run_coro_with_catch( + x( + matcher=matcher, + bot=bot, + event=event, + state=state, + _stack=stack, + _dependency_cache=dependency_cache, + ) ), _run_preprocessors, ) @@ -189,14 +212,16 @@ async def _run_matcher( coros = list( map( - lambda x: x( - matcher=matcher, - exception=exception, - bot=bot, - event=event, - state=state, - _stack=stack, - _dependency_cache=dependency_cache, + lambda x: _run_coro_with_catch( + x( + matcher=matcher, + exception=exception, + bot=bot, + event=event, + state=state, + _stack=stack, + _dependency_cache=dependency_cache, + ) ), _run_postprocessors, ) @@ -247,12 +272,14 @@ async def handle_event(bot: "Bot", event: "Event") -> None: async with AsyncExitStack() as stack: coros = list( map( - lambda x: x( - bot=bot, - event=event, - state=state, - _stack=stack, - _dependency_cache=dependency_cache, + lambda x: _run_coro_with_catch( + x( + bot=bot, + event=event, + state=state, + _stack=stack, + _dependency_cache=dependency_cache, + ) ), _event_preprocessors, ) @@ -307,12 +334,14 @@ async def handle_event(bot: "Bot", event: "Event") -> None: coros = list( map( - lambda x: x( - bot=bot, - event=event, - state=state, - _stack=stack, - _dependency_cache=dependency_cache, + lambda x: _run_coro_with_catch( + x( + bot=bot, + event=event, + state=state, + _stack=stack, + _dependency_cache=dependency_cache, + ) ), _event_postprocessors, ) From 5b75b72720531252c1e305d9dead8ab96d9554ec Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 6 Dec 2021 10:10:51 +0800 Subject: [PATCH 065/174] :recycle: use class rule and permission --- nonebot/dependencies/__init__.py | 30 +++--- nonebot/dependencies/models.py | 6 +- nonebot/dependencies/utils.py | 6 +- nonebot/handler.py | 16 +-- nonebot/matcher.py | 4 +- nonebot/permission.py | 77 +++++++++----- nonebot/rule.py | 168 +++++++++++++++++++------------ nonebot/utils.py | 30 +++--- 8 files changed, 202 insertions(+), 135 deletions(-) diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index 04d91d15..776a25e5 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -69,22 +69,22 @@ def get_sub_dependant( allow_types: Optional[List[Type[Param]]] = None, ) -> Dependent: sub_dependant = get_dependent( - func=dependency, name=name, use_cache=depends.use_cache, allow_types=allow_types + call=dependency, name=name, use_cache=depends.use_cache, allow_types=allow_types ) return sub_dependant def get_dependent( *, - func: T_Handler, + call: T_Handler, name: Optional[str] = None, use_cache: bool = True, allow_types: Optional[List[Type[Param]]] = None, ) -> Dependent: - signature = get_typed_signature(func) + signature = get_typed_signature(call) params = signature.parameters dependent = Dependent( - func=func, name=name, allow_types=allow_types, use_cache=use_cache + call=call, name=name, allow_types=allow_types, use_cache=use_cache ) for param_name, param in params.items(): if isinstance(param.default, DependsWrapper): @@ -108,7 +108,7 @@ def get_dependent( break else: raise ValueError( - f"Unknown parameter {param_name} for function {func} with type {param.annotation}" + f"Unknown parameter {param_name} for function {call} with type {param.annotation}" ) annotation: Any = Any @@ -153,7 +153,7 @@ async def solve_dependencies( if errs_: logger.debug( f"{field_info} " - f"type {type(value)} not match depends {_dependent.func} " + f"type {type(value)} not match depends {_dependent.call} " f"annotation {field._type_display()}, ignored" ) raise SkippedException(field, value) @@ -163,9 +163,9 @@ async def solve_dependencies( # solve sub dependencies sub_dependent: Dependent for sub_dependent in chain(_sub_dependents or tuple(), _dependent.dependencies): - sub_dependent.func = cast(Callable[..., Any], sub_dependent.func) + sub_dependent.call = cast(Callable[..., Any], sub_dependent.call) sub_dependent.cache_key = cast(Callable[..., Any], sub_dependent.cache_key) - func = sub_dependent.func + call = sub_dependent.call # solve sub dependency with current cache solved_result = await solve_dependencies( @@ -179,19 +179,19 @@ async def solve_dependencies( async with cache_lock: if sub_dependent.use_cache and sub_dependent.cache_key in dependency_cache: solved = dependency_cache[sub_dependent.cache_key] - elif is_gen_callable(func) or is_async_gen_callable(func): + elif is_gen_callable(call) or is_async_gen_callable(call): assert isinstance( _stack, AsyncExitStack ), "Generator dependency should be called in context" - if is_gen_callable(func): - cm = run_sync_ctx_manager(contextmanager(func)(**sub_values)) + if is_gen_callable(call): + cm = run_sync_ctx_manager(contextmanager(call)(**sub_values)) else: - cm = asynccontextmanager(func)(**sub_values) + cm = asynccontextmanager(call)(**sub_values) solved = await _stack.enter_async_context(cm) - elif is_coroutine_callable(func): - solved = await func(**sub_values) + elif is_coroutine_callable(call): + solved = await call(**sub_values) else: - solved = await run_sync(func)(**sub_values) + solved = await run_sync(call)(**sub_values) # parameter dependency if sub_dependent.name is not None: diff --git a/nonebot/dependencies/models.py b/nonebot/dependencies/models.py index 3fdb8e81..3875a6d7 100644 --- a/nonebot/dependencies/models.py +++ b/nonebot/dependencies/models.py @@ -36,17 +36,17 @@ class Dependent: def __init__( self, *, - func: Optional[T_Handler] = None, + call: Optional[T_Handler] = None, name: Optional[str] = None, params: Optional[List[ModelField]] = None, allow_types: Optional[List[Type[Param]]] = None, dependencies: Optional[List["Dependent"]] = None, use_cache: bool = True, ) -> None: - self.func = func + self.call = call self.name = name self.params = params or [] self.allow_types = allow_types or [] self.dependencies = dependencies or [] self.use_cache = use_cache - self.cache_key = self.func + self.cache_key = self.call diff --git a/nonebot/dependencies/utils.py b/nonebot/dependencies/utils.py index 44a6b4c9..d82976c5 100644 --- a/nonebot/dependencies/utils.py +++ b/nonebot/dependencies/utils.py @@ -7,9 +7,9 @@ from pydantic.typing import ForwardRef, evaluate_forwardref from nonebot.typing import T_Handler -def get_typed_signature(func: T_Handler) -> inspect.Signature: - signature = inspect.signature(func) - globalns = getattr(func, "__globals__", {}) +def get_typed_signature(call: T_Handler) -> inspect.Signature: + signature = inspect.signature(call) + globalns = getattr(call, "__globals__", {}) typed_params = [ inspect.Parameter( name=param.name, diff --git a/nonebot/handler.py b/nonebot/handler.py index 78ec21b9..30e701fd 100644 --- a/nonebot/handler.py +++ b/nonebot/handler.py @@ -25,7 +25,7 @@ class Handler: def __init__( self, - func: Callable[..., Any], + call: Callable[..., Any], *, name: Optional[str] = None, dependencies: Optional[List[DependsWrapper]] = None, @@ -38,17 +38,17 @@ class Handler: :参数: - * ``func: Callable[..., Any]``: 事件处理函数。 + * ``call: Callable[..., Any]``: 事件处理函数。 * ``name: Optional[str]``: 事件处理器名称。默认为函数名。 * ``dependencies: Optional[List[DependsWrapper]]``: 额外的非参数依赖注入。 * ``allow_types: Optional[List[Type[Param]]]``: 允许的参数类型。 """ - self.func = func + self.call = call """ :类型: ``Callable[..., Any]`` :说明: 事件处理函数 """ - self.name = get_name(func) if name is None else name + self.name = get_name(call) if name is None else name """ :类型: ``str`` :说明: 事件处理函数名 @@ -68,7 +68,7 @@ class Handler: if dependencies: for depends in dependencies: self.cache_dependent(depends) - self.dependent = get_dependent(func=func, allow_types=self.allow_types) + self.dependent = get_dependent(call=call, allow_types=self.allow_types) def __repr__(self) -> str: return f"" @@ -94,10 +94,10 @@ class Handler: **params, ) - if asyncio.iscoroutinefunction(self.func): - return await self.func(**values) + if asyncio.iscoroutinefunction(self.call): + return await self.call(**values) else: - return await run_sync(self.func)(**values) + return await run_sync(self.call)(**values) def cache_dependent(self, dependency: DependsWrapper): if not dependency.dependency: diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 19c7e553..47ebebd1 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -442,7 +442,7 @@ class Matcher(metaclass=MatcherMeta): def _decorator(func: T_Handler) -> T_Handler: - if cls.handlers and cls.handlers[-1].func is func: + if cls.handlers and cls.handlers[-1].call is func: func_handler = cls.handlers[-1] for depend in reversed(_dependencies): func_handler.prepend_dependency(depend) @@ -513,7 +513,7 @@ class Matcher(metaclass=MatcherMeta): def _decorator(func: T_Handler) -> T_Handler: - if cls.handlers and cls.handlers[-1].func is func: + if cls.handlers and cls.handlers[-1].call is func: func_handler = cls.handlers[-1] for depend in reversed(_dependencies): func_handler.prepend_dependency(depend) diff --git a/nonebot/permission.py b/nonebot/permission.py index 185022e0..f1f863db 100644 --- a/nonebot/permission.py +++ b/nonebot/permission.py @@ -11,7 +11,17 @@ r""" import asyncio from contextlib import AsyncExitStack -from typing import Any, Dict, List, Type, Union, Callable, NoReturn, Optional +from typing import ( + Any, + Dict, + List, + Type, + Tuple, + Union, + Callable, + NoReturn, + Optional, +) from nonebot import params from nonebot.handler import Handler @@ -119,41 +129,59 @@ class Permission: return Permission(*self.checkers, other) -async def _message(event: Event) -> bool: - return event.get_type() == "message" +class Message: + async def __call__(self, event: Event) -> bool: + return event.get_type() == "message" -async def _notice(event: Event) -> bool: - return event.get_type() == "notice" +class Notice: + async def __call__(self, event: Event) -> bool: + return event.get_type() == "notice" -async def _request(event: Event) -> bool: - return event.get_type() == "request" +class Request: + async def __call__(self, event: Event) -> bool: + return event.get_type() == "request" -async def _metaevent(event: Event) -> bool: - return event.get_type() == "meta_event" +class MetaEvent: + async def __call__(self, event: Event) -> bool: + return event.get_type() == "meta_event" -MESSAGE = Permission(_message) +MESSAGE = Permission(Message()) """ - **说明**: 匹配任意 ``message`` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 message type 的 Matcher。 """ -NOTICE = Permission(_notice) +NOTICE = Permission(Notice()) """ - **说明**: 匹配任意 ``notice`` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 notice type 的 Matcher。 """ -REQUEST = Permission(_request) +REQUEST = Permission(Request()) """ - **说明**: 匹配任意 ``request`` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 request type 的 Matcher。 """ -METAEVENT = Permission(_metaevent) +METAEVENT = Permission(MetaEvent()) """ - **说明**: 匹配任意 ``meta_event`` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 meta_event type 的 Matcher。 """ -def USER(*user: str, perm: Optional[Permission] = None): +class User: + def __init__( + self, users: Tuple[str, ...], perm: Optional[Permission] = None + ) -> None: + self.users = users + self.perm = perm + + async def __call__(self, bot: Bot, event: Event) -> bool: + return bool( + event.get_session_id() in self.users + and (self.perm is None or await self.perm(bot, event)) + ) + + +def USER(*users: str, perm: Optional[Permission] = None): """ :说明: @@ -165,21 +193,18 @@ def USER(*user: str, perm: Optional[Permission] = None): * ``perm: Optional[Permission]``: 需要同时满足的权限 """ - async def _user(bot: Bot, event: Event) -> bool: - return bool( - event.get_session_id() in user and (perm is None or await perm(bot, event)) + return Permission(User(users, perm)) + + +class SuperUser: + async def __call__(self, bot: Bot, event: Event) -> bool: + return ( + event.get_type() == "message" + and event.get_user_id() in bot.config.superusers ) - return Permission(_user) - -async def _superuser(bot: Bot, event: Event) -> bool: - return ( - event.get_type() == "message" and event.get_user_id() in bot.config.superusers - ) - - -SUPERUSER = Permission(_superuser) +SUPERUSER = Permission(SuperUser()) """ - **说明**: 匹配任意超级用户消息类型事件 """ diff --git a/nonebot/rule.py b/nonebot/rule.py index 9469c517..2408e4eb 100644 --- a/nonebot/rule.py +++ b/nonebot/rule.py @@ -203,6 +203,24 @@ class TrieRule: return prefix, suffix +class Startswith: + def __init__(self, msg: Tuple[str, ...], ignorecase: bool = False): + self.msg = msg + self.ignorecase = ignorecase + + async def __call__(self, event: Event) -> Any: + if event.get_type() != "message": + return False + text = event.get_plaintext() + return bool( + re.match( + f"^(?:{'|'.join(re.escape(prefix) for prefix in self.msg)})", + text, + re.IGNORECASE if self.ignorecase else 0, + ) + ) + + def startswith(msg: Union[str, Tuple[str, ...]], ignorecase: bool = False) -> Rule: """ :说明: @@ -216,18 +234,25 @@ def startswith(msg: Union[str, Tuple[str, ...]], ignorecase: bool = False) -> Ru if isinstance(msg, str): msg = (msg,) - pattern = re.compile( - f"^(?:{'|'.join(re.escape(prefix) for prefix in msg)})", - re.IGNORECASE if ignorecase else 0, - ) + return Rule(Startswith(msg, ignorecase)) - async def _startswith(bot: Bot, event: Event, state: T_State) -> bool: + +class Endswith: + def __init__(self, msg: Tuple[str, ...], ignorecase: bool = False): + self.msg = msg + self.ignorecase = ignorecase + + async def __call__(self, event: Event) -> Any: if event.get_type() != "message": return False text = event.get_plaintext() - return bool(pattern.match(text)) - - return Rule(_startswith) + return bool( + re.search( + f"(?:{'|'.join(re.escape(prefix) for prefix in self.msg)})$", + text, + re.IGNORECASE if self.ignorecase else 0, + ) + ) def endswith(msg: Union[str, Tuple[str, ...]], ignorecase: bool = False) -> Rule: @@ -243,18 +268,18 @@ def endswith(msg: Union[str, Tuple[str, ...]], ignorecase: bool = False) -> Rule if isinstance(msg, str): msg = (msg,) - pattern = re.compile( - f"(?:{'|'.join(re.escape(prefix) for prefix in msg)})$", - re.IGNORECASE if ignorecase else 0, - ) + return Rule(Endswith(msg, ignorecase)) - async def _endswith(bot: Bot, event: Event, state: T_State) -> bool: + +class Keywords: + def __init__(self, *keywords: str): + self.keywords = keywords + + async def __call__(self, bot: Bot, event: Event, state: T_State) -> bool: if event.get_type() != "message": return False text = event.get_plaintext() - return bool(pattern.search(text)) - - return Rule(_endswith) + return bool(text and any(keyword in text for keyword in self.keywords)) def keyword(*keywords: str) -> Rule: @@ -268,13 +293,18 @@ def keyword(*keywords: str) -> Rule: * ``*keywords: str``: 关键词 """ - async def _keyword(event: Event) -> bool: - if event.get_type() != "message": - return False - text = event.get_plaintext() - return bool(text and any(keyword in text for keyword in keywords)) + return Rule(Keywords(*keywords)) - return Rule(_keyword) + +class Command: + def __init__(self, cmds: List[Tuple[str, ...]]): + self.cmds = cmds + + async def __call__(self, state: T_State) -> bool: + return state[PREFIX_KEY][CMD_KEY] in self.cmds + + def __repr__(self): + return f"" def command(*cmds: Union[str, Tuple[str, ...]]) -> Rule: @@ -304,10 +334,12 @@ def command(*cmds: Union[str, Tuple[str, ...]]) -> Rule: config = get_driver().config command_start = config.command_start command_sep = config.command_sep - commands = list(cmds) - for index, command in enumerate(commands): + commands: List[Tuple[str, ...]] = [] + for command in cmds: if isinstance(command, str): - commands[index] = command = (command,) + command = (command,) + + commands.append(command) if len(command) == 1: for start in command_start: @@ -316,10 +348,7 @@ def command(*cmds: Union[str, Tuple[str, ...]]) -> Rule: for start, sep in product(command_start, command_sep): TrieRule.add_prefix(f"{start}{sep.join(command)}", command) - async def _command(state: T_State) -> bool: - return state[PREFIX_KEY][CMD_KEY] in commands - - return Rule(_command) + return Rule(Command(commands)) class ArgumentParser(ArgParser): @@ -350,6 +379,27 @@ class ArgumentParser(ArgParser): return super().parse_args(args=args, namespace=namespace) # type: ignore +class ShellCommand: + def __init__(self, cmds: List[Tuple[str, ...]], parser: Optional[ArgumentParser]): + self.cmds = cmds + self.parser = parser + + async def __call__(self, event: Event, state: T_State) -> bool: + if state[PREFIX_KEY][CMD_KEY] in self.cmds: + message = str(event.get_message()) + strip_message = message[len(state[PREFIX_KEY][RAW_CMD_KEY]) :].lstrip() + state[SHELL_ARGV] = shlex.split(strip_message) + if self.parser: + try: + args = self.parser.parse_args(state[SHELL_ARGV]) + state[SHELL_ARGS] = args + except ParserExit as e: + state[SHELL_ARGS] = e + return True + else: + return False + + def shell_command( *cmds: Union[str, Tuple[str, ...]], parser: Optional[ArgumentParser] = None ) -> Rule: @@ -392,10 +442,12 @@ def shell_command( config = get_driver().config command_start = config.command_start command_sep = config.command_sep - commands = list(cmds) - for index, command in enumerate(commands): + commands: List[Tuple[str, ...]] = [] + for command in cmds: if isinstance(command, str): - commands[index] = command = (command,) + command = (command,) + + commands.append(command) if len(command) == 1: for start in command_start: @@ -404,23 +456,26 @@ def shell_command( for start, sep in product(command_start, command_sep): TrieRule.add_prefix(f"{start}{sep.join(command)}", command) - async def _shell_command(event: Event, state: T_State) -> bool: - if state[PREFIX_KEY][CMD_KEY] in commands: - message = str(event.get_message()) - strip_message = message[len(state[PREFIX_KEY][RAW_CMD_KEY]) :].lstrip() - state[SHELL_ARGV] = shlex.split(strip_message) - if parser: - try: - args = parser.parse_args(state[SHELL_ARGV]) - state[SHELL_ARGS] = args - except ParserExit as e: - state[SHELL_ARGS] = e + return Rule(ShellCommand(commands, parser)) + + +class Regex: + def __init__(self, regex: str, flags: int = 0): + self.regex = regex + self.flags = flags + + async def __call__(self, event: Event, state: T_State) -> bool: + if event.get_type() != "message": + return False + matched = re.search(self.regex, str(event.get_message()), self.flags) + if matched: + state[REGEX_MATCHED] = matched.group() + state[REGEX_GROUP] = matched.groups() + state[REGEX_DICT] = matched.groupdict() return True else: return False - return Rule(_shell_command) - def regex(regex: str, flags: Union[int, re.RegexFlag] = 0) -> Rule: r""" @@ -441,25 +496,12 @@ def regex(regex: str, flags: Union[int, re.RegexFlag] = 0) -> Rule: \:\:\: """ - pattern = re.compile(regex, flags) - - async def _regex(event: Event, state: T_State) -> bool: - if event.get_type() != "message": - return False - matched = pattern.search(str(event.get_message())) - if matched: - state[REGEX_MATCHED] = matched.group() - state[REGEX_GROUP] = matched.groups() - state[REGEX_DICT] = matched.groupdict() - return True - else: - return False - - return Rule(_regex) + return Rule(Regex(regex, flags)) -async def _to_me(event: Event) -> bool: - return event.is_tome() +class ToMe: + async def __call__(self, event: Event) -> bool: + return event.is_tome() def to_me() -> Rule: @@ -473,4 +515,4 @@ def to_me() -> Rule: * 无 """ - return Rule(_to_me) + return Rule(ToMe()) diff --git a/nonebot/utils.py b/nonebot/utils.py index 001ee43e..0c63289c 100644 --- a/nonebot/utils.py +++ b/nonebot/utils.py @@ -66,30 +66,30 @@ def generic_check_issubclass( raise -def is_coroutine_callable(func: Callable[..., Any]) -> bool: - if inspect.isroutine(func): - return inspect.iscoroutinefunction(func) - if inspect.isclass(func): +def is_coroutine_callable(call: Callable[..., Any]) -> bool: + if inspect.isroutine(call): + return inspect.iscoroutinefunction(call) + if inspect.isclass(call): return False - func_ = getattr(func, "__call__", None) + func_ = getattr(call, "__call__", None) return inspect.iscoroutinefunction(func_) -def is_gen_callable(func: Callable[..., Any]) -> bool: - if inspect.isgeneratorfunction(func): +def is_gen_callable(call: Callable[..., Any]) -> bool: + if inspect.isgeneratorfunction(call): return True - func_ = getattr(func, "__call__", None) + func_ = getattr(call, "__call__", None) return inspect.isgeneratorfunction(func_) -def is_async_gen_callable(func: Callable[..., Any]) -> bool: - if inspect.isasyncgenfunction(func): +def is_async_gen_callable(call: Callable[..., Any]) -> bool: + if inspect.isasyncgenfunction(call): return True - func_ = getattr(func, "__call__", None) + func_ = getattr(call, "__call__", None) return inspect.isasyncgenfunction(func_) -def run_sync(func: Callable[P, R]) -> Callable[P, Awaitable[R]]: +def run_sync(call: Callable[P, R]) -> Callable[P, Awaitable[R]]: """ :说明: @@ -97,17 +97,17 @@ def run_sync(func: Callable[P, R]) -> Callable[P, Awaitable[R]]: :参数: - * ``func: Callable[P, R]``: 被装饰的同步函数 + * ``call: Callable[P, R]``: 被装饰的同步函数 :返回: - ``Callable[P, Awaitable[R]]`` """ - @wraps(func) + @wraps(call) async def _wrapper(*args: P.args, **kwargs: P.kwargs) -> R: loop = asyncio.get_running_loop() - pfunc = partial(func, *args, **kwargs) + pfunc = partial(call, *args, **kwargs) result = await loop.run_in_executor(None, pfunc) return result From bbaf156826dd2ea56189ab764198d33fec0dce1e Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 6 Dec 2021 10:28:31 +0800 Subject: [PATCH 066/174] :memo: update change log --- website/src/pages/changelog.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/website/src/pages/changelog.md b/website/src/pages/changelog.md index 8089a54d..dc07a86a 100644 --- a/website/src/pages/changelog.md +++ b/website/src/pages/changelog.md @@ -6,7 +6,9 @@ - 移除插件加载的 `NameSpace` 模式 - 修改 toml 加载插件时的键名为 `tool.nonebot` 以符合规范 - 新增 Handler 依赖注入支持，同步/异步支持 -- 统一 `Processor`, `Rule`, `Permission` 使用 `Handler` +- 统一 `Processor`, `Rule`, `Permission`, `Processor` 使用 `Handler` +- 修改内置 `Rule`, `Permission` 如 `startswith`, `command` 等使用 class 实现 +- 更换文档框架 (docusaurus) 以及主题 (docusaurus-theme-nonepress) ## v2.0.0a16 From a85ee6555f661394f3fa555d436117dc6f4ea754 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 6 Dec 2021 11:27:25 +0800 Subject: [PATCH 067/174] :bug: fix error on python 3.9+ --- nonebot/utils.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nonebot/utils.py b/nonebot/utils.py index 0c63289c..1c1f2e67 100644 --- a/nonebot/utils.py +++ b/nonebot/utils.py @@ -6,7 +6,6 @@ import collections import dataclasses from functools import wraps, partial from contextlib import asynccontextmanager -from typing_extensions import GenericAlias # type: ignore from typing_extensions import ParamSpec, get_args, get_origin from typing import ( Any, @@ -53,16 +52,16 @@ def generic_check_issubclass( try: return issubclass(cls, class_or_tuple) except TypeError: - if get_origin(cls) is Union: + origin = get_origin(cls) + if origin is Union: for type_ in get_args(cls): if type_ is not type(None) and not generic_check_issubclass( type_, class_or_tuple ): return False return True - elif isinstance(cls, GenericAlias): - origin = get_origin(cls) - return bool(origin and issubclass(origin, class_or_tuple)) + elif origin: + return issubclass(origin, class_or_tuple) raise From 180aaadda98a9a620a0fd4542ac4e621d7b1b71a Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 6 Dec 2021 20:34:14 +0800 Subject: [PATCH 068/174] :bug: fix coroutine check error --- nonebot/handler.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nonebot/handler.py b/nonebot/handler.py index 30e701fd..b381a228 100644 --- a/nonebot/handler.py +++ b/nonebot/handler.py @@ -5,11 +5,10 @@ 该模块实现事件处理函数的封装，以实现动态参数等功能。 """ -import asyncio from contextlib import AsyncExitStack from typing import Any, Dict, List, Type, Callable, Optional -from nonebot.utils import get_name, run_sync +from nonebot.utils import get_name, run_sync, is_coroutine_callable from nonebot.dependencies import ( Param, Dependent, @@ -94,7 +93,7 @@ class Handler: **params, ) - if asyncio.iscoroutinefunction(self.call): + if is_coroutine_callable(self.call): return await self.call(**values) else: return await run_sync(self.call)(**values) From d80c02ae4697237618cfab81d2aa70d9e1c3c1b7 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 6 Dec 2021 22:19:05 +0800 Subject: [PATCH 069/174] :recycle: rewrite adapter abc class --- nonebot/adapters/__init__.py | 1 + nonebot/adapters/_adapter.py | 59 ++++++ nonebot/adapters/_bot.py | 42 +--- nonebot/drivers/__init__.py | 83 ++------ nonebot/drivers/fastapi.py | 393 ++++++----------------------------- nonebot/message.py | 3 - nonebot/permission.py | 28 +-- 7 files changed, 172 insertions(+), 437 deletions(-) create mode 100644 nonebot/adapters/_adapter.py diff --git a/nonebot/adapters/__init__.py b/nonebot/adapters/__init__.py index a3080971..2bae9974 100644 --- a/nonebot/adapters/__init__.py +++ b/nonebot/adapters/__init__.py @@ -22,6 +22,7 @@ except Exception: from ._bot import Bot as Bot from ._event import Event as Event +from ._adapter import Adapter as Adapter from ._message import Message as Message from ._message import MessageSegment as MessageSegment from ._template import MessageTemplate as MessageTemplate diff --git a/nonebot/adapters/_adapter.py b/nonebot/adapters/_adapter.py new file mode 100644 index 00000000..92038d78 --- /dev/null +++ b/nonebot/adapters/_adapter.py @@ -0,0 +1,59 @@ +import abc +from typing import Any, Dict + +from ._bot import Bot +from nonebot.config import Config +from nonebot.drivers import ( + Driver, + ForwardDriver, + ReverseDriver, + HTTPServerSetup, + WebSocketServerSetup, +) + + +class Adapter(abc.ABC): + def __init__(self, driver: Driver, **kwargs: Any): + self.driver = driver + self.bots: Dict[str, Bot] = {} + + @classmethod + @abc.abstractmethod + def get_name(cls) -> str: + raise NotImplementedError + + @property + def config(self) -> Config: + return self.driver.config + + def bot_connect(self, bot: Bot): + self.driver._bot_connect(bot) + self.bots[bot.self_id] = bot + + def bot_disconnect(self, bot: Bot): + self.driver._bot_disconnect(bot) + self.bots.pop(bot.self_id, None) + + def setup_http_server(self, setup: HTTPServerSetup): + if not isinstance(self.driver, ReverseDriver): + raise TypeError("Current driver does not support http server") + self.driver.setup_http_server(setup) + + def setup_websocket_server(self, setup: WebSocketServerSetup): + if not isinstance(self.driver, ReverseDriver): + raise TypeError("Current driver does not support websocket server") + self.driver.setup_websocket_server(setup) + + @abc.abstractmethod + async def _call_api(self, api: str, **data) -> Any: + """ + :说明: + + ``adapter`` 实际调用 api 的逻辑实现函数，实现该方法以调用 api。 + + :参数: + + * ``api: str``: API 名称 + * ``**data``: API 数据 + """ + raise NotImplementedError diff --git a/nonebot/adapters/_bot.py b/nonebot/adapters/_bot.py index 5e3aec7f..5aba33ef 100644 --- a/nonebot/adapters/_bot.py +++ b/nonebot/adapters/_bot.py @@ -12,6 +12,7 @@ from nonebot.drivers import Driver, HTTPResponse, HTTPConnection if TYPE_CHECKING: from ._event import Event + from ._adapter import Adapter from ._message import Message, MessageSegment @@ -25,10 +26,6 @@ class Bot(abc.ABC): Bot 基类。用于处理上报消息，并提供 API 调用接口。 """ - driver: Driver - """Driver 对象""" - config: Config - """Config 配置对象""" _calling_api_hook: Set[T_CallingAPIHook] = set() """ :类型: ``Set[T_CallingAPIHook]`` @@ -40,36 +37,27 @@ class Bot(abc.ABC): :说明: call_api 后执行的函数 """ - def __init__(self, self_id: str, request: HTTPConnection): + def __init__(self, adapter: "Adapter", self_id: str): """ :参数: * ``self_id: str``: 机器人 ID * ``request: HTTPConnection``: request 连接对象 """ + self.adapter = adapter self.self_id: str = self_id """机器人 ID""" - self.request: HTTPConnection = request - """连接信息""" def __getattr__(self, name: str) -> _ApiCall: return partial(self.call_api, name) @property - @abc.abstractmethod def type(self) -> str: - """Adapter 类型""" - raise NotImplementedError + return self.adapter.get_name() - @classmethod - def register(cls, driver: Driver, config: Config, **kwargs): - """ - :说明: - - ``register`` 方法会在 ``driver.register_adapter`` 时被调用，用于初始化相关配置 - """ - cls.driver = driver - cls.config = config + @property + def config(self) -> Config: + return self.adapter.config @classmethod @abc.abstractmethod @@ -106,20 +94,6 @@ class Bot(abc.ABC): """ raise NotImplementedError - @abc.abstractmethod - async def _call_api(self, api: str, **data) -> Any: - """ - :说明: - - ``adapter`` 实际调用 api 的逻辑实现函数，实现该方法以调用 api。 - - :参数: - - * ``api: str``: API 名称 - * ``**data``: API 数据 - """ - raise NotImplementedError - async def call_api(self, api: str, **data: Any) -> Any: """ :说明: @@ -162,7 +136,7 @@ class Bot(abc.ABC): if not skip_calling_api: try: - result = await self._call_api(api, **data) + result = await self.adapter._call_api(api, **data) except Exception as e: exception = e diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py index f5e87fca..1785e1b6 100644 --- a/nonebot/drivers/__init__.py +++ b/nonebot/drivers/__init__.py @@ -26,7 +26,7 @@ from nonebot.config import Env, Config from nonebot.typing import T_BotConnectionHook, T_BotDisconnectionHook if TYPE_CHECKING: - from nonebot.adapters import Bot + from nonebot.adapters import Bot, Adapter class Driver(abc.ABC): @@ -34,9 +34,9 @@ class Driver(abc.ABC): Driver 基类。 """ - _adapters: Dict[str, Type["Bot"]] = {} + _adapters: Dict[str, "Adapter"] = {} """ - :类型: ``Dict[str, Type[Bot]]`` + :类型: ``Dict[str, Adapter]`` :说明: 已注册的适配器列表 """ _bot_connection_hook: Set[T_BotConnectionHook] = set() @@ -85,7 +85,7 @@ class Driver(abc.ABC): """ return self._clients - def register_adapter(self, name: str, adapter: Type["Bot"], **kwargs): + def register_adapter(self, adapter: Type["Adapter"], **kwargs): """ :说明: @@ -97,13 +97,13 @@ class Driver(abc.ABC): * ``adapter: Type[Bot]``: 适配器 Class * ``**kwargs``: 其他传递给适配器的参数 """ + name = adapter.get_name() if name in self._adapters: logger.opt(colors=True).debug( f'Adapter "{escape_tag(name)}" already exists' ) return - self._adapters[name] = adapter - adapter.register(self, self.config, **kwargs) + self._adapters[name] = adapter(self, **kwargs) logger.opt(colors=True).debug( f'Succeeded to load adapter "{escape_tag(name)}"' ) @@ -213,34 +213,11 @@ class ForwardDriver(Driver): """ @abc.abstractmethod - def setup_http_polling( - self, - setup: Union["HTTPPollingSetup", Callable[[], Awaitable["HTTPPollingSetup"]]], - ) -> None: - """ - :说明: - - 注册一个 HTTP 轮询连接，如果传入一个函数，则该函数会在每次连接时被调用 - - :参数: - - * ``setup: Union[HTTPPollingSetup, Callable[[], Awaitable[HTTPPollingSetup]]]`` - """ + async def request(self, setup: "HTTPRequest") -> Any: raise NotImplementedError @abc.abstractmethod - def setup_websocket( - self, setup: Union["WebSocketSetup", Callable[[], Awaitable["WebSocketSetup"]]] - ) -> None: - """ - :说明: - - 注册一个 WebSocket 连接，如果传入一个函数，则该函数会在每次重连时被调用 - - :参数: - - * ``setup: Union[WebSocketSetup, Callable[[], Awaitable[WebSocketSetup]]]`` - """ + async def websocket(self, setup: "HTTPConnection") -> Any: raise NotImplementedError @@ -261,7 +238,16 @@ class ReverseDriver(Driver): """驱动 ASGI 对象""" raise NotImplementedError + @abc.abstractmethod + def setup_http_server(self, setup: "HTTPServerSetup") -> None: + raise NotImplementedError + @abc.abstractmethod + def setup_websocket_server(self, setup: "WebSocketServerSetup") -> None: + raise NotImplementedError + + +# TODO: repack dataclass @dataclass class HTTPConnection(abc.ABC): http_version: str @@ -401,36 +387,13 @@ class WebSocket(HTTPConnection, abc.ABC): @dataclass -class HTTPPollingSetup: - adapter: str - """协议适配器名称""" - self_id: str - """机器人 ID""" - url: str - """URL""" +class HTTPServerSetup: + path: str method: str - """HTTP method""" - body: bytes - """HTTP body""" - headers: Dict[str, str] - """HTTP headers""" - http_version: str - """HTTP version""" - poll_interval: float - """HTTP 轮询间隔""" + handle_func: Callable[[HTTPRequest], Awaitable[HTTPResponse]] @dataclass -class WebSocketSetup: - adapter: str - """协议适配器名称""" - self_id: str - """机器人 ID""" - url: str - """URL""" - headers: Dict[str, str] = field(default_factory=dict) - """HTTP headers""" - reconnect: bool = True - """WebSocket 是否重连""" - reconnect_interval: float = 3.0 - """WebSocket 重连间隔""" +class WebSocketServerSetup: + path: str + handle_func: Callable[[WebSocket], Awaitable[Any]] diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index ac23081b..9fea8d95 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -12,38 +12,35 @@ FastAPI 驱动适配 import asyncio import logging +from functools import partial from dataclasses import dataclass -from typing import List, Union, TypeVar, Callable, Optional, Awaitable, cast +from typing import Any, List, Union, Callable, Optional, Awaitable import httpx import uvicorn from pydantic import BaseSettings from fastapi.responses import Response -from websockets.exceptions import ConnectionClosed -from fastapi import FastAPI, Request, HTTPException, status +from starlette.websockets import WebSocketState +from fastapi import Depends, FastAPI, Request, status from starlette.websockets import WebSocket as FastAPIWebSocket -from starlette.websockets import WebSocketState, WebSocketDisconnect from websockets.legacy.client import Connect, WebSocketClientProtocol from nonebot.config import Env -from nonebot.log import logger -from nonebot.adapters import Bot from nonebot.typing import overrides from nonebot.utils import escape_tag +from nonebot.drivers import WebSocket from nonebot.config import Config as NoneBotConfig from nonebot.drivers import WebSocket as BaseWebSocket from nonebot.drivers import ( HTTPRequest, + HTTPResponse, ForwardDriver, ReverseDriver, - WebSocketSetup, - HTTPPollingSetup, + HTTPConnection, + HTTPServerSetup, + WebSocketServerSetup, ) -S = TypeVar("S", bound=Union[HTTPPollingSetup, WebSocketSetup]) -HTTPPOLLING_SETUP = Union[HTTPPollingSetup, Callable[[], Awaitable[HTTPPollingSetup]]] -WEBSOCKET_SETUP = Union[WebSocketSetup, Callable[[], Awaitable[WebSocketSetup]]] - class Config(BaseSettings): """ @@ -136,16 +133,7 @@ class Config(BaseSettings): class Driver(ReverseDriver): - """ - FastAPI 驱动框架。包含反向 Server 功能。 - - :上报地址: - - * ``/{adapter name}/``: HTTP POST 上报 - * ``/{adapter name}/http/``: HTTP POST 上报 - * ``/{adapter name}/ws``: WebSocket 上报 - * ``/{adapter name}/ws/``: WebSocket 上报 - """ + """FastAPI 驱动框架。包含反向 Server 功能。""" def __init__(self, env: Env, config: NoneBotConfig): super(Driver, self).__init__(env, config) @@ -159,11 +147,6 @@ class Driver(ReverseDriver): redoc_url=self.fastapi_config.fastapi_redoc_url, ) - self._server_app.post("/{adapter}/")(self._handle_http) - self._server_app.post("/{adapter}/http")(self._handle_http) - self._server_app.websocket("/{adapter}/ws")(self._handle_ws_reverse) - self._server_app.websocket("/{adapter}/ws/")(self._handle_ws_reverse) - @property @overrides(ReverseDriver) def type(self) -> str: @@ -188,6 +171,30 @@ class Driver(ReverseDriver): """fastapi 使用的 logger""" return logging.getLogger("fastapi") + @overrides(ReverseDriver) + def setup_http_server(self, setup: HTTPServerSetup): + def _get_handle_func(): + return setup.handle_func + + self._server_app.add_api_route( + setup.path, + partial(self._handle_http, handle_func=Depends(_get_handle_func)), + methods=[setup.method], + ) + + @overrides(ReverseDriver) + def setup_websocket_server(self, setup: WebSocketServerSetup) -> None: + def _get_handle_func(): + return setup.handle_func + + self._server_app.add_api_websocket_route( + setup.path, + partial( + self._handle_ws, + handle_func=Depends(_get_handle_func), + ), + ) + @overrides(ReverseDriver) def on_startup(self, func: Callable) -> Callable: """参考文档: `Events `_""" @@ -241,19 +248,11 @@ class Driver(ReverseDriver): **kwargs, ) - async def _handle_http(self, adapter: str, request: Request): - data = await request.body() - - if adapter not in self._adapters: - logger.warning( - f"Unknown adapter {adapter}. Please register the adapter before use." - ) - raise HTTPException( - status_code=status.HTTP_404_NOT_FOUND, detail="adapter not found" - ) - - # 创建 Bot 对象 - BotClass = self._adapters[adapter] + async def _handle_http( + self, + request: Request, + handle_func: Callable[[HTTPRequest], Awaitable[HTTPResponse]], + ): http_request = HTTPRequest( request.scope["http_version"], request.url.scheme, @@ -261,28 +260,17 @@ class Driver(ReverseDriver): request.scope["query_string"], dict(request.headers), request.method, - data, + await request.body(), ) - x_self_id, response = await BotClass.check_permission(self, http_request) - if not x_self_id: - raise HTTPException( - response and response.status or 401, - response and response.body and response.body.decode("utf-8"), - ) + response = await handle_func(http_request) + return Response(response.body, response.status, response.headers) - if x_self_id in self._clients: - logger.warning( - "There's already a reverse websocket connection," - "so the event may be handled twice." - ) - - bot = BotClass(x_self_id, http_request) - - asyncio.create_task(bot.handle_message(data)) - return Response(response and response.body, response and response.status or 200) - - async def _handle_ws_reverse(self, adapter: str, websocket: FastAPIWebSocket): + async def _handle_ws( + self, + websocket: FastAPIWebSocket, + handle_func: Callable[[WebSocket], Awaitable[Any]], + ): ws = WebSocket( websocket.scope.get("http_version", "1.1"), websocket.url.scheme, @@ -292,55 +280,7 @@ class Driver(ReverseDriver): websocket, ) - if adapter not in self._adapters: - logger.warning( - f"Unknown adapter {adapter}. Please register the adapter before use." - ) - await ws.close(code=status.WS_1008_POLICY_VIOLATION) - return - - # Create Bot Object - BotClass = self._adapters[adapter] - self_id, _ = await BotClass.check_permission(self, ws) - - if not self_id: - await ws.close(code=status.WS_1008_POLICY_VIOLATION) - return - - if self_id in self._clients: - logger.opt(colors=True).warning( - "There's already a websocket connection, " - f"{escape_tag(adapter.upper())} Bot {escape_tag(self_id)} ignored." - ) - await ws.close(code=status.WS_1008_POLICY_VIOLATION) - return - - bot = BotClass(self_id, ws) - - await ws.accept() - logger.opt(colors=True).info( - f"WebSocket Connection from {escape_tag(adapter.upper())} " - f"Bot {escape_tag(self_id)} Accepted!" - ) - - self._bot_connect(bot) - - try: - while not ws.closed: - try: - data = await ws.receive() - except WebSocketDisconnect: - logger.error("WebSocket disconnected by peer.") - break - except Exception as e: - logger.opt(exception=e).error( - "Error when receiving data from websocket." - ) - break - - asyncio.create_task(bot.handle_message(data.encode())) - finally: - self._bot_disconnect(bot) + await handle_func(ws) class FullDriver(ForwardDriver, Driver): @@ -354,17 +294,6 @@ class FullDriver(ForwardDriver, Driver): DRIVER=nonebot.drivers.fastapi:FullDriver """ - def __init__(self, env: Env, config: NoneBotConfig): - super(FullDriver, self).__init__(env, config) - - self.http_pollings: List[HTTPPOLLING_SETUP] = [] - self.websockets: List[WEBSOCKET_SETUP] = [] - self.shutdown: asyncio.Event = asyncio.Event() - self.connections: List[asyncio.Task] = [] - - self.on_startup(self._run_forward) - self.on_shutdown(self._shutdown_forward) - @property @overrides(ForwardDriver) def type(self) -> str: @@ -372,217 +301,25 @@ class FullDriver(ForwardDriver, Driver): return "fastapi_full" @overrides(ForwardDriver) - def setup_http_polling(self, setup: HTTPPOLLING_SETUP) -> None: - """ - :说明: - - 注册一个 HTTP 轮询连接，如果传入一个函数，则该函数会在每次连接时被调用 - - :参数: - - * ``setup: Union[HTTPPollingSetup, Callable[[], Awaitable[HTTPPollingSetup]]]`` - """ - self.http_pollings.append(setup) + async def request(self, setup: "HTTPRequest") -> Any: + async with httpx.AsyncClient( + http2=setup.http_version == "2", follow_redirects=True + ) as client: + response = await client.request( + setup.method, + setup.url, + content=setup.body, + headers=setup.headers, + timeout=30.0, + ) + return HTTPResponse( + response.status_code, response.content, response.headers + ) @overrides(ForwardDriver) - def setup_websocket(self, setup: WEBSOCKET_SETUP) -> None: - """ - :说明: - - 注册一个 WebSocket 连接，如果传入一个函数，则该函数会在每次重连时被调用 - - :参数: - - * ``setup: Union[WebSocketSetup, Callable[[], Awaitable[WebSocketSetup]]]`` - """ - self.websockets.append(setup) - - def _run_forward(self): - for setup in self.http_pollings: - self.connections.append(asyncio.create_task(self._http_loop(setup))) - for setup in self.websockets: - self.connections.append(asyncio.create_task(self._ws_loop(setup))) - - def _shutdown_forward(self): - self.shutdown.set() - for task in self.connections: - if not task.done(): - task.cancel() - - async def _prepare_setup( - self, setup: Union[S, Callable[[], Awaitable[S]]] - ) -> Optional[S]: - try: - if callable(setup): - return await setup() - else: - return setup - except Exception as e: - logger.opt(colors=True, exception=e).error( - "Error while parsing setup " - f"{escape_tag(repr(setup))}." - ) - return - - def _build_http_request(self, setup: HTTPPollingSetup) -> Optional[HTTPRequest]: - url = httpx.URL(setup.url) - if not url.netloc: - logger.opt(colors=True).error( - f"Error parsing url {escape_tag(str(url))}" - ) - return - return HTTPRequest( - setup.http_version, - url.scheme, - url.path, - url.query, - setup.headers, - setup.method, - setup.body, - ) - - async def _http_loop(self, _setup: HTTPPOLLING_SETUP): - - http2: bool = False - bot: Optional[Bot] = None - request: Optional[HTTPRequest] = None - client: Optional[httpx.AsyncClient] = None - - # FIXME: seperate const values from setup (self_id, adapter) - # logger.opt(colors=True).info( - # f"Start http polling for {escape_tag(_setup.adapter.upper())} " - # f"Bot {escape_tag(_setup.self_id)}" - # ) - - try: - while not self.shutdown.is_set(): - - setup = await self._prepare_setup(_setup) - if not setup: - await asyncio.sleep(3) - continue - request = self._build_http_request(setup) - if not request: - await asyncio.sleep(setup.poll_interval) - continue - - if not client: - client = httpx.AsyncClient(http2=setup.http_version == "2", follow_redirects=True) - elif http2 != (setup.http_version == "2"): - await client.aclose() - client = httpx.AsyncClient(http2=setup.http_version == "2", follow_redirects=True) - http2 = setup.http_version == "2" - - if not bot: - BotClass = self._adapters[setup.adapter] - bot = BotClass(setup.self_id, request) - self._bot_connect(bot) - else: - bot.request = request - - logger.debug( - f"Bot {setup.self_id} from adapter {setup.adapter} request {setup.url}" - ) - try: - response = await client.request( - request.method, - setup.url, - content=request.body, - headers=request.headers, - timeout=30.0, - ) - response.raise_for_status() - data = response.read() - asyncio.create_task(bot.handle_message(data)) - except httpx.HTTPError as e: - logger.opt(colors=True, exception=e).error( - f"Error occurred while requesting {escape_tag(setup.url)}. " - "Try to reconnect..." - ) - - await asyncio.sleep(setup.poll_interval) - - except asyncio.CancelledError: - pass - except Exception as e: - logger.opt(colors=True, exception=e).error( - "Unexpected exception occurred " - "while http polling" - ) - finally: - if bot: - self._bot_disconnect(bot) - if client: - await client.aclose() - - async def _ws_loop(self, _setup: WEBSOCKET_SETUP): - bot: Optional[Bot] = None - - try: - while True: - - setup = await self._prepare_setup(_setup) - if not setup: - await asyncio.sleep(3) - continue - - url = httpx.URL(setup.url) - if not url.netloc: - logger.opt(colors=True).error( - f"Error parsing url {escape_tag(str(url))}" - ) - return - - logger.debug( - f"Bot {setup.self_id} from adapter {setup.adapter} connecting to {url}" - ) - try: - connection = Connect(setup.url, extra_headers=setup.headers) - async with connection as ws: - logger.opt(colors=True).info( - f"WebSocket Connection to {escape_tag(setup.adapter.upper())} " - f"Bot {escape_tag(setup.self_id)} succeeded!" - ) - request = WebSocket( - "1.1", url.scheme, url.path, url.query, setup.headers, ws - ) - - BotClass = self._adapters[setup.adapter] - bot = BotClass(setup.self_id, request) - self._bot_connect(bot) - while not self.shutdown.is_set(): - # use try except instead of "request.closed" because of queued message - try: - msg = await request.receive_bytes() - asyncio.create_task(bot.handle_message(msg)) - except ConnectionClosed: - logger.opt(colors=True).error( - "WebSocket connection closed. " - "Try to reconnect..." - ) - break - except Exception as e: - logger.opt(colors=True, exception=e).error( - f"Error while connecting to {url}. " - "Try to reconnect..." - ) - finally: - if bot: - self._bot_disconnect(bot) - bot = None - - if not setup.reconnect: - logger.info(f"WebSocket reconnect disabled for bot {setup.self_id}") - break - await asyncio.sleep(setup.reconnect_interval) - - except asyncio.CancelledError: - pass - except Exception as e: - logger.opt(colors=True, exception=e).error( - "Unexpected exception occurred " - "while websocket loop" - ) + async def websocket(self, setup: "HTTPConnection") -> Any: + ws = await Connect(setup.url, extra_headers=setup.headers) + return WebSocket("1.1", url.scheme, url.path, url.query, setup.headers, ws) @dataclass diff --git a/nonebot/message.py b/nonebot/message.py index b36b3049..02863aa5 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -111,9 +111,6 @@ def run_postprocessor(func: T_RunPostProcessor) -> T_RunPostProcessor: return func -# FIXME: run handler with try/except skipped exception - - async def _run_coro_with_catch(coro: Coroutine[Any, Any, Any]) -> Any: try: return await coro diff --git a/nonebot/permission.py b/nonebot/permission.py index f1f863db..3f33dd5d 100644 --- a/nonebot/permission.py +++ b/nonebot/permission.py @@ -14,13 +14,12 @@ from contextlib import AsyncExitStack from typing import ( Any, Dict, - List, - Type, Tuple, Union, Callable, NoReturn, Optional, + Coroutine, ) from nonebot import params @@ -30,6 +29,13 @@ from nonebot.exception import SkippedException from nonebot.typing import T_PermissionChecker +async def _run_coro_with_catch(coro: Coroutine[Any, Any, Any]): + try: + return await coro + except SkippedException: + return False + + class Permission: """ :说明: @@ -100,20 +106,18 @@ class Permission: return True results = await asyncio.gather( *( - checker( - bot=bot, - event=event, - _stack=stack, - _dependency_cache=dependency_cache, + _run_coro_with_catch( + checker( + bot=bot, + event=event, + _stack=stack, + _dependency_cache=dependency_cache, + ) ) for checker in self.checkers ), - return_exceptions=True, - ) - return next( - filter(lambda x: bool(x) and not isinstance(x, SkippedException), results), - False, ) + return any(results) def __and__(self, other) -> NoReturn: raise RuntimeError("And operation between Permissions is not allowed.") From 47d4909b3194d75ad83ee487c42f2b6c5a2fbfbf Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 6 Dec 2021 23:00:10 +0800 Subject: [PATCH 070/174] :arrow_up: update dependencies --- docs_build/adapters/README.rst | 6 + docs_build/adapters/ding.rst | 45 - docs_build/adapters/feishu.rst | 45 - docs_build/adapters/mirai.rst | 75 - packages/nonebot-adapter-ding/README.md | 11 - .../nonebot-adapter-ding/nonebot/__init__.py | 0 .../nonebot/adapters/__init__.py | 0 .../nonebot/adapters/ding/__init__.py | 23 - .../nonebot/adapters/ding/bot.py | 271 ---- .../nonebot/adapters/ding/config.py | 21 - .../nonebot/adapters/ding/event.py | 151 -- .../nonebot/adapters/ding/exception.py | 81 -- .../nonebot/adapters/ding/message.py | 201 --- .../nonebot/adapters/ding/utils.py | 17 - packages/nonebot-adapter-ding/poetry.lock | 649 --------- packages/nonebot-adapter-ding/pyproject.toml | 54 - packages/nonebot-adapter-feishu/README.md | 11 - .../nonebot/__init__.py | 0 .../nonebot/adapters/__init__.py | 0 .../nonebot/adapters/feishu/__init__.py | 13 - .../nonebot/adapters/feishu/bot.py | 395 ----- .../nonebot/adapters/feishu/config.py | 34 - .../nonebot/adapters/feishu/event.py | 878 ----------- .../nonebot/adapters/feishu/exception.py | 63 - .../nonebot/adapters/feishu/message.py | 262 ---- .../nonebot/adapters/feishu/utils.py | 34 - packages/nonebot-adapter-feishu/poetry.lock | 707 --------- .../nonebot-adapter-feishu/pyproject.toml | 56 - packages/nonebot-adapter-mirai/LICENSE | 661 --------- packages/nonebot-adapter-mirai/README.md | 11 - .../nonebot-adapter-mirai/nonebot/__init__.py | 0 .../nonebot/adapters/__init__.py | 0 .../nonebot/adapters/mirai/__init__.py | 37 - .../nonebot/adapters/mirai/bot.py | 749 ---------- .../nonebot/adapters/mirai/config.py | 24 - .../nonebot/adapters/mirai/event/__init__.py | 60 - .../nonebot/adapters/mirai/event/base.py | 158 -- .../nonebot/adapters/mirai/event/message.py | 89 -- .../nonebot/adapters/mirai/event/meta.py | 37 - .../nonebot/adapters/mirai/event/notice.py | 192 --- .../nonebot/adapters/mirai/event/request.py | 185 --- .../nonebot/adapters/mirai/message.py | 324 ----- .../nonebot/adapters/mirai/utils.py | 179 --- packages/nonebot-adapter-mirai/poetry.lock | 649 --------- packages/nonebot-adapter-mirai/pyproject.toml | 54 - poetry.lock | 322 +---- pyproject.toml | 4 - tests/.env | 4 - tests/.env.dev | 24 - tests/bot.py | 37 - tests/plugins.toml | 3 - tests/test_plugins/test_api_hook.py | 6 - tests/test_plugins/test_delete.py | 32 - tests/test_plugins/test_depends.py | 28 - tests/test_plugins/test_ding.py | 233 --- tests/test_plugins/test_export.py | 15 - tests/test_plugins/test_feishu.py | 12 - tests/test_plugins/test_get_export.py | 4 - tests/test_plugins/test_group/__init__.py | 7 - tests/test_plugins/test_group/commands.py | 9 - tests/test_plugins/test_mirai.py | 20 - tests/test_plugins/test_package/__init__.py | 1 - .../test_plugins/test_package/test_command.py | 24 - tests/test_plugins/test_processor.py | 15 - tests/test_plugins/test_shell.py | 15 - tests/test_plugins/test_weather.py | 25 - tests/test_plugins/test_ws_hook.py | 14 - yarn.lock | 1288 ++++++++--------- 68 files changed, 690 insertions(+), 8964 deletions(-) delete mode 100644 docs_build/adapters/ding.rst delete mode 100644 docs_build/adapters/feishu.rst delete mode 100644 docs_build/adapters/mirai.rst delete mode 100644 packages/nonebot-adapter-ding/README.md delete mode 100644 packages/nonebot-adapter-ding/nonebot/__init__.py delete mode 100644 packages/nonebot-adapter-ding/nonebot/adapters/__init__.py delete mode 100644 packages/nonebot-adapter-ding/nonebot/adapters/ding/__init__.py delete mode 100644 packages/nonebot-adapter-ding/nonebot/adapters/ding/bot.py delete mode 100644 packages/nonebot-adapter-ding/nonebot/adapters/ding/config.py delete mode 100644 packages/nonebot-adapter-ding/nonebot/adapters/ding/event.py delete mode 100644 packages/nonebot-adapter-ding/nonebot/adapters/ding/exception.py delete mode 100644 packages/nonebot-adapter-ding/nonebot/adapters/ding/message.py delete mode 100644 packages/nonebot-adapter-ding/nonebot/adapters/ding/utils.py delete mode 100644 packages/nonebot-adapter-ding/poetry.lock delete mode 100644 packages/nonebot-adapter-ding/pyproject.toml delete mode 100644 packages/nonebot-adapter-feishu/README.md delete mode 100644 packages/nonebot-adapter-feishu/nonebot/__init__.py delete mode 100644 packages/nonebot-adapter-feishu/nonebot/adapters/__init__.py delete mode 100644 packages/nonebot-adapter-feishu/nonebot/adapters/feishu/__init__.py delete mode 100644 packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py delete mode 100644 packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py delete mode 100644 packages/nonebot-adapter-feishu/nonebot/adapters/feishu/event.py delete mode 100644 packages/nonebot-adapter-feishu/nonebot/adapters/feishu/exception.py delete mode 100644 packages/nonebot-adapter-feishu/nonebot/adapters/feishu/message.py delete mode 100644 packages/nonebot-adapter-feishu/nonebot/adapters/feishu/utils.py delete mode 100644 packages/nonebot-adapter-feishu/poetry.lock delete mode 100644 packages/nonebot-adapter-feishu/pyproject.toml delete mode 100644 packages/nonebot-adapter-mirai/LICENSE delete mode 100644 packages/nonebot-adapter-mirai/README.md delete mode 100644 packages/nonebot-adapter-mirai/nonebot/__init__.py delete mode 100644 packages/nonebot-adapter-mirai/nonebot/adapters/__init__.py delete mode 100644 packages/nonebot-adapter-mirai/nonebot/adapters/mirai/__init__.py delete mode 100644 packages/nonebot-adapter-mirai/nonebot/adapters/mirai/bot.py delete mode 100644 packages/nonebot-adapter-mirai/nonebot/adapters/mirai/config.py delete mode 100644 packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/__init__.py delete mode 100644 packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/base.py delete mode 100644 packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/message.py delete mode 100644 packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/meta.py delete mode 100644 packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/notice.py delete mode 100644 packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/request.py delete mode 100644 packages/nonebot-adapter-mirai/nonebot/adapters/mirai/message.py delete mode 100644 packages/nonebot-adapter-mirai/nonebot/adapters/mirai/utils.py delete mode 100644 packages/nonebot-adapter-mirai/poetry.lock delete mode 100644 packages/nonebot-adapter-mirai/pyproject.toml delete mode 100644 tests/.env delete mode 100644 tests/.env.dev delete mode 100644 tests/bot.py delete mode 100644 tests/plugins.toml delete mode 100644 tests/test_plugins/test_api_hook.py delete mode 100644 tests/test_plugins/test_delete.py delete mode 100644 tests/test_plugins/test_depends.py delete mode 100644 tests/test_plugins/test_ding.py delete mode 100644 tests/test_plugins/test_export.py delete mode 100644 tests/test_plugins/test_feishu.py delete mode 100644 tests/test_plugins/test_get_export.py delete mode 100644 tests/test_plugins/test_group/__init__.py delete mode 100644 tests/test_plugins/test_group/commands.py delete mode 100644 tests/test_plugins/test_mirai.py delete mode 100644 tests/test_plugins/test_package/__init__.py delete mode 100644 tests/test_plugins/test_package/test_command.py delete mode 100644 tests/test_plugins/test_processor.py delete mode 100644 tests/test_plugins/test_shell.py delete mode 100644 tests/test_plugins/test_weather.py delete mode 100644 tests/test_plugins/test_ws_hook.py diff --git a/docs_build/adapters/README.rst b/docs_build/adapters/README.rst index 79b58e61..41ca34f7 100644 --- a/docs_build/adapters/README.rst +++ b/docs_build/adapters/README.rst @@ -12,6 +12,12 @@ NoneBot.adapters 模块 :special-members: __init__ :show-inheritance: +.. automodule:: nonebot.adapters._adapter + :members: + :private-members: + :special-members: __init__ + :show-inheritance: + .. automodule:: nonebot.adapters._bot :members: :private-members: diff --git a/docs_build/adapters/ding.rst b/docs_build/adapters/ding.rst deleted file mode 100644 index 77dd90f8..00000000 --- a/docs_build/adapters/ding.rst +++ /dev/null @@ -1,45 +0,0 @@ - - -NoneBot.adapters.ding 模块 -=========================== - -.. automodule:: nonebot.adapters.ding - -NoneBot.adapters.ding.config 模块 -=================================== - -.. automodule:: nonebot.adapters.ding.config - :members: - -NoneBot.adapters.ding.exception 模块 -===================================== - -.. automodule:: nonebot.adapters.ding.exception - :members: - :show-inheritance: - - -NoneBot.adapters.ding.bot 模块 -=============================== - -.. automodule:: nonebot.adapters.ding.bot - :members: - :private-members: - :show-inheritance: - - -NoneBot.adapters.ding.message 模块 -=================================== - -.. automodule:: nonebot.adapters.ding.message - :members: - :private-members: - :show-inheritance: - - -NoneBot.adapters.ding.event 模块 -================================= - -.. automodule:: nonebot.adapters.ding.event - :members: - :show-inheritance: diff --git a/docs_build/adapters/feishu.rst b/docs_build/adapters/feishu.rst deleted file mode 100644 index 09de1078..00000000 --- a/docs_build/adapters/feishu.rst +++ /dev/null @@ -1,45 +0,0 @@ - - -NoneBot.adapters.feishu 模块 -============================ - -.. automodule:: nonebot.adapters.feishu - -NoneBot.adapters.feishu.config 模块 -=================================== - -.. automodule:: nonebot.adapters.feishu.config - :members: - -NoneBot.adapters.feishu.exception 模块 -====================================== - -.. automodule:: nonebot.adapters.feishu.exception - :members: - :show-inheritance: - - -NoneBot.adapters.feishu.bot 模块 -================================ - -.. automodule:: nonebot.adapters.feishu.bot - :members: - :private-members: - :show-inheritance: - - -NoneBot.adapters.feishu.message 模块 -==================================== - -.. automodule:: nonebot.adapters.feishu.message - :members: - :private-members: - :show-inheritance: - - -NoneBot.adapters.feishu.event 模块 -================================== - -.. automodule:: nonebot.adapters.feishu.event - :members: - :show-inheritance: diff --git a/docs_build/adapters/mirai.rst b/docs_build/adapters/mirai.rst deleted file mode 100644 index e7270f7f..00000000 --- a/docs_build/adapters/mirai.rst +++ /dev/null @@ -1,75 +0,0 @@ - - -NoneBot.adapters.mirai 模块 -=========================== - -.. automodule:: nonebot.adapters.mirai - -NoneBot.adapters.mirai.config 模块 -================================== - -.. automodule:: nonebot.adapters.mirai.config - :members: - -NoneBot.adapters.mirai.bot 模块 -=============================== - -.. automodule:: nonebot.adapters.mirai.bot - :members: - :show-inheritance: - -NoneBot.adapters.mirai.message 模块 -=================================== - -.. automodule:: nonebot.adapters.mirai.message - :members: - :show-inheritance: - -NoneBot.adapters.mirai.utils 模块 -=================================== - -.. automodule:: nonebot.adapters.mirai.utils - :members: - :show-inheritance: - -NoneBot.adapters.mirai.event 模块 -================================= - -.. automodule:: nonebot.adapters.mirai.event - :members: - :show-inheritance: - -NoneBot.adapters.mirai.event.base 模块 -====================================== - -.. automodule:: nonebot.adapters.mirai.event.base - :members: - :show-inheritance: - -NoneBot.adapters.mirai.event.meta 模块 -====================================== - -.. automodule:: nonebot.adapters.mirai.event.meta - :members: - :show-inheritance: - -NoneBot.adapters.mirai.event.message 模块 -========================================= - -.. automodule:: nonebot.adapters.mirai.event.message - :members: - :show-inheritance: - -NoneBot.adapters.mirai.event.notice 模块 -========================================= - -.. automodule:: nonebot.adapters.mirai.event.notice - :members: - :show-inheritance: - -NoneBot.adapters.mirai.event.request 模块 -========================================= - -.. automodule:: nonebot.adapters.mirai.event.request - :members: - :show-inheritance: diff --git a/packages/nonebot-adapter-ding/README.md b/packages/nonebot-adapter-ding/README.md deleted file mode 100644 index 6bc1b1b2..00000000 --- a/packages/nonebot-adapter-ding/README.md +++ /dev/null @@ -1,11 +0,0 @@ -

- nonebot -

- -
- -# NoneBot-Adapter-DING - -_✨ 钉钉协议适配 ✨_ - -
diff --git a/packages/nonebot-adapter-ding/nonebot/__init__.py b/packages/nonebot-adapter-ding/nonebot/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/nonebot-adapter-ding/nonebot/adapters/__init__.py b/packages/nonebot-adapter-ding/nonebot/adapters/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/nonebot-adapter-ding/nonebot/adapters/ding/__init__.py b/packages/nonebot-adapter-ding/nonebot/adapters/ding/__init__.py deleted file mode 100644 index 4bc02382..00000000 --- a/packages/nonebot-adapter-ding/nonebot/adapters/ding/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -""" -钉钉群机器人 协议适配 -============================ - -协议详情请看: `钉钉文档`_ - -.. _钉钉文档: - https://ding-doc.dingtalk.com/document#/org-dev-guide/elzz1p -""" - -from .bot import Bot as Bot -from .utils import log as log -from .event import Event as Event -from .message import Message as Message -from .event import MessageEvent as MessageEvent -from .exception import ActionFailed as ActionFailed -from .exception import NetworkError as NetworkError -from .message import MessageSegment as MessageSegment -from .exception import SessionExpired as SessionExpired -from .event import GroupMessageEvent as GroupMessageEvent -from .exception import ApiNotAvailable as ApiNotAvailable -from .event import PrivateMessageEvent as PrivateMessageEvent -from .exception import DingAdapterException as DingAdapterException diff --git a/packages/nonebot-adapter-ding/nonebot/adapters/ding/bot.py b/packages/nonebot-adapter-ding/nonebot/adapters/ding/bot.py deleted file mode 100644 index bfcab03f..00000000 --- a/packages/nonebot-adapter-ding/nonebot/adapters/ding/bot.py +++ /dev/null @@ -1,271 +0,0 @@ -import json -import time -import urllib.parse -from datetime import datetime -from typing import TYPE_CHECKING, Any, Tuple, Union, Optional - -import httpx - -from nonebot.log import logger -from nonebot.typing import overrides -from nonebot.utils import escape_tag -from nonebot.message import handle_event -from nonebot.adapters import Bot as BaseBot -from nonebot.drivers import Driver, HTTPRequest, HTTPResponse, HTTPConnection - -from .config import Config as DingConfig -from .utils import log, calc_hmac_base64 -from .message import Message, MessageSegment -from .exception import ( - ActionFailed, - NetworkError, - SessionExpired, - ApiNotAvailable, -) -from .event import ( - MessageEvent, - ConversationType, - GroupMessageEvent, - PrivateMessageEvent, -) - -if TYPE_CHECKING: - from nonebot.config import Config - -SEND = "send" - - -class Bot(BaseBot): - """ - 钉钉 协议 Bot 适配。继承属性参考 `BaseBot `_ 。 - """ - - ding_config: DingConfig - - @property - def type(self) -> str: - """ - - 返回: ``"ding"`` - """ - return "ding" - - @classmethod - def register(cls, driver: Driver, config: "Config"): - super().register(driver, config) - cls.ding_config = DingConfig(**config.dict()) - - @classmethod - @overrides(BaseBot) - async def check_permission( - cls, driver: Driver, request: HTTPConnection - ) -> Tuple[Optional[str], HTTPResponse]: - """ - :说明: - - 钉钉协议鉴权。参考 `鉴权 `_ - """ - timestamp = request.headers.get("timestamp") - sign = request.headers.get("sign") - - # 检查连接方式 - if not isinstance(request, HTTPRequest): - return None, HTTPResponse( - 405, b"Unsupported connection type, available type: `http`" - ) - - # 检查 timestamp - if not timestamp: - return None, HTTPResponse(400, b"Missing `timestamp` Header") - - # 检查 sign - secret = cls.ding_config.secret - if secret: - if not sign: - log("WARNING", "Missing Signature Header") - return None, HTTPResponse(400, b"Missing `sign` Header") - sign_base64 = calc_hmac_base64(str(timestamp), secret) - if sign != sign_base64.decode("utf-8"): - log("WARNING", "Signature Header is invalid") - return None, HTTPResponse(403, b"Signature is invalid") - else: - log("WARNING", "Ding signature check ignored!") - return ( - json.loads(request.body.decode())["chatbotUserId"], - HTTPResponse(204, b""), - ) - - @overrides(BaseBot) - async def handle_message(self, message: bytes): - data: dict = json.loads(message) - - if not data: - return - - # 判断消息类型，生成不同的 Event - try: - conversation_type = data["conversationType"] - if conversation_type == ConversationType.private: - event = PrivateMessageEvent.parse_obj(data) - elif conversation_type == ConversationType.group: - event = GroupMessageEvent.parse_obj(data) - else: - raise ValueError("Unsupported conversation type") - except Exception as e: - log("ERROR", "Event Parser Error", e) - return - - try: - await handle_event(self, event) - except Exception as e: - logger.opt(colors=True, exception=e).error( - f"Failed to handle event. Raw: {escape_tag(str(data))}" - ) - return - - @overrides(BaseBot) - async def _call_api( - self, api: str, event: Optional[MessageEvent] = None, **data - ) -> Any: - if not isinstance(self.request, HTTPRequest): - log("ERROR", "Only support http connection.") - return - - log("DEBUG", f"Calling API {api}") - params = {} - # 传入参数有 webhook，则使用传入的 webhook - webhook = data.get("webhook") - - if webhook: - secret = data.get("secret") - if secret: - # 有这个参数的时候再计算加签的值 - timestamp = str(round(time.time() * 1000)) - params["timestamp"] = timestamp - hmac_code_base64 = calc_hmac_base64(timestamp, secret) - sign = urllib.parse.quote_plus(hmac_code_base64) - params["sign"] = sign - else: - # webhook 不存在则使用 event 中的 sessionWebhook - if event: - # 确保 sessionWebhook 没有过期 - if int(datetime.now().timestamp()) > int( - event.sessionWebhookExpiredTime / 1000 - ): - raise SessionExpired - - webhook = event.sessionWebhook - else: - raise ApiNotAvailable - - headers = {} - message: Message = data.get("message", None) - if not message: - raise ValueError("Message not found") - try: - async with httpx.AsyncClient( - headers=headers, follow_redirects=True - ) as client: - response = await client.post( - webhook, - params=params, - json=message._produce(), - timeout=self.config.api_timeout, - ) - - if 200 <= response.status_code < 300: - result = response.json() - if isinstance(result, dict): - if result.get("errcode") != 0: - raise ActionFailed( - errcode=result.get("errcode"), errmsg=result.get("errmsg") - ) - return result - raise NetworkError( - f"HTTP request received unexpected " - f"status code: {response.status_code}" - ) - except httpx.InvalidURL: - raise NetworkError("API root url invalid") - except httpx.HTTPError: - raise NetworkError("HTTP request failed") - - @overrides(BaseBot) - async def call_api( - self, api: str, event: Optional[MessageEvent] = None, **data - ) -> Any: - """ - :说明: - - 调用 钉钉 协议 API - - :参数: - - * ``api: str``: API 名称 - * ``event: Optional[MessageEvent]``: Event 对象 - * ``**data: Any``: API 参数 - - :返回: - - - ``Any``: API 调用返回数据 - - :异常: - - - ``NetworkError``: 网络错误 - - ``ActionFailed``: API 调用失败 - """ - return await super().call_api(api, event=event, **data) - - @overrides(BaseBot) - async def send( - self, - event: MessageEvent, - message: Union[str, "Message", "MessageSegment"], - at_sender: bool = False, - webhook: Optional[str] = None, - secret: Optional[str] = None, - **kwargs, - ) -> Any: - """ - :说明: - - 根据 ``event`` 向触发事件的主体发送消息。 - - :参数: - - * ``event: Event``: Event 对象 - * ``message: Union[str, Message, MessageSegment]``: 要发送的消息 - * ``at_sender: bool``: 是否 @ 事件主体 - * ``webhook: Optional[str]``: 该条消息将调用的 webhook 地址。不传则将使用 sessionWebhook，若其也不存在，该条消息不发送，使用自定义 webhook 时注意你设置的安全方式，如加关键词，IP地址，加签等等。 - * ``secret: Optional[str]``: 如果你使用自定义的 webhook 地址，推荐使用加签方式对消息进行验证，将 `机器人安全设置页面，加签一栏下面显示的SEC开头的字符串` 传入这个参数即可。 - * ``**kwargs``: 覆盖默认参数 - - :返回: - - - ``Any``: API 调用返回数据 - - :异常: - - - ``ValueError``: 缺少 ``user_id``, ``group_id`` - - ``NetworkError``: 网络错误 - - ``ActionFailed``: API 调用失败 - """ - msg = message if isinstance(message, Message) else Message(message) - - at_sender = at_sender and bool(event.senderId) - params = {} - params["event"] = event - if webhook: - params["webhook"] = webhook - params["secret"] = secret - params.update(kwargs) - - if at_sender and event.conversationType != ConversationType.private: - params["message"] = ( - f"@{event.senderId} " - + msg - + MessageSegment.atDingtalkIds(event.senderId) - ) - else: - params["message"] = msg - - return await self.call_api(SEND, **params) diff --git a/packages/nonebot-adapter-ding/nonebot/adapters/ding/config.py b/packages/nonebot-adapter-ding/nonebot/adapters/ding/config.py deleted file mode 100644 index 9c88b1b7..00000000 --- a/packages/nonebot-adapter-ding/nonebot/adapters/ding/config.py +++ /dev/null @@ -1,21 +0,0 @@ -from typing import Optional - -from pydantic import Field, BaseModel - - -class Config(BaseModel): - """ - 钉钉配置类 - - :配置项: - - - ``access_token`` / ``ding_access_token``: 钉钉令牌 - - ``secret`` / ``ding_secret``: 钉钉 HTTP 上报数据签名口令 - """ - - secret: Optional[str] = Field(default=None, alias="ding_secret") - access_token: Optional[str] = Field(default=None, alias="ding_access_token") - - class Config: - extra = "ignore" - allow_population_by_field_name = True diff --git a/packages/nonebot-adapter-ding/nonebot/adapters/ding/event.py b/packages/nonebot-adapter-ding/nonebot/adapters/ding/event.py deleted file mode 100644 index ad9eb230..00000000 --- a/packages/nonebot-adapter-ding/nonebot/adapters/ding/event.py +++ /dev/null @@ -1,151 +0,0 @@ -from enum import Enum -from typing import List, Optional -from typing_extensions import Literal - -from pydantic import BaseModel, root_validator - -from nonebot.typing import overrides -from nonebot.adapters import Event as BaseEvent - -from .message import Message - - -class Event(BaseEvent): - """ - 钉钉协议事件。各事件字段参考 `钉钉文档`_ - - .. _钉钉文档: - https://ding-doc.dingtalk.com/document#/org-dev-guide/elzz1p - """ - - chatbotUserId: str - - @overrides(BaseEvent) - def get_type(self) -> Literal["message", "notice", "request", "meta_event"]: - raise ValueError("Event has no type!") - - @overrides(BaseEvent) - def get_event_name(self) -> str: - raise ValueError("Event has no name!") - - @overrides(BaseEvent) - def get_event_description(self) -> str: - raise ValueError("Event has no description!") - - @overrides(BaseEvent) - def get_message(self) -> "Message": - raise ValueError("Event has no message!") - - @overrides(BaseEvent) - def get_plaintext(self) -> str: - raise ValueError("Event has no plaintext!") - - @overrides(BaseEvent) - def get_user_id(self) -> str: - raise ValueError("Event has no user_id!") - - @overrides(BaseEvent) - def get_session_id(self) -> str: - raise ValueError("Event has no session_id!") - - @overrides(BaseEvent) - def is_tome(self) -> bool: - return True - - -class TextMessage(BaseModel): - content: str - - -class AtUsersItem(BaseModel): - dingtalkId: str - staffId: Optional[str] - - -class ConversationType(str, Enum): - private = "1" - group = "2" - - -class MessageEvent(Event): - """消息事件""" - - msgtype: str - text: TextMessage - msgId: str - createAt: int # ms - conversationType: ConversationType - conversationId: str - senderId: str - senderNick: str - senderCorpId: Optional[str] - sessionWebhook: str - sessionWebhookExpiredTime: int - isAdmin: bool - - message: Message - - @root_validator(pre=True) - def gen_message(cls, values: dict): - assert "msgtype" in values, "msgtype must be specified" - # 其实目前钉钉机器人只能接收到 text 类型的消息 - assert values["msgtype"] in values, f"{values['msgtype']} must be specified" - content = values[values["msgtype"]]["content"] - # 如果是被 @，第一个字符将会为空格，移除特殊情况 - if content[0] == " ": - content = content[1:] - values["message"] = content - return values - - @overrides(Event) - def get_type(self) -> Literal["message", "notice", "request", "meta_event"]: - return "message" - - @overrides(Event) - def get_event_name(self) -> str: - return f"{self.get_type()}.{self.conversationType.name}" - - @overrides(Event) - def get_event_description(self) -> str: - return f'Message[{self.msgtype}] {self.msgId} from {self.senderId} "{self.text.content}"' - - @overrides(Event) - def get_message(self) -> Message: - return self.message - - @overrides(Event) - def get_plaintext(self) -> str: - return self.text.content - - @overrides(Event) - def get_user_id(self) -> str: - return self.senderId - - @overrides(Event) - def get_session_id(self) -> str: - return self.senderId - - -class PrivateMessageEvent(MessageEvent): - """私聊消息事件""" - - chatbotCorpId: str - senderStaffId: Optional[str] - conversationType: ConversationType = ConversationType.private - - -class GroupMessageEvent(MessageEvent): - """群消息事件""" - - atUsers: List[AtUsersItem] - conversationType: ConversationType = ConversationType.group - conversationTitle: str - isInAtList: bool - - @overrides(MessageEvent) - def is_tome(self) -> bool: - return self.isInAtList - - @overrides(MessageEvent) - def get_session_id(self) -> str: - return f"group_{self.conversationId}_{self.senderId}" diff --git a/packages/nonebot-adapter-ding/nonebot/adapters/ding/exception.py b/packages/nonebot-adapter-ding/nonebot/adapters/ding/exception.py deleted file mode 100644 index 73b08b43..00000000 --- a/packages/nonebot-adapter-ding/nonebot/adapters/ding/exception.py +++ /dev/null @@ -1,81 +0,0 @@ -from typing import Optional - -from nonebot.exception import AdapterException -from nonebot.exception import ActionFailed as BaseActionFailed -from nonebot.exception import NetworkError as BaseNetworkError -from nonebot.exception import ApiNotAvailable as BaseApiNotAvailable - - -class DingAdapterException(AdapterException): - """ - :说明: - - 钉钉 Adapter 错误基类 - """ - - def __init__(self) -> None: - super().__init__("ding") - - -class ActionFailed(BaseActionFailed, DingAdapterException): - """ - :说明: - - API 请求返回错误信息。 - - :参数: - - * ``errcode: Optional[int]``: 错误码 - * ``errmsg: Optional[str]``: 错误信息 - """ - - def __init__(self, errcode: Optional[int] = None, errmsg: Optional[str] = None): - super().__init__() - self.errcode = errcode - self.errmsg = errmsg - - def __repr__(self): - return f'' - - def __str__(self): - return self.__repr__() - - -class ApiNotAvailable(BaseApiNotAvailable, DingAdapterException): - pass - - -class NetworkError(BaseNetworkError, DingAdapterException): - """ - :说明: - - 网络错误。 - - :参数: - - * ``retcode: Optional[int]``: 错误码 - """ - - def __init__(self, msg: Optional[str] = None): - super().__init__() - self.msg = msg - - def __repr__(self): - return f"" - - def __str__(self): - return self.__repr__() - - -class SessionExpired(ApiNotAvailable, DingAdapterException): - """ - :说明: - - 发消息的 session 已经过期。 - """ - - def __repr__(self) -> str: - return f"" - - def __str__(self): - return self.__repr__() diff --git a/packages/nonebot-adapter-ding/nonebot/adapters/ding/message.py b/packages/nonebot-adapter-ding/nonebot/adapters/ding/message.py deleted file mode 100644 index ef092739..00000000 --- a/packages/nonebot-adapter-ding/nonebot/adapters/ding/message.py +++ /dev/null @@ -1,201 +0,0 @@ -from copy import copy -from typing import Any, Dict, Type, Union, Mapping, Iterable, cast - -from nonebot.typing import overrides -from nonebot.adapters import Message as BaseMessage -from nonebot.adapters import MessageSegment as BaseMessageSegment - - -class MessageSegment(BaseMessageSegment["Message"]): - """ - 钉钉 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 - """ - - @classmethod - @overrides(BaseMessageSegment) - def get_message_class(cls) -> Type["Message"]: - return Message - - @overrides(BaseMessageSegment) - def __str__(self) -> str: - """ - 该消息段所代表的 str，在命令匹配部分使用， - 钉钉目前只支持匹配 text 命令 - """ - if self.type == "text": - return str(self.data["content"]) - return "" - - def __bool__(self) -> bool: - """ - 因为暂时还不支持 text 和 markdown 之外的其他复杂消息段的 `__str__`（也不太需要）， - 会导致判断非这两种类型的消息段的布尔值为 true 的时候出错 - """ - return self.data is not None - - @overrides(BaseMessageSegment) - def is_text(self) -> bool: - return self.type == "text" - - @staticmethod - def atAll() -> "MessageSegment": - """@全体""" - return MessageSegment("at", {"isAtAll": True}) - - @staticmethod - def atMobiles(*mobileNumber: str) -> "MessageSegment": - """@指定手机号人员""" - return MessageSegment("at", {"atMobiles": list(mobileNumber)}) - - @staticmethod - def atDingtalkIds(*dingtalkIds: str) -> "MessageSegment": - """@指定 id，@ 默认会在消息段末尾。 - 所以你可以在消息中使用 @{senderId} 占位，发送出去之后 @ 就会出现在占位的位置： - ```python - message = MessageSegment.text(f"@{event.senderId}，你好") - message += MessageSegment.atDingtalkIds(event.senderId) - ``` - """ - return MessageSegment("at", {"atDingtalkIds": list(dingtalkIds)}) - - @staticmethod - def text(text: str) -> "MessageSegment": - """发送 ``text`` 类型消息""" - return MessageSegment("text", {"content": text}) - - @staticmethod - def image(picURL: str) -> "MessageSegment": - """发送 ``image`` 类型消息""" - return MessageSegment("image", {"picURL": picURL}) - - @staticmethod - def extension(dict_: dict) -> "MessageSegment": - """标记 text 文本的 extension 属性，需要与 text 消息段相加。""" - return MessageSegment("extension", dict_) - - @staticmethod - def code(code_language: str, code: str) -> "Message": - """发送 code 消息段""" - message = MessageSegment.text(code) - message += MessageSegment.extension( - {"text_type": "code_snippet", "code_language": code_language} - ) - return message - - @staticmethod - def markdown(title: str, text: str) -> "MessageSegment": - """发送 ``markdown`` 类型消息""" - return MessageSegment( - "markdown", - { - "title": title, - "text": text, - }, - ) - - @staticmethod - def actionCardSingleBtn( - title: str, text: str, singleTitle: str, singleURL - ) -> "MessageSegment": - """发送 ``actionCardSingleBtn`` 类型消息""" - return MessageSegment( - "actionCard", - { - "title": title, - "text": text, - "singleTitle": singleTitle, - "singleURL": singleURL, - }, - ) - - @staticmethod - def actionCardMultiBtns( - title: str, - text: str, - btns: list, - hideAvatar: bool = False, - btnOrientation: str = "1", - ) -> "MessageSegment": - """ - 发送 ``actionCardMultiBtn`` 类型消息 - - :参数: - - * ``btnOrientation``: 0：按钮竖直排列 1：按钮横向排列 - * ``btns``: ``[{ "title": title, "actionURL": actionURL }, ...]`` - """ - return MessageSegment( - "actionCard", - { - "title": title, - "text": text, - "hideAvatar": "1" if hideAvatar else "0", - "btnOrientation": btnOrientation, - "btns": btns, - }, - ) - - @staticmethod - def feedCard(links: list) -> "MessageSegment": - """ - 发送 ``feedCard`` 类型消息 - - :参数: - - * ``links``: ``[{ "title": xxx, "messageURL": xxx, "picURL": xxx }, ...]`` - """ - return MessageSegment("feedCard", {"links": links}) - - @staticmethod - def raw(data) -> "MessageSegment": - return MessageSegment("raw", data) - - def to_dict(self) -> Dict[str, Any]: - # 让用户可以直接发送原始的消息格式 - if self.type == "raw": - return copy(self.data) - - # 不属于消息内容，只是作为消息段的辅助 - if self.type in ["at", "extension"]: - return {self.type: copy(self.data)} - - return {"msgtype": self.type, self.type: copy(self.data)} - - -class Message(BaseMessage[MessageSegment]): - """ - 钉钉 协议 Message 适配。 - """ - - @classmethod - @overrides(BaseMessage) - def get_segment_class(cls) -> Type[MessageSegment]: - return MessageSegment - - @staticmethod - @overrides(BaseMessage) - def _construct( - msg: Union[str, Mapping, Iterable[Mapping]] - ) -> Iterable[MessageSegment]: - if isinstance(msg, Mapping): - msg = cast(Mapping[str, Any], msg) - yield MessageSegment(msg["type"], msg.get("data") or {}) - elif isinstance(msg, str): - yield MessageSegment.text(msg) - elif isinstance(msg, Iterable): - for seg in msg: - yield MessageSegment(seg["type"], seg.get("data") or {}) - - def _produce(self) -> dict: - data = {} - segment: MessageSegment - for segment in self: - # text 可以和 text 合并 - if segment.type == "text" and data.get("msgtype") == "text": - data.setdefault("text", {}) - data["text"]["content"] = ( - data["text"].setdefault("content", "") + segment.data["content"] - ) - else: - data.update(segment.to_dict()) - return data diff --git a/packages/nonebot-adapter-ding/nonebot/adapters/ding/utils.py b/packages/nonebot-adapter-ding/nonebot/adapters/ding/utils.py deleted file mode 100644 index cf77a552..00000000 --- a/packages/nonebot-adapter-ding/nonebot/adapters/ding/utils.py +++ /dev/null @@ -1,17 +0,0 @@ -import hmac -import base64 -import hashlib - -from nonebot.utils import logger_wrapper - -log = logger_wrapper("DING") - - -def calc_hmac_base64(timestamp: str, secret: str): - secret_enc = secret.encode("utf-8") - string_to_sign = "{}\n{}".format(timestamp, secret) - string_to_sign_enc = string_to_sign.encode("utf-8") - hmac_code = hmac.new( - secret_enc, string_to_sign_enc, digestmod=hashlib.sha256 - ).digest() - return base64.b64encode(hmac_code) diff --git a/packages/nonebot-adapter-ding/poetry.lock b/packages/nonebot-adapter-ding/poetry.lock deleted file mode 100644 index 9945f985..00000000 --- a/packages/nonebot-adapter-ding/poetry.lock +++ /dev/null @@ -1,649 +0,0 @@ -[[package]] -name = "anyio" -version = "3.3.4" -description = "High level compatibility layer for multiple asynchronous event loop implementations" -category = "main" -optional = false -python-versions = ">=3.6.2" - -[package.dependencies] -idna = ">=2.8" -sniffio = ">=1.1" -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] -test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (<0.15)", "mock (>=4)", "uvloop (>=0.15)"] -trio = ["trio (>=0.16)"] - -[[package]] -name = "asgiref" -version = "3.4.1" -description = "ASGI specs, helper code, and adapters" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] - -[[package]] -name = "certifi" -version = "2021.10.8" -description = "Python package for providing Mozilla's CA Bundle." -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "charset-normalizer" -version = "2.0.7" -description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -category = "main" -optional = false -python-versions = ">=3.5.0" - -[package.extras] -unicode_backport = ["unicodedata2"] - -[[package]] -name = "click" -version = "8.0.3" -description = "Composable command line interface toolkit" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -colorama = {version = "*", markers = "platform_system == \"Windows\""} -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} - -[[package]] -name = "colorama" -version = "0.4.4" -description = "Cross-platform colored terminal text." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[[package]] -name = "fastapi" -version = "0.70.0" -description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[package.dependencies] -pydantic = ">=1.6.2,<1.7 || >1.7,<1.7.1 || >1.7.1,<1.7.2 || >1.7.2,<1.7.3 || >1.7.3,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0" -starlette = "0.16.0" - -[package.extras] -all = ["requests (>=2.24.0,<3.0.0)", "jinja2 (>=2.11.2,<4.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<3.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] -dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.4.0,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] -doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"] -test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<4.0.0)", "mypy (==0.910)", "flake8 (>=3.8.3,<4.0.0)", "black (==21.9b0)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.19.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.5.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.6.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "flask (>=1.1.2,<3.0.0)", "anyio[trio] (>=3.2.1,<4.0.0)", "types-ujson (==0.1.1)", "types-orjson (==3.6.0)", "types-dataclasses (==0.1.7)"] - -[[package]] -name = "h11" -version = "0.12.0" -description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" -category = "main" -optional = false -python-versions = ">=3.6" - -[[package]] -name = "h2" -version = "4.1.0" -description = "HTTP/2 State-Machine based protocol implementation" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[package.dependencies] -hpack = ">=4.0,<5" -hyperframe = ">=6.0,<7" - -[[package]] -name = "hpack" -version = "4.0.0" -description = "Pure-Python HPACK header compression" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[[package]] -name = "httpcore" -version = "0.13.7" -description = "A minimal low-level HTTP client." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -anyio = ">=3.0.0,<4.0.0" -h11 = ">=0.11,<0.13" -sniffio = ">=1.0.0,<2.0.0" - -[package.extras] -http2 = ["h2 (>=3,<5)"] - -[[package]] -name = "httptools" -version = "0.2.0" -description = "A collection of framework independent HTTP protocol utils." -category = "main" -optional = false -python-versions = "*" - -[package.extras] -test = ["Cython (==0.29.22)"] - -[[package]] -name = "httpx" -version = "0.20.0" -description = "The next generation HTTP client." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -certifi = "*" -charset-normalizer = "*" -h2 = {version = ">=3,<5", optional = true, markers = "extra == \"http2\""} -httpcore = ">=0.13.3,<0.14.0" -rfc3986 = {version = ">=1.3,<2", extras = ["idna2008"]} -sniffio = "*" - -[package.extras] -brotli = ["brotlicffi", "brotli"] -cli = ["click (>=8.0.0,<9.0.0)", "rich (>=10.0.0,<11.0.0)", "pygments (>=2.0.0,<3.0.0)"] -http2 = ["h2 (>=3,<5)"] - -[[package]] -name = "hyperframe" -version = "6.0.1" -description = "HTTP/2 framing layer for Python" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[[package]] -name = "idna" -version = "3.3" -description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "importlib-metadata" -version = "4.8.1" -description = "Read metadata from Python packages" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} -zipp = ">=0.5" - -[package.extras] -docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -perf = ["ipython"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"] - -[[package]] -name = "loguru" -version = "0.5.3" -description = "Python logging made (stupidly) simple" -category = "main" -optional = false -python-versions = ">=3.5" - -[package.dependencies] -colorama = {version = ">=0.3.4", markers = "sys_platform == \"win32\""} -win32-setctime = {version = ">=1.0.0", markers = "sys_platform == \"win32\""} - -[package.extras] -dev = ["codecov (>=2.0.15)", "colorama (>=0.3.4)", "flake8 (>=3.7.7)", "tox (>=3.9.0)", "tox-travis (>=0.12)", "pytest (>=4.6.2)", "pytest-cov (>=2.7.1)", "Sphinx (>=2.2.1)", "sphinx-autobuild (>=0.7.1)", "sphinx-rtd-theme (>=0.4.3)", "black (>=19.10b0)", "isort (>=5.1.1)"] - -[[package]] -name = "nonebot2" -version = "2.0.0-alpha.16" -description = "An asynchronous python bot framework." -category = "main" -optional = false -python-versions = "^3.7.3" -develop = true - -[package.dependencies] -fastapi = "^0.70.0" -httpx = {version = ">=0.20.0, <1.0.0", extras = ["http2"]} -loguru = "^0.5.1" -pydantic = {version = "~1.8.0", extras = ["dotenv"]} -pygtrie = "^2.4.1" -tomlkit = "^0.7.0" -uvicorn = {version = "^0.15.0", extras = ["standard"]} -websockets = ">=9.1" - -[package.extras] -quart = ["Quart (>=0.15.0,<0.16.0)"] -aiohttp = ["aiohttp[speedups] (>=3.7.4,<4.0.0)"] -all = ["Quart (>=0.15.0,<0.16.0)", "aiohttp[speedups] (>=3.7.4,<4.0.0)"] - -[package.source] -type = "directory" -url = "../.." - -[[package]] -name = "pydantic" -version = "1.8.2" -description = "Data validation and settings management using python 3.6 type hinting" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[package.dependencies] -python-dotenv = {version = ">=0.10.4", optional = true, markers = "extra == \"dotenv\""} -typing-extensions = ">=3.7.4.3" - -[package.extras] -dotenv = ["python-dotenv (>=0.10.4)"] -email = ["email-validator (>=1.0.3)"] - -[[package]] -name = "pygtrie" -version = "2.4.2" -description = "A pure Python trie data structure implementation." -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "python-dotenv" -version = "0.19.1" -description = "Read key-value pairs from a .env file and set them as environment variables" -category = "main" -optional = false -python-versions = ">=3.5" - -[package.extras] -cli = ["click (>=5.0)"] - -[[package]] -name = "pyyaml" -version = "6.0" -description = "YAML parser and emitter for Python" -category = "main" -optional = false -python-versions = ">=3.6" - -[[package]] -name = "rfc3986" -version = "1.5.0" -description = "Validating URI References per RFC 3986" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -idna = {version = "*", optional = true, markers = "extra == \"idna2008\""} - -[package.extras] -idna2008 = ["idna"] - -[[package]] -name = "sniffio" -version = "1.2.0" -description = "Sniff out which async library your code is running under" -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "starlette" -version = "0.16.0" -description = "The little ASGI library that shines." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -anyio = ">=3.0.0,<4" -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "graphene"] - -[[package]] -name = "tomlkit" -version = "0.7.2" -description = "Style preserving TOML library" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[[package]] -name = "typing-extensions" -version = "3.10.0.2" -description = "Backported and Experimental Type Hints for Python 3.5+" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "uvicorn" -version = "0.15.0" -description = "The lightning-fast ASGI server." -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -asgiref = ">=3.4.0" -click = ">=7.0" -colorama = {version = ">=0.4", optional = true, markers = "sys_platform == \"win32\" and extra == \"standard\""} -h11 = ">=0.8" -httptools = {version = ">=0.2.0,<0.3.0", optional = true, markers = "extra == \"standard\""} -python-dotenv = {version = ">=0.13", optional = true, markers = "extra == \"standard\""} -PyYAML = {version = ">=5.1", optional = true, markers = "extra == \"standard\""} -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} -uvloop = {version = ">=0.14.0,<0.15.0 || >0.15.0,<0.15.1 || >0.15.1", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} -watchgod = {version = ">=0.6", optional = true, markers = "extra == \"standard\""} -websockets = {version = ">=9.1", optional = true, markers = "extra == \"standard\""} - -[package.extras] -standard = ["websockets (>=9.1)", "httptools (>=0.2.0,<0.3.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"] - -[[package]] -name = "uvloop" -version = "0.16.0" -description = "Fast implementation of asyncio event loop on top of libuv" -category = "main" -optional = false -python-versions = ">=3.7" - -[package.extras] -dev = ["Cython (>=0.29.24,<0.30.0)", "pytest (>=3.6.0)", "Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)", "aiohttp", "flake8 (>=3.9.2,<3.10.0)", "psutil", "pycodestyle (>=2.7.0,<2.8.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] -docs = ["Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)"] -test = ["aiohttp", "flake8 (>=3.9.2,<3.10.0)", "psutil", "pycodestyle (>=2.7.0,<2.8.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] - -[[package]] -name = "watchgod" -version = "0.7" -description = "Simple, modern file watching and code reload in python." -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "websockets" -version = "10.0" -description = "An implementation of the WebSocket Protocol (RFC 6455 & 7692)" -category = "main" -optional = false -python-versions = ">=3.7" - -[[package]] -name = "win32-setctime" -version = "1.0.3" -description = "A small Python utility to set file creation time on Windows" -category = "main" -optional = false -python-versions = ">=3.5" - -[package.extras] -dev = ["pytest (>=4.6.2)", "black (>=19.3b0)"] - -[[package]] -name = "zipp" -version = "3.6.0" -description = "Backport of pathlib-compatible object wrapper for zip files" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.extras] -docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] - -[metadata] -lock-version = "1.1" -python-versions = "^3.7.3" -content-hash = "0cc9df471eb39cfb9b3225370913296535c45171158adc19753cebb7fe791ae3" - -[metadata.files] -anyio = [ - {file = "anyio-3.3.4-py3-none-any.whl", hash = "sha256:4fd09a25ab7fa01d34512b7249e366cd10358cdafc95022c7ff8c8f8a5026d66"}, - {file = "anyio-3.3.4.tar.gz", hash = "sha256:67da67b5b21f96b9d3d65daa6ea99f5d5282cb09f50eb4456f8fb51dffefc3ff"}, -] -asgiref = [ - {file = "asgiref-3.4.1-py3-none-any.whl", hash = "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"}, - {file = "asgiref-3.4.1.tar.gz", hash = "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9"}, -] -certifi = [ - {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, - {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, -] -charset-normalizer = [ - {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"}, - {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"}, -] -click = [ - {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"}, - {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"}, -] -colorama = [ - {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, - {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, -] -fastapi = [ - {file = "fastapi-0.70.0-py3-none-any.whl", hash = "sha256:a36d5f2fad931aa3575c07a3472c784e81f3e664e3bb5c8b9c88d0ec1104f59c"}, - {file = "fastapi-0.70.0.tar.gz", hash = "sha256:66da43cfe5185ea1df99552acffd201f1832c6b364e0f4136c0a99f933466ced"}, -] -h11 = [ - {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, - {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, -] -h2 = [ - {file = "h2-4.1.0-py3-none-any.whl", hash = "sha256:03a46bcf682256c95b5fd9e9a99c1323584c3eec6440d379b9903d709476bc6d"}, - {file = "h2-4.1.0.tar.gz", hash = "sha256:a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb"}, -] -hpack = [ - {file = "hpack-4.0.0-py3-none-any.whl", hash = "sha256:84a076fad3dc9a9f8063ccb8041ef100867b1878b25ef0ee63847a5d53818a6c"}, - {file = "hpack-4.0.0.tar.gz", hash = "sha256:fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095"}, -] -httpcore = [ - {file = "httpcore-0.13.7-py3-none-any.whl", hash = "sha256:369aa481b014cf046f7067fddd67d00560f2f00426e79569d99cb11245134af0"}, - {file = "httpcore-0.13.7.tar.gz", hash = "sha256:036f960468759e633574d7c121afba48af6419615d36ab8ede979f1ad6276fa3"}, -] -httptools = [ - {file = "httptools-0.2.0-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:79dbc21f3612a78b28384e989b21872e2e3cf3968532601544696e4ed0007ce5"}, - {file = "httptools-0.2.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:78d03dd39b09c99ec917d50189e6743adbfd18c15d5944392d2eabda688bf149"}, - {file = "httptools-0.2.0-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:a23166e5ae2775709cf4f7ad4c2048755ebfb272767d244e1a96d55ac775cca7"}, - {file = "httptools-0.2.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:3ab1f390d8867f74b3b5ee2a7ecc9b8d7f53750bd45714bf1cb72a953d7dfa77"}, - {file = "httptools-0.2.0-cp36-cp36m-win_amd64.whl", hash = "sha256:a7594f9a010cdf1e16a58b3bf26c9da39bbf663e3b8d46d39176999d71816658"}, - {file = "httptools-0.2.0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:01b392a166adcc8bc2f526a939a8aabf89fe079243e1543fd0e7dc1b58d737cb"}, - {file = "httptools-0.2.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:80ffa04fe8c8dfacf6e4cef8277347d35b0442c581f5814f3b0cf41b65c43c6e"}, - {file = "httptools-0.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d5682eeb10cca0606c4a8286a3391d4c3c5a36f0c448e71b8bd05be4e1694bfb"}, - {file = "httptools-0.2.0-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:a289c27ccae399a70eacf32df9a44059ca2ba4ac444604b00a19a6c1f0809943"}, - {file = "httptools-0.2.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:813871f961edea6cb2fe312f2d9b27d12a51ba92545380126f80d0de1917ea15"}, - {file = "httptools-0.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:cc9be041e428c10f8b6ab358c6b393648f9457094e1dcc11b4906026d43cd380"}, - {file = "httptools-0.2.0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:b08d00d889a118f68f37f3c43e359aab24ee29eb2e3fe96d64c6a2ba8b9d6557"}, - {file = "httptools-0.2.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:fd3b8905e21431ad306eeaf56644a68fdd621bf8f3097eff54d0f6bdf7262065"}, - {file = "httptools-0.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:200fc1cdf733a9ff554c0bb97a4047785cfaad9875307d6087001db3eb2b417f"}, - {file = "httptools-0.2.0.tar.gz", hash = "sha256:94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"}, -] -httpx = [ - {file = "httpx-0.20.0-py3-none-any.whl", hash = "sha256:33af5aad9bdc82ef1fc89219c1e36f5693bf9cd0ebe330884df563445682c0f8"}, - {file = "httpx-0.20.0.tar.gz", hash = "sha256:09606d630f070d07f9ff28104fbcea429ea0014c1e89ac90b4d8de8286c40e7b"}, -] -hyperframe = [ - {file = "hyperframe-6.0.1-py3-none-any.whl", hash = "sha256:0ec6bafd80d8ad2195c4f03aacba3a8265e57bc4cff261e802bf39970ed02a15"}, - {file = "hyperframe-6.0.1.tar.gz", hash = "sha256:ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914"}, -] -idna = [ - {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, - {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, -] -importlib-metadata = [ - {file = "importlib_metadata-4.8.1-py3-none-any.whl", hash = "sha256:b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15"}, - {file = "importlib_metadata-4.8.1.tar.gz", hash = "sha256:f284b3e11256ad1e5d03ab86bb2ccd6f5339688ff17a4d797a0fe7df326f23b1"}, -] -loguru = [ - {file = "loguru-0.5.3-py3-none-any.whl", hash = "sha256:f8087ac396b5ee5f67c963b495d615ebbceac2796379599820e324419d53667c"}, - {file = "loguru-0.5.3.tar.gz", hash = "sha256:b28e72ac7a98be3d28ad28570299a393dfcd32e5e3f6a353dec94675767b6319"}, -] -nonebot2 = [] -pydantic = [ - {file = "pydantic-1.8.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:05ddfd37c1720c392f4e0d43c484217b7521558302e7069ce8d318438d297739"}, - {file = "pydantic-1.8.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a7c6002203fe2c5a1b5cbb141bb85060cbff88c2d78eccbc72d97eb7022c43e4"}, - {file = "pydantic-1.8.2-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:589eb6cd6361e8ac341db97602eb7f354551482368a37f4fd086c0733548308e"}, - {file = "pydantic-1.8.2-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:10e5622224245941efc193ad1d159887872776df7a8fd592ed746aa25d071840"}, - {file = "pydantic-1.8.2-cp36-cp36m-win_amd64.whl", hash = "sha256:99a9fc39470010c45c161a1dc584997f1feb13f689ecf645f59bb4ba623e586b"}, - {file = "pydantic-1.8.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a83db7205f60c6a86f2c44a61791d993dff4b73135df1973ecd9eed5ea0bda20"}, - {file = "pydantic-1.8.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:41b542c0b3c42dc17da70554bc6f38cbc30d7066d2c2815a94499b5684582ecb"}, - {file = "pydantic-1.8.2-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:ea5cb40a3b23b3265f6325727ddfc45141b08ed665458be8c6285e7b85bd73a1"}, - {file = "pydantic-1.8.2-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:18b5ea242dd3e62dbf89b2b0ec9ba6c7b5abaf6af85b95a97b00279f65845a23"}, - {file = "pydantic-1.8.2-cp37-cp37m-win_amd64.whl", hash = "sha256:234a6c19f1c14e25e362cb05c68afb7f183eb931dd3cd4605eafff055ebbf287"}, - {file = "pydantic-1.8.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:021ea0e4133e8c824775a0cfe098677acf6fa5a3cbf9206a376eed3fc09302cd"}, - {file = "pydantic-1.8.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:e710876437bc07bd414ff453ac8ec63d219e7690128d925c6e82889d674bb505"}, - {file = "pydantic-1.8.2-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:ac8eed4ca3bd3aadc58a13c2aa93cd8a884bcf21cb019f8cfecaae3b6ce3746e"}, - {file = "pydantic-1.8.2-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:4a03cbbe743e9c7247ceae6f0d8898f7a64bb65800a45cbdc52d65e370570820"}, - {file = "pydantic-1.8.2-cp38-cp38-win_amd64.whl", hash = "sha256:8621559dcf5afacf0069ed194278f35c255dc1a1385c28b32dd6c110fd6531b3"}, - {file = "pydantic-1.8.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8b223557f9510cf0bfd8b01316bf6dd281cf41826607eada99662f5e4963f316"}, - {file = "pydantic-1.8.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:244ad78eeb388a43b0c927e74d3af78008e944074b7d0f4f696ddd5b2af43c62"}, - {file = "pydantic-1.8.2-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:05ef5246a7ffd2ce12a619cbb29f3307b7c4509307b1b49f456657b43529dc6f"}, - {file = "pydantic-1.8.2-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:54cd5121383f4a461ff7644c7ca20c0419d58052db70d8791eacbbe31528916b"}, - {file = "pydantic-1.8.2-cp39-cp39-win_amd64.whl", hash = "sha256:4be75bebf676a5f0f87937c6ddb061fa39cbea067240d98e298508c1bda6f3f3"}, - {file = "pydantic-1.8.2-py3-none-any.whl", hash = "sha256:fec866a0b59f372b7e776f2d7308511784dace622e0992a0b59ea3ccee0ae833"}, - {file = "pydantic-1.8.2.tar.gz", hash = "sha256:26464e57ccaafe72b7ad156fdaa4e9b9ef051f69e175dbbb463283000c05ab7b"}, -] -pygtrie = [ - {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, -] -python-dotenv = [ - {file = "python-dotenv-0.19.1.tar.gz", hash = "sha256:14f8185cc8d494662683e6914addcb7e95374771e707601dfc70166946b4c4b8"}, - {file = "python_dotenv-0.19.1-py2.py3-none-any.whl", hash = "sha256:bbd3da593fc49c249397cbfbcc449cf36cb02e75afc8157fcc6a81df6fb7750a"}, -] -pyyaml = [ - {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, - {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, - {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, - {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, - {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, - {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, - {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, - {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, - {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, - {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, - {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, - {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, - {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, - {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, - {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, - {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, -] -rfc3986 = [ - {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"}, - {file = "rfc3986-1.5.0.tar.gz", hash = "sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"}, -] -sniffio = [ - {file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"}, - {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, -] -starlette = [ - {file = "starlette-0.16.0-py3-none-any.whl", hash = "sha256:38eb24bf705a2c317e15868e384c1b8a12ca396e5a3c3a003db7e667c43f939f"}, - {file = "starlette-0.16.0.tar.gz", hash = "sha256:e1904b5d0007aee24bdd3c43994be9b3b729f4f58e740200de1d623f8c3a8870"}, -] -tomlkit = [ - {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"}, - {file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"}, -] -typing-extensions = [ - {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, - {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"}, - {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, -] -uvicorn = [ - {file = "uvicorn-0.15.0-py3-none-any.whl", hash = "sha256:17f898c64c71a2640514d4089da2689e5db1ce5d4086c2d53699bf99513421c1"}, - {file = "uvicorn-0.15.0.tar.gz", hash = "sha256:d9a3c0dd1ca86728d3e235182683b4cf94cd53a867c288eaeca80ee781b2caff"}, -] -uvloop = [ - {file = "uvloop-0.16.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:6224f1401025b748ffecb7a6e2652b17768f30b1a6a3f7b44660e5b5b690b12d"}, - {file = "uvloop-0.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:30ba9dcbd0965f5c812b7c2112a1ddf60cf904c1c160f398e7eed3a6b82dcd9c"}, - {file = "uvloop-0.16.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bd53f7f5db562f37cd64a3af5012df8cac2c464c97e732ed556800129505bd64"}, - {file = "uvloop-0.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:772206116b9b57cd625c8a88f2413df2fcfd0b496eb188b82a43bed7af2c2ec9"}, - {file = "uvloop-0.16.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b572256409f194521a9895aef274cea88731d14732343da3ecdb175228881638"}, - {file = "uvloop-0.16.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:04ff57aa137230d8cc968f03481176041ae789308b4d5079118331ab01112450"}, - {file = "uvloop-0.16.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a19828c4f15687675ea912cc28bbcb48e9bb907c801873bd1519b96b04fb805"}, - {file = "uvloop-0.16.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e814ac2c6f9daf4c36eb8e85266859f42174a4ff0d71b99405ed559257750382"}, - {file = "uvloop-0.16.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bd8f42ea1ea8f4e84d265769089964ddda95eb2bb38b5cbe26712b0616c3edee"}, - {file = "uvloop-0.16.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:647e481940379eebd314c00440314c81ea547aa636056f554d491e40503c8464"}, - {file = "uvloop-0.16.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e0d26fa5875d43ddbb0d9d79a447d2ace4180d9e3239788208527c4784f7cab"}, - {file = "uvloop-0.16.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:6ccd57ae8db17d677e9e06192e9c9ec4bd2066b77790f9aa7dede2cc4008ee8f"}, - {file = "uvloop-0.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:089b4834fd299d82d83a25e3335372f12117a7d38525217c2258e9b9f4578897"}, - {file = "uvloop-0.16.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98d117332cc9e5ea8dfdc2b28b0a23f60370d02e1395f88f40d1effd2cb86c4f"}, - {file = "uvloop-0.16.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e5f2e2ff51aefe6c19ee98af12b4ae61f5be456cd24396953244a30880ad861"}, - {file = "uvloop-0.16.0.tar.gz", hash = "sha256:f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228"}, -] -watchgod = [ - {file = "watchgod-0.7-py3-none-any.whl", hash = "sha256:d6c1ea21df37847ac0537ca0d6c2f4cdf513562e95f77bb93abbcf05573407b7"}, - {file = "watchgod-0.7.tar.gz", hash = "sha256:48140d62b0ebe9dd9cf8381337f06351e1f2e70b2203fa9c6eff4e572ca84f29"}, -] -websockets = [ - {file = "websockets-10.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:cd8c6f2ec24aedace251017bc7a414525171d4e6578f914acab9349362def4da"}, - {file = "websockets-10.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:1f6b814cff6aadc4288297cb3a248614829c6e4ff5556593c44a115e9dd49939"}, - {file = "websockets-10.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:01db0ecd1a0ca6702d02a5ed40413e18b7d22f94afb3bbe0d323bac86c42c1c8"}, - {file = "websockets-10.0-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:82b17524b1ce6ae7f7dd93e4d18e9b9474071e28b65dbf1dfe9b5767778db379"}, - {file = "websockets-10.0-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:8bbf8660c3f833ddc8b1afab90213f2e672a9ddac6eecb3cde968e6b2807c1c7"}, - {file = "websockets-10.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b8176deb6be540a46695960a765a77c28ac8b2e3ef2ec95d50a4f5df901edb1c"}, - {file = "websockets-10.0-cp37-cp37m-win32.whl", hash = "sha256:706e200fc7f03bed99ad0574cd1ea8b0951477dd18cc978ccb190683c69dba76"}, - {file = "websockets-10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:5b2600e01c7ca6f840c42c747ffbe0254f319594ed108db847eb3d75f4aacb80"}, - {file = "websockets-10.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:085bb8a6e780d30eaa1ba48ac7f3a6707f925edea787cfb761ce5a39e77ac09b"}, - {file = "websockets-10.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:9a4d889162bd48588e80950e07fa5e039eee9deb76a58092e8c3ece96d7ef537"}, - {file = "websockets-10.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:b4ade7569b6fd17912452f9c3757d96f8e4044016b6d22b3b8391e641ca50456"}, - {file = "websockets-10.0-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:2a43072e434c041a99f2e1eb9b692df0232a38c37c61d00e9f24db79474329e4"}, - {file = "websockets-10.0-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:7f79f02c7f9a8320aff7d3321cd1c7e3a7dbc15d922ac996cca827301ee75238"}, - {file = "websockets-10.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:1ac35426fe3e7d3d0fac3d63c8965c76ed67a8fd713937be072bf0ce22808539"}, - {file = "websockets-10.0-cp38-cp38-win32.whl", hash = "sha256:ff59c6bdb87b31f7e2d596f09353d5a38c8c8ff571b0e2238e8ee2d55ad68465"}, - {file = "websockets-10.0-cp38-cp38-win_amd64.whl", hash = "sha256:d67646ddd17a86117ae21c27005d83c1895c0cef5d7be548b7549646372f868a"}, - {file = "websockets-10.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:82bd921885231f4a30d9bc550552495b3fc36b1235add6d374e7c65c3babd805"}, - {file = "websockets-10.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:7d2e12e4f901f1bc062dfdf91831712c4106ed18a9a4cdb65e2e5f502124ca37"}, - {file = "websockets-10.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:71358c7816e2762f3e4af3adf0040f268e219f5a38cb3487a9d0fc2e554fef6a"}, - {file = "websockets-10.0-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:fe83b3ec9ef34063d86dfe1029160a85f24a5a94271036e5714a57acfdd089a1"}, - {file = "websockets-10.0-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:eb282127e9c136f860c6068a4fba5756eb25e755baffb5940b6f1eae071928b2"}, - {file = "websockets-10.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:62160772314920397f9d219147f958b33fa27a12c662d4455c9ccbba9a07e474"}, - {file = "websockets-10.0-cp39-cp39-win32.whl", hash = "sha256:e42a1f1e03437b017af341e9bbfdc09252cd48ef32a8c3c3ead769eab3b17368"}, - {file = "websockets-10.0-cp39-cp39-win_amd64.whl", hash = "sha256:c5880442f5fc268f1ef6d37b2c152c114deccca73f48e3a8c48004d2f16f4567"}, - {file = "websockets-10.0.tar.gz", hash = "sha256:c4fc9a1d242317892590abe5b61a9127f1a61740477bfb121743f290b8054002"}, -] -win32-setctime = [ - {file = "win32_setctime-1.0.3-py3-none-any.whl", hash = "sha256:dc925662de0a6eb987f0b01f599c01a8236cb8c62831c22d9cada09ad958243e"}, - {file = "win32_setctime-1.0.3.tar.gz", hash = "sha256:4e88556c32fdf47f64165a2180ba4552f8bb32c1103a2fafd05723a0bd42bd4b"}, -] -zipp = [ - {file = "zipp-3.6.0-py3-none-any.whl", hash = "sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc"}, - {file = "zipp-3.6.0.tar.gz", hash = "sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832"}, -] diff --git a/packages/nonebot-adapter-ding/pyproject.toml b/packages/nonebot-adapter-ding/pyproject.toml deleted file mode 100644 index 2ee57d3d..00000000 --- a/packages/nonebot-adapter-ding/pyproject.toml +++ /dev/null @@ -1,54 +0,0 @@ -[tool.poetry] -name = "nonebot-adapter-ding" -version = "2.0.0-alpha.16" -description = "Ding adapter for nonebot2" -authors = ["Artin ", "yanyongyu "] -license = "MIT" -readme = "README.md" -homepage = "https://v2.nonebot.dev/" -repository = "https://github.com/nonebot/nonebot2" -documentation = "https://v2.nonebot.dev/" -keywords = ["bot", "qq", "qqbot", "ding"] -classifiers = [ - "Development Status :: 5 - Production/Stable", - "Framework :: Robot Framework", - "Framework :: Robot Framework :: Library", - "Operating System :: OS Independent", - "Programming Language :: Python :: 3" -] -packages = [ - { include = "nonebot" } -] -exclude = ["nonebot/__init__.py", "nonebot/adapters/__init__.py"] - -[tool.poetry.dependencies] -python = "^3.7.3" -httpx = ">=0.20.0, <1.0.0" -nonebot2 = "^2.0.0-alpha.14" - -[tool.poetry.dev-dependencies] -nonebot2 = { path = "../../", develop = true } - -# [[tool.poetry.source]] -# name = "aliyun" -# url = "https://mirrors.aliyun.com/pypi/simple/" -# default = true - -[tool.black] -line-length = 88 -target-version = ["py37", "py38", "py39"] -include = '\.pyi?$' -extend-exclude = ''' -''' - -[tool.isort] -profile = "black" -line_length = 80 -length_sort = true -skip_gitignore = true -force_sort_within_sections = true -extra_standard_library = ["typing_extensions"] - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" diff --git a/packages/nonebot-adapter-feishu/README.md b/packages/nonebot-adapter-feishu/README.md deleted file mode 100644 index 8d9c629c..00000000 --- a/packages/nonebot-adapter-feishu/README.md +++ /dev/null @@ -1,11 +0,0 @@ -

- nonebot -

- -
- -# NoneBot-Adapter-Feishu - -_✨ 飞书协议适配 ✨_ - -
diff --git a/packages/nonebot-adapter-feishu/nonebot/__init__.py b/packages/nonebot-adapter-feishu/nonebot/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/__init__.py b/packages/nonebot-adapter-feishu/nonebot/adapters/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/__init__.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/__init__.py deleted file mode 100644 index d9e2cdfb..00000000 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -import logging - -from nonebot.log import LoguruHandler, logger - -aiocache_logger = logging.getLogger("aiocache.serializers.serializers") -aiocache_logger.setLevel(logging.DEBUG) -aiocache_logger.handlers.clear() -aiocache_logger.addHandler(LoguruHandler()) - -from .event import * -from .bot import Bot as Bot -from .message import Message as Message -from .message import MessageSegment as MessageSegment diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py deleted file mode 100644 index 98696bf9..00000000 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/bot.py +++ /dev/null @@ -1,395 +0,0 @@ -import re -import json -from typing import ( - TYPE_CHECKING, - Any, - Dict, - Tuple, - Union, - Iterable, - Optional, - AsyncIterable, - cast, -) - -import httpx -from aiocache import Cache, cached -from aiocache.serializers import PickleSerializer - -from nonebot.log import logger -from nonebot.typing import overrides -from nonebot.utils import escape_tag -from nonebot.message import handle_event -from nonebot.adapters import Bot as BaseBot -from nonebot.drivers import Driver, HTTPRequest, HTTPResponse - -from .utils import AESCipher, log -from .config import Config as FeishuConfig -from .message import Message, MessageSegment, MessageSerializer -from .exception import ActionFailed, NetworkError, ApiNotAvailable -from .event import ( - Event, - MessageEvent, - GroupMessageEvent, - PrivateMessageEvent, - get_event_model, -) - -if TYPE_CHECKING: - from nonebot.config import Config - - -def _check_at_me(bot: "Bot", event: "Event"): - """ - :说明: - - 检查消息开头或结尾是否存在 @机器人，去除并赋值 ``event.reply``, ``event.to_me`` - - :参数: - - * ``bot: Bot``: Bot 对象 - * ``event: Event``: Event 对象 - """ - if not isinstance(event, MessageEvent): - return - - message = event.get_message() - # ensure message not empty - if not message: - message.append(MessageSegment.text("")) - - if event.event.message.chat_type == "p2p": - event.to_me = True - - for index, segment in enumerate(message): - if ( - segment.type == "at" - and segment.data.get("user_name") in bot.config.nickname - ): - event.to_me = True - del event.event.message.content[index] - return - elif segment.type == "text" and segment.data.get("mentions"): - for mention in segment.data["mentions"].values(): - if mention["name"] in bot.config.nickname: - event.to_me = True - segment.data["text"] = segment.data["text"].replace( - f"@{mention['name']}", "" - ) - segment.data["text"] = segment.data["text"].lstrip() - break - else: - continue - break - - if not message: - message.append(MessageSegment.text("")) - - -def _check_nickname(bot: "Bot", event: "Event"): - """ - :说明: - - 检查消息开头是否存在昵称，去除并赋值 ``event.to_me`` - - :参数: - - * ``bot: Bot``: Bot 对象 - * ``event: Event``: Event 对象 - """ - if not isinstance(event, MessageEvent): - return - - first_msg_seg = event.get_message()[0] - if first_msg_seg.type != "text": - return - - first_text = first_msg_seg.data["text"] - - nicknames = set(filter(lambda n: n, bot.config.nickname)) - if nicknames: - # check if the user is calling me with my nickname - nickname_regex = "|".join(nicknames) - m = re.search(rf"^({nickname_regex})([\s,，]*|$)", first_text, re.IGNORECASE) - if m: - nickname = m.group(1) - log("DEBUG", f"User is calling me {nickname}") - event.to_me = True - first_msg_seg.data["text"] = first_text[m.end() :] - - -def _handle_api_result( - result: Union[ - Optional[Dict[str, Any]], str, bytes, Iterable[bytes], AsyncIterable[bytes] - ] -) -> Any: - """ - :说明: - - 处理 API 请求返回值。 - - :参数: - - * ``result: Optional[Dict[str, Any]]``: API 返回数据 - - :返回: - - - ``Any``: API 调用返回数据 - - :异常: - - - ``ActionFailed``: API 调用失败 - """ - if isinstance(result, dict): - result = cast(Dict[str, Any], result) - if result.get("code") != 0: - raise ActionFailed(**result) - return result.get("data") - else: - return result - - -class Bot(BaseBot): - """ - 飞书 协议 Bot 适配。继承属性参考 `BaseBot `_ 。 - """ - - @property - def type(self) -> str: - return "feishu" - - @property - def api_root(self) -> str: - if self.feishu_config.is_lark: - return "https://open.larksuite.com/open-apis/" - else: - return "https://open.feishu.cn/open-apis/" - - @classmethod - def register(cls, driver: Driver, config: "Config"): - super().register(driver, config) - cls.feishu_config = FeishuConfig(**config.dict()) - - @classmethod - @overrides(BaseBot) - async def check_permission( - cls, driver: Driver, request: HTTPRequest - ) -> Tuple[Optional[str], Optional[HTTPResponse]]: - if not isinstance(request, HTTPRequest): - log("WARNING", "Unsupported connection type, available type: `http`") - return None, HTTPResponse( - 405, b"Unsupported connection type, available type: `http`" - ) - - encrypt_key = cls.feishu_config.encrypt_key - if encrypt_key: - encrypted = json.loads(request.body)["encrypt"] - decrypted = AESCipher(encrypt_key).decrypt_string(encrypted) - data = json.loads(decrypted) - else: - data = json.loads(request.body) - - challenge = data.get("challenge") - if challenge: - return data.get("token"), HTTPResponse( - 200, json.dumps({"challenge": challenge}).encode() - ) - - schema = data.get("schema") - if not schema: - return None, HTTPResponse( - 400, b"Missing `schema` in POST body, only accept event of version 2.0" - ) - - headers = data.get("header") - if headers: - token = headers.get("token") - app_id = headers.get("app_id") - else: - log("WARNING", "Missing `header` in POST body") - return None, HTTPResponse(400, b"Missing `header` in POST body") - - if not token: - log("WARNING", "Missing `verification token` in POST body") - return None, HTTPResponse(400, b"Missing `verification token` in POST body") - else: - if token != cls.feishu_config.verification_token: - log("WARNING", "Verification token check failed") - return None, HTTPResponse(403, b"Verification token check failed") - - return app_id, HTTPResponse(200, b"") - - async def handle_message(self, message: bytes): - """ - :说明: - - 处理事件并转换为 `Event <#class-event>`_ - """ - data: dict = json.loads(message) - if data.get("type") == "url_verification": - return - - try: - header = data["header"] - event_type = header["event_type"] - if data.get("event"): - if data["event"].get("message"): - event_type += f".{data['event']['message']['chat_type']}" - - models = get_event_model(event_type) - for model in models: - try: - event = model.parse_obj(data) - break - except Exception as e: - log("DEBUG", "Event Parser Error", e) - else: - event = Event.parse_obj(data) - - _check_at_me(self, event) - _check_nickname(self, event) - - await handle_event(self, event) - except Exception as e: - logger.opt(colors=True, exception=e).error( - f"Failed to handle event. Raw: {escape_tag(str(data))}" - ) - - def _construct_url(self, path: str) -> str: - return self.api_root + path - - @cached( - ttl=60 * 60, - cache=Cache.MEMORY, - key="_feishu_tenant_access_token", - serializer=PickleSerializer(), - ) - async def _fetch_tenant_access_token(self) -> str: - try: - async with httpx.AsyncClient(follow_redirects=True) as client: - response = await client.post( - self._construct_url("auth/v3/tenant_access_token/internal/"), - json={ - "app_id": self.feishu_config.app_id, - "app_secret": self.feishu_config.app_secret, - }, - timeout=self.config.api_timeout, - ) - - if 200 <= response.status_code < 300: - result = response.json() - return result["tenant_access_token"] - else: - raise NetworkError( - f"HTTP request received unexpected " - f"status code: {response.status_code}" - ) - except httpx.InvalidURL: - raise NetworkError("API root url invalid") - except httpx.HTTPError: - raise NetworkError("HTTP request failed") - - @overrides(BaseBot) - async def _call_api(self, api: str, **data) -> Any: - log("DEBUG", f"Calling API {api}") - if isinstance(self.request, HTTPRequest): - if not self.api_root: - raise ApiNotAvailable - - headers = {} - self.feishu_config.tenant_access_token = ( - await self._fetch_tenant_access_token() - ) - headers["Authorization"] = ( - "Bearer " + self.feishu_config.tenant_access_token - ) - - try: - async with httpx.AsyncClient( - timeout=self.config.api_timeout, follow_redirects=True - ) as client: - response = await client.send( - httpx.Request( - data["method"], - self.api_root + api, - json=data.get("body", {}), - params=data.get("query", {}), - headers=headers, - ) - ) - if 200 <= response.status_code < 300: - if response.headers["content-type"].startswith("application/json"): - result = response.json() - else: - result = response.content - return _handle_api_result(result) - raise NetworkError( - f"HTTP request received unexpected " - f"status code: {response.status_code} " - f"response body: {response.text}" - ) - except httpx.InvalidURL: - raise NetworkError("API root url invalid") - except httpx.HTTPError: - raise NetworkError("HTTP request failed") - - @overrides(BaseBot) - async def call_api(self, api: str, **data) -> Any: - """ - :说明: - - 调用 飞书 协议 API - - :参数: - - * ``api: str``: API 名称 - * ``**data: Any``: API 参数 - - :返回: - - - ``Any``: API 调用返回数据 - - :异常: - - - ``NetworkError``: 网络错误 - - ``ActionFailed``: API 调用失败 - """ - return await super().call_api(api, **data) - - @overrides(BaseBot) - async def send( - self, - event: Event, - message: Union[str, Message, MessageSegment], - at_sender: bool = False, - **kwargs, - ) -> Any: - msg = message if isinstance(message, Message) else Message(message) - - if isinstance(event, GroupMessageEvent): - receive_id, receive_id_type = event.event.message.chat_id, "chat_id" - elif isinstance(event, PrivateMessageEvent): - receive_id, receive_id_type = event.get_user_id(), "open_id" - else: - raise ValueError( - "Cannot guess `receive_id` and `receive_id_type` to reply!" - ) - - at_sender = at_sender and bool(event.get_user_id()) - - if at_sender and receive_id_type == "chat_id": - msg = MessageSegment.at(event.get_user_id()) + " " + msg - - msg_type, content = MessageSerializer(msg).serialize() - - params = { - "method": "POST", - "query": {"receive_id_type": receive_id_type}, - "body": { - "receive_id": receive_id, - "content": content, - "msg_type": msg_type, - }, - } - - return await self.call_api(f"im/v1/messages", **params) diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py deleted file mode 100644 index 4bc70c12..00000000 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/config.py +++ /dev/null @@ -1,34 +0,0 @@ -from typing import Optional - -from pydantic import Field, BaseModel - - -class Config(BaseModel): - """ - 飞书配置类 - - :配置项: - - - ``app_id`` / ``feishu_app_id``: 飞书开放平台后台“凭证与基础信息”处给出的 App ID - - ``app_secret`` / ``feishu_app_secret``: 飞书开放平台后台“凭证与基础信息”处给出的 App Secret - - ``encrypt_key`` / ``feishu_encrypt_key``: 飞书开放平台后台“事件订阅”处设置的 Encrypt Key - - ``verification_token`` / ``feishu_verification_token``: 飞书开放平台后台“事件订阅”处设置的 Verification Token - - ``tenant_access_token`` / ``feishu_tenant_access_token``: 请求飞书 API 后返回的租户密钥 - - ``is_lark`` / ``feishu_is_lark``: 是否使用Lark（飞书海外版），默认为 false - - """ - - app_id: Optional[str] = Field(default=None, alias="feishu_app_id") - app_secret: Optional[str] = Field(default=None, alias="feishu_app_secret") - encrypt_key: Optional[str] = Field(default=None, alias="feishu_encrypt_key") - verification_token: Optional[str] = Field( - default=None, alias="feishu_verification_token" - ) - tenant_access_token: Optional[str] = Field( - default=None, alias="feishu_tenant_access_token" - ) - is_lark: Optional[str] = Field(default=False, alias="feishu_is_lark") - - class Config: - extra = "ignore" - allow_population_by_field_name = True diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/event.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/event.py deleted file mode 100644 index 620bbe36..00000000 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/event.py +++ /dev/null @@ -1,878 +0,0 @@ -import json -import inspect -from typing import Any, Dict, List, Type, Literal, Optional - -from pygtrie import StringTrie -from pydantic import Field, BaseModel, root_validator - -from nonebot.typing import overrides -from nonebot.adapters import Event as BaseEvent - -from .message import Message, MessageDeserializer - - -class EventHeader(BaseModel): - event_id: str - event_type: str - create_time: str - token: str - app_id: str - tenant_key: str - resource_id: Optional[str] - user_list: Optional[List[dict]] - - -class Event(BaseEvent): - """ - 飞书协议事件。各事件字段参考 `飞书文档`_ - - .. _飞书文档: - https://open.feishu.cn/document/ukTMukTMukTM/uYDNxYjL2QTM24iN0EjN/event-list - """ - - __event__ = "" - schema_: str = Field("", alias="schema") - header: EventHeader - event: Any - - @overrides(BaseEvent) - def get_type(self) -> str: - return self.header.event_type - - @overrides(BaseEvent) - def get_event_name(self) -> str: - return self.header.event_type - - @overrides(BaseEvent) - def get_event_description(self) -> str: - return str(self.dict()) - - @overrides(BaseEvent) - def get_message(self) -> Message: - raise ValueError("Event has no message!") - - @overrides(BaseEvent) - def get_plaintext(self) -> str: - raise ValueError("Event has no plaintext!") - - @overrides(BaseEvent) - def get_user_id(self) -> str: - raise ValueError("Event has no user_id!") - - @overrides(BaseEvent) - def get_session_id(self) -> str: - raise ValueError("Event has no session_id!") - - @overrides(BaseEvent) - def is_tome(self) -> bool: - return False - - -class UserId(BaseModel): - union_id: str - user_id: str - open_id: str - - -class Sender(BaseModel): - sender_id: UserId - sender_type: str - tenant_key: str - - -class ReplySender(BaseModel): - id: str - id_type: str - sender_type: str - tenant_key: str - - -class Mention(BaseModel): - key: str - id: UserId - name: str - tenant_key: str - - -class ReplyMention(BaseModel): - id: str - id_type: str - key: str - name: str - tenant_key: str - - -class MessageBody(BaseModel): - content: str - - -class Reply(BaseModel): - message_id: str - root_id: Optional[str] - parent_id: Optional[str] - msg_type: str - create_time: str - update_time: str - deleted: bool - updated: bool - chat_id: str - sender: ReplySender - body: MessageBody - mentions: List[ReplyMention] - upper_message_id: Optional[str] - - class Config: - extra = "allow" - - -class EventMessage(BaseModel): - message_id: str - root_id: Optional[str] - parent_id: Optional[str] - create_time: str - chat_id: str - chat_type: str - message_type: str - content: Message - mentions: Optional[List[Mention]] - - @root_validator(pre=True) - def parse_message(cls, values: dict): - values["content"] = MessageDeserializer( - values["message_type"], - json.loads(values["content"]), - values.get("mentions"), - ).deserialize() - return values - - -class GroupEventMessage(EventMessage): - chat_type: Literal["group"] - - -class PrivateEventMessage(EventMessage): - chat_type: Literal["p2p"] - - -class MessageEventDetail(BaseModel): - sender: Sender - message: EventMessage - - -class GroupMessageEventDetail(MessageEventDetail): - message: GroupEventMessage - - -class PrivateMessageEventDetail(MessageEventDetail): - message: PrivateEventMessage - - -class MessageEvent(Event): - __event__ = "im.message.receive_v1" - event: MessageEventDetail - - to_me: bool = False - """ - :说明: 消息是否与机器人有关 - - :类型: ``bool`` - """ - reply: Optional[Reply] - - @overrides(Event) - def get_type(self) -> Literal["message", "notice"]: - return "message" - - @overrides(Event) - def get_event_name(self) -> str: - return f"{self.get_type()}.{self.event.message.chat_type}" - - @overrides(Event) - def get_event_description(self) -> str: - return ( - f"{self.event.message.message_id} from {self.get_user_id()}" - f"@[{self.event.message.chat_type}:{self.event.message.chat_id}]" - f" {self.get_message()}" - ) - - @overrides(Event) - def get_message(self) -> Message: - return self.event.message.content - - @overrides(Event) - def get_plaintext(self) -> str: - return str(self.get_message()) - - @overrides(Event) - def get_user_id(self) -> str: - return self.event.sender.sender_id.open_id - - def get_all_user_id(self) -> UserId: - return self.event.sender.sender_id - - @overrides(Event) - def get_session_id(self) -> str: - return f"{self.event.message.chat_type}_{self.event.message.chat_id}_{self.get_user_id()}" - - -class GroupMessageEvent(MessageEvent): - __event__ = "im.message.receive_v1.group" - event: GroupMessageEventDetail - - -class PrivateMessageEvent(MessageEvent): - __event__ = "im.message.receive_v1.p2p" - event: PrivateMessageEventDetail - - -class NoticeEvent(Event): - event: Dict[str, Any] - - @overrides(Event) - def get_type(self) -> Literal["message", "notice"]: - return "notice" - - @overrides(Event) - def get_event_name(self) -> str: - return self.header.event_type - - @overrides(Event) - def get_event_description(self) -> str: - return str(self.dict()) - - @overrides(Event) - def get_message(self) -> Message: - raise ValueError("Event has no message!") - - @overrides(Event) - def get_plaintext(self) -> str: - raise ValueError("Event has no plaintext!") - - @overrides(Event) - def get_user_id(self) -> str: - raise ValueError("Event has no user_id!") - - @overrides(Event) - def get_session_id(self) -> str: - raise ValueError("Event has no session_id!") - - -class MessageReader(BaseModel): - reader_id: UserId - read_time: str - tenant_key: str - - -class MessageReadEventDetail(BaseModel): - reader: MessageReader - message_id_list: List[str] - - -class MessageReadEvent(NoticeEvent): - __event__ = "im.message.message_read_v1" - event: MessageReadEventDetail - - -class GroupDisbandedEventDetail(BaseModel): - chat_id: str - operator_id: UserId - external: bool - operator_tenant_key: str - - -class GroupDisbandedEvent(NoticeEvent): - __event__ = "im.chat.disbanded_v1" - event: GroupDisbandedEventDetail - - -class I18nNames(BaseModel): - zh_cn: str - en_us: str - ja_jp: str - - -class ChatChange(BaseModel): - avatar: str - name: str - description: str - i18n_names: I18nNames - add_member_permission: str - share_card_permission: str - at_all_permission: str - edit_permission: str - membership_approval: str - join_message_visibility: str - leave_message_visibility: str - moderation_permission: str - owner_id: UserId - - -class EventModerator(BaseModel): - tenant_key: str - user_id: UserId - - -class ModeratorList(BaseModel): - added_member_list: EventModerator - removed_member_list: EventModerator - - -class GroupConfigUpdatedEventDetail(BaseModel): - chat_id: str - operator_id: UserId - external: bool - operator_tenant_key: str - after_change: ChatChange - before_change: ChatChange - moderator_list: ModeratorList - - -class GroupConfigUpdatedEvent(NoticeEvent): - __event__ = "im.chat.updated_v1" - event: GroupConfigUpdatedEventDetail - - -class GroupMemberBotAddedEventDetail(BaseModel): - chat_id: str - operator_id: UserId - external: bool - operator_tenant_key: str - - -class GroupMemberBotAddedEvent(NoticeEvent): - __event__ = "im.chat.member.bot.added_v1" - event: GroupMemberBotAddedEventDetail - - -class GroupMemberBotDeletedEventDetail(BaseModel): - chat_id: str - operator_id: UserId - external: bool - operator_tenant_key: str - - -class GroupMemberBotDeletedEvent(NoticeEvent): - __event__ = "im.chat.member.bot.deleted_v1" - event: GroupMemberBotDeletedEventDetail - - -class ChatMemberUser(BaseModel): - name: str - tenant_key: str - user_id: UserId - - -class GroupMemberUserAddedEventDetail(BaseModel): - chat_id: str - operator_id: UserId - external: bool - operator_tenant_key: str - users: List[ChatMemberUser] - - -class GroupMemberUserAddedEvent(NoticeEvent): - __event__ = "im.chat.member.user.added_v1" - event: GroupMemberUserAddedEventDetail - - -class GroupMemberUserWithdrawnEventDetail(BaseModel): - chat_id: str - operator_id: UserId - external: bool - operator_tenant_key: str - users: List[ChatMemberUser] - - -class GroupMemberUserWithdrawnEvent(NoticeEvent): - __event__ = "im.chat.member.user.withdrawn_v1" - event: GroupMemberUserWithdrawnEventDetail - - -class GroupMemberUserDeletedEventDetail(BaseModel): - chat_id: str - operator_id: UserId - external: bool - operator_tenant_key: str - users: List[ChatMemberUser] - - -class GroupMemberUserDeletedEvent(NoticeEvent): - __event__ = "im.chat.member.user.deleted_v1" - event: GroupMemberUserDeletedEventDetail - - -class AvatarInfo(BaseModel): - avatar_72: str - avatar_240: str - avatar_640: str - avatar_origin: str - - -class UserStatus(BaseModel): - is_frozen: bool - is_resigned: bool - is_activated: bool - - -class UserOrder(BaseModel): - department_id: str - user_order: int - department_order: int - - -class UserCustomAttrValue(BaseModel): - text: str - url: str - pc_url: str - - -class UserCustomAttr(BaseModel): - type: str - id: str - value: UserCustomAttrValue - - -class ContactUser(BaseModel): - open_id: str - user_id: str - name: str - en_name: str - email: str - mobile: str - gender: int - avatar: AvatarInfo - status: UserStatus - department_ids: Optional[List[str]] - leader_user_id: str - city: str - country: str - work_station: str - join_time: int - employee_no: str - employee_type: int - orders: Optional[List[UserOrder]] - custom_attrs: List[UserCustomAttr] - - -class OldContactUser(BaseModel): - department_ids: List[str] - open_id: str - - -class ContactUserUpdatedEventDetail(BaseModel): - object: ContactUser - old_object: ContactUser - - -class ContactUserUpdatedEvent(NoticeEvent): - __event__ = "contact.user.updated_v3" - event: ContactUserUpdatedEventDetail - - -class ContactUserDeletedEventDetail(NoticeEvent): - object: ContactUser - old_object: OldContactUser - - -class ContactUserDeletedEvent(NoticeEvent): - __event__ = "contact.user.deleted_v3" - event: ContactUserDeletedEventDetail - - -class ContactUserCreatedEventDetail(BaseModel): - object: ContactUser - - -class ContactUserCreatedEvent(NoticeEvent): - __event__ = "contact.user.created_v3" - event: ContactUserCreatedEventDetail - - -class ContactDepartmentStatus(BaseModel): - is_deleted: bool - - -class ContactDepartment(BaseModel): - name: str - parent_department_id: str - department_id: str - open_department_id: str - leader_user_id: str - chat_id: str - order: int - status: ContactDepartmentStatus - - -class ContactDepartmentUpdatedEventDetail(BaseModel): - object: ContactDepartment - old_object: ContactDepartment - - -class ContactDepartmentUpdatedEvent(NoticeEvent): - __event__ = "contact.department.updated_v3" - event: ContactDepartmentUpdatedEventDetail - - -class OldContactDepartment(BaseModel): - status: ContactDepartmentStatus - open_department_id: str - - -class ContactDepartmentDeletedEventDetail(NoticeEvent): - object: ContactDepartment - old_object: OldContactDepartment - - -class ContactDepartmentDeletedEvent(NoticeEvent): - __event__ = "contact.department.deleted_v3" - event: ContactDepartmentDeletedEventDetail - - -class ContactDepartmentCreatedEventDetail(BaseModel): - object: ContactDepartment - - -class ContactDepartmentCreatedEvent(NoticeEvent): - __event__ = "contact.department.created_v3" - event: ContactDepartmentCreatedEventDetail - - -class CalendarAclScope(BaseModel): - type: str - user_id: str - - -class CalendarAclCreatedEventDetail(BaseModel): - acl_id: str - role: str - scope: CalendarAclScope - - -class CalendarAclCreatedEvent(NoticeEvent): - __event__ = "calendar.calendar.acl.created_v4" - event: CalendarAclCreatedEventDetail - - -class CalendarAclDeletedEventDetail(BaseModel): - acl_id: str - role: str - scope: CalendarAclScope - - -class CalendarAclDeletedEvent(NoticeEvent): - __event__ = "calendar.calendar.acl.deleted_v4" - event: CalendarAclDeletedEventDetail - - -class CalendarChangedEvent(NoticeEvent): - __event__ = "calendar.calendar.changed_v4" - event: dict - - -class CalendarEventChangedEventDetail(BaseModel): - calendar_id: str - - -class CalendarEventChangedEvent(NoticeEvent): - __event__ = "calendar.calendar.event.changed_v4" - event: CalendarEventChangedEventDetail - - -class DriveFileReadEventDetail(BaseModel): - file_token: str - file_type: str - operator_id_list: List[UserId] - - -class DriveFileReadEvent(NoticeEvent): - __event__ = "drive.file.read_v1" - event: DriveFileReadEventDetail - - -class DriveFileTitleUpdatedEventDetail(BaseModel): - file_token: str - file_type: str - operator_id: UserId - - -class DriveFileTitleUpdatedEvent(NoticeEvent): - __event__ = "drive.file.title_updated_v1" - event: DriveFileTitleUpdatedEventDetail - - -class DriveFilePermissionMemberAddedEventDetail(BaseModel): - chat_list: List[str] - file_token: str - file_type: str - operator_id: UserId - user_list: List[UserId] - - -class DriveFilePermissionMemberAddedEvent(NoticeEvent): - __event__ = "drive.file.permission_member_added_v1" - event: DriveFilePermissionMemberAddedEventDetail - - -class DriveFilePermissionMemberRemovedEventDetail(BaseModel): - chat_list: List[str] - file_token: str - file_type: str - operator_id: UserId - user_list: List[UserId] - - -class DriveFilePermissionMemberRemovedEvent(NoticeEvent): - __event__ = "drive.file.permission_member_removed_v1" - event: DriveFilePermissionMemberRemovedEventDetail - - -class DriveFileTrashedEventDetail(BaseModel): - file_token: str - file_type: str - operator_id: UserId - - -class DriveFileTrashedEvent(NoticeEvent): - __event__ = "drive.file.trashed_v1" - event: DriveFileTrashedEventDetail - - -class DriveFileDeletedEventDetail(BaseModel): - file_token: str - file_type: str - operator_id: UserId - - -class DriveFileDeletedEvent(NoticeEvent): - __event__ = "drive.file.deleted_v1" - event: DriveFileDeletedEventDetail - - -class DriveFileEditedEventDetail(BaseModel): - file_token: str - file_type: str - operator_id_list: List[UserId] - subscriber_id_list: List[UserId] - - -class DriveFileEditedEvent(NoticeEvent): - __event__ = "drive.file.edit_v1" - event: DriveFileEditedEventDetail - - -class MeetingRoomCreatedEventDetail(BaseModel): - room_id: str - room_name: str - - -class MeetingRoomCreatedEvent(NoticeEvent): - __event__ = "meeting_room.meeting_room.created_v1" - event: MeetingRoomCreatedEventDetail - - -class MeetingRoomUpdatedEventDetail(BaseModel): - room_id: str - room_name: str - - -class MeetingRoomUpdatedEvent(NoticeEvent): - __event__ = "meeting_room.meeting_room.updated_v1" - event: MeetingRoomUpdatedEventDetail - - -class MeetingRoomDeletedEventDetail(BaseModel): - room_id: str - room_name: str - - -class MeetingRoomDeletedEvent(NoticeEvent): - __event__ = "meeting_room.meeting_room.deleted_v1" - event: MeetingRoomDeletedEventDetail - - -class MeetingRoomStatusChangedEventDetail(BaseModel): - room_id: str - room_name: str - - -class MeetingRoomStatusChangedEvent(NoticeEvent): - __event__ = "meeting_room.meeting_room.status_changed_v1" - event: MeetingRoomStatusChangedEventDetail - - -class MeetingUser(BaseModel): - id: UserId - user_role: Optional[int] - user_type: Optional[int] - - -class Meeting(BaseModel): - id: str - topic: str - meeting_no: str - start_time: Optional[str] - end_time: Optional[str] - host_user: Optional[MeetingUser] - owner: MeetingUser - - -class VCMeetingStartedEventDetail(BaseModel): - meeting: Meeting - operator: MeetingUser - - -class VCMeetingStartedEvent(NoticeEvent): - __event__ = "vc.meeting.meeting_started_v1" - event: VCMeetingStartedEventDetail - - -class VCMeetingEndedEventDetail(BaseModel): - meeting: Meeting - operator: MeetingUser - - -class VCMeetingEndedEvent(NoticeEvent): - __event__ = "vc.meeting.meeting_ended_v1" - event: VCMeetingEndedEventDetail - - -class VCMeetingJoinedEventDetail(BaseModel): - meeting: Meeting - operator: MeetingUser - - -class VCMeetingJoinedEvent(NoticeEvent): - __event__ = "vc.meeting.join_meeting_v1" - event: VCMeetingJoinedEventDetail - - -class VCMeetingLeftEventDetail(BaseModel): - meeting: Meeting - operator: MeetingUser - leave_reason: int - - -class VCMeetingLeftEvent(NoticeEvent): - __event__ = "vc.meeting.leave_meeting_v1" - event: VCMeetingLeftEventDetail - - -class VCMeetingRecordingStartedEventDetail(BaseModel): - meeting: Meeting - operator: MeetingUser - - -class VCMeetingRecordingStartedEvent(NoticeEvent): - __event__ = "vc.meeting.recording_started_v1" - event: VCMeetingRecordingStartedEventDetail - - -class VCMeetingRecordingEndedEventDetail(BaseModel): - meeting: Meeting - operator: MeetingUser - - -class VCMeetingRecordingEndedEvent(NoticeEvent): - __event__ = "vc.meeting.recording_ended_v1" - event: VCMeetingRecordingEndedEventDetail - - -class VCMeetingRecordingReadyEventDetail(BaseModel): - meeting: Meeting - url: str - duration: str - - -class VCMeetingRecordingReadyEvent(NoticeEvent): - __event__ = "vc.meeting.recording_ready_v1" - event: VCMeetingRecordingReadyEventDetail - - -class VCMeetingShareStartedEventDetail(BaseModel): - meeting: Meeting - operator: MeetingUser - - -class VCMeetingShareStartedEvent(NoticeEvent): - __event__ = "vc.meeting.share_started_v1" - event: VCMeetingShareStartedEventDetail - - -class VCMeetingShareEndedEventDetail(BaseModel): - meeting: Meeting - operator: MeetingUser - - -class VCMeetingShareEndedEvent(NoticeEvent): - __event__ = "vc.meeting.share_ended_v1" - event: VCMeetingShareEndedEventDetail - - -class AttendanceUserFlowCreatedEventDetail(BaseModel): - bssid: str - check_time: str - comment: str - employee_id: str - employee_no: str - is_field: bool - is_wifi: bool - latitude: float - location_name: str - longitude: float - photo_urls: Optional[List[str]] - record_id: str - ssid: str - type: int - - -class AttendanceUserFlowCreatedEvent(NoticeEvent): - __event__ = "attendance.user_flow.created_v1" - event: AttendanceUserFlowCreatedEventDetail - - -class AttendanceUserTaskStatusDiff(BaseModel): - before_status: str - before_supplement: str - current_status: str - current_supplement: str - index: int - work_type: str - - -class AttendanceUserTaskUpdatedEventDetail(BaseModel): - date: int - employee_id: str - employee_no: str - group_id: str - shift_id: str - status_changes: List[AttendanceUserTaskStatusDiff] - task_id: str - time_zone: str - - -class AttendanceUserTaskUpdatedEvent(NoticeEvent): - __event__ = "attendance.user_task.updated_v1" - event: AttendanceUserTaskUpdatedEventDetail - - -_t = StringTrie(separator=".") - -# define `model` first to avoid globals changing while `for` -model = None -for model in globals().values(): - if not inspect.isclass(model) or not issubclass(model, Event): - continue - _t["." + model.__event__] = model - - -def get_event_model(event_name) -> List[Type[Event]]: - """ - :说明: - - 根据事件名获取对应 ``Event Model`` 及 ``FallBack Event Model`` 列表 - - :返回: - - - ``List[Type[Event]]`` - """ - return [model.value for model in _t.prefixes("." + event_name)][::-1] diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/exception.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/exception.py deleted file mode 100644 index 99fb562c..00000000 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/exception.py +++ /dev/null @@ -1,63 +0,0 @@ -from typing import Optional - -from nonebot.exception import AdapterException -from nonebot.exception import ActionFailed as BaseActionFailed -from nonebot.exception import NetworkError as BaseNetworkError -from nonebot.exception import ApiNotAvailable as BaseApiNotAvailable - - -class FeishuAdapterException(AdapterException): - def __init__(self): - super().__init__("feishu") - - -class ActionFailed(BaseActionFailed, FeishuAdapterException): - """ - :说明: - - API 请求返回错误信息。 - - :参数: - - * ``retcode: Optional[int]``: 错误码 - """ - - def __init__(self, **kwargs): - super().__init__() - self.info = kwargs - - def __repr__(self): - return ( - f"" - ) - - def __str__(self): - return self.__repr__() - - -class NetworkError(BaseNetworkError, FeishuAdapterException): - """ - :说明: - - 网络错误。 - - :参数: - - * ``retcode: Optional[int]``: 错误码 - """ - - def __init__(self, msg: Optional[str] = None): - super().__init__() - self.msg = msg - - def __repr__(self): - return f"" - - def __str__(self): - return self.__repr__() - - -class ApiNotAvailable(BaseApiNotAvailable, FeishuAdapterException): - pass diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/message.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/message.py deleted file mode 100644 index 7e7eabd9..00000000 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/message.py +++ /dev/null @@ -1,262 +0,0 @@ -import json -import itertools -from dataclasses import dataclass -from typing import ( - Any, - Dict, - List, - Type, - Tuple, - Union, - Mapping, - Iterable, - Optional, - cast, -) - -from nonebot.typing import overrides -from nonebot.adapters import Message as BaseMessage -from nonebot.adapters import MessageSegment as BaseMessageSegment - - -class MessageSegment(BaseMessageSegment["Message"]): - """ - 飞书 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 - """ - - @classmethod - @overrides(BaseMessageSegment) - def get_message_class(cls) -> Type["Message"]: - return Message - - @property - def segment_text(self) -> dict: - return { - "image": "[图片]", - "file": "[文件]", - "audio": "[音频]", - "media": "[视频]", - "sticker": "[表情包]", - "interactive": "[消息卡片]", - "hongbao": "[红包]", - "share_calendar_event": "[日程卡片]", - "share_chat": "[群名片]", - "share_user": "[个人名片]", - "system": "[系统消息]", - "location": "[位置]", - "video_chat": "[视频通话]", - } - - def __str__(self) -> str: - if self.type in ["text", "hongbao", "a"]: - return str(self.data["text"]) - elif self.type == "at": - return str(f"@{self.data['user_name']}") - else: - return self.segment_text.get(self.type, "") - - @overrides(BaseMessageSegment) - def __add__(self, other) -> "Message": - return Message(self) + ( - MessageSegment.text(other) if isinstance(other, str) else other - ) - - @overrides(BaseMessageSegment) - def __radd__(self, other) -> "Message": - return ( - MessageSegment.text(other) if isinstance(other, str) else Message(other) - ) + self - - @overrides(BaseMessageSegment) - def is_text(self) -> bool: - return self.type == "text" - - # 接收消息 - @staticmethod - def at(user_id: str) -> "MessageSegment": - return MessageSegment("at", {"user_id": user_id}) - - # 发送消息 - @staticmethod - def text(text: str) -> "MessageSegment": - return MessageSegment("text", {"text": text}) - - @staticmethod - def post(title: str, content: list) -> "MessageSegment": - return MessageSegment("post", {"title": title, "content": content}) - - @staticmethod - def image(image_key: str) -> "MessageSegment": - return MessageSegment("image", {"image_key": image_key}) - - @staticmethod - def interactive(title: str, elements: list) -> "MessageSegment": - return MessageSegment("interactive", {"title": title, "elements": elements}) - - @staticmethod - def share_chat(chat_id: str) -> "MessageSegment": - return MessageSegment("share_chat", {"chat_id": chat_id}) - - @staticmethod - def share_user(user_id: str) -> "MessageSegment": - return MessageSegment("share_user", {"user_id": user_id}) - - @staticmethod - def audio(file_key: str, duration: int) -> "MessageSegment": - return MessageSegment("audio", {"file_key": file_key, "duration": duration}) - - @staticmethod - def media( - file_key: str, image_key: str, file_name: str, duration: int - ) -> "MessageSegment": - return MessageSegment( - "media", - { - "file_key": file_key, - "image_key": image_key, - "file_name": file_name, - "duration": duration, - }, - ) - - @staticmethod - def file(file_key: str, file_name: str) -> "MessageSegment": - return MessageSegment("file", {"file_key": file_key, "file_name": file_name}) - - @staticmethod - def sticker(file_key) -> "MessageSegment": - return MessageSegment("sticker", {"file_key": file_key}) - - -class Message(BaseMessage[MessageSegment]): - """ - 飞书 协议 Message 适配。 - """ - - @classmethod - @overrides(BaseMessage) - def get_segment_class(cls) -> Type[MessageSegment]: - return MessageSegment - - @overrides(BaseMessage) - def __add__(self, other: Union[str, Mapping, Iterable[Mapping]]) -> "Message": - return super(Message, self).__add__( - MessageSegment.text(other) if isinstance(other, str) else other - ) - - @overrides(BaseMessage) - def __radd__(self, other: Union[str, Mapping, Iterable[Mapping]]) -> "Message": - return super(Message, self).__radd__( - MessageSegment.text(other) if isinstance(other, str) else other - ) - - @staticmethod - @overrides(BaseMessage) - def _construct( - msg: Union[str, Mapping, Iterable[Mapping]] - ) -> Iterable[MessageSegment]: - if isinstance(msg, Mapping): - msg = cast(Mapping[str, Any], msg) - yield MessageSegment(msg["type"], msg.get("data") or {}) - return - elif isinstance(msg, str): - yield MessageSegment.text(msg) - elif isinstance(msg, Iterable): - for seg in msg: - if isinstance(seg, MessageSegment): - yield seg - else: - yield MessageSegment(seg["type"], seg.get("data") or {}) - - def _merge(self) -> "Message": - i: int - seg: MessageSegment - msg: List[MessageSegment] = [] - for i, seg in enumerate(self): - if seg.type == "text" and i != 0 and msg[-1].type == "text": - msg[-1] = MessageSegment( - "text", {"text": msg[-1].data["text"] + seg.data["text"]} - ) - else: - msg.append(seg) - return Message(msg) - - @overrides(BaseMessage) - def extract_plain_text(self) -> str: - return "".join(seg.data["text"] for seg in self if seg.is_text()) - - -@dataclass -class MessageSerializer: - """ - 飞书 协议 Message 序列化器。 - """ - - message: Message - - def serialize(self) -> Tuple[str, str]: - segments = list(self.message) - last_segment_type: str = "" - if len(segments) > 1: - msg = {"title": "", "content": [[]]} - for segment in segments: - if segment == "image": - if last_segment_type != "image": - msg["content"].append([]) - else: - if last_segment_type == "image": - msg["content"].append([]) - msg["content"][-1].append( - { - "tag": segment.type if segment.type != "image" else "img", - **segment.data, - } - ) - last_segment_type = segment.type - return "post", json.dumps({"zh_cn": {**msg}}) - - else: - return self.message[0].type, json.dumps(self.message[0].data) - - -@dataclass -class MessageDeserializer: - """ - 飞书 协议 Message 反序列化器。 - """ - - type: str - data: Dict[str, Any] - mentions: Optional[List[dict]] - - def deserialize(self) -> Message: - dict_mention = {} - if self.mentions: - for mention in self.mentions: - dict_mention[mention["key"]] = mention - - if self.type == "post": - msg = Message() - if self.data["title"] != "": - msg += MessageSegment("text", {"text": self.data["title"]}) - - for seg in itertools.chain(*self.data["content"]): - tag = seg.pop("tag") - if tag == "at": - seg["user_name"] = dict_mention[seg["user_id"]]["name"] - seg["user_id"] = dict_mention[seg["user_id"]]["id"]["open_id"] - - msg += MessageSegment(tag if tag != "img" else "image", seg) - - return msg._merge() - elif self.type == "text": - for key, mention in dict_mention.items(): - self.data["text"] = self.data["text"].replace( - key, f"@{mention['name']}" - ) - self.data["mentions"] = dict_mention - - return Message(MessageSegment(self.type, self.data)) - - else: - return Message(MessageSegment(self.type, self.data)) diff --git a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/utils.py b/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/utils.py deleted file mode 100644 index 8848e563..00000000 --- a/packages/nonebot-adapter-feishu/nonebot/adapters/feishu/utils.py +++ /dev/null @@ -1,34 +0,0 @@ -import base64 -import hashlib - -from Crypto.Cipher import AES - -from nonebot.utils import logger_wrapper - -log = logger_wrapper("FEISHU") - - -class AESCipher(object): - def __init__(self, key): - self.block_size = AES.block_size - self.key = hashlib.sha256(AESCipher.str_to_bytes(key)).digest() - - @staticmethod - def str_to_bytes(data): - u_type = type(b"".decode("utf8")) - if isinstance(data, u_type): - return data.encode("utf8") - return data - - @staticmethod - def _unpad(s): - return s[: -ord(s[len(s) - 1 :])] - - def decrypt(self, enc): - iv = enc[: AES.block_size] - cipher = AES.new(self.key, AES.MODE_CBC, iv) - return self._unpad(cipher.decrypt(enc[AES.block_size :])) - - def decrypt_string(self, enc): - enc = base64.b64decode(enc) - return self.decrypt(enc).decode("utf8") diff --git a/packages/nonebot-adapter-feishu/poetry.lock b/packages/nonebot-adapter-feishu/poetry.lock deleted file mode 100644 index 0f9b972f..00000000 --- a/packages/nonebot-adapter-feishu/poetry.lock +++ /dev/null @@ -1,707 +0,0 @@ -[[package]] -name = "aiocache" -version = "0.11.1" -description = "multi backend asyncio cache" -category = "main" -optional = false -python-versions = "*" - -[package.extras] -dev = ["asynctest (>=0.11.0)", "codecov", "coverage", "flake8", "ipdb", "marshmallow", "pystache", "pytest", "pytest-asyncio", "pytest-mock", "sphinx", "sphinx-autobuild", "sphinx-rtd-theme", "black"] -memcached = ["aiomcache (>=0.5.2)"] -msgpack = ["msgpack (>=0.5.5)"] -redis = ["aioredis (>=0.3.3)", "aioredis (>=1.0.0)"] - -[[package]] -name = "anyio" -version = "3.3.4" -description = "High level compatibility layer for multiple asynchronous event loop implementations" -category = "main" -optional = false -python-versions = ">=3.6.2" - -[package.dependencies] -idna = ">=2.8" -sniffio = ">=1.1" -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] -test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (<0.15)", "mock (>=4)", "uvloop (>=0.15)"] -trio = ["trio (>=0.16)"] - -[[package]] -name = "asgiref" -version = "3.4.1" -description = "ASGI specs, helper code, and adapters" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] - -[[package]] -name = "certifi" -version = "2021.10.8" -description = "Python package for providing Mozilla's CA Bundle." -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "charset-normalizer" -version = "2.0.7" -description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -category = "main" -optional = false -python-versions = ">=3.5.0" - -[package.extras] -unicode_backport = ["unicodedata2"] - -[[package]] -name = "click" -version = "8.0.3" -description = "Composable command line interface toolkit" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -colorama = {version = "*", markers = "platform_system == \"Windows\""} -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} - -[[package]] -name = "colorama" -version = "0.4.4" -description = "Cross-platform colored terminal text." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[[package]] -name = "fastapi" -version = "0.70.0" -description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[package.dependencies] -pydantic = ">=1.6.2,<1.7 || >1.7,<1.7.1 || >1.7.1,<1.7.2 || >1.7.2,<1.7.3 || >1.7.3,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0" -starlette = "0.16.0" - -[package.extras] -all = ["requests (>=2.24.0,<3.0.0)", "jinja2 (>=2.11.2,<4.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<3.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] -dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.4.0,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] -doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"] -test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<4.0.0)", "mypy (==0.910)", "flake8 (>=3.8.3,<4.0.0)", "black (==21.9b0)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.19.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.5.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.6.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "flask (>=1.1.2,<3.0.0)", "anyio[trio] (>=3.2.1,<4.0.0)", "types-ujson (==0.1.1)", "types-orjson (==3.6.0)", "types-dataclasses (==0.1.7)"] - -[[package]] -name = "h11" -version = "0.12.0" -description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" -category = "main" -optional = false -python-versions = ">=3.6" - -[[package]] -name = "h2" -version = "4.1.0" -description = "HTTP/2 State-Machine based protocol implementation" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[package.dependencies] -hpack = ">=4.0,<5" -hyperframe = ">=6.0,<7" - -[[package]] -name = "hpack" -version = "4.0.0" -description = "Pure-Python HPACK header compression" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[[package]] -name = "httpcore" -version = "0.13.7" -description = "A minimal low-level HTTP client." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -anyio = ">=3.0.0,<4.0.0" -h11 = ">=0.11,<0.13" -sniffio = ">=1.0.0,<2.0.0" - -[package.extras] -http2 = ["h2 (>=3,<5)"] - -[[package]] -name = "httptools" -version = "0.2.0" -description = "A collection of framework independent HTTP protocol utils." -category = "main" -optional = false -python-versions = "*" - -[package.extras] -test = ["Cython (==0.29.22)"] - -[[package]] -name = "httpx" -version = "0.20.0" -description = "The next generation HTTP client." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -certifi = "*" -charset-normalizer = "*" -h2 = {version = ">=3,<5", optional = true, markers = "extra == \"http2\""} -httpcore = ">=0.13.3,<0.14.0" -rfc3986 = {version = ">=1.3,<2", extras = ["idna2008"]} -sniffio = "*" - -[package.extras] -brotli = ["brotlicffi", "brotli"] -cli = ["click (>=8.0.0,<9.0.0)", "rich (>=10.0.0,<11.0.0)", "pygments (>=2.0.0,<3.0.0)"] -http2 = ["h2 (>=3,<5)"] - -[[package]] -name = "hyperframe" -version = "6.0.1" -description = "HTTP/2 framing layer for Python" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[[package]] -name = "idna" -version = "3.3" -description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "importlib-metadata" -version = "4.8.1" -description = "Read metadata from Python packages" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} -zipp = ">=0.5" - -[package.extras] -docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -perf = ["ipython"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"] - -[[package]] -name = "loguru" -version = "0.5.3" -description = "Python logging made (stupidly) simple" -category = "main" -optional = false -python-versions = ">=3.5" - -[package.dependencies] -colorama = {version = ">=0.3.4", markers = "sys_platform == \"win32\""} -win32-setctime = {version = ">=1.0.0", markers = "sys_platform == \"win32\""} - -[package.extras] -dev = ["codecov (>=2.0.15)", "colorama (>=0.3.4)", "flake8 (>=3.7.7)", "tox (>=3.9.0)", "tox-travis (>=0.12)", "pytest (>=4.6.2)", "pytest-cov (>=2.7.1)", "Sphinx (>=2.2.1)", "sphinx-autobuild (>=0.7.1)", "sphinx-rtd-theme (>=0.4.3)", "black (>=19.10b0)", "isort (>=5.1.1)"] - -[[package]] -name = "nonebot2" -version = "2.0.0-alpha.16" -description = "An asynchronous python bot framework." -category = "main" -optional = false -python-versions = "^3.7.3" -develop = true - -[package.dependencies] -fastapi = "^0.70.0" -httpx = {version = ">=0.20.0, <1.0.0", extras = ["http2"]} -loguru = "^0.5.1" -pydantic = {version = "~1.8.0", extras = ["dotenv"]} -pygtrie = "^2.4.1" -tomlkit = "^0.7.0" -uvicorn = {version = "^0.15.0", extras = ["standard"]} -websockets = ">=9.1" - -[package.extras] -quart = ["Quart (>=0.15.0,<0.16.0)"] -aiohttp = ["aiohttp[speedups] (>=3.7.4,<4.0.0)"] -all = ["Quart (>=0.15.0,<0.16.0)", "aiohttp[speedups] (>=3.7.4,<4.0.0)"] - -[package.source] -type = "directory" -url = "../.." - -[[package]] -name = "pycryptodome" -version = "3.11.0" -description = "Cryptographic library for Python" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[[package]] -name = "pydantic" -version = "1.8.2" -description = "Data validation and settings management using python 3.6 type hinting" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[package.dependencies] -python-dotenv = {version = ">=0.10.4", optional = true, markers = "extra == \"dotenv\""} -typing-extensions = ">=3.7.4.3" - -[package.extras] -dotenv = ["python-dotenv (>=0.10.4)"] -email = ["email-validator (>=1.0.3)"] - -[[package]] -name = "pygtrie" -version = "2.4.2" -description = "A pure Python trie data structure implementation." -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "python-dotenv" -version = "0.19.1" -description = "Read key-value pairs from a .env file and set them as environment variables" -category = "main" -optional = false -python-versions = ">=3.5" - -[package.extras] -cli = ["click (>=5.0)"] - -[[package]] -name = "pyyaml" -version = "6.0" -description = "YAML parser and emitter for Python" -category = "main" -optional = false -python-versions = ">=3.6" - -[[package]] -name = "rfc3986" -version = "1.5.0" -description = "Validating URI References per RFC 3986" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -idna = {version = "*", optional = true, markers = "extra == \"idna2008\""} - -[package.extras] -idna2008 = ["idna"] - -[[package]] -name = "sniffio" -version = "1.2.0" -description = "Sniff out which async library your code is running under" -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "starlette" -version = "0.16.0" -description = "The little ASGI library that shines." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -anyio = ">=3.0.0,<4" -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "graphene"] - -[[package]] -name = "tomlkit" -version = "0.7.2" -description = "Style preserving TOML library" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[[package]] -name = "typing-extensions" -version = "3.10.0.2" -description = "Backported and Experimental Type Hints for Python 3.5+" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "uvicorn" -version = "0.15.0" -description = "The lightning-fast ASGI server." -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -asgiref = ">=3.4.0" -click = ">=7.0" -colorama = {version = ">=0.4", optional = true, markers = "sys_platform == \"win32\" and extra == \"standard\""} -h11 = ">=0.8" -httptools = {version = ">=0.2.0,<0.3.0", optional = true, markers = "extra == \"standard\""} -python-dotenv = {version = ">=0.13", optional = true, markers = "extra == \"standard\""} -PyYAML = {version = ">=5.1", optional = true, markers = "extra == \"standard\""} -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} -uvloop = {version = ">=0.14.0,<0.15.0 || >0.15.0,<0.15.1 || >0.15.1", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} -watchgod = {version = ">=0.6", optional = true, markers = "extra == \"standard\""} -websockets = {version = ">=9.1", optional = true, markers = "extra == \"standard\""} - -[package.extras] -standard = ["websockets (>=9.1)", "httptools (>=0.2.0,<0.3.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"] - -[[package]] -name = "uvloop" -version = "0.16.0" -description = "Fast implementation of asyncio event loop on top of libuv" -category = "main" -optional = false -python-versions = ">=3.7" - -[package.extras] -dev = ["Cython (>=0.29.24,<0.30.0)", "pytest (>=3.6.0)", "Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)", "aiohttp", "flake8 (>=3.9.2,<3.10.0)", "psutil", "pycodestyle (>=2.7.0,<2.8.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] -docs = ["Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)"] -test = ["aiohttp", "flake8 (>=3.9.2,<3.10.0)", "psutil", "pycodestyle (>=2.7.0,<2.8.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] - -[[package]] -name = "watchgod" -version = "0.7" -description = "Simple, modern file watching and code reload in python." -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "websockets" -version = "10.0" -description = "An implementation of the WebSocket Protocol (RFC 6455 & 7692)" -category = "main" -optional = false -python-versions = ">=3.7" - -[[package]] -name = "win32-setctime" -version = "1.0.3" -description = "A small Python utility to set file creation time on Windows" -category = "main" -optional = false -python-versions = ">=3.5" - -[package.extras] -dev = ["pytest (>=4.6.2)", "black (>=19.3b0)"] - -[[package]] -name = "zipp" -version = "3.6.0" -description = "Backport of pathlib-compatible object wrapper for zip files" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.extras] -docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] - -[metadata] -lock-version = "1.1" -python-versions = "^3.7.3" -content-hash = "c25fec9564d96a549db4b8828e75458d1980e192bdbbcaebeba1e2f35326ea40" - -[metadata.files] -aiocache = [ - {file = "aiocache-0.11.1-py2.py3-none-any.whl", hash = "sha256:e55c7caaa5753794fd301c3a2e592737fa1d036db9f8d04ae154facdfb48a157"}, - {file = "aiocache-0.11.1.tar.gz", hash = "sha256:f2ebe0b05cec45782e7b5ea0bb74640f157dd4bb1028b4565364dda9fe33be7f"}, -] -anyio = [ - {file = "anyio-3.3.4-py3-none-any.whl", hash = "sha256:4fd09a25ab7fa01d34512b7249e366cd10358cdafc95022c7ff8c8f8a5026d66"}, - {file = "anyio-3.3.4.tar.gz", hash = "sha256:67da67b5b21f96b9d3d65daa6ea99f5d5282cb09f50eb4456f8fb51dffefc3ff"}, -] -asgiref = [ - {file = "asgiref-3.4.1-py3-none-any.whl", hash = "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"}, - {file = "asgiref-3.4.1.tar.gz", hash = "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9"}, -] -certifi = [ - {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, - {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, -] -charset-normalizer = [ - {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"}, - {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"}, -] -click = [ - {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"}, - {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"}, -] -colorama = [ - {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, - {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, -] -fastapi = [ - {file = "fastapi-0.70.0-py3-none-any.whl", hash = "sha256:a36d5f2fad931aa3575c07a3472c784e81f3e664e3bb5c8b9c88d0ec1104f59c"}, - {file = "fastapi-0.70.0.tar.gz", hash = "sha256:66da43cfe5185ea1df99552acffd201f1832c6b364e0f4136c0a99f933466ced"}, -] -h11 = [ - {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, - {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, -] -h2 = [ - {file = "h2-4.1.0-py3-none-any.whl", hash = "sha256:03a46bcf682256c95b5fd9e9a99c1323584c3eec6440d379b9903d709476bc6d"}, - {file = "h2-4.1.0.tar.gz", hash = "sha256:a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb"}, -] -hpack = [ - {file = "hpack-4.0.0-py3-none-any.whl", hash = "sha256:84a076fad3dc9a9f8063ccb8041ef100867b1878b25ef0ee63847a5d53818a6c"}, - {file = "hpack-4.0.0.tar.gz", hash = "sha256:fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095"}, -] -httpcore = [ - {file = "httpcore-0.13.7-py3-none-any.whl", hash = "sha256:369aa481b014cf046f7067fddd67d00560f2f00426e79569d99cb11245134af0"}, - {file = "httpcore-0.13.7.tar.gz", hash = "sha256:036f960468759e633574d7c121afba48af6419615d36ab8ede979f1ad6276fa3"}, -] -httptools = [ - {file = "httptools-0.2.0-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:79dbc21f3612a78b28384e989b21872e2e3cf3968532601544696e4ed0007ce5"}, - {file = "httptools-0.2.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:78d03dd39b09c99ec917d50189e6743adbfd18c15d5944392d2eabda688bf149"}, - {file = "httptools-0.2.0-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:a23166e5ae2775709cf4f7ad4c2048755ebfb272767d244e1a96d55ac775cca7"}, - {file = "httptools-0.2.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:3ab1f390d8867f74b3b5ee2a7ecc9b8d7f53750bd45714bf1cb72a953d7dfa77"}, - {file = "httptools-0.2.0-cp36-cp36m-win_amd64.whl", hash = "sha256:a7594f9a010cdf1e16a58b3bf26c9da39bbf663e3b8d46d39176999d71816658"}, - {file = "httptools-0.2.0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:01b392a166adcc8bc2f526a939a8aabf89fe079243e1543fd0e7dc1b58d737cb"}, - {file = "httptools-0.2.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:80ffa04fe8c8dfacf6e4cef8277347d35b0442c581f5814f3b0cf41b65c43c6e"}, - {file = "httptools-0.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d5682eeb10cca0606c4a8286a3391d4c3c5a36f0c448e71b8bd05be4e1694bfb"}, - {file = "httptools-0.2.0-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:a289c27ccae399a70eacf32df9a44059ca2ba4ac444604b00a19a6c1f0809943"}, - {file = "httptools-0.2.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:813871f961edea6cb2fe312f2d9b27d12a51ba92545380126f80d0de1917ea15"}, - {file = "httptools-0.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:cc9be041e428c10f8b6ab358c6b393648f9457094e1dcc11b4906026d43cd380"}, - {file = "httptools-0.2.0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:b08d00d889a118f68f37f3c43e359aab24ee29eb2e3fe96d64c6a2ba8b9d6557"}, - {file = "httptools-0.2.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:fd3b8905e21431ad306eeaf56644a68fdd621bf8f3097eff54d0f6bdf7262065"}, - {file = "httptools-0.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:200fc1cdf733a9ff554c0bb97a4047785cfaad9875307d6087001db3eb2b417f"}, - {file = "httptools-0.2.0.tar.gz", hash = "sha256:94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"}, -] -httpx = [ - {file = "httpx-0.20.0-py3-none-any.whl", hash = "sha256:33af5aad9bdc82ef1fc89219c1e36f5693bf9cd0ebe330884df563445682c0f8"}, - {file = "httpx-0.20.0.tar.gz", hash = "sha256:09606d630f070d07f9ff28104fbcea429ea0014c1e89ac90b4d8de8286c40e7b"}, -] -hyperframe = [ - {file = "hyperframe-6.0.1-py3-none-any.whl", hash = "sha256:0ec6bafd80d8ad2195c4f03aacba3a8265e57bc4cff261e802bf39970ed02a15"}, - {file = "hyperframe-6.0.1.tar.gz", hash = "sha256:ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914"}, -] -idna = [ - {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, - {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, -] -importlib-metadata = [ - {file = "importlib_metadata-4.8.1-py3-none-any.whl", hash = "sha256:b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15"}, - {file = "importlib_metadata-4.8.1.tar.gz", hash = "sha256:f284b3e11256ad1e5d03ab86bb2ccd6f5339688ff17a4d797a0fe7df326f23b1"}, -] -loguru = [ - {file = "loguru-0.5.3-py3-none-any.whl", hash = "sha256:f8087ac396b5ee5f67c963b495d615ebbceac2796379599820e324419d53667c"}, - {file = "loguru-0.5.3.tar.gz", hash = "sha256:b28e72ac7a98be3d28ad28570299a393dfcd32e5e3f6a353dec94675767b6319"}, -] -nonebot2 = [] -pycryptodome = [ - {file = "pycryptodome-3.11.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:ffd0cac13ff41f2d15ed39dc6ba1d2ad88dd2905d656c33d8235852f5d6151fd"}, - {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:ead516e03dfe062aefeafe4a29445a6449b0fc43bc8cb30194b2754917a63798"}, - {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:4ce6b09547bf2c7cede3a017f79502eaed3e819c13cdb3cb357aea1b004e4cc6"}, - {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:014c758af7fa38cab85b357a496b76f4fc9dda1f731eb28358d66fef7ad4a3e1"}, - {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:a843350d08c3d22f6c09c2f17f020d8dcfa59496165d7425a3fba0045543dda7"}, - {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux2014_aarch64.whl", hash = "sha256:53989477044be41fa4a63da09d5038c2a34b2f4554cfea2e3933b17186ee9e19"}, - {file = "pycryptodome-3.11.0-cp27-cp27m-win32.whl", hash = "sha256:f9bad2220b80b4ed74f089db012ab5ab5419143a33fad6c8aedcc2a9341eac70"}, - {file = "pycryptodome-3.11.0-cp27-cp27m-win_amd64.whl", hash = "sha256:3c7ed5b07274535979c730daf5817db5e983ea80b04c22579eee8da4ca3ae4f8"}, - {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:8f3a60926be78422e662b0d0b18351b426ce27657101c8a50bad80300de6a701"}, - {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:fce7e22d96030b35345637c563246c24d4513bd3b413e1c40293114837ab8912"}, - {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:bc3c61ff92efdcc14af4a7b81da71d849c9acee51d8fd8ac9841a7620140d6c6"}, - {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:b33c9b3d1327d821e28e9cc3a6512c14f8b17570ddb4cfb9a52247ed0fcc5d8b"}, - {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux2014_aarch64.whl", hash = "sha256:75e78360d1dd6d02eb288fd8275bb4d147d6e3f5337935c096d11dba1fa84748"}, - {file = "pycryptodome-3.11.0-cp35-abi3-macosx_10_9_x86_64.whl", hash = "sha256:621a90147a5e255fdc2a0fec2d56626b76b5d72ea9e60164c9a5a8976d45b0c9"}, - {file = "pycryptodome-3.11.0-cp35-abi3-manylinux1_i686.whl", hash = "sha256:0ca7a6b4fc1f9fafe990b95c8cda89099797e2cfbf40e55607f2f2f5a3355dcb"}, - {file = "pycryptodome-3.11.0-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:b59bf823cfafde8ef1105d8984f26d1694dff165adb7198b12e3e068d7999b15"}, - {file = "pycryptodome-3.11.0-cp35-abi3-manylinux2010_i686.whl", hash = "sha256:ce81b9c6aaa0f920e2ab05eb2b9f4ccd102e3016b2f37125593b16a83a4b0cc2"}, - {file = "pycryptodome-3.11.0-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:ae29fcd56152f417bfba50a36a56a7a5f9fb74ff80bab98704cac704de6568ab"}, - {file = "pycryptodome-3.11.0-cp35-abi3-manylinux2014_aarch64.whl", hash = "sha256:ae31cb874f6f0cedbed457c6374e7e54d7ed45c1a4e11a65a9c80968da90a650"}, - {file = "pycryptodome-3.11.0-cp35-abi3-win32.whl", hash = "sha256:6db1f9fa1f52226621905f004278ce7bd90c8f5363ffd5d7ab3755363d98549a"}, - {file = "pycryptodome-3.11.0-cp35-abi3-win_amd64.whl", hash = "sha256:d7e5f6f692421e5219aa3b545eb0cffd832cd589a4b9dcd4a5eb4260e2c0d68a"}, - {file = "pycryptodome-3.11.0-pp27-pypy_73-macosx_10_9_x86_64.whl", hash = "sha256:da796e9221dda61a0019d01742337eb8a322de8598b678a4344ca0a436380315"}, - {file = "pycryptodome-3.11.0-pp27-pypy_73-manylinux1_x86_64.whl", hash = "sha256:ed45ef92d21db33685b789de2c015e9d9a18a74760a8df1fc152faee88cdf741"}, - {file = "pycryptodome-3.11.0-pp27-pypy_73-manylinux2010_x86_64.whl", hash = "sha256:4169ed515742425ff21e4bd3fabbb6994ffb64434472fb72230019bdfa36b939"}, - {file = "pycryptodome-3.11.0-pp27-pypy_73-win32.whl", hash = "sha256:f19edd42368e9057c39492947bb99570dc927123e210008f2af7cf9b505c6892"}, - {file = "pycryptodome-3.11.0-pp36-pypy36_pp73-macosx_10_9_x86_64.whl", hash = "sha256:06162fcfed2f9deee8383fd59eaeabc7b7ffc3af50d3fad4000032deb8f700b0"}, - {file = "pycryptodome-3.11.0-pp36-pypy36_pp73-manylinux1_x86_64.whl", hash = "sha256:6eda8a3157c91ba60b26a07bedd6c44ab8bda6cd79b6b5ea9744ba62c39b7b1e"}, - {file = "pycryptodome-3.11.0-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:7ff701fc283412e651eaab4319b3cd4eaa0827e94569cd37ee9075d5c05fe655"}, - {file = "pycryptodome-3.11.0-pp36-pypy36_pp73-win32.whl", hash = "sha256:2a4bcc8a9977fee0979079cd33a9e9f0d3ddba5660d35ffe874cf84f1dd399d2"}, - {file = "pycryptodome-3.11.0.tar.gz", hash = "sha256:428096bbf7a77e207f418dfd4d7c284df8ade81d2dc80f010e92753a3e406ad0"}, -] -pydantic = [ - {file = "pydantic-1.8.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:05ddfd37c1720c392f4e0d43c484217b7521558302e7069ce8d318438d297739"}, - {file = "pydantic-1.8.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a7c6002203fe2c5a1b5cbb141bb85060cbff88c2d78eccbc72d97eb7022c43e4"}, - {file = "pydantic-1.8.2-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:589eb6cd6361e8ac341db97602eb7f354551482368a37f4fd086c0733548308e"}, - {file = "pydantic-1.8.2-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:10e5622224245941efc193ad1d159887872776df7a8fd592ed746aa25d071840"}, - {file = "pydantic-1.8.2-cp36-cp36m-win_amd64.whl", hash = "sha256:99a9fc39470010c45c161a1dc584997f1feb13f689ecf645f59bb4ba623e586b"}, - {file = "pydantic-1.8.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a83db7205f60c6a86f2c44a61791d993dff4b73135df1973ecd9eed5ea0bda20"}, - {file = "pydantic-1.8.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:41b542c0b3c42dc17da70554bc6f38cbc30d7066d2c2815a94499b5684582ecb"}, - {file = "pydantic-1.8.2-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:ea5cb40a3b23b3265f6325727ddfc45141b08ed665458be8c6285e7b85bd73a1"}, - {file = "pydantic-1.8.2-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:18b5ea242dd3e62dbf89b2b0ec9ba6c7b5abaf6af85b95a97b00279f65845a23"}, - {file = "pydantic-1.8.2-cp37-cp37m-win_amd64.whl", hash = "sha256:234a6c19f1c14e25e362cb05c68afb7f183eb931dd3cd4605eafff055ebbf287"}, - {file = "pydantic-1.8.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:021ea0e4133e8c824775a0cfe098677acf6fa5a3cbf9206a376eed3fc09302cd"}, - {file = "pydantic-1.8.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:e710876437bc07bd414ff453ac8ec63d219e7690128d925c6e82889d674bb505"}, - {file = "pydantic-1.8.2-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:ac8eed4ca3bd3aadc58a13c2aa93cd8a884bcf21cb019f8cfecaae3b6ce3746e"}, - {file = "pydantic-1.8.2-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:4a03cbbe743e9c7247ceae6f0d8898f7a64bb65800a45cbdc52d65e370570820"}, - {file = "pydantic-1.8.2-cp38-cp38-win_amd64.whl", hash = "sha256:8621559dcf5afacf0069ed194278f35c255dc1a1385c28b32dd6c110fd6531b3"}, - {file = "pydantic-1.8.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8b223557f9510cf0bfd8b01316bf6dd281cf41826607eada99662f5e4963f316"}, - {file = "pydantic-1.8.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:244ad78eeb388a43b0c927e74d3af78008e944074b7d0f4f696ddd5b2af43c62"}, - {file = "pydantic-1.8.2-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:05ef5246a7ffd2ce12a619cbb29f3307b7c4509307b1b49f456657b43529dc6f"}, - {file = "pydantic-1.8.2-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:54cd5121383f4a461ff7644c7ca20c0419d58052db70d8791eacbbe31528916b"}, - {file = "pydantic-1.8.2-cp39-cp39-win_amd64.whl", hash = "sha256:4be75bebf676a5f0f87937c6ddb061fa39cbea067240d98e298508c1bda6f3f3"}, - {file = "pydantic-1.8.2-py3-none-any.whl", hash = "sha256:fec866a0b59f372b7e776f2d7308511784dace622e0992a0b59ea3ccee0ae833"}, - {file = "pydantic-1.8.2.tar.gz", hash = "sha256:26464e57ccaafe72b7ad156fdaa4e9b9ef051f69e175dbbb463283000c05ab7b"}, -] -pygtrie = [ - {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, -] -python-dotenv = [ - {file = "python-dotenv-0.19.1.tar.gz", hash = "sha256:14f8185cc8d494662683e6914addcb7e95374771e707601dfc70166946b4c4b8"}, - {file = "python_dotenv-0.19.1-py2.py3-none-any.whl", hash = "sha256:bbd3da593fc49c249397cbfbcc449cf36cb02e75afc8157fcc6a81df6fb7750a"}, -] -pyyaml = [ - {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, - {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, - {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, - {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, - {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, - {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, - {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, - {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, - {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, - {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, - {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, - {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, - {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, - {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, - {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, - {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, -] -rfc3986 = [ - {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"}, - {file = "rfc3986-1.5.0.tar.gz", hash = "sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"}, -] -sniffio = [ - {file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"}, - {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, -] -starlette = [ - {file = "starlette-0.16.0-py3-none-any.whl", hash = "sha256:38eb24bf705a2c317e15868e384c1b8a12ca396e5a3c3a003db7e667c43f939f"}, - {file = "starlette-0.16.0.tar.gz", hash = "sha256:e1904b5d0007aee24bdd3c43994be9b3b729f4f58e740200de1d623f8c3a8870"}, -] -tomlkit = [ - {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"}, - {file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"}, -] -typing-extensions = [ - {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, - {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"}, - {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, -] -uvicorn = [ - {file = "uvicorn-0.15.0-py3-none-any.whl", hash = "sha256:17f898c64c71a2640514d4089da2689e5db1ce5d4086c2d53699bf99513421c1"}, - {file = "uvicorn-0.15.0.tar.gz", hash = "sha256:d9a3c0dd1ca86728d3e235182683b4cf94cd53a867c288eaeca80ee781b2caff"}, -] -uvloop = [ - {file = "uvloop-0.16.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:6224f1401025b748ffecb7a6e2652b17768f30b1a6a3f7b44660e5b5b690b12d"}, - {file = "uvloop-0.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:30ba9dcbd0965f5c812b7c2112a1ddf60cf904c1c160f398e7eed3a6b82dcd9c"}, - {file = "uvloop-0.16.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bd53f7f5db562f37cd64a3af5012df8cac2c464c97e732ed556800129505bd64"}, - {file = "uvloop-0.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:772206116b9b57cd625c8a88f2413df2fcfd0b496eb188b82a43bed7af2c2ec9"}, - {file = "uvloop-0.16.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b572256409f194521a9895aef274cea88731d14732343da3ecdb175228881638"}, - {file = "uvloop-0.16.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:04ff57aa137230d8cc968f03481176041ae789308b4d5079118331ab01112450"}, - {file = "uvloop-0.16.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a19828c4f15687675ea912cc28bbcb48e9bb907c801873bd1519b96b04fb805"}, - {file = "uvloop-0.16.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e814ac2c6f9daf4c36eb8e85266859f42174a4ff0d71b99405ed559257750382"}, - {file = "uvloop-0.16.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bd8f42ea1ea8f4e84d265769089964ddda95eb2bb38b5cbe26712b0616c3edee"}, - {file = "uvloop-0.16.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:647e481940379eebd314c00440314c81ea547aa636056f554d491e40503c8464"}, - {file = "uvloop-0.16.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e0d26fa5875d43ddbb0d9d79a447d2ace4180d9e3239788208527c4784f7cab"}, - {file = "uvloop-0.16.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:6ccd57ae8db17d677e9e06192e9c9ec4bd2066b77790f9aa7dede2cc4008ee8f"}, - {file = "uvloop-0.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:089b4834fd299d82d83a25e3335372f12117a7d38525217c2258e9b9f4578897"}, - {file = "uvloop-0.16.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98d117332cc9e5ea8dfdc2b28b0a23f60370d02e1395f88f40d1effd2cb86c4f"}, - {file = "uvloop-0.16.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e5f2e2ff51aefe6c19ee98af12b4ae61f5be456cd24396953244a30880ad861"}, - {file = "uvloop-0.16.0.tar.gz", hash = "sha256:f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228"}, -] -watchgod = [ - {file = "watchgod-0.7-py3-none-any.whl", hash = "sha256:d6c1ea21df37847ac0537ca0d6c2f4cdf513562e95f77bb93abbcf05573407b7"}, - {file = "watchgod-0.7.tar.gz", hash = "sha256:48140d62b0ebe9dd9cf8381337f06351e1f2e70b2203fa9c6eff4e572ca84f29"}, -] -websockets = [ - {file = "websockets-10.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:cd8c6f2ec24aedace251017bc7a414525171d4e6578f914acab9349362def4da"}, - {file = "websockets-10.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:1f6b814cff6aadc4288297cb3a248614829c6e4ff5556593c44a115e9dd49939"}, - {file = "websockets-10.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:01db0ecd1a0ca6702d02a5ed40413e18b7d22f94afb3bbe0d323bac86c42c1c8"}, - {file = "websockets-10.0-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:82b17524b1ce6ae7f7dd93e4d18e9b9474071e28b65dbf1dfe9b5767778db379"}, - {file = "websockets-10.0-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:8bbf8660c3f833ddc8b1afab90213f2e672a9ddac6eecb3cde968e6b2807c1c7"}, - {file = "websockets-10.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b8176deb6be540a46695960a765a77c28ac8b2e3ef2ec95d50a4f5df901edb1c"}, - {file = "websockets-10.0-cp37-cp37m-win32.whl", hash = "sha256:706e200fc7f03bed99ad0574cd1ea8b0951477dd18cc978ccb190683c69dba76"}, - {file = "websockets-10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:5b2600e01c7ca6f840c42c747ffbe0254f319594ed108db847eb3d75f4aacb80"}, - {file = "websockets-10.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:085bb8a6e780d30eaa1ba48ac7f3a6707f925edea787cfb761ce5a39e77ac09b"}, - {file = "websockets-10.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:9a4d889162bd48588e80950e07fa5e039eee9deb76a58092e8c3ece96d7ef537"}, - {file = "websockets-10.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:b4ade7569b6fd17912452f9c3757d96f8e4044016b6d22b3b8391e641ca50456"}, - {file = "websockets-10.0-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:2a43072e434c041a99f2e1eb9b692df0232a38c37c61d00e9f24db79474329e4"}, - {file = "websockets-10.0-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:7f79f02c7f9a8320aff7d3321cd1c7e3a7dbc15d922ac996cca827301ee75238"}, - {file = "websockets-10.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:1ac35426fe3e7d3d0fac3d63c8965c76ed67a8fd713937be072bf0ce22808539"}, - {file = "websockets-10.0-cp38-cp38-win32.whl", hash = "sha256:ff59c6bdb87b31f7e2d596f09353d5a38c8c8ff571b0e2238e8ee2d55ad68465"}, - {file = "websockets-10.0-cp38-cp38-win_amd64.whl", hash = "sha256:d67646ddd17a86117ae21c27005d83c1895c0cef5d7be548b7549646372f868a"}, - {file = "websockets-10.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:82bd921885231f4a30d9bc550552495b3fc36b1235add6d374e7c65c3babd805"}, - {file = "websockets-10.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:7d2e12e4f901f1bc062dfdf91831712c4106ed18a9a4cdb65e2e5f502124ca37"}, - {file = "websockets-10.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:71358c7816e2762f3e4af3adf0040f268e219f5a38cb3487a9d0fc2e554fef6a"}, - {file = "websockets-10.0-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:fe83b3ec9ef34063d86dfe1029160a85f24a5a94271036e5714a57acfdd089a1"}, - {file = "websockets-10.0-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:eb282127e9c136f860c6068a4fba5756eb25e755baffb5940b6f1eae071928b2"}, - {file = "websockets-10.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:62160772314920397f9d219147f958b33fa27a12c662d4455c9ccbba9a07e474"}, - {file = "websockets-10.0-cp39-cp39-win32.whl", hash = "sha256:e42a1f1e03437b017af341e9bbfdc09252cd48ef32a8c3c3ead769eab3b17368"}, - {file = "websockets-10.0-cp39-cp39-win_amd64.whl", hash = "sha256:c5880442f5fc268f1ef6d37b2c152c114deccca73f48e3a8c48004d2f16f4567"}, - {file = "websockets-10.0.tar.gz", hash = "sha256:c4fc9a1d242317892590abe5b61a9127f1a61740477bfb121743f290b8054002"}, -] -win32-setctime = [ - {file = "win32_setctime-1.0.3-py3-none-any.whl", hash = "sha256:dc925662de0a6eb987f0b01f599c01a8236cb8c62831c22d9cada09ad958243e"}, - {file = "win32_setctime-1.0.3.tar.gz", hash = "sha256:4e88556c32fdf47f64165a2180ba4552f8bb32c1103a2fafd05723a0bd42bd4b"}, -] -zipp = [ - {file = "zipp-3.6.0-py3-none-any.whl", hash = "sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc"}, - {file = "zipp-3.6.0.tar.gz", hash = "sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832"}, -] diff --git a/packages/nonebot-adapter-feishu/pyproject.toml b/packages/nonebot-adapter-feishu/pyproject.toml deleted file mode 100644 index c3dfd427..00000000 --- a/packages/nonebot-adapter-feishu/pyproject.toml +++ /dev/null @@ -1,56 +0,0 @@ -[tool.poetry] -name = "nonebot-adapter-feishu" -version = "2.0.0-alpha.16" -description = "feishu(larksuite) adapter for nonebot2" -authors = ["StarHeartHunt "] -license = "MIT" -readme = "README.md" -homepage = "https://v2.nonebot.dev/" -repository = "https://github.com/nonebot/nonebot2" -documentation = "https://v2.nonebot.dev/" -keywords = ["bot", "qq", "qqbot", "feishu", "larksuite"] -classifiers = [ - "Development Status :: 5 - Production/Stable", - "Framework :: Robot Framework", - "Framework :: Robot Framework :: Library", - "Operating System :: OS Independent", - "Programming Language :: Python :: 3" -] -packages = [ - { include = "nonebot" } -] -exclude = ["nonebot/__init__.py", "nonebot/adapters/__init__.py"] - -[tool.poetry.dependencies] -python = "^3.7.3" -aiocache = "^0.11.1" -pycryptodome = "^3.10.1" -httpx = ">=0.20.0, <1.0.0" -nonebot2 = "^2.0.0-alpha.14" - -[tool.poetry.dev-dependencies] -nonebot2 = { path = "../../", develop = true } - -# [[tool.poetry.source]] -# name = "aliyun" -# url = "https://mirrors.aliyun.com/pypi/simple/" -# default = true - -[tool.black] -line-length = 88 -target-version = ["py37", "py38", "py39"] -include = '\.pyi?$' -extend-exclude = ''' -''' - -[tool.isort] -profile = "black" -line_length = 80 -length_sort = true -skip_gitignore = true -force_sort_within_sections = true -extra_standard_library = ["typing_extensions"] - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" diff --git a/packages/nonebot-adapter-mirai/LICENSE b/packages/nonebot-adapter-mirai/LICENSE deleted file mode 100644 index be3f7b28..00000000 --- a/packages/nonebot-adapter-mirai/LICENSE +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/packages/nonebot-adapter-mirai/README.md b/packages/nonebot-adapter-mirai/README.md deleted file mode 100644 index c3958ef6..00000000 --- a/packages/nonebot-adapter-mirai/README.md +++ /dev/null @@ -1,11 +0,0 @@ -

- nonebot -

- -
- -# NoneBot-Adapter-MIRAI - -_✨ mirai-api-http 协议适配 ✨_ - -
diff --git a/packages/nonebot-adapter-mirai/nonebot/__init__.py b/packages/nonebot-adapter-mirai/nonebot/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/__init__.py b/packages/nonebot-adapter-mirai/nonebot/adapters/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/__init__.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/__init__.py deleted file mode 100644 index c78bd913..00000000 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/__init__.py +++ /dev/null @@ -1,37 +0,0 @@ -r""" -Mirai-API-HTTP 协议适配 -============================ - -协议详情请看: `mirai-api-http 文档`_ - -\:\:\: tip -该Adapter目前仍然处在早期实验性阶段, 并未经过充分测试 - -如果你在使用过程中遇到了任何问题, 请前往 `Issue页面`_ 为我们提供反馈 -\:\:\: - -\:\:\: danger -Mirai-API-HTTP 的适配器以 `AGPLv3许可`_ 单独开源 - -这意味着在使用该适配器时需要 **以该许可开源您的完整程序代码** -\:\:\: - -.. _mirai-api-http 文档: - https://github.com/project-mirai/mirai-api-http/tree/master/docs - -.. _Issue页面: - https://github.com/nonebot/nonebot2/issues - -.. _AGPLv3许可: - https://opensource.org/licenses/AGPL-3.0 - -""" - -from .bot import Bot -from .event import * -from .message import MessageChain, MessageSegment - -WebsocketBot = Bot -""" -``WebsocketBot``现在已经和``Bot``合并, 并已经被弃用, 请直接使用``Bot`` -""" diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/bot.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/bot.py deleted file mode 100644 index 8af7ad8d..00000000 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/bot.py +++ /dev/null @@ -1,749 +0,0 @@ -import json -import asyncio -from io import BytesIO -from functools import partial -from ipaddress import IPv4Address -from typing import Any, Dict, List, Tuple, Union, NoReturn, Optional - -import httpx -from loguru import logger - -from nonebot.config import Config -from nonebot.typing import overrides -from nonebot.adapters import Bot as BaseBot -from nonebot.exception import ApiNotAvailable -from nonebot.drivers import ( - Driver, - WebSocket, - HTTPResponse, - ForwardDriver, - ReverseDriver, - HTTPConnection, - WebSocketSetup, -) - -from .config import Config as MiraiConfig -from .message import MessageChain, MessageSegment -from .event import Event, TempMessage, GroupMessage, FriendMessage -from .utils import Log, process_event, argument_validation, catch_network_error - - -class SessionManager: - """Bot会话管理器, 提供API主动调用接口""" - - sessions: Dict[int, Tuple[str, httpx.AsyncClient]] = {} - - def __init__(self, session_key: str, client: httpx.AsyncClient): - self.session_key, self.client = session_key, client - - @catch_network_error - async def post(self, path: str, *, params: Optional[Dict[str, Any]] = None) -> Any: - """ - :说明: - - 以POST方式主动提交API请求 - - :参数: - - * ``path: str``: 对应API路径 - * ``params: Optional[Dict[str, Any]]``: 请求参数 (无需sessionKey) - - :返回: - - - ``Dict[str, Any]``: API 返回值 - """ - response = await self.client.post( - path, - json={ - **(params or {}), - "sessionKey": self.session_key, - }, - timeout=3, - ) - response.raise_for_status() - return response.json() - - @catch_network_error - async def request( - self, path: str, *, params: Optional[Dict[str, Any]] = None - ) -> Any: - """ - :说明: - - 以GET方式主动提交API请求 - - :参数: - - * ``path: str``: 对应API路径 - * ``params: Optional[Dict[str, Any]]``: 请求参数 (无需sessionKey) - """ - response = await self.client.get( - path, - params={ - **(params or {}), - "sessionKey": self.session_key, - }, - timeout=3, - ) - response.raise_for_status() - return response.json() - - @catch_network_error - async def upload(self, path: str, *, params: Dict[str, Any]) -> Any: - """ - :说明: - - 以表单(``multipart/form-data``)形式主动提交API请求 - - :参数: - - * ``path: str``: 对应API路径 - * ``params: Dict[str, Any]``: 请求参数 (无需sessionKey) - """ - files = {k: v for k, v in params.items() if isinstance(v, BytesIO)} - form = {k: v for k, v in params.items() if k not in files} - form["sessionKey"] = self.session_key - response = await self.client.post( - path, - data=form, - files=files, - timeout=6, - ) - response.raise_for_status() - return response.json() - - @classmethod - async def new( - cls, self_id: int, *, host: IPv4Address, port: int, auth_key: str - ) -> "SessionManager": - session = cls.get(self_id) - if session is not None: - return session - - client = httpx.AsyncClient( - base_url=f"http://{host}:{port}", follow_redirects=True - ) - response = await client.post("/auth", json={"authKey": auth_key}) - response.raise_for_status() - auth = response.json() - assert auth["code"] == 0 - session_key = auth["session"] - response = await client.post( - "/verify", json={"sessionKey": session_key, "qq": self_id} - ) - assert response.json()["code"] == 0 - cls.sessions[self_id] = session_key, client - - return cls(session_key, client) - - @classmethod - def get(cls, self_id: int): - if self_id not in cls.sessions: - return None - key, client = cls.sessions[self_id] - return cls(key, client) - - -class Bot(BaseBot): - r""" - mirai-api-http 协议 Bot 适配。 - - \:\:\: warning - API中为了使代码更加整洁, 我们采用了与PEP8相符的命名规则取代Mirai原有的驼峰命名 - - 部分字段可能与文档在符号上不一致 - \:\:\: - - """ - - _type = "mirai" - - @property - @overrides(BaseBot) - def type(self) -> str: - return self._type - - @property - def api(self) -> SessionManager: - """返回该Bot对象的会话管理实例以提供API主动调用""" - api = SessionManager.get(self_id=int(self.self_id)) - if api is None: - if isinstance(self.request, WebSocket): - asyncio.create_task(self.request.close(1000)) - assert api is not None, "SessionManager has not been initialized" - return api - - @classmethod - @overrides(BaseBot) - async def check_permission( - cls, driver: Driver, request: HTTPConnection - ) -> Tuple[Optional[str], HTTPResponse]: - if isinstance(request, WebSocket): - return None, HTTPResponse(501, b"Websocket connection is not implemented") - self_id: Optional[str] = request.headers.get("bot") - if self_id is None: - return None, HTTPResponse(400, b"Header `Bot` is required.") - self_id = str(self_id).strip() - await SessionManager.new( - int(self_id), - host=cls.mirai_config.host, # type: ignore - port=cls.mirai_config.port, # type: ignore - auth_key=cls.mirai_config.auth_key, # type: ignore - ) - return self_id, HTTPResponse(204, b"") - - @classmethod - @overrides(BaseBot) - def register( - cls, - driver: Driver, - config: "Config", - qq: Optional[Union[int, List[int]]] = None, - ): - cls.mirai_config = MiraiConfig(**config.dict()) - if ( - cls.mirai_config.auth_key - and cls.mirai_config.host - and cls.mirai_config.port - ) is None: - raise ApiNotAvailable(cls._type) - - super().register(driver, config) - - if not isinstance(driver, ForwardDriver) and qq: - logger.warning( - f"Current driver {cls.config.driver} don't support forward connections" - ) - elif isinstance(driver, ForwardDriver) and qq: - self_ids = [qq] if isinstance(qq, int) else qq - - async def url_factory(qq: int): - assert ( - cls.mirai_config.host - and cls.mirai_config.port - and cls.mirai_config.auth_key - ) - session = await SessionManager.new( - qq, - host=cls.mirai_config.host, - port=cls.mirai_config.port, - auth_key=cls.mirai_config.auth_key, - ) - return WebSocketSetup( - adapter=cls._type, - self_id=str(qq), - url=( - f"ws://{cls.mirai_config.host}:{cls.mirai_config.port}" - f"/all?sessionKey={session.session_key}" - ), - ) - - for self_id in self_ids: - driver.setup_websocket(partial(url_factory, qq=self_id)) - - elif isinstance(driver, ReverseDriver): - logger.debug( - 'Param "qq" does not set for mirai adapter, use http post instead' - ) - - @overrides(BaseBot) - async def handle_message(self, message: bytes): - try: - await process_event( - bot=self, - event=Event.new( - { - **json.loads(message), - "self_id": self.self_id, - } - ), - ) - except Exception as e: - Log.error(f"Failed to handle message: {message}", e) - - @overrides(BaseBot) - async def _call_api(self, api: str, **data) -> NoReturn: - raise NotImplementedError - - @overrides(BaseBot) - async def call_api(self, api: str, **data) -> NoReturn: - r""" - \:\:\: danger - 由于Mirai的HTTP API特殊性, 该API暂时无法实现 - \:\:\: - - \:\:\: tip - 你可以使用 ``MiraiBot.api`` 中提供的调用方法来代替 - \:\:\: - """ - raise NotImplementedError - - @overrides(BaseBot) - def __getattr__(self, key: str) -> NoReturn: - """由于Mirai的HTTP API特殊性, 该API暂时无法实现""" - raise NotImplementedError - - @overrides(BaseBot) - @argument_validation - async def send( - self, - event: Event, - message: Union[MessageChain, MessageSegment, str], - at_sender: bool = False, - ): - """ - :说明: - - 根据 ``event`` 向触发事件的主体发送信息 - - :参数: - - * ``event: Event``: Event对象 - * ``message: Union[MessageChain, MessageSegment, str]``: 要发送的消息 - * ``at_sender: bool``: 是否 @ 事件主体 - """ - if not isinstance(message, MessageChain): - message = MessageChain(message) - if isinstance(event, FriendMessage): - return await self.send_friend_message( - target=event.sender.id, message_chain=message - ) - elif isinstance(event, GroupMessage): - if at_sender: - message = MessageSegment.at(event.sender.id) + message - return await self.send_group_message( - group=event.sender.group.id, message_chain=message - ) - elif isinstance(event, TempMessage): - return await self.send_temp_message( - qq=event.sender.id, group=event.sender.group.id, message_chain=message - ) - else: - raise ValueError(f"Unsupported event type {event!r}.") - - @argument_validation - async def send_friend_message(self, target: int, message_chain: MessageChain): - """ - :说明: - - 使用此方法向指定好友发送消息 - - :参数: - - * ``target: int``: 发送消息目标好友的 QQ 号 - * ``message_chain: MessageChain``: 消息链，是一个消息对象构成的数组 - """ - return await self.api.post( - "sendFriendMessage", - params={"target": target, "messageChain": message_chain.export()}, - ) - - @argument_validation - async def send_temp_message(self, qq: int, group: int, message_chain: MessageChain): - """ - :说明: - - 使用此方法向临时会话对象发送消息 - - :参数: - - * ``qq: int``: 临时会话对象 QQ 号 - * ``group: int``: 临时会话群号 - * ``message_chain: MessageChain``: 消息链，是一个消息对象构成的数组 - """ - return await self.api.post( - "sendTempMessage", - params={"qq": qq, "group": group, "messageChain": message_chain.export()}, - ) - - @argument_validation - async def send_group_message( - self, group: int, message_chain: MessageChain, quote: Optional[int] = None - ): - """ - :说明: - - 使用此方法向指定群发送消息 - - :参数: - - * ``group: int``: 发送消息目标群的群号 - * ``message_chain: MessageChain``: 消息链，是一个消息对象构成的数组 - * ``quote: Optional[int]``: 引用一条消息的 message_id 进行回复 - """ - return await self.api.post( - "sendGroupMessage", - params={ - "group": group, - "messageChain": message_chain.export(), - "quote": quote, - }, - ) - - @argument_validation - async def recall(self, target: int): - """ - :说明: - - 使用此方法撤回指定消息。对于bot发送的消息，有2分钟时间限制。对于撤回群聊中群员的消息，需要有相应权限 - - :参数: - - * ``target: int``: 需要撤回的消息的message_id - """ - return await self.api.post("recall", params={"target": target}) - - @argument_validation - async def send_image_message( - self, target: int, qq: int, group: int, urls: List[str] - ) -> List[str]: - """ - :说明: - - 使用此方法向指定对象（群或好友）发送图片消息 - 除非需要通过此手段获取image_id，否则不推荐使用该接口 - - > 当qq和group同时存在时，表示发送临时会话图片，qq为临时会话对象QQ号，group为临时会话发起的群号 - - :参数: - - * ``target: int``: 发送对象的QQ号或群号，可能存在歧义 - * ``qq: int``: 发送对象的QQ号 - * ``group: int``: 发送对象的群号 - * ``urls: List[str]``: 是一个url字符串构成的数组 - - :返回: - - - ``List[str]``: 一个包含图片imageId的数组 - """ - return await self.api.post( - "sendImageMessage", - params={"target": target, "qq": qq, "group": group, "urls": urls}, - ) - - @argument_validation - async def upload_image(self, type: str, img: BytesIO): - """ - :说明: - - 使用此方法上传图片文件至服务器并返回Image_id - - :参数: - - * ``type: str``: "friend" 或 "group" 或 "temp" - * ``img: BytesIO``: 图片的BytesIO对象 - """ - return await self.api.upload("uploadImage", params={"type": type, "img": img}) - - @argument_validation - async def upload_voice(self, type: str, voice: BytesIO): - """ - :说明: - - 使用此方法上传语音文件至服务器并返回voice_id - - :参数: - - * ``type: str``: 当前仅支持 "group" - * ``voice: BytesIO``: 语音的BytesIO对象 - """ - return await self.api.upload( - "uploadVoice", params={"type": type, "voice": voice} - ) - - @argument_validation - async def fetch_message(self, count: int = 10): - """ - :说明: - - 使用此方法获取bot接收到的最老消息和最老各类事件 - (会从MiraiApiHttp消息记录中删除) - - :参数: - - * ``count: int``: 获取消息和事件的数量 - """ - return await self.api.request("fetchMessage", params={"count": count}) - - @argument_validation - async def fetch_latest_message(self, count: int = 10): - """ - :说明: - - 使用此方法获取bot接收到的最新消息和最新各类事件 - (会从MiraiApiHttp消息记录中删除) - - :参数: - - * ``count: int``: 获取消息和事件的数量 - """ - return await self.api.request("fetchLatestMessage", params={"count": count}) - - @argument_validation - async def peek_message(self, count: int = 10): - """ - :说明: - - 使用此方法获取bot接收到的最老消息和最老各类事件 - (不会从MiraiApiHttp消息记录中删除) - - :参数: - - * ``count: int``: 获取消息和事件的数量 - """ - return await self.api.request("peekMessage", params={"count": count}) - - @argument_validation - async def peek_latest_message(self, count: int = 10): - """ - :说明: - - 使用此方法获取bot接收到的最新消息和最新各类事件 - (不会从MiraiApiHttp消息记录中删除) - - :参数: - - * ``count: int``: 获取消息和事件的数量 - """ - return await self.api.request("peekLatestMessage", params={"count": count}) - - @argument_validation - async def messsage_from_id(self, id: int): - """ - :说明: - - 通过messageId获取一条被缓存的消息 - 使用此方法获取bot接收到的消息和各类事件 - - :参数: - - * ``id: int``: 获取消息的message_id - """ - return await self.api.request("messageFromId", params={"id": id}) - - @argument_validation - async def count_message(self): - """ - :说明: - - 使用此方法获取bot接收并缓存的消息总数，注意不包含被删除的 - """ - return await self.api.request("countMessage") - - @argument_validation - async def friend_list(self) -> List[Dict[str, Any]]: - """ - :说明: - - 使用此方法获取bot的好友列表 - - :返回: - - - ``List[Dict[str, Any]]``: 返回的好友列表数据 - """ - return await self.api.request("friendList") - - @argument_validation - async def group_list(self) -> List[Dict[str, Any]]: - """ - :说明: - - 使用此方法获取bot的群列表 - - :返回: - - - ``List[Dict[str, Any]]``: 返回的群列表数据 - """ - return await self.api.request("groupList") - - @argument_validation - async def member_list(self, target: int) -> List[Dict[str, Any]]: - """ - :说明: - - 使用此方法获取bot指定群种的成员列表 - - :参数: - - * ``target: int``: 指定群的群号 - - :返回: - - - ``List[Dict[str, Any]]``: 返回的群成员列表数据 - """ - return await self.api.request("memberList", params={"target": target}) - - @argument_validation - async def mute(self, target: int, member_id: int, time: int): - """ - :说明: - - 使用此方法指定群禁言指定群员（需要有相关权限） - - :参数: - - * ``target: int``: 指定群的群号 - * ``member_id: int``: 指定群员QQ号 - * ``time: int``: 禁言时长，单位为秒，最多30天 - """ - return await self.api.post( - "mute", params={"target": target, "memberId": member_id, "time": time} - ) - - @argument_validation - async def unmute(self, target: int, member_id: int): - """ - :说明: - - 使用此方法指定群解除群成员禁言（需要有相关权限） - - :参数: - - * ``target: int``: 指定群的群号 - * ``member_id: int``: 指定群员QQ号 - """ - return await self.api.post( - "unmute", params={"target": target, "memberId": member_id} - ) - - @argument_validation - async def kick(self, target: int, member_id: int, msg: str): - """ - :说明: - - 使用此方法移除指定群成员（需要有相关权限） - - :参数: - - * ``target: int``: 指定群的群号 - * ``member_id: int``: 指定群员QQ号 - * ``msg: str``: 信息 - """ - return await self.api.post( - "kick", params={"target": target, "memberId": member_id, "msg": msg} - ) - - @argument_validation - async def quit(self, target: int): - """ - :说明: - - 使用此方法使Bot退出群聊 - - :参数: - - * ``target: int``: 退出的群号 - """ - return await self.api.post("quit", params={"target": target}) - - @argument_validation - async def mute_all(self, target: int): - """ - :说明: - - 使用此方法令指定群进行全体禁言（需要有相关权限） - - :参数: - - * ``target: int``: 指定群的群号 - """ - return await self.api.post("muteAll", params={"target": target}) - - @argument_validation - async def unmute_all(self, target: int): - """ - :说明: - - 使用此方法令指定群解除全体禁言（需要有相关权限） - - :参数: - - * ``target: int``: 指定群的群号 - """ - return await self.api.post("unmuteAll", params={"target": target}) - - @argument_validation - async def group_config(self, target: int): - """ - :说明: - - 使用此方法获取群设置 - - :参数: - - * ``target: int``: 指定群的群号 - - :返回: - - .. code-block:: json - - { - "name": "群名称", - "announcement": "群公告", - "confessTalk": true, - "allowMemberInvite": true, - "autoApprove": true, - "anonymousChat": true - } - """ - return await self.api.request("groupConfig", params={"target": target}) - - @argument_validation - async def modify_group_config(self, target: int, config: Dict[str, Any]): - """ - :说明: - - 使用此方法修改群设置（需要有相关权限） - - :参数: - - * ``target: int``: 指定群的群号 - * ``config: Dict[str, Any]``: 群设置, 格式见 ``group_config`` 的返回值 - """ - return await self.api.post( - "groupConfig", params={"target": target, "config": config} - ) - - @argument_validation - async def member_info(self, target: int, member_id: int): - """ - :说明: - - 使用此方法获取群员资料 - - :参数: - - * ``target: int``: 指定群的群号 - * ``member_id: int``: 群员QQ号 - - :返回: - - .. code-block:: json - - { - "name": "群名片", - "specialTitle": "群头衔" - } - """ - return await self.api.request( - "memberInfo", params={"target": target, "memberId": member_id} - ) - - @argument_validation - async def modify_member_info( - self, target: int, member_id: int, info: Dict[str, Any] - ): - """ - :说明: - - 使用此方法修改群员资料（需要有相关权限） - - :参数: - - * ``target: int``: 指定群的群号 - * ``member_id: int``: 群员QQ号 - * ``info: Dict[str, Any]``: 群员资料, 格式见 ``member_info`` 的返回值 - """ - return await self.api.post( - "memberInfo", params={"target": target, "memberId": member_id, "info": info} - ) diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/config.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/config.py deleted file mode 100644 index 241af2a3..00000000 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/config.py +++ /dev/null @@ -1,24 +0,0 @@ -from typing import Optional -from ipaddress import IPv4Address - -from pydantic import Extra, Field, BaseModel - - -class Config(BaseModel): - """ - Mirai 配置类 - - :必填: - - - ``auth_key`` / ``mirai_auth_key``: mirai-api-http 的 auth_key - - ``mirai_host``: mirai-api-http 的地址 - - ``mirai_port``: mirai-api-http 的端口 - """ - - auth_key: Optional[str] = Field(None, alias="mirai_auth_key") - host: Optional[IPv4Address] = Field(None, alias="mirai_host") - port: Optional[int] = Field(None, alias="mirai_port") - - class Config: - extra = Extra.ignore - allow_population_by_field_name = True diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/__init__.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/__init__.py deleted file mode 100644 index 14e21c74..00000000 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/__init__.py +++ /dev/null @@ -1,60 +0,0 @@ -r""" -\:\:\: warning -事件中为了使代码更加整洁, 我们采用了与PEP8相符的命名规则取代Mirai原有的驼峰命名 - -部分字段可能与文档在符号上不一致 -\:\:\: -""" -from .notice import * -from .message import * -from .request import * -from .base import ( - Event, - GroupInfo, - GroupChatInfo, - UserPermission, - PrivateChatInfo, -) - -__all__ = [ - "Event", - "GroupChatInfo", - "GroupInfo", - "PrivateChatInfo", - "UserPermission", - "MessageSource", - "MessageEvent", - "GroupMessage", - "FriendMessage", - "TempMessage", - "NoticeEvent", - "MuteEvent", - "BotMuteEvent", - "BotUnmuteEvent", - "MemberMuteEvent", - "MemberUnmuteEvent", - "BotJoinGroupEvent", - "BotLeaveEventActive", - "BotLeaveEventKick", - "MemberJoinEvent", - "MemberLeaveEventKick", - "MemberLeaveEventQuit", - "FriendRecallEvent", - "GroupRecallEvent", - "GroupStateChangeEvent", - "GroupNameChangeEvent", - "GroupEntranceAnnouncementChangeEvent", - "GroupMuteAllEvent", - "GroupAllowAnonymousChatEvent", - "GroupAllowConfessTalkEvent", - "GroupAllowMemberInviteEvent", - "MemberStateChangeEvent", - "MemberCardChangeEvent", - "MemberSpecialTitleChangeEvent", - "BotGroupPermissionChangeEvent", - "MemberPermissionChangeEvent", - "RequestEvent", - "NewFriendRequestEvent", - "MemberJoinRequestEvent", - "BotInvitedJoinGroupRequestEvent", -] diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/base.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/base.py deleted file mode 100644 index 93b7863b..00000000 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/base.py +++ /dev/null @@ -1,158 +0,0 @@ -import json -from enum import Enum -from typing_extensions import Literal -from typing import Any, Dict, Type, Optional - -from pydantic import Field, BaseModel, ValidationError - -from nonebot.log import logger -from nonebot.typing import overrides -from nonebot.utils import escape_tag -from nonebot.adapters import Event as BaseEvent -from nonebot.adapters import Message as BaseMessage - - -class UserPermission(str, Enum): - """ - :说明: - - 用户权限枚举类 - - * ``OWNER``: 群主 - * ``ADMINISTRATOR``: 群管理 - * ``MEMBER``: 普通群成员 - """ - - OWNER = "OWNER" - ADMINISTRATOR = "ADMINISTRATOR" - MEMBER = "MEMBER" - - -class NudgeSubjectKind(str, Enum): - """ - :说明: - - 戳一戳类型枚举类 - - * ``Group``: 群 - * ``Friend``: 好友 - """ - - Group = "Group" - Friend = "Friend" - - -class GroupInfo(BaseModel): - id: int - name: str - permission: UserPermission - - -class GroupChatInfo(BaseModel): - id: int - name: str = Field(alias="memberName") - permission: UserPermission - group: GroupInfo - - -class PrivateChatInfo(BaseModel): - id: int - nickname: str - remark: str - - -class NudgeSubject(BaseModel): - id: int - kind: NudgeSubjectKind - - -class Event(BaseEvent): - """ - mirai-api-http 协议事件，字段与 mirai-api-http 一致。各事件字段参考 `mirai-api-http 事件类型`_ - - .. _mirai-api-http 事件类型: - https://github.com/project-mirai/mirai-api-http/blob/master/docs/EventType.md - """ - - self_id: int - type: str - - @classmethod - def new(cls, data: Dict[str, Any]) -> "Event": - """ - 此事件类的工厂函数, 能够通过事件数据选择合适的子类进行序列化 - """ - type = data["type"] - - def all_subclasses(cls: Type[Event]): - return set(cls.__subclasses__()).union( - [s for c in cls.__subclasses__() for s in all_subclasses(c)] - ) - - event_class: Optional[Type[Event]] = None - for subclass in all_subclasses(cls): - if subclass.__name__ != type: - continue - event_class = subclass - - if event_class is None: - return Event.parse_obj(data) - - while event_class and issubclass(event_class, Event): - try: - return event_class.parse_obj(data) - except ValidationError as e: - logger.info( - f"Failed to parse {data} to class {event_class.__name__}: " - f"{e.errors()!r}. Fallback to parent class." - ) - event_class = event_class.__base__ # type: ignore - - raise ValueError(f"Failed to serialize {data}.") - - @overrides(BaseEvent) - def get_type(self) -> Literal["message", "notice", "request", "meta_event"]: - from . import meta, notice, message, request - - if isinstance(self, message.MessageEvent): - return "message" - elif isinstance(self, notice.NoticeEvent): - return "notice" - elif isinstance(self, request.RequestEvent): - return "request" - else: - return "meta_event" - - @overrides(BaseEvent) - def get_event_name(self) -> str: - return self.type - - @overrides(BaseEvent) - def get_event_description(self) -> str: - return escape_tag(str(self.normalize_dict())) - - @overrides(BaseEvent) - def get_message(self) -> BaseMessage: - raise ValueError("Event has no message!") - - @overrides(BaseEvent) - def get_plaintext(self) -> str: - raise ValueError("Event has no message!") - - @overrides(BaseEvent) - def get_user_id(self) -> str: - raise ValueError("Event has no message!") - - @overrides(BaseEvent) - def get_session_id(self) -> str: - raise ValueError("Event has no message!") - - @overrides(BaseEvent) - def is_tome(self) -> bool: - return False - - def normalize_dict(self, **kwargs) -> Dict[str, Any]: - """ - 返回可以被json正常反序列化的结构体 - """ - return json.loads(self.json(**kwargs)) diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/message.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/message.py deleted file mode 100644 index 74896eee..00000000 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/message.py +++ /dev/null @@ -1,89 +0,0 @@ -from datetime import datetime -from typing import Any, Optional - -from pydantic import Field, BaseModel - -from nonebot.typing import overrides - -from ..message import MessageChain -from .base import Event, GroupChatInfo, PrivateChatInfo - - -class MessageSource(BaseModel): - id: int - time: datetime - - -class MessageEvent(Event): - """消息事件基类""" - - message_chain: MessageChain = Field(alias="messageChain") - source: Optional[MessageSource] = None - sender: Any - - @overrides(Event) - def get_message(self) -> MessageChain: - return self.message_chain - - @overrides(Event) - def get_plaintext(self) -> str: - return self.message_chain.extract_plain_text() - - @overrides(Event) - def get_user_id(self) -> str: - raise NotImplementedError - - @overrides(Event) - def get_session_id(self) -> str: - raise NotImplementedError - - -class GroupMessage(MessageEvent): - """群消息事件""" - - sender: GroupChatInfo - to_me: bool = False - - @overrides(MessageEvent) - def get_session_id(self) -> str: - return f"group_{self.sender.group.id}_" + self.get_user_id() - - @overrides(MessageEvent) - def get_user_id(self) -> str: - return str(self.sender.id) - - @overrides(MessageEvent) - def is_tome(self) -> bool: - return self.to_me - - -class FriendMessage(MessageEvent): - """好友消息事件""" - - sender: PrivateChatInfo - - @overrides(MessageEvent) - def get_user_id(self) -> str: - return str(self.sender.id) - - @overrides(MessageEvent) - def get_session_id(self) -> str: - return "friend_" + self.get_user_id() - - @overrides(MessageEvent) - def is_tome(self) -> bool: - return True - - -class TempMessage(MessageEvent): - """临时会话消息事件""" - - sender: GroupChatInfo - - @overrides(MessageEvent) - def get_session_id(self) -> str: - return f"temp_{self.sender.group.id}_" + self.get_user_id() - - @overrides(MessageEvent) - def is_tome(self) -> bool: - return True diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/meta.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/meta.py deleted file mode 100644 index c0fa7a29..00000000 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/meta.py +++ /dev/null @@ -1,37 +0,0 @@ -from .base import Event - - -class MetaEvent(Event): - """元事件基类""" - - qq: int - - -class BotOnlineEvent(MetaEvent): - """Bot登录成功""" - - pass - - -class BotOfflineEventActive(MetaEvent): - """Bot主动离线""" - - pass - - -class BotOfflineEventForce(MetaEvent): - """Bot被挤下线""" - - pass - - -class BotOfflineEventDropped(MetaEvent): - """Bot被服务器断开或因网络问题而掉线""" - - pass - - -class BotReloginEvent(MetaEvent): - """Bot主动重新登录""" - - pass diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/notice.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/notice.py deleted file mode 100644 index 0fa30dda..00000000 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/notice.py +++ /dev/null @@ -1,192 +0,0 @@ -from typing import Any, Optional - -from pydantic import Field - -from .base import Event, GroupInfo, NudgeSubject, GroupChatInfo, UserPermission - - -class NoticeEvent(Event): - """通知事件基类""" - - pass - - -class MuteEvent(NoticeEvent): - """禁言类事件基类""" - - operator: GroupChatInfo - - -class BotMuteEvent(MuteEvent): - """Bot被禁言""" - - pass - - -class BotUnmuteEvent(MuteEvent): - """Bot被取消禁言""" - - pass - - -class MemberMuteEvent(MuteEvent): - """群成员被禁言事件（该成员不是Bot）""" - - duration_seconds: int = Field(alias="durationSeconds") - member: GroupChatInfo - operator: Optional[GroupChatInfo] = None - - -class MemberUnmuteEvent(MuteEvent): - """群成员被取消禁言事件（该成员不是Bot）""" - - member: GroupChatInfo - operator: Optional[GroupChatInfo] = None - - -class BotJoinGroupEvent(NoticeEvent): - """Bot加入了一个新群""" - - group: GroupInfo - - -class BotLeaveEventActive(BotJoinGroupEvent): - """Bot主动退出一个群""" - - pass - - -class BotLeaveEventKick(BotJoinGroupEvent): - """Bot被踢出一个群""" - - pass - - -class MemberJoinEvent(NoticeEvent): - """新人入群的事件""" - - member: GroupChatInfo - - -class MemberLeaveEventKick(MemberJoinEvent): - """成员被踢出群（该成员不是Bot）""" - - operator: Optional[GroupChatInfo] = None - - -class MemberLeaveEventQuit(MemberJoinEvent): - """成员主动离群（该成员不是Bot）""" - - pass - - -class FriendRecallEvent(NoticeEvent): - """好友消息撤回""" - - author_id: int = Field(alias="authorId") - message_id: int = Field(alias="messageId") - time: int - operator: int - - -class GroupRecallEvent(FriendRecallEvent): - """群消息撤回""" - - group: GroupInfo - operator: Optional[GroupChatInfo] = None - - -class GroupStateChangeEvent(NoticeEvent): - """群变化事件基类""" - - origin: Any - current: Any - group: GroupInfo - operator: Optional[GroupChatInfo] = None - - -class GroupNameChangeEvent(GroupStateChangeEvent): - """某个群名改变""" - - origin: str - current: str - - -class GroupEntranceAnnouncementChangeEvent(GroupStateChangeEvent): - """某群入群公告改变""" - - origin: str - current: str - - -class GroupMuteAllEvent(GroupStateChangeEvent): - """全员禁言""" - - origin: bool - current: bool - - -class GroupAllowAnonymousChatEvent(GroupStateChangeEvent): - """匿名聊天""" - - origin: bool - current: bool - - -class GroupAllowConfessTalkEvent(GroupStateChangeEvent): - """坦白说""" - - origin: bool - current: bool - - -class GroupAllowMemberInviteEvent(GroupStateChangeEvent): - """允许群员邀请好友加群""" - - origin: bool - current: bool - - -class MemberStateChangeEvent(NoticeEvent): - """群成员变化事件基类""" - - member: GroupChatInfo - operator: Optional[GroupChatInfo] = None - - -class MemberCardChangeEvent(MemberStateChangeEvent): - """群名片改动""" - - origin: str - current: str - - -class MemberSpecialTitleChangeEvent(MemberStateChangeEvent): - """群头衔改动（只有群主有操作限权）""" - - origin: str - current: str - - -class BotGroupPermissionChangeEvent(MemberStateChangeEvent): - """Bot在群里的权限被改变""" - - origin: UserPermission - current: UserPermission - - -class MemberPermissionChangeEvent(MemberStateChangeEvent): - """成员权限改变的事件（该成员不是Bot）""" - - origin: UserPermission - current: UserPermission - - -class NudgeEvent(NoticeEvent): - """戳一戳触发事件""" - - from_id: int = Field(alias="fromId") - target: int - subject: NudgeSubject - action: str - suffix: str diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/request.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/request.py deleted file mode 100644 index 42f33e97..00000000 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/event/request.py +++ /dev/null @@ -1,185 +0,0 @@ -from typing import TYPE_CHECKING -from typing_extensions import Literal - -from pydantic import Field - -from .base import Event - -if TYPE_CHECKING: - from ..bot import Bot - - -class RequestEvent(Event): - """请求事件基类""" - - event_id: int = Field(alias="eventId") - message: str - nick: str - - -class NewFriendRequestEvent(RequestEvent): - """添加好友申请""" - - from_id: int = Field(alias="fromId") - group_id: int = Field(0, alias="groupId") - - async def approve(self, bot: "Bot"): - """ - :说明: - - 通过此人的好友申请 - - :参数: - - * ``bot: Bot``: 当前的 ``Bot`` 对象 - """ - return await bot.api.post( - "/resp/newFriendRequestEvent", - params={ - "eventId": self.event_id, - "groupId": self.group_id, - "fromId": self.from_id, - "operate": 0, - "message": "", - }, - ) - - async def reject(self, bot: "Bot", operate: Literal[1, 2] = 1, message: str = ""): - """ - :说明: - - 拒绝此人的好友申请 - - :参数: - - * ``bot: Bot``: 当前的 ``Bot`` 对象 - * ``operate: Literal[1, 2]``: 响应的操作类型 - - * ``1``: 拒绝添加好友 - * ``2``: 拒绝添加好友并添加黑名单，不再接收该用户的好友申请 - - * ``message: str``: 回复的信息 - """ - assert operate > 0 - return await bot.api.post( - "/resp/newFriendRequestEvent", - params={ - "eventId": self.event_id, - "groupId": self.group_id, - "fromId": self.from_id, - "operate": operate, - "message": message, - }, - ) - - -class MemberJoinRequestEvent(RequestEvent): - """用户入群申请（Bot需要有管理员权限）""" - - from_id: int = Field(alias="fromId") - group_id: int = Field(alias="groupId") - group_name: str = Field(alias="groupName") - - async def approve(self, bot: "Bot"): - """ - :说明: - - 通过此人的加群申请 - - :参数: - - * ``bot: Bot``: 当前的 ``Bot`` 对象 - """ - return await bot.api.post( - "/resp/memberJoinRequestEvent", - params={ - "eventId": self.event_id, - "groupId": self.group_id, - "fromId": self.from_id, - "operate": 0, - "message": "", - }, - ) - - async def reject( - self, bot: "Bot", operate: Literal[1, 2, 3, 4] = 1, message: str = "" - ): - """ - :说明: - - 拒绝(忽略)此人的加群申请 - - :参数: - - * ``bot: Bot``: 当前的 ``Bot`` 对象 - * ``operate: Literal[1, 2, 3, 4]``: 响应的操作类型 - - * ``1``: 拒绝入群 - * ``2``: 忽略请求 - * ``3``: 拒绝入群并添加黑名单，不再接收该用户的入群申请 - * ``4``: 忽略入群并添加黑名单，不再接收该用户的入群申请 - - * ``message: str``: 回复的信息 - """ - assert operate > 0 - return await bot.api.post( - "/resp/memberJoinRequestEvent", - params={ - "eventId": self.event_id, - "groupId": self.group_id, - "fromId": self.from_id, - "operate": operate, - "message": message, - }, - ) - - -class BotInvitedJoinGroupRequestEvent(RequestEvent): - """Bot被邀请入群申请""" - - from_id: int = Field(alias="fromId") - group_id: int = Field(alias="groupId") - group_name: str = Field(alias="groupName") - - async def approve(self, bot: "Bot"): - """ - :说明: - - 通过这份被邀请入群申请 - - :参数: - - * ``bot: Bot``: 当前的 ``Bot`` 对象 - """ - return await bot.api.post( - "/resp/botInvitedJoinGroupRequestEvent", - params={ - "eventId": self.event_id, - "groupId": self.group_id, - "fromId": self.from_id, - "operate": 0, - "message": "", - }, - ) - - async def reject(self, bot: "Bot", message: str = ""): - """ - :说明: - - 拒绝这份被邀请入群申请 - - :参数: - - * ``bot: Bot``: 当前的 ``Bot`` 对象 - * ``message: str``: 邀请消息 - """ - return await bot.api.post( - "/resp/botInvitedJoinGroupRequestEvent", - params={ - "eventId": self.event_id, - "groupId": self.group_id, - "fromId": self.from_id, - "operate": 1, - "message": message, - }, - ) diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/message.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/message.py deleted file mode 100644 index 2f74b197..00000000 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/message.py +++ /dev/null @@ -1,324 +0,0 @@ -from enum import Enum -from typing import Any, Dict, List, Type, Union, Iterable, Optional - -from pydantic import validate_arguments - -from nonebot.typing import overrides -from nonebot.adapters import Message as BaseMessage -from nonebot.adapters import MessageSegment as BaseMessageSegment - - -class MessageType(str, Enum): - """消息类型枚举类""" - - SOURCE = "Source" - QUOTE = "Quote" - AT = "At" - AT_ALL = "AtAll" - FACE = "Face" - PLAIN = "Plain" - IMAGE = "Image" - FLASH_IMAGE = "FlashImage" - VOICE = "Voice" - XML = "Xml" - JSON = "Json" - APP = "App" - POKE = "Poke" - - -class MessageSegment(BaseMessageSegment["MessageChain"]): - """ - Mirai-API-HTTP 协议 MessageSegment 适配。具体方法参考 `mirai-api-http 消息类型`_ - - .. _mirai-api-http 消息类型: - https://github.com/project-mirai/mirai-api-http/blob/master/docs/MessageType.md - """ - - type: MessageType - data: Dict[str, Any] - - @classmethod - def get_message_class(cls) -> Type["MessageChain"]: - return MessageChain - - @validate_arguments - @overrides(BaseMessageSegment) - def __init__(self, type: MessageType, **data: Any): - super().__init__( - type=type, data={k: v for k, v in data.items() if v is not None} - ) - - @overrides(BaseMessageSegment) - def __str__(self) -> str: - return self.data["text"] if self.is_text() else repr(self) - - def __repr__(self) -> str: - return "[mirai:%s]" % ",".join( - [ - self.type.value, - *map( - lambda s: "%s=%r" % s, - self.data.items(), - ), - ] - ) - - @overrides(BaseMessageSegment) - def is_text(self) -> bool: - return self.type == MessageType.PLAIN - - def as_dict(self) -> Dict[str, Any]: - """导出可以被正常json序列化的结构体""" - return {"type": self.type.value, **self.data} - - @classmethod - def source(cls, id: int, time: int): - return cls(type=MessageType.SOURCE, id=id, time=time) - - @classmethod - def quote( - cls, - id: int, - group_id: int, - sender_id: int, - target_id: int, - origin: "MessageChain", - ): - """ - :说明: - - 生成回复引用消息段 - - :参数: - - * ``id: int``: 被引用回复的原消息的message_id - * ``group_id: int``: 被引用回复的原消息所接收的群号，当为好友消息时为0 - * ``sender_id: int``: 被引用回复的原消息的发送者的QQ号 - * ``target_id: int``: 被引用回复的原消息的接收者者的QQ号（或群号） - * ``origin: MessageChain``: 被引用回复的原消息的消息链对象 - """ - return cls( - type=MessageType.QUOTE, - id=id, - groupId=group_id, - senderId=sender_id, - targetId=target_id, - origin=origin.export(), - ) - - @classmethod - def at(cls, target: int): - """ - :说明: - - @某个人 - - :参数: - - * ``target: int``: 群员QQ号 - """ - return cls(type=MessageType.AT, target=target) - - @classmethod - def at_all(cls): - """ - :说明: - - @全体成员 - """ - return cls(type=MessageType.AT_ALL) - - @classmethod - def face(cls, face_id: Optional[int] = None, name: Optional[str] = None): - """ - :说明: - - 发送QQ表情 - - :参数: - - * ``face_id: Optional[int]``: QQ表情编号，可选，优先高于name - * ``name: Optional[str]``: QQ表情拼音，可选 - """ - return cls(type=MessageType.FACE, faceId=face_id, name=name) - - @classmethod - def plain(cls, text: str): - """ - :说明: - - 纯文本消息 - - :参数: - - * ``text: str``: 文字消息 - """ - return cls(type=MessageType.PLAIN, text=text) - - @classmethod - def image( - cls, - image_id: Optional[str] = None, - url: Optional[str] = None, - path: Optional[str] = None, - ): - """ - :说明: - - 图片消息 - - :参数: - - * ``image_id: Optional[str]``: 图片的image_id，群图片与好友图片格式不同。不为空时将忽略url属性 - * ``url: Optional[str]``: 图片的URL，发送时可作网络图片的链接 - * ``path: Optional[str]``: 图片的路径，发送本地图片 - """ - return cls(type=MessageType.IMAGE, imageId=image_id, url=url, path=path) - - @classmethod - def flash_image( - cls, - image_id: Optional[str] = None, - url: Optional[str] = None, - path: Optional[str] = None, - ): - """ - :说明: - - 闪照消息 - - :参数: - - 同 ``image`` - """ - return cls(type=MessageType.FLASH_IMAGE, imageId=image_id, url=url, path=path) - - @classmethod - def voice( - cls, - voice_id: Optional[str] = None, - url: Optional[str] = None, - path: Optional[str] = None, - ): - """ - :说明: - - 语音消息 - - :参数: - - * ``voice_id: Optional[str]``: 语音的voice_id，不为空时将忽略url属性 - * ``url: Optional[str]``: 语音的URL，发送时可作网络语音的链接 - * ``path: Optional[str]``: 语音的路径，发送本地语音 - """ - return cls(type=MessageType.FLASH_IMAGE, imageId=voice_id, url=url, path=path) - - @classmethod - def xml(cls, xml: str): - """ - :说明: - - XML消息 - - :参数: - - * ``xml: str``: XML文本 - """ - return cls(type=MessageType.XML, xml=xml) - - @classmethod - def json(cls, json: str): - """ - :说明: - - Json消息 - - :参数: - - * ``json: str``: Json文本 - """ - return cls(type=MessageType.JSON, json=json) - - @classmethod - def app(cls, content: str): - """ - :说明: - - 应用程序消息 - - :参数: - - * ``content: str``: 内容 - """ - return cls(type=MessageType.APP, content=content) - - @classmethod - def poke(cls, name: str): - """ - :说明: - - 戳一戳消息 - - :参数: - - * ``name: str``: 戳一戳的类型 - - * ``Poke``: 戳一戳 - * ``ShowLove``: 比心 - * ``Like``: 点赞 - * ``Heartbroken``: 心碎 - * ``SixSixSix``: 666 - * ``FangDaZhao``: 放大招 - - """ - return cls(type=MessageType.POKE, name=name) - - -class MessageChain(BaseMessage[MessageSegment]): - """ - Mirai 协议 Message 适配 - - 由于Mirai协议的Message实现较为特殊, 故使用MessageChain命名 - """ - - @classmethod - @overrides(BaseMessage) - def get_segment_class(cls) -> Type[MessageSegment]: - return MessageSegment - - @overrides(BaseMessage) - def _construct( - self, message: Union[List[Dict[str, Any]], Iterable[MessageSegment]] - ) -> List[MessageSegment]: - if isinstance(message, str): - return [MessageSegment.plain(text=message)] - return [ - *map( - lambda x: x if isinstance(x, MessageSegment) else MessageSegment(**x), - message, - ) - ] - - def export(self) -> List[Dict[str, Any]]: - """导出为可以被正常json序列化的数组""" - return [*map(lambda segment: segment.as_dict(), self.copy())] # type: ignore - - def extract_first(self, *type: MessageType) -> Optional[MessageSegment]: - """ - :说明: - - 弹出该消息链的第一个消息 - - :参数: - - * `*type: MessageType`: 指定的消息类型, 当指定后如类型不匹配不弹出 - """ - if not len(self): - return None - first: MessageSegment = self[0] - if (not type) or (first.type in type): - return self.pop(0) - return None - - def __repr__(self) -> str: - return f"<{self.__class__.__name__} {[*self.copy()]}>" diff --git a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/utils.py b/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/utils.py deleted file mode 100644 index 6a403990..00000000 --- a/packages/nonebot-adapter-mirai/nonebot/adapters/mirai/utils.py +++ /dev/null @@ -1,179 +0,0 @@ -import re -from functools import wraps -from typing import TYPE_CHECKING, Any, TypeVar, Callable, Optional, Coroutine - -import httpx -from pydantic import Extra, ValidationError, validate_arguments - -from nonebot.log import logger -import nonebot.exception as exception -from nonebot.message import handle_event -from nonebot.utils import escape_tag, logger_wrapper - -from .message import MessageType, MessageSegment -from .event import Event, GroupMessage, MessageEvent, MessageSource - -if TYPE_CHECKING: - from .bot import Bot - -_AsyncCallable = TypeVar("_AsyncCallable", bound=Callable[..., Coroutine]) -_AnyCallable = TypeVar("_AnyCallable", bound=Callable) - - -class Log: - @staticmethod - def log(level: str, message: str, exception: Optional[Exception] = None): - logger = logger_wrapper("MIRAI") - message = "" + escape_tag(message) + "" - logger(level=level.upper(), message=message, exception=exception) - - @classmethod - def info(cls, message: Any): - cls.log("INFO", str(message)) - - @classmethod - def debug(cls, message: Any): - cls.log("DEBUG", str(message)) - - @classmethod - def warn(cls, message: Any): - cls.log("WARNING", str(message)) - - @classmethod - def error(cls, message: Any, exception: Optional[Exception] = None): - cls.log("ERROR", str(message), exception=exception) - - -class ActionFailed(exception.ActionFailed): - """ - :说明: - - API 请求成功返回数据，但 API 操作失败。 - """ - - def __init__(self, **kwargs): - super().__init__("mirai") - self.data = kwargs.copy() - - def __repr__(self): - return self.__class__.__name__ + "(%s)" % ", ".join( - map(lambda m: "%s=%r" % m, self.data.items()) - ) - - -class InvalidArgument(exception.AdapterException): - """ - :说明: - - 调用API的参数出错 - """ - - def __init__(self, **kwargs): - super().__init__("mirai") - - -def catch_network_error(function: _AsyncCallable) -> _AsyncCallable: - r""" - :说明: - - 捕捉函数抛出的httpx网络异常并释放 ``NetworkError`` 异常 - - 处理返回数据, 在code不为0时释放 ``ActionFailed`` 异常 - - \:\:\: warning - 此装饰器只支持使用了httpx的异步函数 - \:\:\: - """ - - @wraps(function) - async def wrapper(*args, **kwargs): - try: - data = await function(*args, **kwargs) - except httpx.HTTPError: - raise exception.NetworkError("mirai") - logger.opt(colors=True).debug( - "Mirai API returned data: " f"{escape_tag(str(data))}" - ) - if isinstance(data, dict): - if data.get("code", 0) != 0: - raise ActionFailed(**data) - return data - - return wrapper # type: ignore - - -def argument_validation(function: _AnyCallable) -> _AnyCallable: - """ - :说明: - - 通过函数签名中的类型注解来对传入参数进行运行时校验 - - 会在参数出错时释放 ``InvalidArgument`` 异常 - """ - function = validate_arguments( - config={"arbitrary_types_allowed": True, "extra": Extra.forbid} - )(function) - - @wraps(function) - def wrapper(*args, **kwargs): - try: - return function(*args, **kwargs) - except ValidationError: - raise InvalidArgument - - return wrapper # type: ignore - - -def process_source(bot: "Bot", event: MessageEvent) -> MessageEvent: - source = event.message_chain.extract_first(MessageType.SOURCE) - if source is not None: - event.source = MessageSource.parse_obj(source.data) - return event - - -def process_at(bot: "Bot", event: GroupMessage) -> GroupMessage: - at = event.message_chain.extract_first(MessageType.AT) - if at is not None: - if at.data["target"] == event.self_id: - event.to_me = True - else: - event.message_chain.insert(0, at) - if not event.message_chain: - event.message_chain.append(MessageSegment.plain("")) - return event - - -def process_nick(bot: "Bot", event: GroupMessage) -> GroupMessage: - plain = event.message_chain.extract_first(MessageType.PLAIN) - if plain is not None: - text = str(plain) - nick_regex = "|".join(filter(lambda x: x, bot.config.nickname)) - matched = re.search(rf"^({nick_regex})([\s,，]*|$)", text, re.IGNORECASE) - if matched is not None: - event.to_me = True - nickname = matched.group(1) - Log.info(f"User is calling me {nickname}") - plain.data["text"] = text[matched.end() :] - event.message_chain.insert(0, plain) - return event - - -def process_reply(bot: "Bot", event: GroupMessage) -> GroupMessage: - reply = event.message_chain.extract_first(MessageType.QUOTE) - if reply is not None: - if reply.data["senderId"] == event.self_id: - event.to_me = True - else: - event.message_chain.insert(0, reply) - return event - - -async def process_event(bot: "Bot", event: Event) -> None: - if isinstance(event, MessageEvent): - Log.debug(event.message_chain) - event = process_source(bot, event) - if isinstance(event, GroupMessage): - event = process_nick(bot, event) - event = process_at(bot, event) - event = process_reply(bot, event) - await handle_event(bot, event) diff --git a/packages/nonebot-adapter-mirai/poetry.lock b/packages/nonebot-adapter-mirai/poetry.lock deleted file mode 100644 index 9945f985..00000000 --- a/packages/nonebot-adapter-mirai/poetry.lock +++ /dev/null @@ -1,649 +0,0 @@ -[[package]] -name = "anyio" -version = "3.3.4" -description = "High level compatibility layer for multiple asynchronous event loop implementations" -category = "main" -optional = false -python-versions = ">=3.6.2" - -[package.dependencies] -idna = ">=2.8" -sniffio = ">=1.1" -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -doc = ["sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] -test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (<0.15)", "mock (>=4)", "uvloop (>=0.15)"] -trio = ["trio (>=0.16)"] - -[[package]] -name = "asgiref" -version = "3.4.1" -description = "ASGI specs, helper code, and adapters" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] - -[[package]] -name = "certifi" -version = "2021.10.8" -description = "Python package for providing Mozilla's CA Bundle." -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "charset-normalizer" -version = "2.0.7" -description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -category = "main" -optional = false -python-versions = ">=3.5.0" - -[package.extras] -unicode_backport = ["unicodedata2"] - -[[package]] -name = "click" -version = "8.0.3" -description = "Composable command line interface toolkit" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -colorama = {version = "*", markers = "platform_system == \"Windows\""} -importlib-metadata = {version = "*", markers = "python_version < \"3.8\""} - -[[package]] -name = "colorama" -version = "0.4.4" -description = "Cross-platform colored terminal text." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[[package]] -name = "fastapi" -version = "0.70.0" -description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[package.dependencies] -pydantic = ">=1.6.2,<1.7 || >1.7,<1.7.1 || >1.7.1,<1.7.2 || >1.7.2,<1.7.3 || >1.7.3,<1.8 || >1.8,<1.8.1 || >1.8.1,<2.0.0" -starlette = "0.16.0" - -[package.extras] -all = ["requests (>=2.24.0,<3.0.0)", "jinja2 (>=2.11.2,<4.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "itsdangerous (>=1.1.0,<3.0.0)", "pyyaml (>=5.3.1,<6.0.0)", "ujson (>=4.0.1,<5.0.0)", "orjson (>=3.2.1,<4.0.0)", "email_validator (>=1.1.1,<2.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] -dev = ["python-jose[cryptography] (>=3.3.0,<4.0.0)", "passlib[bcrypt] (>=1.7.2,<2.0.0)", "autoflake (>=1.4.0,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "uvicorn[standard] (>=0.12.0,<0.16.0)"] -doc = ["mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=7.1.9,<8.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs-markdownextradata-plugin (>=0.1.7,<0.3.0)", "typer-cli (>=0.0.12,<0.0.13)", "pyyaml (>=5.3.1,<6.0.0)"] -test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<4.0.0)", "mypy (==0.910)", "flake8 (>=3.8.3,<4.0.0)", "black (==21.9b0)", "isort (>=5.0.6,<6.0.0)", "requests (>=2.24.0,<3.0.0)", "httpx (>=0.14.0,<0.19.0)", "email_validator (>=1.1.1,<2.0.0)", "sqlalchemy (>=1.3.18,<1.5.0)", "peewee (>=3.13.3,<4.0.0)", "databases[sqlite] (>=0.3.2,<0.6.0)", "orjson (>=3.2.1,<4.0.0)", "ujson (>=4.0.1,<5.0.0)", "python-multipart (>=0.0.5,<0.0.6)", "flask (>=1.1.2,<3.0.0)", "anyio[trio] (>=3.2.1,<4.0.0)", "types-ujson (==0.1.1)", "types-orjson (==3.6.0)", "types-dataclasses (==0.1.7)"] - -[[package]] -name = "h11" -version = "0.12.0" -description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" -category = "main" -optional = false -python-versions = ">=3.6" - -[[package]] -name = "h2" -version = "4.1.0" -description = "HTTP/2 State-Machine based protocol implementation" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[package.dependencies] -hpack = ">=4.0,<5" -hyperframe = ">=6.0,<7" - -[[package]] -name = "hpack" -version = "4.0.0" -description = "Pure-Python HPACK header compression" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[[package]] -name = "httpcore" -version = "0.13.7" -description = "A minimal low-level HTTP client." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -anyio = ">=3.0.0,<4.0.0" -h11 = ">=0.11,<0.13" -sniffio = ">=1.0.0,<2.0.0" - -[package.extras] -http2 = ["h2 (>=3,<5)"] - -[[package]] -name = "httptools" -version = "0.2.0" -description = "A collection of framework independent HTTP protocol utils." -category = "main" -optional = false -python-versions = "*" - -[package.extras] -test = ["Cython (==0.29.22)"] - -[[package]] -name = "httpx" -version = "0.20.0" -description = "The next generation HTTP client." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -certifi = "*" -charset-normalizer = "*" -h2 = {version = ">=3,<5", optional = true, markers = "extra == \"http2\""} -httpcore = ">=0.13.3,<0.14.0" -rfc3986 = {version = ">=1.3,<2", extras = ["idna2008"]} -sniffio = "*" - -[package.extras] -brotli = ["brotlicffi", "brotli"] -cli = ["click (>=8.0.0,<9.0.0)", "rich (>=10.0.0,<11.0.0)", "pygments (>=2.0.0,<3.0.0)"] -http2 = ["h2 (>=3,<5)"] - -[[package]] -name = "hyperframe" -version = "6.0.1" -description = "HTTP/2 framing layer for Python" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[[package]] -name = "idna" -version = "3.3" -description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "importlib-metadata" -version = "4.8.1" -description = "Read metadata from Python packages" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} -zipp = ">=0.5" - -[package.extras] -docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -perf = ["ipython"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"] - -[[package]] -name = "loguru" -version = "0.5.3" -description = "Python logging made (stupidly) simple" -category = "main" -optional = false -python-versions = ">=3.5" - -[package.dependencies] -colorama = {version = ">=0.3.4", markers = "sys_platform == \"win32\""} -win32-setctime = {version = ">=1.0.0", markers = "sys_platform == \"win32\""} - -[package.extras] -dev = ["codecov (>=2.0.15)", "colorama (>=0.3.4)", "flake8 (>=3.7.7)", "tox (>=3.9.0)", "tox-travis (>=0.12)", "pytest (>=4.6.2)", "pytest-cov (>=2.7.1)", "Sphinx (>=2.2.1)", "sphinx-autobuild (>=0.7.1)", "sphinx-rtd-theme (>=0.4.3)", "black (>=19.10b0)", "isort (>=5.1.1)"] - -[[package]] -name = "nonebot2" -version = "2.0.0-alpha.16" -description = "An asynchronous python bot framework." -category = "main" -optional = false -python-versions = "^3.7.3" -develop = true - -[package.dependencies] -fastapi = "^0.70.0" -httpx = {version = ">=0.20.0, <1.0.0", extras = ["http2"]} -loguru = "^0.5.1" -pydantic = {version = "~1.8.0", extras = ["dotenv"]} -pygtrie = "^2.4.1" -tomlkit = "^0.7.0" -uvicorn = {version = "^0.15.0", extras = ["standard"]} -websockets = ">=9.1" - -[package.extras] -quart = ["Quart (>=0.15.0,<0.16.0)"] -aiohttp = ["aiohttp[speedups] (>=3.7.4,<4.0.0)"] -all = ["Quart (>=0.15.0,<0.16.0)", "aiohttp[speedups] (>=3.7.4,<4.0.0)"] - -[package.source] -type = "directory" -url = "../.." - -[[package]] -name = "pydantic" -version = "1.8.2" -description = "Data validation and settings management using python 3.6 type hinting" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[package.dependencies] -python-dotenv = {version = ">=0.10.4", optional = true, markers = "extra == \"dotenv\""} -typing-extensions = ">=3.7.4.3" - -[package.extras] -dotenv = ["python-dotenv (>=0.10.4)"] -email = ["email-validator (>=1.0.3)"] - -[[package]] -name = "pygtrie" -version = "2.4.2" -description = "A pure Python trie data structure implementation." -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "python-dotenv" -version = "0.19.1" -description = "Read key-value pairs from a .env file and set them as environment variables" -category = "main" -optional = false -python-versions = ">=3.5" - -[package.extras] -cli = ["click (>=5.0)"] - -[[package]] -name = "pyyaml" -version = "6.0" -description = "YAML parser and emitter for Python" -category = "main" -optional = false -python-versions = ">=3.6" - -[[package]] -name = "rfc3986" -version = "1.5.0" -description = "Validating URI References per RFC 3986" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -idna = {version = "*", optional = true, markers = "extra == \"idna2008\""} - -[package.extras] -idna2008 = ["idna"] - -[[package]] -name = "sniffio" -version = "1.2.0" -description = "Sniff out which async library your code is running under" -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "starlette" -version = "0.16.0" -description = "The little ASGI library that shines." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -anyio = ">=3.0.0,<4" -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} - -[package.extras] -full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "graphene"] - -[[package]] -name = "tomlkit" -version = "0.7.2" -description = "Style preserving TOML library" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[[package]] -name = "typing-extensions" -version = "3.10.0.2" -description = "Backported and Experimental Type Hints for Python 3.5+" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "uvicorn" -version = "0.15.0" -description = "The lightning-fast ASGI server." -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -asgiref = ">=3.4.0" -click = ">=7.0" -colorama = {version = ">=0.4", optional = true, markers = "sys_platform == \"win32\" and extra == \"standard\""} -h11 = ">=0.8" -httptools = {version = ">=0.2.0,<0.3.0", optional = true, markers = "extra == \"standard\""} -python-dotenv = {version = ">=0.13", optional = true, markers = "extra == \"standard\""} -PyYAML = {version = ">=5.1", optional = true, markers = "extra == \"standard\""} -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} -uvloop = {version = ">=0.14.0,<0.15.0 || >0.15.0,<0.15.1 || >0.15.1", optional = true, markers = "sys_platform != \"win32\" and sys_platform != \"cygwin\" and platform_python_implementation != \"PyPy\" and extra == \"standard\""} -watchgod = {version = ">=0.6", optional = true, markers = "extra == \"standard\""} -websockets = {version = ">=9.1", optional = true, markers = "extra == \"standard\""} - -[package.extras] -standard = ["websockets (>=9.1)", "httptools (>=0.2.0,<0.3.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"] - -[[package]] -name = "uvloop" -version = "0.16.0" -description = "Fast implementation of asyncio event loop on top of libuv" -category = "main" -optional = false -python-versions = ">=3.7" - -[package.extras] -dev = ["Cython (>=0.29.24,<0.30.0)", "pytest (>=3.6.0)", "Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)", "aiohttp", "flake8 (>=3.9.2,<3.10.0)", "psutil", "pycodestyle (>=2.7.0,<2.8.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] -docs = ["Sphinx (>=4.1.2,<4.2.0)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)", "sphinx-rtd-theme (>=0.5.2,<0.6.0)"] -test = ["aiohttp", "flake8 (>=3.9.2,<3.10.0)", "psutil", "pycodestyle (>=2.7.0,<2.8.0)", "pyOpenSSL (>=19.0.0,<19.1.0)", "mypy (>=0.800)"] - -[[package]] -name = "watchgod" -version = "0.7" -description = "Simple, modern file watching and code reload in python." -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "websockets" -version = "10.0" -description = "An implementation of the WebSocket Protocol (RFC 6455 & 7692)" -category = "main" -optional = false -python-versions = ">=3.7" - -[[package]] -name = "win32-setctime" -version = "1.0.3" -description = "A small Python utility to set file creation time on Windows" -category = "main" -optional = false -python-versions = ">=3.5" - -[package.extras] -dev = ["pytest (>=4.6.2)", "black (>=19.3b0)"] - -[[package]] -name = "zipp" -version = "3.6.0" -description = "Backport of pathlib-compatible object wrapper for zip files" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.extras] -docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] - -[metadata] -lock-version = "1.1" -python-versions = "^3.7.3" -content-hash = "0cc9df471eb39cfb9b3225370913296535c45171158adc19753cebb7fe791ae3" - -[metadata.files] -anyio = [ - {file = "anyio-3.3.4-py3-none-any.whl", hash = "sha256:4fd09a25ab7fa01d34512b7249e366cd10358cdafc95022c7ff8c8f8a5026d66"}, - {file = "anyio-3.3.4.tar.gz", hash = "sha256:67da67b5b21f96b9d3d65daa6ea99f5d5282cb09f50eb4456f8fb51dffefc3ff"}, -] -asgiref = [ - {file = "asgiref-3.4.1-py3-none-any.whl", hash = "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"}, - {file = "asgiref-3.4.1.tar.gz", hash = "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9"}, -] -certifi = [ - {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, - {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, -] -charset-normalizer = [ - {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"}, - {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"}, -] -click = [ - {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"}, - {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"}, -] -colorama = [ - {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, - {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, -] -fastapi = [ - {file = "fastapi-0.70.0-py3-none-any.whl", hash = "sha256:a36d5f2fad931aa3575c07a3472c784e81f3e664e3bb5c8b9c88d0ec1104f59c"}, - {file = "fastapi-0.70.0.tar.gz", hash = "sha256:66da43cfe5185ea1df99552acffd201f1832c6b364e0f4136c0a99f933466ced"}, -] -h11 = [ - {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, - {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, -] -h2 = [ - {file = "h2-4.1.0-py3-none-any.whl", hash = "sha256:03a46bcf682256c95b5fd9e9a99c1323584c3eec6440d379b9903d709476bc6d"}, - {file = "h2-4.1.0.tar.gz", hash = "sha256:a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb"}, -] -hpack = [ - {file = "hpack-4.0.0-py3-none-any.whl", hash = "sha256:84a076fad3dc9a9f8063ccb8041ef100867b1878b25ef0ee63847a5d53818a6c"}, - {file = "hpack-4.0.0.tar.gz", hash = "sha256:fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095"}, -] -httpcore = [ - {file = "httpcore-0.13.7-py3-none-any.whl", hash = "sha256:369aa481b014cf046f7067fddd67d00560f2f00426e79569d99cb11245134af0"}, - {file = "httpcore-0.13.7.tar.gz", hash = "sha256:036f960468759e633574d7c121afba48af6419615d36ab8ede979f1ad6276fa3"}, -] -httptools = [ - {file = "httptools-0.2.0-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:79dbc21f3612a78b28384e989b21872e2e3cf3968532601544696e4ed0007ce5"}, - {file = "httptools-0.2.0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:78d03dd39b09c99ec917d50189e6743adbfd18c15d5944392d2eabda688bf149"}, - {file = "httptools-0.2.0-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:a23166e5ae2775709cf4f7ad4c2048755ebfb272767d244e1a96d55ac775cca7"}, - {file = "httptools-0.2.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:3ab1f390d8867f74b3b5ee2a7ecc9b8d7f53750bd45714bf1cb72a953d7dfa77"}, - {file = "httptools-0.2.0-cp36-cp36m-win_amd64.whl", hash = "sha256:a7594f9a010cdf1e16a58b3bf26c9da39bbf663e3b8d46d39176999d71816658"}, - {file = "httptools-0.2.0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:01b392a166adcc8bc2f526a939a8aabf89fe079243e1543fd0e7dc1b58d737cb"}, - {file = "httptools-0.2.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:80ffa04fe8c8dfacf6e4cef8277347d35b0442c581f5814f3b0cf41b65c43c6e"}, - {file = "httptools-0.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d5682eeb10cca0606c4a8286a3391d4c3c5a36f0c448e71b8bd05be4e1694bfb"}, - {file = "httptools-0.2.0-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:a289c27ccae399a70eacf32df9a44059ca2ba4ac444604b00a19a6c1f0809943"}, - {file = "httptools-0.2.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:813871f961edea6cb2fe312f2d9b27d12a51ba92545380126f80d0de1917ea15"}, - {file = "httptools-0.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:cc9be041e428c10f8b6ab358c6b393648f9457094e1dcc11b4906026d43cd380"}, - {file = "httptools-0.2.0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:b08d00d889a118f68f37f3c43e359aab24ee29eb2e3fe96d64c6a2ba8b9d6557"}, - {file = "httptools-0.2.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:fd3b8905e21431ad306eeaf56644a68fdd621bf8f3097eff54d0f6bdf7262065"}, - {file = "httptools-0.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:200fc1cdf733a9ff554c0bb97a4047785cfaad9875307d6087001db3eb2b417f"}, - {file = "httptools-0.2.0.tar.gz", hash = "sha256:94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"}, -] -httpx = [ - {file = "httpx-0.20.0-py3-none-any.whl", hash = "sha256:33af5aad9bdc82ef1fc89219c1e36f5693bf9cd0ebe330884df563445682c0f8"}, - {file = "httpx-0.20.0.tar.gz", hash = "sha256:09606d630f070d07f9ff28104fbcea429ea0014c1e89ac90b4d8de8286c40e7b"}, -] -hyperframe = [ - {file = "hyperframe-6.0.1-py3-none-any.whl", hash = "sha256:0ec6bafd80d8ad2195c4f03aacba3a8265e57bc4cff261e802bf39970ed02a15"}, - {file = "hyperframe-6.0.1.tar.gz", hash = "sha256:ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914"}, -] -idna = [ - {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, - {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, -] -importlib-metadata = [ - {file = "importlib_metadata-4.8.1-py3-none-any.whl", hash = "sha256:b618b6d2d5ffa2f16add5697cf57a46c76a56229b0ed1c438322e4e95645bd15"}, - {file = "importlib_metadata-4.8.1.tar.gz", hash = "sha256:f284b3e11256ad1e5d03ab86bb2ccd6f5339688ff17a4d797a0fe7df326f23b1"}, -] -loguru = [ - {file = "loguru-0.5.3-py3-none-any.whl", hash = "sha256:f8087ac396b5ee5f67c963b495d615ebbceac2796379599820e324419d53667c"}, - {file = "loguru-0.5.3.tar.gz", hash = "sha256:b28e72ac7a98be3d28ad28570299a393dfcd32e5e3f6a353dec94675767b6319"}, -] -nonebot2 = [] -pydantic = [ - {file = "pydantic-1.8.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:05ddfd37c1720c392f4e0d43c484217b7521558302e7069ce8d318438d297739"}, - {file = "pydantic-1.8.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a7c6002203fe2c5a1b5cbb141bb85060cbff88c2d78eccbc72d97eb7022c43e4"}, - {file = "pydantic-1.8.2-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:589eb6cd6361e8ac341db97602eb7f354551482368a37f4fd086c0733548308e"}, - {file = "pydantic-1.8.2-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:10e5622224245941efc193ad1d159887872776df7a8fd592ed746aa25d071840"}, - {file = "pydantic-1.8.2-cp36-cp36m-win_amd64.whl", hash = "sha256:99a9fc39470010c45c161a1dc584997f1feb13f689ecf645f59bb4ba623e586b"}, - {file = "pydantic-1.8.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a83db7205f60c6a86f2c44a61791d993dff4b73135df1973ecd9eed5ea0bda20"}, - {file = "pydantic-1.8.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:41b542c0b3c42dc17da70554bc6f38cbc30d7066d2c2815a94499b5684582ecb"}, - {file = "pydantic-1.8.2-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:ea5cb40a3b23b3265f6325727ddfc45141b08ed665458be8c6285e7b85bd73a1"}, - {file = "pydantic-1.8.2-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:18b5ea242dd3e62dbf89b2b0ec9ba6c7b5abaf6af85b95a97b00279f65845a23"}, - {file = "pydantic-1.8.2-cp37-cp37m-win_amd64.whl", hash = "sha256:234a6c19f1c14e25e362cb05c68afb7f183eb931dd3cd4605eafff055ebbf287"}, - {file = "pydantic-1.8.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:021ea0e4133e8c824775a0cfe098677acf6fa5a3cbf9206a376eed3fc09302cd"}, - {file = "pydantic-1.8.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:e710876437bc07bd414ff453ac8ec63d219e7690128d925c6e82889d674bb505"}, - {file = "pydantic-1.8.2-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:ac8eed4ca3bd3aadc58a13c2aa93cd8a884bcf21cb019f8cfecaae3b6ce3746e"}, - {file = "pydantic-1.8.2-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:4a03cbbe743e9c7247ceae6f0d8898f7a64bb65800a45cbdc52d65e370570820"}, - {file = "pydantic-1.8.2-cp38-cp38-win_amd64.whl", hash = "sha256:8621559dcf5afacf0069ed194278f35c255dc1a1385c28b32dd6c110fd6531b3"}, - {file = "pydantic-1.8.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8b223557f9510cf0bfd8b01316bf6dd281cf41826607eada99662f5e4963f316"}, - {file = "pydantic-1.8.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:244ad78eeb388a43b0c927e74d3af78008e944074b7d0f4f696ddd5b2af43c62"}, - {file = "pydantic-1.8.2-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:05ef5246a7ffd2ce12a619cbb29f3307b7c4509307b1b49f456657b43529dc6f"}, - {file = "pydantic-1.8.2-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:54cd5121383f4a461ff7644c7ca20c0419d58052db70d8791eacbbe31528916b"}, - {file = "pydantic-1.8.2-cp39-cp39-win_amd64.whl", hash = "sha256:4be75bebf676a5f0f87937c6ddb061fa39cbea067240d98e298508c1bda6f3f3"}, - {file = "pydantic-1.8.2-py3-none-any.whl", hash = "sha256:fec866a0b59f372b7e776f2d7308511784dace622e0992a0b59ea3ccee0ae833"}, - {file = "pydantic-1.8.2.tar.gz", hash = "sha256:26464e57ccaafe72b7ad156fdaa4e9b9ef051f69e175dbbb463283000c05ab7b"}, -] -pygtrie = [ - {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, -] -python-dotenv = [ - {file = "python-dotenv-0.19.1.tar.gz", hash = "sha256:14f8185cc8d494662683e6914addcb7e95374771e707601dfc70166946b4c4b8"}, - {file = "python_dotenv-0.19.1-py2.py3-none-any.whl", hash = "sha256:bbd3da593fc49c249397cbfbcc449cf36cb02e75afc8157fcc6a81df6fb7750a"}, -] -pyyaml = [ - {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, - {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, - {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, - {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, - {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, - {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, - {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, - {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, - {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, - {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, - {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, - {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, - {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, - {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, - {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, - {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, -] -rfc3986 = [ - {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"}, - {file = "rfc3986-1.5.0.tar.gz", hash = "sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"}, -] -sniffio = [ - {file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"}, - {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, -] -starlette = [ - {file = "starlette-0.16.0-py3-none-any.whl", hash = "sha256:38eb24bf705a2c317e15868e384c1b8a12ca396e5a3c3a003db7e667c43f939f"}, - {file = "starlette-0.16.0.tar.gz", hash = "sha256:e1904b5d0007aee24bdd3c43994be9b3b729f4f58e740200de1d623f8c3a8870"}, -] -tomlkit = [ - {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"}, - {file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"}, -] -typing-extensions = [ - {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, - {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"}, - {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, -] -uvicorn = [ - {file = "uvicorn-0.15.0-py3-none-any.whl", hash = "sha256:17f898c64c71a2640514d4089da2689e5db1ce5d4086c2d53699bf99513421c1"}, - {file = "uvicorn-0.15.0.tar.gz", hash = "sha256:d9a3c0dd1ca86728d3e235182683b4cf94cd53a867c288eaeca80ee781b2caff"}, -] -uvloop = [ - {file = "uvloop-0.16.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:6224f1401025b748ffecb7a6e2652b17768f30b1a6a3f7b44660e5b5b690b12d"}, - {file = "uvloop-0.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:30ba9dcbd0965f5c812b7c2112a1ddf60cf904c1c160f398e7eed3a6b82dcd9c"}, - {file = "uvloop-0.16.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bd53f7f5db562f37cd64a3af5012df8cac2c464c97e732ed556800129505bd64"}, - {file = "uvloop-0.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:772206116b9b57cd625c8a88f2413df2fcfd0b496eb188b82a43bed7af2c2ec9"}, - {file = "uvloop-0.16.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b572256409f194521a9895aef274cea88731d14732343da3ecdb175228881638"}, - {file = "uvloop-0.16.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:04ff57aa137230d8cc968f03481176041ae789308b4d5079118331ab01112450"}, - {file = "uvloop-0.16.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3a19828c4f15687675ea912cc28bbcb48e9bb907c801873bd1519b96b04fb805"}, - {file = "uvloop-0.16.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e814ac2c6f9daf4c36eb8e85266859f42174a4ff0d71b99405ed559257750382"}, - {file = "uvloop-0.16.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bd8f42ea1ea8f4e84d265769089964ddda95eb2bb38b5cbe26712b0616c3edee"}, - {file = "uvloop-0.16.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:647e481940379eebd314c00440314c81ea547aa636056f554d491e40503c8464"}, - {file = "uvloop-0.16.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e0d26fa5875d43ddbb0d9d79a447d2ace4180d9e3239788208527c4784f7cab"}, - {file = "uvloop-0.16.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:6ccd57ae8db17d677e9e06192e9c9ec4bd2066b77790f9aa7dede2cc4008ee8f"}, - {file = "uvloop-0.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:089b4834fd299d82d83a25e3335372f12117a7d38525217c2258e9b9f4578897"}, - {file = "uvloop-0.16.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98d117332cc9e5ea8dfdc2b28b0a23f60370d02e1395f88f40d1effd2cb86c4f"}, - {file = "uvloop-0.16.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1e5f2e2ff51aefe6c19ee98af12b4ae61f5be456cd24396953244a30880ad861"}, - {file = "uvloop-0.16.0.tar.gz", hash = "sha256:f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228"}, -] -watchgod = [ - {file = "watchgod-0.7-py3-none-any.whl", hash = "sha256:d6c1ea21df37847ac0537ca0d6c2f4cdf513562e95f77bb93abbcf05573407b7"}, - {file = "watchgod-0.7.tar.gz", hash = "sha256:48140d62b0ebe9dd9cf8381337f06351e1f2e70b2203fa9c6eff4e572ca84f29"}, -] -websockets = [ - {file = "websockets-10.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:cd8c6f2ec24aedace251017bc7a414525171d4e6578f914acab9349362def4da"}, - {file = "websockets-10.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:1f6b814cff6aadc4288297cb3a248614829c6e4ff5556593c44a115e9dd49939"}, - {file = "websockets-10.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:01db0ecd1a0ca6702d02a5ed40413e18b7d22f94afb3bbe0d323bac86c42c1c8"}, - {file = "websockets-10.0-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:82b17524b1ce6ae7f7dd93e4d18e9b9474071e28b65dbf1dfe9b5767778db379"}, - {file = "websockets-10.0-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:8bbf8660c3f833ddc8b1afab90213f2e672a9ddac6eecb3cde968e6b2807c1c7"}, - {file = "websockets-10.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b8176deb6be540a46695960a765a77c28ac8b2e3ef2ec95d50a4f5df901edb1c"}, - {file = "websockets-10.0-cp37-cp37m-win32.whl", hash = "sha256:706e200fc7f03bed99ad0574cd1ea8b0951477dd18cc978ccb190683c69dba76"}, - {file = "websockets-10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:5b2600e01c7ca6f840c42c747ffbe0254f319594ed108db847eb3d75f4aacb80"}, - {file = "websockets-10.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:085bb8a6e780d30eaa1ba48ac7f3a6707f925edea787cfb761ce5a39e77ac09b"}, - {file = "websockets-10.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:9a4d889162bd48588e80950e07fa5e039eee9deb76a58092e8c3ece96d7ef537"}, - {file = "websockets-10.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:b4ade7569b6fd17912452f9c3757d96f8e4044016b6d22b3b8391e641ca50456"}, - {file = "websockets-10.0-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:2a43072e434c041a99f2e1eb9b692df0232a38c37c61d00e9f24db79474329e4"}, - {file = "websockets-10.0-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:7f79f02c7f9a8320aff7d3321cd1c7e3a7dbc15d922ac996cca827301ee75238"}, - {file = "websockets-10.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:1ac35426fe3e7d3d0fac3d63c8965c76ed67a8fd713937be072bf0ce22808539"}, - {file = "websockets-10.0-cp38-cp38-win32.whl", hash = "sha256:ff59c6bdb87b31f7e2d596f09353d5a38c8c8ff571b0e2238e8ee2d55ad68465"}, - {file = "websockets-10.0-cp38-cp38-win_amd64.whl", hash = "sha256:d67646ddd17a86117ae21c27005d83c1895c0cef5d7be548b7549646372f868a"}, - {file = "websockets-10.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:82bd921885231f4a30d9bc550552495b3fc36b1235add6d374e7c65c3babd805"}, - {file = "websockets-10.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:7d2e12e4f901f1bc062dfdf91831712c4106ed18a9a4cdb65e2e5f502124ca37"}, - {file = "websockets-10.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:71358c7816e2762f3e4af3adf0040f268e219f5a38cb3487a9d0fc2e554fef6a"}, - {file = "websockets-10.0-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:fe83b3ec9ef34063d86dfe1029160a85f24a5a94271036e5714a57acfdd089a1"}, - {file = "websockets-10.0-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:eb282127e9c136f860c6068a4fba5756eb25e755baffb5940b6f1eae071928b2"}, - {file = "websockets-10.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:62160772314920397f9d219147f958b33fa27a12c662d4455c9ccbba9a07e474"}, - {file = "websockets-10.0-cp39-cp39-win32.whl", hash = "sha256:e42a1f1e03437b017af341e9bbfdc09252cd48ef32a8c3c3ead769eab3b17368"}, - {file = "websockets-10.0-cp39-cp39-win_amd64.whl", hash = "sha256:c5880442f5fc268f1ef6d37b2c152c114deccca73f48e3a8c48004d2f16f4567"}, - {file = "websockets-10.0.tar.gz", hash = "sha256:c4fc9a1d242317892590abe5b61a9127f1a61740477bfb121743f290b8054002"}, -] -win32-setctime = [ - {file = "win32_setctime-1.0.3-py3-none-any.whl", hash = "sha256:dc925662de0a6eb987f0b01f599c01a8236cb8c62831c22d9cada09ad958243e"}, - {file = "win32_setctime-1.0.3.tar.gz", hash = "sha256:4e88556c32fdf47f64165a2180ba4552f8bb32c1103a2fafd05723a0bd42bd4b"}, -] -zipp = [ - {file = "zipp-3.6.0-py3-none-any.whl", hash = "sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc"}, - {file = "zipp-3.6.0.tar.gz", hash = "sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832"}, -] diff --git a/packages/nonebot-adapter-mirai/pyproject.toml b/packages/nonebot-adapter-mirai/pyproject.toml deleted file mode 100644 index 7f3c5380..00000000 --- a/packages/nonebot-adapter-mirai/pyproject.toml +++ /dev/null @@ -1,54 +0,0 @@ -[tool.poetry] -name = "nonebot-adapter-mirai" -version = "2.0.0-alpha.16" -description = "Mirai Api HTTP adapter for nonebot2" -authors = ["Mix ", "yanyongyu "] -license = "AGPL-3.0-or-later" -readme = "README.md" -homepage = "https://v2.nonebot.dev/" -repository = "https://github.com/nonebot/nonebot2" -documentation = "https://v2.nonebot.dev/" -keywords = ["bot", "qq", "qqbot", "mirai"] -classifiers = [ - "Development Status :: 5 - Production/Stable", - "Framework :: Robot Framework", - "Framework :: Robot Framework :: Library", - "Operating System :: OS Independent", - "Programming Language :: Python :: 3" -] -packages = [ - { include = "nonebot" } -] -exclude = ["nonebot/__init__.py", "nonebot/adapters/__init__.py"] - -[tool.poetry.dependencies] -python = "^3.7.3" -httpx = ">=0.20.0, <1.0.0" -nonebot2 = "^2.0.0-alpha.14" - -[tool.poetry.dev-dependencies] -nonebot2 = { path = "../../", develop = true } - -# [[tool.poetry.source]] -# name = "aliyun" -# url = "https://mirrors.aliyun.com/pypi/simple/" -# default = true - -[tool.black] -line-length = 88 -target-version = ["py37", "py38", "py39"] -include = '\.pyi?$' -extend-exclude = ''' -''' - -[tool.isort] -profile = "black" -line_length = 80 -length_sort = true -skip_gitignore = true -force_sort_within_sections = true -extra_standard_library = ["typing_extensions"] - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api" diff --git a/poetry.lock b/poetry.lock index c8bf9923..f26c1e66 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,17 +1,3 @@ -[[package]] -name = "aiocache" -version = "0.11.1" -description = "multi backend asyncio cache" -category = "dev" -optional = false -python-versions = "*" - -[package.extras] -dev = ["asynctest (>=0.11.0)", "codecov", "coverage", "flake8", "ipdb", "marshmallow", "pystache", "pytest", "pytest-asyncio", "pytest-mock", "sphinx", "sphinx-autobuild", "sphinx-rtd-theme", "black"] -memcached = ["aiomcache (>=0.5.2)"] -msgpack = ["msgpack (>=0.5.5)"] -redis = ["aioredis (>=0.3.3)", "aioredis (>=1.0.0)"] - [[package]] name = "aiodns" version = "3.0.0" @@ -25,10 +11,10 @@ pycares = ">=4.0.0" [[package]] name = "aiofiles" -version = "0.7.0" +version = "0.8.0" description = "File support for asyncio." category = "main" -optional = false +optional = true python-versions = ">=3.6,<4.0" [[package]] @@ -153,7 +139,7 @@ pytz = ">=2015.7" [[package]] name = "black" -version = "21.11b1" +version = "21.12b0" description = "The uncompromising code formatter." category = "dev" optional = false @@ -164,7 +150,6 @@ click = ">=7.1.2" mypy-extensions = ">=0.4.3" pathspec = ">=0.9.0,<1" platformdirs = ">=2" -regex = ">=2021.4.4" tomli = ">=0.2.6,<2.0.0" typed-ast = {version = ">=1.4.2", markers = "python_version < \"3.8\" and implementation_name == \"cpython\""} typing-extensions = [ @@ -224,7 +209,7 @@ pycparser = "*" [[package]] name = "charset-normalizer" -version = "2.0.7" +version = "2.0.9" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false @@ -509,72 +494,6 @@ category = "dev" optional = false python-versions = "*" -[[package]] -name = "nonebot-adapter-ding" -version = "2.0.0-alpha.16" -description = "Ding adapter for nonebot2" -category = "dev" -optional = false -python-versions = "^3.7.3" -develop = true - -[package.dependencies] -httpx = ">=0.20.0, <1.0.0" -nonebot2 = "^2.0.0-alpha.14" - -[package.source] -type = "directory" -url = "packages/nonebot-adapter-ding" - -[[package]] -name = "nonebot-adapter-feishu" -version = "2.0.0-alpha.16" -description = "feishu(larksuite) adapter for nonebot2" -category = "dev" -optional = false -python-versions = "^3.7.3" -develop = true - -[package.dependencies] -aiocache = "^0.11.1" -httpx = ">=0.20.0, <1.0.0" -nonebot2 = "^2.0.0-alpha.14" -pycryptodome = "^3.10.1" - -[package.source] -type = "directory" -url = "packages/nonebot-adapter-feishu" - -[[package]] -name = "nonebot-adapter-mirai" -version = "2.0.0-alpha.16" -description = "Mirai Api HTTP adapter for nonebot2" -category = "dev" -optional = false -python-versions = "^3.7.3" -develop = true - -[package.dependencies] -httpx = ">=0.20.0, <1.0.0" -nonebot2 = "^2.0.0-alpha.14" - -[package.source] -type = "directory" -url = "packages/nonebot-adapter-mirai" - -[[package]] -name = "nonebot-plugin-test" -version = "0.3.0" -description = "Test frontend for nonebot v2+" -category = "dev" -optional = false -python-versions = ">=3.7.3,<4.0.0" - -[package.dependencies] -aiofiles = ">=0.7.0,<0.8.0" -nonebot2 = ">=2.0.0-alpha.14,<3.0.0" -python-socketio = ">=4.6.1,<5.0.0" - [[package]] name = "packaging" version = "21.3" @@ -636,14 +555,6 @@ category = "main" optional = true python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -[[package]] -name = "pycryptodome" -version = "3.11.0" -description = "Cryptographic library for Python" -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - [[package]] name = "pydantic" version = "1.8.2" @@ -709,37 +620,6 @@ python-versions = ">=3.5" [package.extras] cli = ["click (>=5.0)"] -[[package]] -name = "python-engineio" -version = "3.14.2" -description = "Engine.IO server" -category = "dev" -optional = false -python-versions = "*" - -[package.dependencies] -six = ">=1.9.0" - -[package.extras] -asyncio_client = ["aiohttp (>=3.4)"] -client = ["requests (>=2.21.0)", "websocket-client (>=0.54.0)"] - -[[package]] -name = "python-socketio" -version = "4.6.1" -description = "Socket.IO server" -category = "dev" -optional = false -python-versions = "*" - -[package.dependencies] -python-engineio = ">=3.13.0,<4" -six = ">=1.9.0" - -[package.extras] -asyncio_client = ["aiohttp (>=3.4)", "websockets (>=7.0)"] -client = ["requests (>=2.21.0)", "websocket-client (>=0.54.0)"] - [[package]] name = "pytz" version = "2021.3" @@ -778,14 +658,6 @@ werkzeug = ">=2.0.0" [package.extras] dotenv = ["python-dotenv"] -[[package]] -name = "regex" -version = "2021.11.10" -description = "Alternative regular expression module, to replace re." -category = "dev" -optional = false -python-versions = "*" - [[package]] name = "requests" version = "2.26.0" @@ -818,14 +690,6 @@ idna = {version = "*", optional = true, markers = "extra == \"idna2008\""} [package.extras] idna2008 = ["idna"] -[[package]] -name = "six" -version = "1.16.0" -description = "Python 2 and 3 compatibility utilities" -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" - [[package]] name = "sniffio" version = "1.2.0" @@ -844,7 +708,7 @@ python-versions = "*" [[package]] name = "sphinx" -version = "4.3.0" +version = "4.3.1" description = "Python documentation generator" category = "dev" optional = false @@ -1007,7 +871,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "typed-ast" -version = "1.5.0" +version = "1.5.1" description = "a fork of Python 2 and 3 ast modules with type comment support" category = "dev" optional = false @@ -1015,7 +879,7 @@ python-versions = ">=3.6" [[package]] name = "typing-extensions" -version = "4.0.0" +version = "4.0.1" description = "Backported and Experimental Type Hints for Python 3.6+" category = "main" optional = false @@ -1119,7 +983,7 @@ watchdog = ["watchdog"] [[package]] name = "win32-setctime" -version = "1.0.3" +version = "1.0.4" description = "A small Python utility to set file creation time on Windows" category = "main" optional = false @@ -1180,20 +1044,16 @@ quart = ["Quart"] [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "9c7bf3b0936f4084baf0184046f4443a37c60dadb289c2baaa4360c8d85e3ae8" +content-hash = "d7cede1e6f5d427a8122a895459faf0181ccee6e670fc275e8890219fc11d545" [metadata.files] -aiocache = [ - {file = "aiocache-0.11.1-py2.py3-none-any.whl", hash = "sha256:e55c7caaa5753794fd301c3a2e592737fa1d036db9f8d04ae154facdfb48a157"}, - {file = "aiocache-0.11.1.tar.gz", hash = "sha256:f2ebe0b05cec45782e7b5ea0bb74640f157dd4bb1028b4565364dda9fe33be7f"}, -] aiodns = [ {file = "aiodns-3.0.0-py3-none-any.whl", hash = "sha256:2b19bc5f97e5c936638d28e665923c093d8af2bf3aa88d35c43417fa25d136a2"}, {file = "aiodns-3.0.0.tar.gz", hash = "sha256:946bdfabe743fceeeb093c8a010f5d1645f708a241be849e17edfb0e49e08cd6"}, ] aiofiles = [ - {file = "aiofiles-0.7.0-py3-none-any.whl", hash = "sha256:c67a6823b5f23fcab0a2595a289cec7d8c863ffcb4322fb8cd6b90400aedfdbc"}, - {file = "aiofiles-0.7.0.tar.gz", hash = "sha256:a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4"}, + {file = "aiofiles-0.8.0-py3-none-any.whl", hash = "sha256:7a973fc22b29e9962d0897805ace5856e6a566ab1f0c8e5c91ff6c866519c937"}, + {file = "aiofiles-0.8.0.tar.gz", hash = "sha256:8334f23235248a3b2e83b2c3a78a22674f39969b96397126cc93664d9a901e59"}, ] aiohttp = [ {file = "aiohttp-3.8.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1ed0b6477896559f17b9eaeb6d38e07f7f9ffe40b9f0f9627ae8b9926ae260a8"}, @@ -1302,8 +1162,8 @@ babel = [ {file = "Babel-2.9.1.tar.gz", hash = "sha256:bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0"}, ] black = [ - {file = "black-21.11b1-py3-none-any.whl", hash = "sha256:802c6c30b637b28645b7fde282ed2569c0cd777dbe493a41b6a03c1d903f99ac"}, - {file = "black-21.11b1.tar.gz", hash = "sha256:a042adbb18b3262faad5aff4e834ff186bb893f95ba3a8013f09de1e5569def2"}, + {file = "black-21.12b0-py3-none-any.whl", hash = "sha256:a615e69ae185e08fdd73e4715e260e2479c861b5740057fde6e8b4e3b7dd589f"}, + {file = "black-21.12b0.tar.gz", hash = "sha256:77b80f693a569e2e527958459634f18df9b0ba2625ba4e0c2d5da5be42e6f2b3"}, ] blinker = [ {file = "blinker-1.4.tar.gz", hash = "sha256:471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6"}, @@ -1445,8 +1305,8 @@ cffi = [ {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, ] charset-normalizer = [ - {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"}, - {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"}, + {file = "charset-normalizer-2.0.9.tar.gz", hash = "sha256:b0b883e8e874edfdece9c28f314e3dd5badf067342e42fb162203335ae61aa2c"}, + {file = "charset_normalizer-2.0.9-py3-none-any.whl", hash = "sha256:1eecaa09422db5be9e29d7fc65664e6c33bd06f9ced7838578ba40d58bdf3721"}, ] click = [ {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"}, @@ -1764,13 +1624,6 @@ mypy-extensions = [ {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, ] -nonebot-adapter-ding = [] -nonebot-adapter-feishu = [] -nonebot-adapter-mirai = [] -nonebot-plugin-test = [ - {file = "nonebot-plugin-test-0.3.0.tar.gz", hash = "sha256:6cea9342f4df69a73b9aa27a3eaa22a08c6e54b675e2e6638b4b3fc8568cd6fe"}, - {file = "nonebot_plugin_test-0.3.0-py3-none-any.whl", hash = "sha256:edb880340436323ccd0a13b31d48975136b6bdc71daa178601c4b05b068cc73e"}, -] packaging = [ {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"}, {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"}, @@ -1824,38 +1677,6 @@ pycparser = [ {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] -pycryptodome = [ - {file = "pycryptodome-3.11.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:ffd0cac13ff41f2d15ed39dc6ba1d2ad88dd2905d656c33d8235852f5d6151fd"}, - {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:ead516e03dfe062aefeafe4a29445a6449b0fc43bc8cb30194b2754917a63798"}, - {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:4ce6b09547bf2c7cede3a017f79502eaed3e819c13cdb3cb357aea1b004e4cc6"}, - {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:014c758af7fa38cab85b357a496b76f4fc9dda1f731eb28358d66fef7ad4a3e1"}, - {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:a843350d08c3d22f6c09c2f17f020d8dcfa59496165d7425a3fba0045543dda7"}, - {file = "pycryptodome-3.11.0-cp27-cp27m-manylinux2014_aarch64.whl", hash = "sha256:53989477044be41fa4a63da09d5038c2a34b2f4554cfea2e3933b17186ee9e19"}, - {file = "pycryptodome-3.11.0-cp27-cp27m-win32.whl", hash = "sha256:f9bad2220b80b4ed74f089db012ab5ab5419143a33fad6c8aedcc2a9341eac70"}, - {file = "pycryptodome-3.11.0-cp27-cp27m-win_amd64.whl", hash = "sha256:3c7ed5b07274535979c730daf5817db5e983ea80b04c22579eee8da4ca3ae4f8"}, - {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:8f3a60926be78422e662b0d0b18351b426ce27657101c8a50bad80300de6a701"}, - {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:fce7e22d96030b35345637c563246c24d4513bd3b413e1c40293114837ab8912"}, - {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:bc3c61ff92efdcc14af4a7b81da71d849c9acee51d8fd8ac9841a7620140d6c6"}, - {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:b33c9b3d1327d821e28e9cc3a6512c14f8b17570ddb4cfb9a52247ed0fcc5d8b"}, - {file = "pycryptodome-3.11.0-cp27-cp27mu-manylinux2014_aarch64.whl", hash = "sha256:75e78360d1dd6d02eb288fd8275bb4d147d6e3f5337935c096d11dba1fa84748"}, - {file = "pycryptodome-3.11.0-cp35-abi3-macosx_10_9_x86_64.whl", hash = "sha256:621a90147a5e255fdc2a0fec2d56626b76b5d72ea9e60164c9a5a8976d45b0c9"}, - {file = "pycryptodome-3.11.0-cp35-abi3-manylinux1_i686.whl", hash = "sha256:0ca7a6b4fc1f9fafe990b95c8cda89099797e2cfbf40e55607f2f2f5a3355dcb"}, - {file = "pycryptodome-3.11.0-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:b59bf823cfafde8ef1105d8984f26d1694dff165adb7198b12e3e068d7999b15"}, - {file = "pycryptodome-3.11.0-cp35-abi3-manylinux2010_i686.whl", hash = "sha256:ce81b9c6aaa0f920e2ab05eb2b9f4ccd102e3016b2f37125593b16a83a4b0cc2"}, - {file = "pycryptodome-3.11.0-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:ae29fcd56152f417bfba50a36a56a7a5f9fb74ff80bab98704cac704de6568ab"}, - {file = "pycryptodome-3.11.0-cp35-abi3-manylinux2014_aarch64.whl", hash = "sha256:ae31cb874f6f0cedbed457c6374e7e54d7ed45c1a4e11a65a9c80968da90a650"}, - {file = "pycryptodome-3.11.0-cp35-abi3-win32.whl", hash = "sha256:6db1f9fa1f52226621905f004278ce7bd90c8f5363ffd5d7ab3755363d98549a"}, - {file = "pycryptodome-3.11.0-cp35-abi3-win_amd64.whl", hash = "sha256:d7e5f6f692421e5219aa3b545eb0cffd832cd589a4b9dcd4a5eb4260e2c0d68a"}, - {file = "pycryptodome-3.11.0-pp27-pypy_73-macosx_10_9_x86_64.whl", hash = "sha256:da796e9221dda61a0019d01742337eb8a322de8598b678a4344ca0a436380315"}, - {file = "pycryptodome-3.11.0-pp27-pypy_73-manylinux1_x86_64.whl", hash = "sha256:ed45ef92d21db33685b789de2c015e9d9a18a74760a8df1fc152faee88cdf741"}, - {file = "pycryptodome-3.11.0-pp27-pypy_73-manylinux2010_x86_64.whl", hash = "sha256:4169ed515742425ff21e4bd3fabbb6994ffb64434472fb72230019bdfa36b939"}, - {file = "pycryptodome-3.11.0-pp27-pypy_73-win32.whl", hash = "sha256:f19edd42368e9057c39492947bb99570dc927123e210008f2af7cf9b505c6892"}, - {file = "pycryptodome-3.11.0-pp36-pypy36_pp73-macosx_10_9_x86_64.whl", hash = "sha256:06162fcfed2f9deee8383fd59eaeabc7b7ffc3af50d3fad4000032deb8f700b0"}, - {file = "pycryptodome-3.11.0-pp36-pypy36_pp73-manylinux1_x86_64.whl", hash = "sha256:6eda8a3157c91ba60b26a07bedd6c44ab8bda6cd79b6b5ea9744ba62c39b7b1e"}, - {file = "pycryptodome-3.11.0-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:7ff701fc283412e651eaab4319b3cd4eaa0827e94569cd37ee9075d5c05fe655"}, - {file = "pycryptodome-3.11.0-pp36-pypy36_pp73-win32.whl", hash = "sha256:2a4bcc8a9977fee0979079cd33a9e9f0d3ddba5660d35ffe874cf84f1dd399d2"}, - {file = "pycryptodome-3.11.0.tar.gz", hash = "sha256:428096bbf7a77e207f418dfd4d7c284df8ade81d2dc80f010e92753a3e406ad0"}, -] pydantic = [ {file = "pydantic-1.8.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:05ddfd37c1720c392f4e0d43c484217b7521558302e7069ce8d318438d297739"}, {file = "pydantic-1.8.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a7c6002203fe2c5a1b5cbb141bb85060cbff88c2d78eccbc72d97eb7022c43e4"}, @@ -1899,14 +1720,6 @@ python-dotenv = [ {file = "python-dotenv-0.19.2.tar.gz", hash = "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"}, {file = "python_dotenv-0.19.2-py2.py3-none-any.whl", hash = "sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3"}, ] -python-engineio = [ - {file = "python-engineio-3.14.2.tar.gz", hash = "sha256:eab4553f2804c1ce97054c8b22cf0d5a9ab23128075248b97e1a5b2f29553085"}, - {file = "python_engineio-3.14.2-py2.py3-none-any.whl", hash = "sha256:5a9e6086d192463b04a1428ff1f85b6ba631bbb19d453b144ffc04f530542b84"}, -] -python-socketio = [ - {file = "python-socketio-4.6.1.tar.gz", hash = "sha256:cd1f5aa492c1eb2be77838e837a495f117e17f686029ebc03d62c09e33f4fa10"}, - {file = "python_socketio-4.6.1-py2.py3-none-any.whl", hash = "sha256:5a21da53fdbdc6bb6c8071f40e13d100e0b279ad997681c2492478e06f370523"}, -] pytz = [ {file = "pytz-2021.3-py2.py3-none-any.whl", hash = "sha256:3672058bc3453457b622aab7a1c3bfd5ab0bdae451512f6cf25f64ed37f5b87c"}, {file = "pytz-2021.3.tar.gz", hash = "sha256:acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326"}, @@ -1950,57 +1763,6 @@ quart = [ {file = "Quart-0.15.1-py3-none-any.whl", hash = "sha256:f35134fb1d81af61624e6d89bca33cd611dcedce2dc4e291f527ab04395f4e1a"}, {file = "Quart-0.15.1.tar.gz", hash = "sha256:f80c91d1e0588662483e22dd9c368a5778886b62e128c5399d2cc1b1898482cf"}, ] -regex = [ - {file = "regex-2021.11.10-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9345b6f7ee578bad8e475129ed40123d265464c4cfead6c261fd60fc9de00bcf"}, - {file = "regex-2021.11.10-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:416c5f1a188c91e3eb41e9c8787288e707f7d2ebe66e0a6563af280d9b68478f"}, - {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e0538c43565ee6e703d3a7c3bdfe4037a5209250e8502c98f20fea6f5fdf2965"}, - {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ee1227cf08b6716c85504aebc49ac827eb88fcc6e51564f010f11a406c0a667"}, - {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6650f16365f1924d6014d2ea770bde8555b4a39dc9576abb95e3cd1ff0263b36"}, - {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:30ab804ea73972049b7a2a5c62d97687d69b5a60a67adca07eb73a0ddbc9e29f"}, - {file = "regex-2021.11.10-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:68a067c11463de2a37157930d8b153005085e42bcb7ad9ca562d77ba7d1404e0"}, - {file = "regex-2021.11.10-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:162abfd74e88001d20cb73ceaffbfe601469923e875caf9118333b1a4aaafdc4"}, - {file = "regex-2021.11.10-cp310-cp310-win32.whl", hash = "sha256:98ba568e8ae26beb726aeea2273053c717641933836568c2a0278a84987b2a1a"}, - {file = "regex-2021.11.10-cp310-cp310-win_amd64.whl", hash = "sha256:780b48456a0f0ba4d390e8b5f7c661fdd218934388cde1a974010a965e200e12"}, - {file = "regex-2021.11.10-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:dba70f30fd81f8ce6d32ddeef37d91c8948e5d5a4c63242d16a2b2df8143aafc"}, - {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e1f54b9b4b6c53369f40028d2dd07a8c374583417ee6ec0ea304e710a20f80a0"}, - {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fbb9dc00e39f3e6c0ef48edee202f9520dafb233e8b51b06b8428cfcb92abd30"}, - {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:666abff54e474d28ff42756d94544cdfd42e2ee97065857413b72e8a2d6a6345"}, - {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5537f71b6d646f7f5f340562ec4c77b6e1c915f8baae822ea0b7e46c1f09b733"}, - {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ed2e07c6a26ed4bea91b897ee2b0835c21716d9a469a96c3e878dc5f8c55bb23"}, - {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ca5f18a75e1256ce07494e245cdb146f5a9267d3c702ebf9b65c7f8bd843431e"}, - {file = "regex-2021.11.10-cp36-cp36m-win32.whl", hash = "sha256:93a5051fcf5fad72de73b96f07d30bc29665697fb8ecdfbc474f3452c78adcf4"}, - {file = "regex-2021.11.10-cp36-cp36m-win_amd64.whl", hash = "sha256:b483c9d00a565633c87abd0aaf27eb5016de23fed952e054ecc19ce32f6a9e7e"}, - {file = "regex-2021.11.10-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fff55f3ce50a3ff63ec8e2a8d3dd924f1941b250b0aac3d3d42b687eeff07a8e"}, - {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e32d2a2b02ccbef10145df9135751abea1f9f076e67a4e261b05f24b94219e36"}, - {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:53db2c6be8a2710b359bfd3d3aa17ba38f8aa72a82309a12ae99d3c0c3dcd74d"}, - {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2207ae4f64ad3af399e2d30dde66f0b36ae5c3129b52885f1bffc2f05ec505c8"}, - {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5ca078bb666c4a9d1287a379fe617a6dccd18c3e8a7e6c7e1eb8974330c626a"}, - {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dd33eb9bdcfbabab3459c9ee651d94c842bc8a05fabc95edf4ee0c15a072495e"}, - {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:05b7d6d7e64efe309972adab77fc2af8907bb93217ec60aa9fe12a0dad35874f"}, - {file = "regex-2021.11.10-cp37-cp37m-win32.whl", hash = "sha256:e71255ba42567d34a13c03968736c5d39bb4a97ce98188fafb27ce981115beec"}, - {file = "regex-2021.11.10-cp37-cp37m-win_amd64.whl", hash = "sha256:07856afef5ffcc052e7eccf3213317fbb94e4a5cd8177a2caa69c980657b3cb4"}, - {file = "regex-2021.11.10-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba05430e819e58544e840a68b03b28b6d328aff2e41579037e8bab7653b37d83"}, - {file = "regex-2021.11.10-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7f301b11b9d214f83ddaf689181051e7f48905568b0c7017c04c06dfd065e244"}, - {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4aaa4e0705ef2b73dd8e36eeb4c868f80f8393f5f4d855e94025ce7ad8525f50"}, - {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:788aef3549f1924d5c38263104dae7395bf020a42776d5ec5ea2b0d3d85d6646"}, - {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f8af619e3be812a2059b212064ea7a640aff0568d972cd1b9e920837469eb3cb"}, - {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85bfa6a5413be0ee6c5c4a663668a2cad2cbecdee367630d097d7823041bdeec"}, - {file = "regex-2021.11.10-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f23222527b307970e383433daec128d769ff778d9b29343fb3496472dc20dabe"}, - {file = "regex-2021.11.10-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:da1a90c1ddb7531b1d5ff1e171b4ee61f6345119be7351104b67ff413843fe94"}, - {file = "regex-2021.11.10-cp38-cp38-win32.whl", hash = "sha256:0617383e2fe465732af4509e61648b77cbe3aee68b6ac8c0b6fe934db90be5cc"}, - {file = "regex-2021.11.10-cp38-cp38-win_amd64.whl", hash = "sha256:a3feefd5e95871872673b08636f96b61ebef62971eab044f5124fb4dea39919d"}, - {file = "regex-2021.11.10-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f7f325be2804246a75a4f45c72d4ce80d2443ab815063cdf70ee8fb2ca59ee1b"}, - {file = "regex-2021.11.10-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:537ca6a3586931b16a85ac38c08cc48f10fc870a5b25e51794c74df843e9966d"}, - {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eef2afb0fd1747f33f1ee3e209bce1ed582d1896b240ccc5e2697e3275f037c7"}, - {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:432bd15d40ed835a51617521d60d0125867f7b88acf653e4ed994a1f8e4995dc"}, - {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b43c2b8a330a490daaef5a47ab114935002b13b3f9dc5da56d5322ff218eeadb"}, - {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:962b9a917dd7ceacbe5cd424556914cb0d636001e393b43dc886ba31d2a1e449"}, - {file = "regex-2021.11.10-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fa8c626d6441e2d04b6ee703ef2d1e17608ad44c7cb75258c09dd42bacdfc64b"}, - {file = "regex-2021.11.10-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3c5fb32cc6077abad3bbf0323067636d93307c9fa93e072771cf9a64d1c0f3ef"}, - {file = "regex-2021.11.10-cp39-cp39-win32.whl", hash = "sha256:3b5df18db1fccd66de15aa59c41e4f853b5df7550723d26aa6cb7f40e5d9da5a"}, - {file = "regex-2021.11.10-cp39-cp39-win_amd64.whl", hash = "sha256:83ee89483672b11f8952b158640d0c0ff02dc43d9cb1b70c1564b49abe92ce29"}, - {file = "regex-2021.11.10.tar.gz", hash = "sha256:f341ee2df0999bfdf7a95e448075effe0db212a59387de1a70690e4acb03d4c6"}, -] requests = [ {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, @@ -2009,10 +1771,6 @@ rfc3986 = [ {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"}, {file = "rfc3986-1.5.0.tar.gz", hash = "sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"}, ] -six = [ - {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, - {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, -] sniffio = [ {file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"}, {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, @@ -2022,8 +1780,8 @@ snowballstemmer = [ {file = "snowballstemmer-2.2.0.tar.gz", hash = "sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"}, ] sphinx = [ - {file = "Sphinx-4.3.0-py3-none-any.whl", hash = "sha256:7e2b30da5f39170efcd95c6270f07669d623c276521fee27ad6c380f49d2bf5b"}, - {file = "Sphinx-4.3.0.tar.gz", hash = "sha256:6d051ab6e0d06cba786c4656b0fe67ba259fe058410f49e95bee6e49c4052cbf"}, + {file = "Sphinx-4.3.1-py3-none-any.whl", hash = "sha256:048dac56039a5713f47a554589dc98a442b39226a2b9ed7f82797fcb2fe9253f"}, + {file = "Sphinx-4.3.1.tar.gz", hash = "sha256:32a5b3e9a1b176cc25ed048557d4d3d01af635e6b76c5bc7a43b0a34447fbd45"}, ] sphinx-markdown-builder = [] sphinxcontrib-applehelp = [ @@ -2067,29 +1825,29 @@ tomlkit = [ {file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"}, ] typed-ast = [ - {file = "typed_ast-1.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7b310a207ee9fde3f46ba327989e6cba4195bc0c8c70a158456e7b10233e6bed"}, - {file = "typed_ast-1.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:52ca2b2b524d770bed7a393371a38e91943f9160a190141e0df911586066ecda"}, - {file = "typed_ast-1.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:14fed8820114a389a2b7e91624db5f85f3f6682fda09fe0268a59aabd28fe5f5"}, - {file = "typed_ast-1.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:65c81abbabda7d760df7304d843cc9dbe7ef5d485504ca59a46ae2d1731d2428"}, - {file = "typed_ast-1.5.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:37ba2ab65a0028b1a4f2b61a8fe77f12d242731977d274a03d68ebb751271508"}, - {file = "typed_ast-1.5.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:49af5b8f6f03ed1eb89ee06c1d7c2e7c8e743d720c3746a5857609a1abc94c94"}, - {file = "typed_ast-1.5.0-cp36-cp36m-win_amd64.whl", hash = "sha256:e4374a76e61399a173137e7984a1d7e356038cf844f24fd8aea46c8029a2f712"}, - {file = "typed_ast-1.5.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:ea517c2bb11c5e4ba7a83a91482a2837041181d57d3ed0749a6c382a2b6b7086"}, - {file = "typed_ast-1.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:51040bf45aacefa44fa67fb9ebcd1f2bec73182b99a532c2394eea7dabd18e24"}, - {file = "typed_ast-1.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:806e0c7346b9b4af8c62d9a29053f484599921a4448c37fbbcbbf15c25138570"}, - {file = "typed_ast-1.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a67fd5914603e2165e075f1b12f5a8356bfb9557e8bfb74511108cfbab0f51ed"}, - {file = "typed_ast-1.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:224afecb8b39739f5c9562794a7c98325cb9d972712e1a98b6989a4720219541"}, - {file = "typed_ast-1.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:155b74b078be842d2eb630dd30a280025eca0a5383c7d45853c27afee65f278f"}, - {file = "typed_ast-1.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:361b9e5d27bd8e3ccb6ea6ad6c4f3c0be322a1a0f8177db6d56264fa0ae40410"}, - {file = "typed_ast-1.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:618912cbc7e17b4aeba86ffe071698c6e2d292acbd6d1d5ec1ee724b8c4ae450"}, - {file = "typed_ast-1.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:7e6731044f748340ef68dcadb5172a4b1f40847a2983fe3983b2a66445fbc8e6"}, - {file = "typed_ast-1.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e8a9b9c87801cecaad3b4c2b8876387115d1a14caa602c1618cedbb0cb2a14e6"}, - {file = "typed_ast-1.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:ec184dfb5d3d11e82841dbb973e7092b75f306b625fad7b2e665b64c5d60ab3f"}, - {file = "typed_ast-1.5.0.tar.gz", hash = "sha256:ff4ad88271aa7a55f19b6a161ed44e088c393846d954729549e3cde8257747bb"}, + {file = "typed_ast-1.5.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5d8314c92414ce7481eee7ad42b353943679cf6f30237b5ecbf7d835519e1212"}, + {file = "typed_ast-1.5.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:b53ae5de5500529c76225d18eeb060efbcec90ad5e030713fe8dab0fb4531631"}, + {file = "typed_ast-1.5.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:24058827d8f5d633f97223f5148a7d22628099a3d2efe06654ce872f46f07cdb"}, + {file = "typed_ast-1.5.1-cp310-cp310-win_amd64.whl", hash = "sha256:a6d495c1ef572519a7bac9534dbf6d94c40e5b6a608ef41136133377bba4aa08"}, + {file = "typed_ast-1.5.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:de4ecae89c7d8b56169473e08f6bfd2df7f95015591f43126e4ea7865928677e"}, + {file = "typed_ast-1.5.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:256115a5bc7ea9e665c6314ed6671ee2c08ca380f9d5f130bd4d2c1f5848d695"}, + {file = "typed_ast-1.5.1-cp36-cp36m-win_amd64.whl", hash = "sha256:7c42707ab981b6cf4b73490c16e9d17fcd5227039720ca14abe415d39a173a30"}, + {file = "typed_ast-1.5.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:71dcda943a471d826ea930dd449ac7e76db7be778fcd722deb63642bab32ea3f"}, + {file = "typed_ast-1.5.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4f30a2bcd8e68adbb791ce1567fdb897357506f7ea6716f6bbdd3053ac4d9471"}, + {file = "typed_ast-1.5.1-cp37-cp37m-win_amd64.whl", hash = "sha256:ca9e8300d8ba0b66d140820cf463438c8e7b4cdc6fd710c059bfcfb1531d03fb"}, + {file = "typed_ast-1.5.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9caaf2b440efb39ecbc45e2fabde809cbe56272719131a6318fd9bf08b58e2cb"}, + {file = "typed_ast-1.5.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c9bcad65d66d594bffab8575f39420fe0ee96f66e23c4d927ebb4e24354ec1af"}, + {file = "typed_ast-1.5.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:591bc04e507595887160ed7aa8d6785867fb86c5793911be79ccede61ae96f4d"}, + {file = "typed_ast-1.5.1-cp38-cp38-win_amd64.whl", hash = "sha256:a80d84f535642420dd17e16ae25bb46c7f4c16ee231105e7f3eb43976a89670a"}, + {file = "typed_ast-1.5.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:38cf5c642fa808300bae1281460d4f9b7617cf864d4e383054a5ef336e344d32"}, + {file = "typed_ast-1.5.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:5b6ab14c56bc9c7e3c30228a0a0b54b915b1579613f6e463ba6f4eb1382e7fd4"}, + {file = "typed_ast-1.5.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a2b8d7007f6280e36fa42652df47087ac7b0a7d7f09f9468f07792ba646aac2d"}, + {file = "typed_ast-1.5.1-cp39-cp39-win_amd64.whl", hash = "sha256:b6d17f37f6edd879141e64a5db17b67488cfeffeedad8c5cec0392305e9bc775"}, + {file = "typed_ast-1.5.1.tar.gz", hash = "sha256:484137cab8ecf47e137260daa20bafbba5f4e3ec7fda1c1e69ab299b75fa81c5"}, ] typing-extensions = [ - {file = "typing_extensions-4.0.0-py3-none-any.whl", hash = "sha256:829704698b22e13ec9eaf959122315eabb370b0884400e9818334d8b677023d9"}, - {file = "typing_extensions-4.0.0.tar.gz", hash = "sha256:2cdf80e4e04866a9b3689a51869016d36db0814d84b8d8a568d22781d45d27ed"}, + {file = "typing_extensions-4.0.1-py3-none-any.whl", hash = "sha256:7f001e5ac290a0c0401508864c7ec868be4e701886d5b573a9528ed3973d9d3b"}, + {file = "typing_extensions-4.0.1.tar.gz", hash = "sha256:4ca091dea149f945ec56afb48dae714f21e8692ef22a395223bcd328961b6a0e"}, ] unify = [ {file = "unify-0.5.tar.gz", hash = "sha256:8ddce812b2457212b7598fe574c9e6eb3ad69710f445391338270c7f8a71723c"}, @@ -2182,8 +1940,8 @@ werkzeug = [ {file = "Werkzeug-2.0.2.tar.gz", hash = "sha256:aa2bb6fc8dee8d6c504c0ac1e7f5f7dc5810a9903e793b6f715a9f015bdadb9a"}, ] win32-setctime = [ - {file = "win32_setctime-1.0.3-py3-none-any.whl", hash = "sha256:dc925662de0a6eb987f0b01f599c01a8236cb8c62831c22d9cada09ad958243e"}, - {file = "win32_setctime-1.0.3.tar.gz", hash = "sha256:4e88556c32fdf47f64165a2180ba4552f8bb32c1103a2fafd05723a0bd42bd4b"}, + {file = "win32_setctime-1.0.4-py3-none-any.whl", hash = "sha256:7964234073ad9bc7a689ef2ebe6ce931976b644fe73fd50cf7729c996b7d8385"}, + {file = "win32_setctime-1.0.4.tar.gz", hash = "sha256:2b72b798fdc1d909fb3cc0d25e0be52a42f4848857e3588dd3947c6a18b42609"}, ] wsproto = [ {file = "wsproto-1.0.0-py3-none-any.whl", hash = "sha256:d8345d1808dd599b5ffb352c25a367adb6157e664e140dbecba3f9bc007edb9f"}, diff --git a/pyproject.toml b/pyproject.toml index 79c2faf3..bd75b6c9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,10 +39,6 @@ aiohttp = { version = "^3.7.4", extras = ["speedups"], optional = true } sphinx = "^4.1.1" isort = "^5.10.1" black = "^21.11b1" -nonebot-plugin-test = "^0.3.0" -nonebot-adapter-ding = { path = "./packages/nonebot-adapter-ding", develop = true } -nonebot-adapter-mirai = { path = "./packages/nonebot-adapter-mirai", develop = true } -nonebot-adapter-feishu = { path = "./packages/nonebot-adapter-feishu", develop = true } sphinx-markdown-builder = { git = "https://github.com/nonebot/sphinx-markdown-builder.git" } [tool.poetry.extras] diff --git a/tests/.env b/tests/.env deleted file mode 100644 index 38cdba09..00000000 --- a/tests/.env +++ /dev/null @@ -1,4 +0,0 @@ -ENVIRONMENT=dev -LOG_LEVEL=25 -CUSTOM_CONFIG=common -# FASTAPI_RELOAD_DIRS=["test_plugins"] diff --git a/tests/.env.dev b/tests/.env.dev deleted file mode 100644 index c55b1a3a..00000000 --- a/tests/.env.dev +++ /dev/null @@ -1,24 +0,0 @@ -DRIVER=nonebot.drivers.fastapi:FullDriver -HOST=0.0.0.0 -PORT=2333 -DEBUG=true -LOG_LEVEL=DEBUG - -SUPERUSERS=["123123123"] -NICKNAME=["bot"] - -COMMAND_START=["", "/", "#"] -COMMAND_SEP=["/", "."] - -CUSTOM_CONFIG1=config in env -CUSTOM_CONFIG3= - -# CQHTTP_WS_URLS={"123123123": "ws://127.0.0.1:6700/"} - -MIRAI_AUTH_KEY=12345678 -MIRAI_HOST=127.0.0.1 -MIRAI_PORT=8080 - -APP_ID=111111111111 -APP_SECRET=222222222222222222 -VERIFICATION_TOKEN=3333333333333333333333333333 diff --git a/tests/bot.py b/tests/bot.py deleted file mode 100644 index 695857b3..00000000 --- a/tests/bot.py +++ /dev/null @@ -1,37 +0,0 @@ -import os -import sys - -sys.path.insert(0, os.path.abspath("..")) - -import nonebot -from nonebot.log import logger, default_format -from nonebot.adapters.ding import Bot as DingBot -from nonebot.adapters.mirai import Bot as MiraiBot -from nonebot.adapters.feishu import Bot as FeishuBot - -# test custom log -logger.add( - "error.log", rotation="00:00", diagnose=False, level="ERROR", format=default_format -) - -nonebot.init(custom_config2="config on init") -app = nonebot.get_asgi() -driver = nonebot.get_driver() -driver.register_adapter("ding", DingBot) -driver.register_adapter("mirai", MiraiBot) -driver.register_adapter("feishu", FeishuBot) - -# load builtin plugin -nonebot.load_builtin_plugins() - -# load all plugins -nonebot.load_from_toml("plugins.toml") - -# modify some config / config depends on loaded configs -config = driver.config -config.custom_config3 = config.custom_config1 -config.custom_config4 = "New custom config" - -if __name__ == "__main__": - nonebot.run(app="__mp_main__:app") - # nonebot.run() diff --git a/tests/plugins.toml b/tests/plugins.toml deleted file mode 100644 index a905f3dc..00000000 --- a/tests/plugins.toml +++ /dev/null @@ -1,3 +0,0 @@ -[tool.nonebot] -plugins = ["nonebot_plugin_test"] -plugin_dirs = ["test_plugins"] diff --git a/tests/test_plugins/test_api_hook.py b/tests/test_plugins/test_api_hook.py deleted file mode 100644 index 1849daf9..00000000 --- a/tests/test_plugins/test_api_hook.py +++ /dev/null @@ -1,6 +0,0 @@ -from nonebot.adapters import Bot - - -@Bot.on_calling_api -async def call(bot: Bot, api: str, data: dict): - print(type(bot), api, data) diff --git a/tests/test_plugins/test_delete.py b/tests/test_plugins/test_delete.py deleted file mode 100644 index 4530771d..00000000 --- a/tests/test_plugins/test_delete.py +++ /dev/null @@ -1,32 +0,0 @@ -import asyncio - -from nonebot import on_message -from nonebot.typing import T_State -from nonebot.permission import USER -from nonebot.adapters import Bot, Event - -a = on_message(priority=0, permission=USER("123123123"), temp=True) - - -@a.handle() -async def test_a(bot: Bot, event: Event, state: T_State): - print("======== A Received ========") - print("======== A Running Completed ========") - - -b = on_message(priority=0, permission=USER("123456789"), temp=True) - - -@b.handle() -async def test_b(bot: Bot, event: Event, state: T_State): - print("======== B Received ========") - await asyncio.sleep(10) - print("======== B Running Completed ========") - - -c = on_message(priority=0, permission=USER("1111111111")) - - -@c.handle() -async def test_c(bot: Bot, event: Event, state: T_State): - print("======== C Received ========") diff --git a/tests/test_plugins/test_depends.py b/tests/test_plugins/test_depends.py deleted file mode 100644 index e23c9c4e..00000000 --- a/tests/test_plugins/test_depends.py +++ /dev/null @@ -1,28 +0,0 @@ -from nonebot.log import logger -from nonebot.dependencies import Depends -from nonebot import on_command, on_message - -test = on_command("123") - - -def depend(state: dict): - print("==== depends running =====") - return state - - -@test.got("a", prompt="a") -@test.got("b", prompt="b") -@test.receive() -@test.got("c", prompt="c") -async def _(x: dict = Depends(depend)): - logger.info(f"=======, {x}") - - -test_cache1 = on_message() -test_cache2 = on_message() - - -@test_cache1.handle() -@test_cache2.handle() -async def _(x: dict = Depends(depend)): - logger.info(f"======= test, {x}") diff --git a/tests/test_plugins/test_ding.py b/tests/test_plugins/test_ding.py deleted file mode 100644 index 234d07fe..00000000 --- a/tests/test_plugins/test_ding.py +++ /dev/null @@ -1,233 +0,0 @@ -from nonebot.rule import to_me -from nonebot.plugin import on_command -from nonebot.adapters.ding import Bot as DingBot -from nonebot.adapters.ding import MessageEvent, MessageSegment -from nonebot.adapters.ding.event import GroupMessageEvent, PrivateMessageEvent - -helper = on_command("ding_helper", to_me()) - - -@helper.handle() -async def ding_helper(bot: DingBot, event: MessageEvent): - message = MessageSegment.markdown( - "Hello, This is NoneBot", - """帮助信息如下：\n -[ding_helper](dtmd://dingtalkclient/sendMessage?content=ding_helper) 查看帮助\n -[markdown](dtmd://dingtalkclient/sendMessage?content=markdown) 发送 markdown\n -[actionCardSingleBtn](dtmd://dingtalkclient/sendMessage?content=actionCardSingleBtn)\n -[actionCard](dtmd://dingtalkclient/sendMessage?content=actionCard)\n -[feedCard](dtmd://dingtalkclient/sendMessage?content=feedCard)\n -[atme](dtmd://dingtalkclient/sendMessage?content=atme)\n -[image](dtmd://dingtalkclient/sendMessage?content=image)\n -[t](dtmd://dingtalkclient/sendMessage?content=t)\n -[code](dtmd://dingtalkclient/sendMessage?content=code) 发送代码\n -[test_message](dtmd://dingtalkclient/sendMessage?content=test_message)\n -[hello](dtmd://dingtalkclient/sendMessage?content=hello)\n -[webhook](dtmd://dingtalkclient/sendMessage?content=webhook)""", - ) - await markdown.finish(message) - - -markdown = on_command("markdown", to_me()) - - -@markdown.handle() -async def markdown_handler(bot: DingBot): - message = MessageSegment.markdown( - "Hello, This is NoneBot", - "#### NoneBot \n> Nonebot 是一款高性能的 Python 机器人框架\n> ![screenshot](https://v2.nonebot.dev/logo.png)\n> [GitHub 仓库地址](https://github.com/nonebot/nonebot2) \n", - ) - await markdown.finish(message) - - -actionCardSingleBtn = on_command("actionCardSingleBtn", to_me()) - - -@actionCardSingleBtn.handle() -async def actionCardSingleBtn_handler(bot: DingBot): - message = MessageSegment.actionCardSingleBtn( - title="打造一间咖啡厅", - text="![screenshot](https://img.alicdn.com/tfs/TB1NwmBEL9TBuNjy1zbXXXpepXa-2400-1218.png) \n #### 乔布斯 20 年前想打造的苹果咖啡厅 \n\n Apple Store 的设计正从原来满满的科技感走向生活化，而其生活化的走向其实可以追溯到 20 年前苹果一个建立咖啡馆的计划", - singleTitle="阅读全文", - singleURL="https://www.dingtalk.com/", - ) - await actionCardSingleBtn.finish(message) - - -actionCard = on_command("actionCard", to_me()) - - -@actionCard.handle() -async def actionCard_handler(bot: DingBot): - message = MessageSegment.raw( - { - "msgtype": "actionCard", - "actionCard": { - "title": "乔布斯 20 年前想打造一间苹果咖啡厅，而它正是 Apple Store 的前身", - "text": "![screenshot](https://img.alicdn.com/tfs/TB1NwmBEL9TBuNjy1zbXXXpepXa-2400-1218.png) \n\n #### 乔布斯 20 年前想打造的苹果咖啡厅 \n\n Apple Store 的设计正从原来满满的科技感走向生活化，而其生活化的走向其实可以追溯到 20 年前苹果一个建立咖啡馆的计划", - "hideAvatar": "0", - "btnOrientation": "0", - "btns": [ - {"title": "内容不错", "actionURL": "https://www.dingtalk.com/"}, - {"title": "不感兴趣", "actionURL": "https://www.dingtalk.com/"}, - ], - }, - } - ) - await actionCard.finish(message, at_sender=True) - - -feedCard = on_command("feedCard", to_me()) - - -@feedCard.handle() -async def feedCard_handler(bot: DingBot): - message = MessageSegment.raw( - { - "msgtype": "feedCard", - "feedCard": { - "links": [ - { - "title": "时代的火车向前开1", - "messageURL": "https://www.dingtalk.com/", - "picURL": "https://img.alicdn.com/tfs/TB1NwmBEL9TBuNjy1zbXXXpepXa-2400-1218.png", - }, - { - "title": "时代的火车向前开2", - "messageURL": "https://www.dingtalk.com/", - "picURL": "https://img.alicdn.com/tfs/TB1NwmBEL9TBuNjy1zbXXXpepXa-2400-1218.png", - }, - ] - }, - } - ) - await feedCard.finish(message) - - -atme = on_command("atme", to_me()) - - -@atme.handle() -async def atme_handler(bot: DingBot, event: MessageEvent): - message = f"@{event.senderId} manually at you" + MessageSegment.atDingtalkIds( - event.senderId - ) - await atme.send("matcher send auto at you", at_sender=True) - await bot.send(event, "bot send auto at you", at_sender=True) - await atme.finish(message) - - -image = on_command("image", to_me()) - - -@image.handle() -async def image_handler(bot: DingBot, event: MessageEvent): - message = MessageSegment.image( - "https://static-aliyun-doc.oss-accelerate.aliyuncs.com/assets/img/zh-CN/0634199951/p158167.png" - ) - await image.finish(message) - - -textAdd = on_command("t", to_me()) - - -@textAdd.handle() -async def textAdd_handler(bot: DingBot, event: MessageEvent): - message = "第一段消息\n" + MessageSegment.text("asdawefaefa\n") - await textAdd.send(message) - - message = message + MessageSegment.text("第二段消息\n") - await textAdd.send(message) - - message = ( - message + MessageSegment.text("\n第三段消息\n") + "adfkasfkhsdkfahskdjasdashdkjasdf" - ) - message = message + MessageSegment.extension( - {"text_type": "code_snippet", "code_language": "C#"} - ) - await textAdd.send(message) - - -code = on_command("code", to_me()) - - -@code.handle() -async def code_handler(bot: DingBot, event: MessageEvent): - raw = MessageSegment.code("Python", 'print("hello world")') - await code.send(raw) - message = MessageSegment.text( - """using System; - -namespace HelloWorld -{ - class Program - { - static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } -}""" - ) - message += MessageSegment.extension( - {"text_type": "code_snippet", "code_language": "C#"} - ) - await code.finish(message) - - -test_message = on_command("test_message", to_me()) - - -@test_message.handle() -async def test_message_handler1(bot: DingBot, event: PrivateMessageEvent): - await test_message.finish("PrivateMessageEvent") - - -@test_message.handle() -async def test_message_handler2(bot: DingBot, event: GroupMessageEvent): - await test_message.finish("GroupMessageEvent") - - -hello = on_command("hello", to_me()) - - -@hello.handle() -async def hello_handler(bot: DingBot, event: MessageEvent): - message = MessageSegment.raw( - { - "msgtype": "text", - "text": {"content": "hello "}, - } - ) - message += MessageSegment.atDingtalkIds(event.senderId) - await hello.send(message) - - message = MessageSegment.text(f"@{event.senderId}，你好") - message += MessageSegment.atDingtalkIds(event.senderId) - await hello.finish(message) - - -hello = on_command("webhook", to_me()) - - -@hello.handle() -async def webhook_handler(bot: DingBot, event: MessageEvent): - print(event) - message = MessageSegment.raw( - { - "msgtype": "text", - "text": {"content": "hello from webhook,一定要注意安全方式的鉴权哦，否则可能发送失败的"}, - } - ) - message += MessageSegment.atDingtalkIds(event.senderId) - await hello.send( - message, - webhook="https://oapi.dingtalk.com/robot/send?access_token=XXXXXXXXXXXXXX", - secret="SECXXXXXXXXXXXXXXXXXXXXXXXXX", - ) - - message = MessageSegment.text("TEST 123123 S") - await hello.send( - message, - webhook="https://oapi.dingtalk.com/robot/send?access_token=XXXXXXXXXXXXXX", - ) diff --git a/tests/test_plugins/test_export.py b/tests/test_plugins/test_export.py deleted file mode 100644 index ec549571..00000000 --- a/tests/test_plugins/test_export.py +++ /dev/null @@ -1,15 +0,0 @@ -import nonebot - -export = nonebot.export() -export.foo = "bar" -export["bar"] = "foo" - - -@export -def a(): - pass - - -@export.sub -def b(): - pass diff --git a/tests/test_plugins/test_feishu.py b/tests/test_plugins/test_feishu.py deleted file mode 100644 index 5d8726eb..00000000 --- a/tests/test_plugins/test_feishu.py +++ /dev/null @@ -1,12 +0,0 @@ -from nonebot.typing import T_State -from nonebot.plugin import on_command -from nonebot.adapters.feishu import MessageEvent -from nonebot.adapters.feishu import Bot as FeishuBot - -helper = on_command("say") - - -@helper.handle() -async def feishu_helper(bot: FeishuBot, event: MessageEvent, state: T_State): - message = event.get_message() - await helper.finish(message, at_sender=True) diff --git a/tests/test_plugins/test_get_export.py b/tests/test_plugins/test_get_export.py deleted file mode 100644 index 1bf06602..00000000 --- a/tests/test_plugins/test_get_export.py +++ /dev/null @@ -1,4 +0,0 @@ -import nonebot -from .test_export import export - -print(export, nonebot.require("test_export")) diff --git a/tests/test_plugins/test_group/__init__.py b/tests/test_plugins/test_group/__init__.py deleted file mode 100644 index 0de0241f..00000000 --- a/tests/test_plugins/test_group/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -from nonebot.rule import to_me -from nonebot import CommandGroup, MatcherGroup - -cmd = CommandGroup("test", rule=to_me()) -match = MatcherGroup(priority=2) - -from . import commands diff --git a/tests/test_plugins/test_group/commands.py b/tests/test_plugins/test_group/commands.py deleted file mode 100644 index 71968351..00000000 --- a/tests/test_plugins/test_group/commands.py +++ /dev/null @@ -1,9 +0,0 @@ -from . import cmd -from nonebot.adapters import Bot, Event - -test_1 = cmd.command("1", aliases={"test"}) - - -@test_1.handle() -async def test1(bot: Bot, event: Event): - await test_1.finish(event.get_message()) diff --git a/tests/test_plugins/test_mirai.py b/tests/test_plugins/test_mirai.py deleted file mode 100644 index 08b23e34..00000000 --- a/tests/test_plugins/test_mirai.py +++ /dev/null @@ -1,20 +0,0 @@ -from nonebot.rule import to_me -from nonebot.plugin import on_command, on_keyword -from nonebot.adapters.mirai import Bot, MessageEvent - -message_test = on_keyword({"reply"}, rule=to_me()) - - -@message_test.handle() -async def _message(bot: Bot, event: MessageEvent): - text = event.get_plaintext() - await bot.send(event, text, at_sender=True) - - -command_test = on_command("miecho") - - -@command_test.handle() -async def _echo(bot: Bot, event: MessageEvent): - text = event.get_plaintext() - await bot.send(event, text, at_sender=True) diff --git a/tests/test_plugins/test_package/__init__.py b/tests/test_plugins/test_package/__init__.py deleted file mode 100644 index 139447bf..00000000 --- a/tests/test_plugins/test_package/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from . import test_command diff --git a/tests/test_plugins/test_package/test_command.py b/tests/test_plugins/test_package/test_command.py deleted file mode 100644 index 9ffa3fbf..00000000 --- a/tests/test_plugins/test_package/test_command.py +++ /dev/null @@ -1,24 +0,0 @@ -from nonebot.rule import to_me -from nonebot.typing import T_State -from nonebot.plugin import on_command -from nonebot.adapters import Bot, Event - -test_command = on_command("帮助", to_me()) - - -@test_command.handle() -async def test_handler1(bot: Bot, event: Event, state: T_State): - args = str(event.get_message()).strip() - print("[!] Command:", state["_prefix"], "Args:", args) - if args: - state["help"] = args - else: - await bot.send(message="命令:\n1. test1\n2. test2", event=event) - - -@test_command.got("help", prompt="你要帮助的命令是？") -async def test_handler2(bot: Bot, event: Event, state: T_State): - print("[!] Command 帮助:", state["help"]) - if state["help"] not in ["test1", "test2"]: - await test_command.reject(f"{state['help']} 不支持，请重新输入！") - await bot.send(message=f"{state['help']} 帮助:\n...", event=event) diff --git a/tests/test_plugins/test_processor.py b/tests/test_plugins/test_processor.py deleted file mode 100644 index 438dda96..00000000 --- a/tests/test_plugins/test_processor.py +++ /dev/null @@ -1,15 +0,0 @@ -from nonebot.adapters import Event -from nonebot.typing import T_State -from nonebot.matcher import Matcher -from nonebot.message import run_preprocessor, event_preprocessor - - -@event_preprocessor -async def handle(event: Event, state: T_State): - state["preprocessed"] = True - print(type(event), event) - - -@run_preprocessor -async def run(matcher: Matcher): - print(matcher) diff --git a/tests/test_plugins/test_shell.py b/tests/test_plugins/test_shell.py deleted file mode 100644 index 3428406c..00000000 --- a/tests/test_plugins/test_shell.py +++ /dev/null @@ -1,15 +0,0 @@ -from nonebot.adapters import Bot -from nonebot.typing import T_State -from nonebot import on_shell_command -from nonebot.rule import ArgumentParser, to_me - -parser = ArgumentParser() -parser.add_argument("-a", action="store_true") - -shell = on_shell_command("ls", to_me(), parser=parser) - - -@shell.handle() -async def _(bot: Bot, state: T_State): - print(state["argv"]) - print(state["args"]) diff --git a/tests/test_plugins/test_weather.py b/tests/test_plugins/test_weather.py deleted file mode 100644 index 350e8d1d..00000000 --- a/tests/test_plugins/test_weather.py +++ /dev/null @@ -1,25 +0,0 @@ -from nonebot import on_command -from nonebot.rule import to_me -from nonebot.typing import T_State -from nonebot.adapters import Bot, Event - -weather = on_command("天气", rule=to_me(), priority=1) - - -@weather.handle() -async def handle_first_receive(bot: Bot, event: Event, state: T_State): - args = str(event.get_message()).strip() # 首次发送命令时跟随的参数，例：/天气 上海，则args为上海 - print(f"==={args}===") - if args: - state["city"] = args # 如果用户发送了参数则直接赋值 - - -@weather.got("city", prompt="你想查询哪个城市的天气呢？") -async def handle_city(bot: Bot, state: T_State): - city = state["city"] - if city not in ["上海", "北京"]: - await weather.reject("你想查询的城市暂不支持，请重新输入！") - # weather = await get_weather_from_xxx(city) - city_weather = "晴天" - # await bot.send(city_weather) - await weather.finish(city_weather) diff --git a/tests/test_plugins/test_ws_hook.py b/tests/test_plugins/test_ws_hook.py deleted file mode 100644 index 7b5f9b2b..00000000 --- a/tests/test_plugins/test_ws_hook.py +++ /dev/null @@ -1,14 +0,0 @@ -import nonebot -from nonebot.adapters import Bot - -driver = nonebot.get_driver() - - -@driver.on_bot_connect -async def connect(bot: Bot) -> None: - print("Connect", bot) - - -@driver.on_bot_disconnect -async def disconnect(bot: Bot) -> None: - print("Disconnect", bot) diff --git a/yarn.lock b/yarn.lock index d49e543a..df387078 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4,7 +4,7 @@ "@algolia/autocomplete-core@1.5.0": version "1.5.0" - resolved "https://registry.npmmirror.com/@algolia/autocomplete-core/download/@algolia/autocomplete-core-1.5.0.tgz?cache=0&sync_timestamp=1635931001143&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40algolia%2Fautocomplete-core%2Fdownload%2F%40algolia%2Fautocomplete-core-1.5.0.tgz#6c91c9de7748e9c103846828a58dfe92bd4d6689" + resolved "https://registry.npmmirror.com/@algolia/autocomplete-core/download/@algolia/autocomplete-core-1.5.0.tgz#6c91c9de7748e9c103846828a58dfe92bd4d6689" integrity sha1-bJHJ3ndI6cEDhGgopY3+kr1NZok= dependencies: "@algolia/autocomplete-shared" "1.5.0" @@ -127,14 +127,14 @@ "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.8.3": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/code-frame/download/@babel/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" + resolved "https://registry.npmmirror.com/@babel/code-frame/download/@babel/code-frame-7.16.0.tgz?cache=0&sync_timestamp=1635560657003&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcode-frame%2Fdownload%2F%40babel%2Fcode-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" integrity sha1-DfyAMJvuyEEeZecGRhxAiwu5tDE= dependencies: "@babel/highlight" "^7.16.0" "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.0", "@babel/compat-data@^7.16.4": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/compat-data/download/@babel/compat-data-7.16.4.tgz?cache=0&sync_timestamp=1637102917946&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcompat-data%2Fdownload%2F%40babel%2Fcompat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" + resolved "https://registry.npmmirror.com/@babel/compat-data/download/@babel/compat-data-7.16.4.tgz?cache=0&sync_timestamp=1637102860099&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcompat-data%2Fdownload%2F%40babel%2Fcompat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q== "@babel/core@7.12.9": @@ -191,14 +191,14 @@ "@babel/helper-annotate-as-pure@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.16.0.tgz?cache=0&sync_timestamp=1635560850385&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-annotate-as-pure%2Fdownload%2F%40babel%2Fhelper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" + resolved "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" integrity sha1-mh8OvNpT2aLQAQjEzqzmpdXx8I0= dependencies: "@babel/types" "^7.16.0" "@babel/helper-builder-binary-assignment-operator-visitor@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/download/@babel/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz?cache=0&sync_timestamp=1635567279113&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-builder-binary-assignment-operator-visitor%2Fdownload%2F%40babel%2Fhelper-builder-binary-assignment-operator-visitor-7.16.0.tgz#f1a686b92da794020c26582eb852e9accd0d7882" + resolved "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/download/@babel/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz#f1a686b92da794020c26582eb852e9accd0d7882" integrity sha1-8aaGuS2nlAIMJlguuFLprM0NeII= dependencies: "@babel/helper-explode-assignable-expression" "^7.16.0" @@ -206,7 +206,7 @@ "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.0", "@babel/helper-compilation-targets@^7.16.3": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/download/@babel/helper-compilation-targets-7.16.3.tgz?cache=0&sync_timestamp=1636494857717&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-compilation-targets%2Fdownload%2F%40babel%2Fhelper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" + resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/download/@babel/helper-compilation-targets-7.16.3.tgz?cache=0&sync_timestamp=1636496295030&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-compilation-targets%2Fdownload%2F%40babel%2Fhelper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA== dependencies: "@babel/compat-data" "^7.16.0" @@ -216,7 +216,7 @@ "@babel/helper-create-class-features-plugin@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/download/@babel/helper-create-class-features-plugin-7.16.0.tgz?cache=0&sync_timestamp=1635560843669&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-create-class-features-plugin%2Fdownload%2F%40babel%2Fhelper-create-class-features-plugin-7.16.0.tgz#090d4d166b342a03a9fec37ef4fd5aeb9c7c6a4b" + resolved "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/download/@babel/helper-create-class-features-plugin-7.16.0.tgz#090d4d166b342a03a9fec37ef4fd5aeb9c7c6a4b" integrity sha1-CQ1NFms0KgOp/sN+9P1a65x8aks= dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -228,7 +228,7 @@ "@babel/helper-create-regexp-features-plugin@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/download/@babel/helper-create-regexp-features-plugin-7.16.0.tgz?cache=0&sync_timestamp=1635567006236&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-create-regexp-features-plugin%2Fdownload%2F%40babel%2Fhelper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" + resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/download/@babel/helper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" integrity sha1-BrI0jON/zMT14Y3NjXUFPyp8RP8= dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -236,7 +236,7 @@ "@babel/helper-define-polyfill-provider@^0.3.0": version "0.3.0" - resolved "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/download/@babel/helper-define-polyfill-provider-0.3.0.tgz?cache=0&sync_timestamp=1636802677759&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-define-polyfill-provider%2Fdownload%2F%40babel%2Fhelper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971" + resolved "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/download/@babel/helper-define-polyfill-provider-0.3.0.tgz?cache=0&sync_timestamp=1636799795992&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-define-polyfill-provider%2Fdownload%2F%40babel%2Fhelper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971" integrity sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg== dependencies: "@babel/helper-compilation-targets" "^7.13.0" @@ -250,14 +250,14 @@ "@babel/helper-explode-assignable-expression@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-explode-assignable-expression/download/@babel/helper-explode-assignable-expression-7.16.0.tgz?cache=0&sync_timestamp=1635567281113&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-explode-assignable-expression%2Fdownload%2F%40babel%2Fhelper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778" + resolved "https://registry.npmmirror.com/@babel/helper-explode-assignable-expression/download/@babel/helper-explode-assignable-expression-7.16.0.tgz?cache=0&sync_timestamp=1635567269941&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-explode-assignable-expression%2Fdownload%2F%40babel%2Fhelper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778" integrity sha1-dTAXM3oV9G+cCfZ0z/EM7pudd3g= dependencies: "@babel/types" "^7.16.0" "@babel/helper-function-name@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-function-name/download/@babel/helper-function-name-7.16.0.tgz?cache=0&sync_timestamp=1635560848914&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-function-name%2Fdownload%2F%40babel%2Fhelper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481" + resolved "https://registry.npmmirror.com/@babel/helper-function-name/download/@babel/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481" integrity sha1-t90Hl9ALv+5PB+nE6lsOMMi7FIE= dependencies: "@babel/helper-get-function-arity" "^7.16.0" @@ -266,28 +266,28 @@ "@babel/helper-get-function-arity@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-get-function-arity/download/@babel/helper-get-function-arity-7.16.0.tgz?cache=0&sync_timestamp=1635561476993&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-get-function-arity%2Fdownload%2F%40babel%2Fhelper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa" + resolved "https://registry.npmmirror.com/@babel/helper-get-function-arity/download/@babel/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa" integrity sha1-AIjHSGspqctdlIsaHeRttm4InPo= dependencies: "@babel/types" "^7.16.0" "@babel/helper-hoist-variables@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-hoist-variables/download/@babel/helper-hoist-variables-7.16.0.tgz?cache=0&sync_timestamp=1635560848430&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-hoist-variables%2Fdownload%2F%40babel%2Fhelper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" + resolved "https://registry.npmmirror.com/@babel/helper-hoist-variables/download/@babel/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" integrity sha1-TJAjwvHe9+KP9G/B2802o5vqqBo= dependencies: "@babel/types" "^7.16.0" "@babel/helper-member-expression-to-functions@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/download/@babel/helper-member-expression-to-functions-7.16.0.tgz?cache=0&sync_timestamp=1635560912738&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-member-expression-to-functions%2Fdownload%2F%40babel%2Fhelper-member-expression-to-functions-7.16.0.tgz#29287040efd197c77636ef75188e81da8bccd5a4" + resolved "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/download/@babel/helper-member-expression-to-functions-7.16.0.tgz#29287040efd197c77636ef75188e81da8bccd5a4" integrity sha1-KShwQO/Rl8d2Nu91GI6B2ovM1aQ= dependencies: "@babel/types" "^7.16.0" "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-module-imports/download/@babel/helper-module-imports-7.16.0.tgz?cache=0&sync_timestamp=1635561425184&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-module-imports%2Fdownload%2F%40babel%2Fhelper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" + resolved "https://registry.npmmirror.com/@babel/helper-module-imports/download/@babel/helper-module-imports-7.16.0.tgz?cache=0&sync_timestamp=1635560941965&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-module-imports%2Fdownload%2F%40babel%2Fhelper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" integrity sha1-kFOOYLZy7PG0SPX09UM9N+eaPsM= dependencies: "@babel/types" "^7.16.0" @@ -308,24 +308,24 @@ "@babel/helper-optimise-call-expression@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-optimise-call-expression/download/@babel/helper-optimise-call-expression-7.16.0.tgz?cache=0&sync_timestamp=1635560849413&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-optimise-call-expression%2Fdownload%2F%40babel%2Fhelper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338" + resolved "https://registry.npmmirror.com/@babel/helper-optimise-call-expression/download/@babel/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338" integrity sha1-zs2xRdcMVAlrFWT46fEM19GTszg= dependencies: "@babel/types" "^7.16.0" "@babel/helper-plugin-utils@7.10.4": version "7.10.4" - resolved "https://registry.nlark.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" + resolved "https://registry.nlark.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.10.4.tgz?cache=0&sync_timestamp=1623280296194&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-plugin-utils%2Fdownload%2F%40babel%2Fhelper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" integrity sha1-L3WoMSadT2d95JmG3/WZJ1M883U= "@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.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": version "7.14.5" - resolved "https://registry.nlark.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" + resolved "https://registry.nlark.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.14.5.tgz?cache=0&sync_timestamp=1623280296194&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-plugin-utils%2Fdownload%2F%40babel%2Fhelper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" integrity sha1-WsgizpfuxGdBq3ClF5ceRDpwxak= "@babel/helper-remap-async-to-generator@^7.16.0", "@babel/helper-remap-async-to-generator@^7.16.4": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/download/@babel/helper-remap-async-to-generator-7.16.4.tgz?cache=0&sync_timestamp=1637103423365&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-remap-async-to-generator%2Fdownload%2F%40babel%2Fhelper-remap-async-to-generator-7.16.4.tgz#5d7902f61349ff6b963e07f06a389ce139fbfe6e" + resolved "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/download/@babel/helper-remap-async-to-generator-7.16.4.tgz?cache=0&sync_timestamp=1637103399116&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-remap-async-to-generator%2Fdownload%2F%40babel%2Fhelper-remap-async-to-generator-7.16.4.tgz#5d7902f61349ff6b963e07f06a389ce139fbfe6e" integrity sha512-vGERmmhR+s7eH5Y/cp8PCVzj4XEjerq8jooMfxFdA5xVtAk9Sh4AQsrWgiErUEBjtGrBtOFKDUcWQFW4/dFwMA== dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -334,7 +334,7 @@ "@babel/helper-replace-supers@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-replace-supers/download/@babel/helper-replace-supers-7.16.0.tgz?cache=0&sync_timestamp=1635560847493&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-replace-supers%2Fdownload%2F%40babel%2Fhelper-replace-supers-7.16.0.tgz#73055e8d3cf9bcba8ddb55cad93fedc860f68f17" + resolved "https://registry.npmmirror.com/@babel/helper-replace-supers/download/@babel/helper-replace-supers-7.16.0.tgz#73055e8d3cf9bcba8ddb55cad93fedc860f68f17" integrity sha1-cwVejTz5vLqN21XK2T/tyGD2jxc= dependencies: "@babel/helper-member-expression-to-functions" "^7.16.0" @@ -344,28 +344,28 @@ "@babel/helper-simple-access@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-simple-access/download/@babel/helper-simple-access-7.16.0.tgz?cache=0&sync_timestamp=1635560847012&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-simple-access%2Fdownload%2F%40babel%2Fhelper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" + resolved "https://registry.npmmirror.com/@babel/helper-simple-access/download/@babel/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" integrity sha1-IdaidiDjg+N1NM9sELugGab5BRc= dependencies: "@babel/types" "^7.16.0" "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/download/@babel/helper-skip-transparent-expression-wrappers-7.16.0.tgz?cache=0&sync_timestamp=1635567004674&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-skip-transparent-expression-wrappers%2Fdownload%2F%40babel%2Fhelper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" + resolved "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/download/@babel/helper-skip-transparent-expression-wrappers-7.16.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-skip-transparent-expression-wrappers%2Fdownload%2F%40babel%2Fhelper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" integrity sha1-DuM4gHAUfDrgUeSH7KPrsOLouwk= dependencies: "@babel/types" "^7.16.0" "@babel/helper-split-export-declaration@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-split-export-declaration/download/@babel/helper-split-export-declaration-7.16.0.tgz?cache=0&sync_timestamp=1635560847983&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-split-export-declaration%2Fdownload%2F%40babel%2Fhelper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" + resolved "https://registry.npmmirror.com/@babel/helper-split-export-declaration/download/@babel/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" integrity sha1-KWcvQ2Y+k23zcKrrIr7ds7rsdDg= dependencies: "@babel/types" "^7.16.0" "@babel/helper-validator-identifier@^7.15.7": version "7.15.7" - resolved "https://registry.nlark.com/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.15.7.tgz?cache=0&sync_timestamp=1631920000984&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-validator-identifier%2Fdownload%2F%40babel%2Fhelper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" + resolved "https://registry.nlark.com/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.15.7.tgz?cache=0&sync_timestamp=1631920857390&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-validator-identifier%2Fdownload%2F%40babel%2Fhelper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" integrity sha1-Ig35k7/pBKSmsCq08zhaXr9uI4k= "@babel/helper-validator-option@^7.14.5": @@ -375,7 +375,7 @@ "@babel/helper-wrap-function@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-wrap-function/download/@babel/helper-wrap-function-7.16.0.tgz?cache=0&sync_timestamp=1635567280414&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-wrap-function%2Fdownload%2F%40babel%2Fhelper-wrap-function-7.16.0.tgz#b3cf318afce774dfe75b86767cd6d68f3482e57c" + resolved "https://registry.npmmirror.com/@babel/helper-wrap-function/download/@babel/helper-wrap-function-7.16.0.tgz?cache=0&sync_timestamp=1635567238019&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-wrap-function%2Fdownload%2F%40babel%2Fhelper-wrap-function-7.16.0.tgz#b3cf318afce774dfe75b86767cd6d68f3482e57c" integrity sha1-s88xivzndN/nW4Z2fNbWjzSC5Xw= dependencies: "@babel/helper-function-name" "^7.16.0" @@ -385,7 +385,7 @@ "@babel/helpers@^7.12.5", "@babel/helpers@^7.16.0": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/helpers/download/@babel/helpers-7.16.3.tgz?cache=0&sync_timestamp=1636494884812&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelpers%2Fdownload%2F%40babel%2Fhelpers-7.16.3.tgz#27fc64f40b996e7074dc73128c3e5c3e7f55c43c" + resolved "https://registry.npmmirror.com/@babel/helpers/download/@babel/helpers-7.16.3.tgz?cache=0&sync_timestamp=1636496293613&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelpers%2Fdownload%2F%40babel%2Fhelpers-7.16.3.tgz#27fc64f40b996e7074dc73128c3e5c3e7f55c43c" integrity sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w== dependencies: "@babel/template" "^7.16.0" @@ -394,7 +394,7 @@ "@babel/highlight@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/highlight/download/@babel/highlight-7.16.0.tgz?cache=0&sync_timestamp=1635560845502&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhighlight%2Fdownload%2F%40babel%2Fhighlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" + resolved "https://registry.npmmirror.com/@babel/highlight/download/@babel/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" integrity sha1-bOsysspLj182H7f9gh4/3fShclo= dependencies: "@babel/helper-validator-identifier" "^7.15.7" @@ -403,7 +403,7 @@ "@babel/parser@^7.12.16", "@babel/parser@^7.12.7", "@babel/parser@^7.16.0", "@babel/parser@^7.16.3": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/parser/download/@babel/parser-7.16.4.tgz?cache=0&sync_timestamp=1637102910055&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fparser%2Fdownload%2F%40babel%2Fparser-7.16.4.tgz#d5f92f57cf2c74ffe9b37981c0e72fee7311372e" + resolved "https://registry.npmmirror.com/@babel/parser/download/@babel/parser-7.16.4.tgz?cache=0&sync_timestamp=1637102852943&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fparser%2Fdownload%2F%40babel%2Fparser-7.16.4.tgz#d5f92f57cf2c74ffe9b37981c0e72fee7311372e" integrity sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.2": @@ -424,7 +424,7 @@ "@babel/plugin-proposal-async-generator-functions@^7.16.4": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-async-generator-functions/download/@babel/plugin-proposal-async-generator-functions-7.16.4.tgz?cache=0&sync_timestamp=1637103364027&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-proposal-async-generator-functions%2Fdownload%2F%40babel%2Fplugin-proposal-async-generator-functions-7.16.4.tgz#e606eb6015fec6fa5978c940f315eae4e300b081" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-async-generator-functions/download/@babel/plugin-proposal-async-generator-functions-7.16.4.tgz?cache=0&sync_timestamp=1637103399235&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-proposal-async-generator-functions%2Fdownload%2F%40babel%2Fplugin-proposal-async-generator-functions-7.16.4.tgz#e606eb6015fec6fa5978c940f315eae4e300b081" integrity sha512-/CUekqaAaZCQHleSK/9HajvcD/zdnJiKRiuUFq8ITE+0HsPzquf53cpFiqAwl/UfmJbR6n5uGPQSPdrmKOvHHg== dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -450,7 +450,7 @@ "@babel/plugin-proposal-dynamic-import@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-dynamic-import/download/@babel/plugin-proposal-dynamic-import-7.16.0.tgz#783eca61d50526202f9b296095453977e88659f1" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-dynamic-import/download/@babel/plugin-proposal-dynamic-import-7.16.0.tgz?cache=0&sync_timestamp=1635566469916&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-proposal-dynamic-import%2Fdownload%2F%40babel%2Fplugin-proposal-dynamic-import-7.16.0.tgz#783eca61d50526202f9b296095453977e88659f1" integrity sha1-eD7KYdUFJiAvmylglUU5d+iGWfE= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -561,35 +561,35 @@ "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-async-generators/download/@babel/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + resolved "https://registry.nlark.com/@babel/plugin-syntax-async-generators/download/@babel/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" integrity sha1-qYP7Gusuw/btBCohD2QOkOeG/g0= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-class-properties@^7.12.13": version "7.12.13" - resolved "https://registry.nlark.com/@babel/plugin-syntax-class-properties/download/@babel/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-class-properties/download/@babel/plugin-syntax-class-properties-7.12.13.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-syntax-class-properties%2Fdownload%2F%40babel%2Fplugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" integrity sha1-tcmHJ0xKOoK4lxR5aTGmtTVErhA= dependencies: "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-class-static-block@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-class-static-block/download/@babel/plugin-syntax-class-static-block-7.14.5.tgz?cache=0&sync_timestamp=1623280461402&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-class-static-block%2Fdownload%2F%40babel%2Fplugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" + resolved "https://registry.nlark.com/@babel/plugin-syntax-class-static-block/download/@babel/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" integrity sha1-GV34mxRrS3izv4l/16JXyEZZ1AY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-dynamic-import@^7.8.3": version "7.8.3" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-dynamic-import/download/@babel/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" + resolved "https://registry.nlark.com/@babel/plugin-syntax-dynamic-import/download/@babel/plugin-syntax-dynamic-import-7.8.3.tgz?cache=0&sync_timestamp=1618847125283&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-dynamic-import%2Fdownload%2F%40babel%2Fplugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" integrity sha1-Yr+Ysto80h1iYVT8lu5bPLaOrLM= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-export-namespace-from@^7.8.3": version "7.8.3" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-export-namespace-from/download/@babel/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" + resolved "https://registry.nlark.com/@babel/plugin-syntax-export-namespace-from/download/@babel/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" integrity sha1-AolkqbqA28CUyRXEh618TnpmRlo= dependencies: "@babel/helper-plugin-utils" "^7.8.3" @@ -631,49 +631,49 @@ "@babel/plugin-syntax-numeric-separator@^7.10.4": version "7.10.4" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-numeric-separator/download/@babel/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-numeric-separator/download/@babel/plugin-syntax-numeric-separator-7.10.4.tgz?cache=0&sync_timestamp=1593522054358&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-syntax-numeric-separator%2Fdownload%2F%40babel%2Fplugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" integrity sha1-ubBws+M1cM2f0Hun+pHA3Te5r5c= dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-object-rest-spread@7.8.3", "@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3": version "7.8.3" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-object-rest-spread/download/@babel/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + resolved "https://registry.nlark.com/@babel/plugin-syntax-object-rest-spread/download/@babel/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" integrity sha1-YOIl7cvZimQDMqLnLdPmbxr1WHE= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-optional-catch-binding@^7.8.3": version "7.8.3" - resolved "https://registry.nlark.com/@babel/plugin-syntax-optional-catch-binding/download/@babel/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-optional-catch-binding/download/@babel/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" integrity sha1-YRGiZbz7Ag6579D9/X0mQCue1sE= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-optional-chaining@^7.8.3": version "7.8.3" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-optional-chaining/download/@babel/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + resolved "https://registry.nlark.com/@babel/plugin-syntax-optional-chaining/download/@babel/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" integrity sha1-T2nCq5UWfgGAzVM2YT+MV4j31Io= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-private-property-in-object@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-private-property-in-object/download/@babel/plugin-syntax-private-property-in-object-7.14.5.tgz?cache=0&sync_timestamp=1623280462994&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-private-property-in-object%2Fdownload%2F%40babel%2Fplugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" + resolved "https://registry.nlark.com/@babel/plugin-syntax-private-property-in-object/download/@babel/plugin-syntax-private-property-in-object-7.14.5.tgz?cache=0&sync_timestamp=1623280423879&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-private-property-in-object%2Fdownload%2F%40babel%2Fplugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" integrity sha1-DcZnHsDqIrbpShEU+FeXDNOd4a0= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-top-level-await@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-top-level-await/download/@babel/plugin-syntax-top-level-await-7.14.5.tgz?cache=0&sync_timestamp=1623280464882&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-top-level-await%2Fdownload%2F%40babel%2Fplugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" + resolved "https://registry.nlark.com/@babel/plugin-syntax-top-level-await/download/@babel/plugin-syntax-top-level-await-7.14.5.tgz?cache=0&sync_timestamp=1623280427172&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-top-level-await%2Fdownload%2F%40babel%2Fplugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" integrity sha1-wc/a3DWmRiQAAfBhOCR7dBw02Uw= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-syntax-typescript/download/@babel/plugin-syntax-typescript-7.16.0.tgz?cache=0&sync_timestamp=1635561095296&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-syntax-typescript%2Fdownload%2F%40babel%2Fplugin-syntax-typescript-7.16.0.tgz#2feeb13d9334cc582ea9111d3506f773174179bb" + resolved "https://registry.npmmirror.com/@babel/plugin-syntax-typescript/download/@babel/plugin-syntax-typescript-7.16.0.tgz#2feeb13d9334cc582ea9111d3506f773174179bb" integrity sha1-L+6xPZM0zFguqREdNQb3cxdBebs= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -696,21 +696,21 @@ "@babel/plugin-transform-block-scoped-functions@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/download/@babel/plugin-transform-block-scoped-functions-7.16.0.tgz#c618763233ad02847805abcac4c345ce9de7145d" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/download/@babel/plugin-transform-block-scoped-functions-7.16.0.tgz?cache=0&sync_timestamp=1635567466710&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-block-scoped-functions%2Fdownload%2F%40babel%2Fplugin-transform-block-scoped-functions-7.16.0.tgz#c618763233ad02847805abcac4c345ce9de7145d" integrity sha1-xhh2MjOtAoR4BavKxMNFzp3nFF0= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-block-scoping@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/download/@babel/plugin-transform-block-scoping-7.16.0.tgz#bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/download/@babel/plugin-transform-block-scoping-7.16.0.tgz?cache=0&sync_timestamp=1635567471555&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-block-scoping%2Fdownload%2F%40babel%2Fplugin-transform-block-scoping-7.16.0.tgz#bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16" integrity sha1-vPQz+0gv6MPTtOimaxxKjnfTfBY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-classes@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-classes/download/@babel/plugin-transform-classes-7.16.0.tgz?cache=0&sync_timestamp=1635566985814&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-classes%2Fdownload%2F%40babel%2Fplugin-transform-classes-7.16.0.tgz#54cf5ff0b2242c6573d753cd4bfc7077a8b282f5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-classes/download/@babel/plugin-transform-classes-7.16.0.tgz?cache=0&sync_timestamp=1635566945526&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-classes%2Fdownload%2F%40babel%2Fplugin-transform-classes-7.16.0.tgz#54cf5ff0b2242c6573d753cd4bfc7077a8b282f5" integrity sha1-VM9f8LIkLGVz11PNS/xwd6iygvU= dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -723,21 +723,21 @@ "@babel/plugin-transform-computed-properties@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-computed-properties/download/@babel/plugin-transform-computed-properties-7.16.0.tgz?cache=0&sync_timestamp=1635566987282&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-computed-properties%2Fdownload%2F%40babel%2Fplugin-transform-computed-properties-7.16.0.tgz#e0c385507d21e1b0b076d66bed6d5231b85110b7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-computed-properties/download/@babel/plugin-transform-computed-properties-7.16.0.tgz?cache=0&sync_timestamp=1635567483688&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-computed-properties%2Fdownload%2F%40babel%2Fplugin-transform-computed-properties-7.16.0.tgz#e0c385507d21e1b0b076d66bed6d5231b85110b7" integrity sha1-4MOFUH0h4bCwdtZr7W1SMbhRELc= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-destructuring@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/download/@babel/plugin-transform-destructuring-7.16.0.tgz?cache=0&sync_timestamp=1635566986610&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-destructuring%2Fdownload%2F%40babel%2Fplugin-transform-destructuring-7.16.0.tgz#ad3d7e74584ad5ea4eadb1e6642146c590dee33c" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/download/@babel/plugin-transform-destructuring-7.16.0.tgz?cache=0&sync_timestamp=1635567488550&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-destructuring%2Fdownload%2F%40babel%2Fplugin-transform-destructuring-7.16.0.tgz#ad3d7e74584ad5ea4eadb1e6642146c590dee33c" integrity sha1-rT1+dFhK1epOrbHmZCFGxZDe4zw= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-dotall-regex@^7.16.0", "@babel/plugin-transform-dotall-regex@^7.4.4": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-dotall-regex/download/@babel/plugin-transform-dotall-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566988439&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-dotall-regex%2Fdownload%2F%40babel%2Fplugin-transform-dotall-regex-7.16.0.tgz#50bab00c1084b6162d0a58a818031cf57798e06f" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-dotall-regex/download/@babel/plugin-transform-dotall-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566946960&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-dotall-regex%2Fdownload%2F%40babel%2Fplugin-transform-dotall-regex-7.16.0.tgz#50bab00c1084b6162d0a58a818031cf57798e06f" integrity sha1-ULqwDBCEthYtClioGAMc9XeY4G8= dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.0" @@ -745,14 +745,14 @@ "@babel/plugin-transform-duplicate-keys@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/download/@babel/plugin-transform-duplicate-keys-7.16.0.tgz?cache=0&sync_timestamp=1635566987876&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-duplicate-keys%2Fdownload%2F%40babel%2Fplugin-transform-duplicate-keys-7.16.0.tgz#8bc2e21813e3e89e5e5bf3b60aa5fc458575a176" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/download/@babel/plugin-transform-duplicate-keys-7.16.0.tgz?cache=0&sync_timestamp=1635567498133&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-duplicate-keys%2Fdownload%2F%40babel%2Fplugin-transform-duplicate-keys-7.16.0.tgz#8bc2e21813e3e89e5e5bf3b60aa5fc458575a176" integrity sha1-i8LiGBPj6J5eW/O2CqX8RYV1oXY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-exponentiation-operator@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/download/@babel/plugin-transform-exponentiation-operator-7.16.0.tgz?cache=0&sync_timestamp=1635566989126&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-exponentiation-operator%2Fdownload%2F%40babel%2Fplugin-transform-exponentiation-operator-7.16.0.tgz#a180cd2881e3533cef9d3901e48dad0fbeff4be4" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/download/@babel/plugin-transform-exponentiation-operator-7.16.0.tgz?cache=0&sync_timestamp=1635567503871&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-exponentiation-operator%2Fdownload%2F%40babel%2Fplugin-transform-exponentiation-operator-7.16.0.tgz#a180cd2881e3533cef9d3901e48dad0fbeff4be4" integrity sha1-oYDNKIHjUzzvnTkB5I2tD77/S+Q= dependencies: "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.0" @@ -760,14 +760,14 @@ "@babel/plugin-transform-for-of@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-for-of/download/@babel/plugin-transform-for-of-7.16.0.tgz?cache=0&sync_timestamp=1635566989689&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-for-of%2Fdownload%2F%40babel%2Fplugin-transform-for-of-7.16.0.tgz#f7abaced155260e2461359bbc7c7248aca5e6bd2" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-for-of/download/@babel/plugin-transform-for-of-7.16.0.tgz?cache=0&sync_timestamp=1635566911464&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-for-of%2Fdownload%2F%40babel%2Fplugin-transform-for-of-7.16.0.tgz#f7abaced155260e2461359bbc7c7248aca5e6bd2" integrity sha1-96us7RVSYOJGE1m7x8ckispea9I= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-function-name@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-function-name/download/@babel/plugin-transform-function-name-7.16.0.tgz?cache=0&sync_timestamp=1635566990298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-function-name%2Fdownload%2F%40babel%2Fplugin-transform-function-name-7.16.0.tgz#02e3699c284c6262236599f751065c5d5f1f400e" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-function-name/download/@babel/plugin-transform-function-name-7.16.0.tgz?cache=0&sync_timestamp=1635566947920&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-function-name%2Fdownload%2F%40babel%2Fplugin-transform-function-name-7.16.0.tgz#02e3699c284c6262236599f751065c5d5f1f400e" integrity sha1-AuNpnChMYmIjZZn3UQZcXV8fQA4= dependencies: "@babel/helper-function-name" "^7.16.0" @@ -775,7 +775,7 @@ "@babel/plugin-transform-literals@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-literals/download/@babel/plugin-transform-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566990751&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-literals%2Fdownload%2F%40babel%2Fplugin-transform-literals-7.16.0.tgz#79711e670ffceb31bd298229d50f3621f7980cac" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-literals/download/@babel/plugin-transform-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566912041&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-literals%2Fdownload%2F%40babel%2Fplugin-transform-literals-7.16.0.tgz#79711e670ffceb31bd298229d50f3621f7980cac" integrity sha1-eXEeZw/86zG9KYIp1Q82IfeYDKw= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -789,7 +789,7 @@ "@babel/plugin-transform-modules-amd@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/download/@babel/plugin-transform-modules-amd-7.16.0.tgz?cache=0&sync_timestamp=1635566992517&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-amd%2Fdownload%2F%40babel%2Fplugin-transform-modules-amd-7.16.0.tgz#09abd41e18dcf4fd479c598c1cef7bd39eb1337e" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/download/@babel/plugin-transform-modules-amd-7.16.0.tgz?cache=0&sync_timestamp=1635566912764&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-amd%2Fdownload%2F%40babel%2Fplugin-transform-modules-amd-7.16.0.tgz#09abd41e18dcf4fd479c598c1cef7bd39eb1337e" integrity sha1-CavUHhjc9P1HnFmMHO97056xM34= dependencies: "@babel/helper-module-transforms" "^7.16.0" @@ -798,7 +798,7 @@ "@babel/plugin-transform-modules-commonjs@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/download/@babel/plugin-transform-modules-commonjs-7.16.0.tgz?cache=0&sync_timestamp=1635566992001&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-commonjs%2Fdownload%2F%40babel%2Fplugin-transform-modules-commonjs-7.16.0.tgz#add58e638c8ddc4875bd9a9ecb5c594613f6c922" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/download/@babel/plugin-transform-modules-commonjs-7.16.0.tgz?cache=0&sync_timestamp=1635566912532&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-commonjs%2Fdownload%2F%40babel%2Fplugin-transform-modules-commonjs-7.16.0.tgz#add58e638c8ddc4875bd9a9ecb5c594613f6c922" integrity sha1-rdWOY4yN3Eh1vZqey1xZRhP2ySI= dependencies: "@babel/helper-module-transforms" "^7.16.0" @@ -808,7 +808,7 @@ "@babel/plugin-transform-modules-systemjs@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/download/@babel/plugin-transform-modules-systemjs-7.16.0.tgz?cache=0&sync_timestamp=1635566993126&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-systemjs%2Fdownload%2F%40babel%2Fplugin-transform-modules-systemjs-7.16.0.tgz#a92cf240afeb605f4ca16670453024425e421ea4" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/download/@babel/plugin-transform-modules-systemjs-7.16.0.tgz?cache=0&sync_timestamp=1635566949693&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-systemjs%2Fdownload%2F%40babel%2Fplugin-transform-modules-systemjs-7.16.0.tgz#a92cf240afeb605f4ca16670453024425e421ea4" integrity sha1-qSzyQK/rYF9MoWZwRTAkQl5CHqQ= dependencies: "@babel/helper-hoist-variables" "^7.16.0" @@ -819,7 +819,7 @@ "@babel/plugin-transform-modules-umd@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/download/@babel/plugin-transform-modules-umd-7.16.0.tgz?cache=0&sync_timestamp=1635567544568&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-umd%2Fdownload%2F%40babel%2Fplugin-transform-modules-umd-7.16.0.tgz#195f26c2ad6d6a391b70880effce18ce625e06a7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/download/@babel/plugin-transform-modules-umd-7.16.0.tgz?cache=0&sync_timestamp=1635566950831&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-umd%2Fdownload%2F%40babel%2Fplugin-transform-modules-umd-7.16.0.tgz#195f26c2ad6d6a391b70880effce18ce625e06a7" integrity sha1-GV8mwq1tajkbcIgO/84YzmJeBqc= dependencies: "@babel/helper-module-transforms" "^7.16.0" @@ -827,21 +827,21 @@ "@babel/plugin-transform-named-capturing-groups-regex@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-named-capturing-groups-regex/download/@babel/plugin-transform-named-capturing-groups-regex-7.16.0.tgz?cache=0&sync_timestamp=1635567550482&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-named-capturing-groups-regex%2Fdownload%2F%40babel%2Fplugin-transform-named-capturing-groups-regex-7.16.0.tgz#d3db61cc5d5b97986559967cd5ea83e5c32096ca" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-named-capturing-groups-regex/download/@babel/plugin-transform-named-capturing-groups-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566951624&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-named-capturing-groups-regex%2Fdownload%2F%40babel%2Fplugin-transform-named-capturing-groups-regex-7.16.0.tgz#d3db61cc5d5b97986559967cd5ea83e5c32096ca" integrity sha1-09thzF1bl5hlWZZ81eqD5cMglso= dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.0" "@babel/plugin-transform-new-target@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-new-target/download/@babel/plugin-transform-new-target-7.16.0.tgz?cache=0&sync_timestamp=1635567556261&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-new-target%2Fdownload%2F%40babel%2Fplugin-transform-new-target-7.16.0.tgz#af823ab576f752215a49937779a41ca65825ab35" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-new-target/download/@babel/plugin-transform-new-target-7.16.0.tgz?cache=0&sync_timestamp=1635566913480&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-new-target%2Fdownload%2F%40babel%2Fplugin-transform-new-target-7.16.0.tgz#af823ab576f752215a49937779a41ca65825ab35" integrity sha1-r4I6tXb3UiFaSZN3eaQcplglqzU= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-object-super@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-object-super/download/@babel/plugin-transform-object-super-7.16.0.tgz?cache=0&sync_timestamp=1635566995485&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-object-super%2Fdownload%2F%40babel%2Fplugin-transform-object-super-7.16.0.tgz#fb20d5806dc6491a06296ac14ea8e8d6fedda72b" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-object-super/download/@babel/plugin-transform-object-super-7.16.0.tgz?cache=0&sync_timestamp=1635566951968&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-object-super%2Fdownload%2F%40babel%2Fplugin-transform-object-super-7.16.0.tgz#fb20d5806dc6491a06296ac14ea8e8d6fedda72b" integrity sha1-+yDVgG3GSRoGKWrBTqjo1v7dpys= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -849,28 +849,28 @@ "@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.16.0", "@babel/plugin-transform-parameters@^7.16.3": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-parameters/download/@babel/plugin-transform-parameters-7.16.3.tgz?cache=0&sync_timestamp=1636494867938&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-parameters%2Fdownload%2F%40babel%2Fplugin-transform-parameters-7.16.3.tgz#fa9e4c874ee5223f891ee6fa8d737f4766d31d15" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-parameters/download/@babel/plugin-transform-parameters-7.16.3.tgz?cache=0&sync_timestamp=1636496296752&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-parameters%2Fdownload%2F%40babel%2Fplugin-transform-parameters-7.16.3.tgz#fa9e4c874ee5223f891ee6fa8d737f4766d31d15" integrity sha512-3MaDpJrOXT1MZ/WCmkOFo7EtmVVC8H4EUZVrHvFOsmwkk4lOjQj8rzv8JKUZV4YoQKeoIgk07GO+acPU9IMu/w== dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-property-literals@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/download/@babel/plugin-transform-property-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566996767&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-property-literals%2Fdownload%2F%40babel%2Fplugin-transform-property-literals-7.16.0.tgz#a95c552189a96a00059f6776dc4e00e3690c78d1" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/download/@babel/plugin-transform-property-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566914424&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-property-literals%2Fdownload%2F%40babel%2Fplugin-transform-property-literals-7.16.0.tgz#a95c552189a96a00059f6776dc4e00e3690c78d1" integrity sha1-qVxVIYmpagAFn2d23E4A42kMeNE= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-react-constant-elements@^7.12.1": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-constant-elements/download/@babel/plugin-transform-react-constant-elements-7.16.0.tgz#1483b894b8e6ef0709d260532fbd4db9fc27a0e6" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-constant-elements/download/@babel/plugin-transform-react-constant-elements-7.16.0.tgz?cache=0&sync_timestamp=1635739052504&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-react-constant-elements%2Fdownload%2F%40babel%2Fplugin-transform-react-constant-elements-7.16.0.tgz#1483b894b8e6ef0709d260532fbd4db9fc27a0e6" integrity sha1-FIO4lLjm7wcJ0mBTL71NufwnoOY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-react-display-name@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-display-name/download/@babel/plugin-transform-react-display-name-7.16.0.tgz?cache=0&sync_timestamp=1635578747884&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-react-display-name%2Fdownload%2F%40babel%2Fplugin-transform-react-display-name-7.16.0.tgz#9a0ad8aa8e8790883a7bd2736f66229a58125676" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-display-name/download/@babel/plugin-transform-react-display-name-7.16.0.tgz#9a0ad8aa8e8790883a7bd2736f66229a58125676" integrity sha1-mgrYqo6HkIg6e9Jzb2YimlgSVnY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -884,7 +884,7 @@ "@babel/plugin-transform-react-jsx@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-jsx/download/@babel/plugin-transform-react-jsx-7.16.0.tgz?cache=0&sync_timestamp=1635578748013&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-react-jsx%2Fdownload%2F%40babel%2Fplugin-transform-react-jsx-7.16.0.tgz#55b797d4960c3de04e07ad1c0476e2bc6a4889f1" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-jsx/download/@babel/plugin-transform-react-jsx-7.16.0.tgz#55b797d4960c3de04e07ad1c0476e2bc6a4889f1" integrity sha1-VbeX1JYMPeBOB60cBHbivGpIifE= dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -903,21 +903,21 @@ "@babel/plugin-transform-regenerator@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/download/@babel/plugin-transform-regenerator-7.16.0.tgz?cache=0&sync_timestamp=1635566997626&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-regenerator%2Fdownload%2F%40babel%2Fplugin-transform-regenerator-7.16.0.tgz#eaee422c84b0232d03aea7db99c97deeaf6125a4" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/download/@babel/plugin-transform-regenerator-7.16.0.tgz?cache=0&sync_timestamp=1635566914723&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-regenerator%2Fdownload%2F%40babel%2Fplugin-transform-regenerator-7.16.0.tgz#eaee422c84b0232d03aea7db99c97deeaf6125a4" integrity sha1-6u5CLISwIy0Drqfbmcl97q9hJaQ= dependencies: regenerator-transform "^0.14.2" "@babel/plugin-transform-reserved-words@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/download/@babel/plugin-transform-reserved-words-7.16.0.tgz?cache=0&sync_timestamp=1635566998298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-reserved-words%2Fdownload%2F%40babel%2Fplugin-transform-reserved-words-7.16.0.tgz#fff4b9dcb19e12619394bda172d14f2d04c0379c" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/download/@babel/plugin-transform-reserved-words-7.16.0.tgz?cache=0&sync_timestamp=1635566914972&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-reserved-words%2Fdownload%2F%40babel%2Fplugin-transform-reserved-words-7.16.0.tgz#fff4b9dcb19e12619394bda172d14f2d04c0379c" integrity sha1-//S53LGeEmGTlL2hctFPLQTAN5w= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-runtime@^7.15.0": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-runtime/download/@babel/plugin-transform-runtime-7.16.4.tgz?cache=0&sync_timestamp=1637103539571&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-runtime%2Fdownload%2F%40babel%2Fplugin-transform-runtime-7.16.4.tgz#f9ba3c7034d429c581e1bd41b4952f3db3c2c7e8" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-runtime/download/@babel/plugin-transform-runtime-7.16.4.tgz?cache=0&sync_timestamp=1637102846932&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-runtime%2Fdownload%2F%40babel%2Fplugin-transform-runtime-7.16.4.tgz#f9ba3c7034d429c581e1bd41b4952f3db3c2c7e8" integrity sha512-pru6+yHANMTukMtEZGC4fs7XPwg35v8sj5CIEmE+gEkFljFiVJxEWxx/7ZDkTK+iZRYo1bFXBtfIN95+K3cJ5A== dependencies: "@babel/helper-module-imports" "^7.16.0" @@ -929,14 +929,14 @@ "@babel/plugin-transform-shorthand-properties@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/download/@babel/plugin-transform-shorthand-properties-7.16.0.tgz?cache=0&sync_timestamp=1635566998907&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-shorthand-properties%2Fdownload%2F%40babel%2Fplugin-transform-shorthand-properties-7.16.0.tgz#090372e3141f7cc324ed70b3daf5379df2fa384d" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/download/@babel/plugin-transform-shorthand-properties-7.16.0.tgz?cache=0&sync_timestamp=1635566916554&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-shorthand-properties%2Fdownload%2F%40babel%2Fplugin-transform-shorthand-properties-7.16.0.tgz#090372e3141f7cc324ed70b3daf5379df2fa384d" integrity sha1-CQNy4xQffMMk7XCz2vU3nfL6OE0= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-spread@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-spread/download/@babel/plugin-transform-spread-7.16.0.tgz?cache=0&sync_timestamp=1635566999392&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-spread%2Fdownload%2F%40babel%2Fplugin-transform-spread-7.16.0.tgz#d21ca099bbd53ab307a8621e019a7bd0f40cdcfb" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-spread/download/@babel/plugin-transform-spread-7.16.0.tgz?cache=0&sync_timestamp=1635566916819&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-spread%2Fdownload%2F%40babel%2Fplugin-transform-spread-7.16.0.tgz#d21ca099bbd53ab307a8621e019a7bd0f40cdcfb" integrity sha1-0hygmbvVOrMHqGIeAZp70PQM3Ps= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -944,21 +944,21 @@ "@babel/plugin-transform-sticky-regex@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-sticky-regex/download/@babel/plugin-transform-sticky-regex-7.16.0.tgz?cache=0&sync_timestamp=1635567000017&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-sticky-regex%2Fdownload%2F%40babel%2Fplugin-transform-sticky-regex-7.16.0.tgz#c35ea31a02d86be485f6aa510184b677a91738fd" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-sticky-regex/download/@babel/plugin-transform-sticky-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566917052&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-sticky-regex%2Fdownload%2F%40babel%2Fplugin-transform-sticky-regex-7.16.0.tgz#c35ea31a02d86be485f6aa510184b677a91738fd" integrity sha1-w16jGgLYa+SF9qpRAYS2d6kXOP0= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-template-literals@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/download/@babel/plugin-transform-template-literals-7.16.0.tgz?cache=0&sync_timestamp=1635567001190&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-template-literals%2Fdownload%2F%40babel%2Fplugin-transform-template-literals-7.16.0.tgz#a8eced3a8e7b8e2d40ec4ec4548a45912630d302" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/download/@babel/plugin-transform-template-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566917280&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-template-literals%2Fdownload%2F%40babel%2Fplugin-transform-template-literals-7.16.0.tgz#a8eced3a8e7b8e2d40ec4ec4548a45912630d302" integrity sha1-qOztOo57ji1A7E7EVIpFkSYw0wI= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-typeof-symbol@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/download/@babel/plugin-transform-typeof-symbol-7.16.0.tgz?cache=0&sync_timestamp=1635567001690&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-typeof-symbol%2Fdownload%2F%40babel%2Fplugin-transform-typeof-symbol-7.16.0.tgz#8b19a244c6f8c9d668dca6a6f754ad6ead1128f2" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/download/@babel/plugin-transform-typeof-symbol-7.16.0.tgz?cache=0&sync_timestamp=1635566920452&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-typeof-symbol%2Fdownload%2F%40babel%2Fplugin-transform-typeof-symbol-7.16.0.tgz#8b19a244c6f8c9d668dca6a6f754ad6ead1128f2" integrity sha1-ixmiRMb4ydZo3Kam91Stbq0RKPI= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -974,14 +974,14 @@ "@babel/plugin-transform-unicode-escapes@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/download/@babel/plugin-transform-unicode-escapes-7.16.0.tgz?cache=0&sync_timestamp=1635567002111&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-unicode-escapes%2Fdownload%2F%40babel%2Fplugin-transform-unicode-escapes-7.16.0.tgz#1a354064b4c45663a32334f46fa0cf6100b5b1f3" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/download/@babel/plugin-transform-unicode-escapes-7.16.0.tgz?cache=0&sync_timestamp=1635566920674&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-unicode-escapes%2Fdownload%2F%40babel%2Fplugin-transform-unicode-escapes-7.16.0.tgz#1a354064b4c45663a32334f46fa0cf6100b5b1f3" integrity sha1-GjVAZLTEVmOjIzT0b6DPYQC1sfM= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-unicode-regex@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-regex/download/@babel/plugin-transform-unicode-regex-7.16.0.tgz?cache=0&sync_timestamp=1635567002690&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-unicode-regex%2Fdownload%2F%40babel%2Fplugin-transform-unicode-regex-7.16.0.tgz#293b80950177c8c85aede87cef280259fb995402" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-regex/download/@babel/plugin-transform-unicode-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566921655&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-unicode-regex%2Fdownload%2F%40babel%2Fplugin-transform-unicode-regex-7.16.0.tgz#293b80950177c8c85aede87cef280259fb995402" integrity sha1-KTuAlQF3yMha7eh87ygCWfuZVAI= dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.0" @@ -989,7 +989,7 @@ "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.15.6": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/preset-env/download/@babel/preset-env-7.16.4.tgz?cache=0&sync_timestamp=1637103547851&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-env%2Fdownload%2F%40babel%2Fpreset-env-7.16.4.tgz#4f6ec33b2a3fe72d6bfdcdf3859500232563a2e3" + resolved "https://registry.npmmirror.com/@babel/preset-env/download/@babel/preset-env-7.16.4.tgz?cache=0&sync_timestamp=1637103615805&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-env%2Fdownload%2F%40babel%2Fpreset-env-7.16.4.tgz#4f6ec33b2a3fe72d6bfdcdf3859500232563a2e3" integrity sha512-v0QtNd81v/xKj4gNKeuAerQ/azeNn/G1B1qMLeXOcV8+4TWlD2j3NV1u8q29SDFBXx/NBq5kyEAO+0mpRgacjA== dependencies: "@babel/compat-data" "^7.16.4" @@ -1069,7 +1069,7 @@ "@babel/preset-modules@^0.1.5": version "0.1.5" - resolved "https://registry.npmmirror.com/@babel/preset-modules/download/@babel/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" + resolved "https://registry.npmmirror.com/@babel/preset-modules/download/@babel/preset-modules-0.1.5.tgz?cache=0&sync_timestamp=1635094844477&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-modules%2Fdownload%2F%40babel%2Fpreset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" integrity sha1-75Odbn8miCfhhBY43G/5VRXhFdk= dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -1092,7 +1092,7 @@ "@babel/preset-typescript@^7.12.16": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/preset-typescript/download/@babel/preset-typescript-7.16.0.tgz?cache=0&sync_timestamp=1635578507981&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-typescript%2Fdownload%2F%40babel%2Fpreset-typescript-7.16.0.tgz#b0b4f105b855fb3d631ec036cdc9d1ffd1fa5eac" + resolved "https://registry.npmmirror.com/@babel/preset-typescript/download/@babel/preset-typescript-7.16.0.tgz#b0b4f105b855fb3d631ec036cdc9d1ffd1fa5eac" integrity sha1-sLTxBbhV+z1jHsA2zcnR/9H6Xqw= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -1101,7 +1101,7 @@ "@babel/runtime-corejs3@^7.15.4": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/runtime-corejs3/download/@babel/runtime-corejs3-7.16.3.tgz?cache=0&sync_timestamp=1636494859987&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fruntime-corejs3%2Fdownload%2F%40babel%2Fruntime-corejs3-7.16.3.tgz#1e25de4fa994c57c18e5fdda6cc810dac70f5590" + resolved "https://registry.npmmirror.com/@babel/runtime-corejs3/download/@babel/runtime-corejs3-7.16.3.tgz#1e25de4fa994c57c18e5fdda6cc810dac70f5590" integrity sha512-IAdDC7T0+wEB4y2gbIL0uOXEYpiZEeuFUTVbdGq+UwCcF35T/tS8KrmMomEwEc5wBbyfH3PJVpTSUqrhPDXFcQ== dependencies: core-js-pure "^3.19.0" @@ -1109,7 +1109,7 @@ "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.15.4", "@babel/runtime@^7.8.4": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/runtime/download/@babel/runtime-7.16.3.tgz?cache=0&sync_timestamp=1636494819594&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5" + resolved "https://registry.npmmirror.com/@babel/runtime/download/@babel/runtime-7.16.3.tgz?cache=0&sync_timestamp=1636494920863&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5" integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ== dependencies: regenerator-runtime "^0.13.4" @@ -1125,7 +1125,7 @@ "@babel/traverse@^7.12.13", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.16.3": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/traverse/download/@babel/traverse-7.16.3.tgz?cache=0&sync_timestamp=1636494921751&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Ftraverse%2Fdownload%2F%40babel%2Ftraverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787" + resolved "https://registry.npmmirror.com/@babel/traverse/download/@babel/traverse-7.16.3.tgz?cache=0&sync_timestamp=1636496295750&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Ftraverse%2Fdownload%2F%40babel%2Ftraverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787" integrity sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag== dependencies: "@babel/code-frame" "^7.16.0" @@ -1140,7 +1140,7 @@ "@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.16.0", "@babel/types@^7.4.4": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/types/download/@babel/types-7.16.0.tgz?cache=0&sync_timestamp=1635560842991&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Ftypes%2Fdownload%2F%40babel%2Ftypes-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" + resolved "https://registry.npmmirror.com/@babel/types/download/@babel/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" integrity sha1-2zsxOAT5aq3Qt3bEgj4SetZyibo= dependencies: "@babel/helper-validator-identifier" "^7.15.7" @@ -1468,7 +1468,7 @@ "@hapi/hoek@^9.0.0": version "9.2.1" - resolved "https://registry.npmmirror.com/@hapi/hoek/download/@hapi/hoek-9.2.1.tgz?cache=0&sync_timestamp=1632777883600&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40hapi%2Fhoek%2Fdownload%2F%40hapi%2Fhoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" + resolved "https://registry.npmmirror.com/@hapi/hoek/download/@hapi/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" integrity sha1-lVEUKhmAUDdSU2tQUP2Z9KfxOxc= "@hapi/topo@^5.0.0": @@ -1480,7 +1480,7 @@ "@mdx-js/mdx@1.6.22", "@mdx-js/mdx@^1.6.21": version "1.6.22" - resolved "https://registry.npmmirror.com/@mdx-js/mdx/download/@mdx-js/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" + resolved "https://registry.npmmirror.com/@mdx-js/mdx/download/@mdx-js/mdx-1.6.22.tgz?cache=0&sync_timestamp=1637010128219&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40mdx-js%2Fmdx%2Fdownload%2F%40mdx-js%2Fmdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" integrity sha1-inIxV7+Q548X3A8nmVOY5scx8bo= dependencies: "@babel/core" "7.12.9" @@ -1505,7 +1505,7 @@ "@mdx-js/react@1.6.22", "@mdx-js/react@^1.6.21": version "1.6.22" - resolved "https://registry.npmmirror.com/@mdx-js/react/download/@mdx-js/react-1.6.22.tgz?cache=0&sync_timestamp=1637010066448&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40mdx-js%2Freact%2Fdownload%2F%40mdx-js%2Freact-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573" + resolved "https://registry.npmmirror.com/@mdx-js/react/download/@mdx-js/react-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573" integrity sha1-rgm0dE/dx0cU7p+dbxembnfENXM= "@mdx-js/runtime@^1.6.22": @@ -1519,12 +1519,12 @@ "@mdx-js/util@1.6.22": version "1.6.22" - resolved "https://registry.npm.taobao.org/@mdx-js/util/download/@mdx-js/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" + resolved "https://registry.npm.taobao.org/@mdx-js/util/download/@mdx-js/util-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40mdx-js%2Futil%2Fdownload%2F%40mdx-js%2Futil-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" integrity sha1-IZ39ia5bl6iAHwFTI/+kti9FcYs= "@nodelib/fs.scandir@2.1.5": version "2.1.5" - resolved "https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + resolved "https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz?cache=0&sync_timestamp=1622792738877&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.scandir%2Fdownload%2F%40nodelib%2Ffs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" integrity sha1-dhnC6yGyVIP20WdUi0z9WnSIw9U= dependencies: "@nodelib/fs.stat" "2.0.5" @@ -1532,12 +1532,12 @@ "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" - resolved "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + resolved "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&sync_timestamp=1622792616417&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha1-W9Jir5Tp0lvR5xsF3u1Eh2oiLos= "@nodelib/fs.walk@^1.2.3": version "1.2.8" - resolved "https://registry.nlark.com/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.8.tgz?cache=0&sync_timestamp=1625769815389&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.walk%2Fdownload%2F%40nodelib%2Ffs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + resolved "https://registry.nlark.com/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" integrity sha1-6Vc36LtnRt3t9pxVaVNJTxlv5po= dependencies: "@nodelib/fs.scandir" "2.1.5" @@ -1545,12 +1545,12 @@ "@polka/url@^1.0.0-next.20": version "1.0.0-next.21" - resolved "https://registry.npmmirror.com/@polka/url/download/@polka/url-1.0.0-next.21.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40polka%2Furl%2Fdownload%2F%40polka%2Furl-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" + resolved "https://registry.npmmirror.com/@polka/url/download/@polka/url-1.0.0-next.21.tgz?cache=0&sync_timestamp=1633093101880&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40polka%2Furl%2Fdownload%2F%40polka%2Furl-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha1-XeWiOFo1MJQn9gEZkrVEUU1VmqE= "@seznam/compose-react-refs@^1.0.6": version "1.0.6" - resolved "https://registry.nlark.com/@seznam/compose-react-refs/download/@seznam/compose-react-refs-1.0.6.tgz#6ec4e70bdd6e32f8e70b4100f27267cf306bd8df" + resolved "https://registry.npm.taobao.org/@seznam/compose-react-refs/download/@seznam/compose-react-refs-1.0.6.tgz#6ec4e70bdd6e32f8e70b4100f27267cf306bd8df" integrity sha1-bsTnC91uMvjnC0EA8nJnzzBr2N8= "@sideway/address@^4.1.3": @@ -1562,7 +1562,7 @@ "@sideway/formula@^3.0.0": version "3.0.0" - resolved "https://registry.npm.taobao.org/@sideway/formula/download/@sideway/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" + resolved "https://registry.npm.taobao.org/@sideway/formula/download/@sideway/formula-3.0.0.tgz?cache=0&sync_timestamp=1603525579815&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40sideway%2Fformula%2Fdownload%2F%40sideway%2Fformula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" integrity sha1-/hWK7jLmvV3oUES+YVvAhHigoTw= "@sideway/pinpoint@^2.0.0": @@ -1691,7 +1691,7 @@ "@szmarczak/http-timer@^1.1.2": version "1.1.2" - resolved "https://registry.nlark.com/@szmarczak/http-timer/download/@szmarczak/http-timer-1.1.2.tgz?cache=0&sync_timestamp=1629502165113&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40szmarczak%2Fhttp-timer%2Fdownload%2F%40szmarczak%2Fhttp-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" + resolved "https://registry.nlark.com/@szmarczak/http-timer/download/@szmarczak/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" integrity sha1-sWZeLEYaLNkvTBu/UNVFTeDUtCE= dependencies: defer-to-connect "^1.0.1" @@ -1713,7 +1713,7 @@ "@tsconfig/docusaurus@^1.0.4": version "1.0.4" - resolved "https://registry.nlark.com/@tsconfig/docusaurus/download/@tsconfig/docusaurus-1.0.4.tgz#fc40f87a672568678d83533dd4031a09d75877ca" + resolved "https://registry.npmmirror.com/@tsconfig/docusaurus/download/@tsconfig/docusaurus-1.0.4.tgz#fc40f87a672568678d83533dd4031a09d75877ca" integrity sha1-/ED4emclaGeNg1M91AMaCddYd8o= "@types/cssnano@^4.0.1": @@ -1732,16 +1732,16 @@ "@types/estree" "*" "@types/eslint@*": - version "8.2.0" - resolved "https://registry.npmmirror.com/@types/eslint/download/@types/eslint-8.2.0.tgz#afd0519223c29c347087542cbaee2fedc0873b16" - integrity sha512-74hbvsnc+7TEDa1z5YLSe4/q8hGYB3USNvCuzHUJrjPV6hXaq8IXcngCrHkuvFt0+8rFz7xYXrHgNayIX0UZvQ== + version "8.2.1" + resolved "https://registry.npmmirror.com/@types/eslint/download/@types/eslint-8.2.1.tgz#13f3d69bac93c2ae008019c28783868d0a1d6605" + integrity sha512-UP9rzNn/XyGwb5RQ2fok+DzcIRIYwc16qTXse5+Smsy8MOIccCChT15KAwnsgQx4PzJkaMq4myFyZ4CL5TjhIQ== dependencies: "@types/estree" "*" "@types/json-schema" "*" "@types/estree@*", "@types/estree@^0.0.50": version "0.0.50" - resolved "https://registry.npmmirror.com/@types/estree/download/@types/estree-0.0.50.tgz?cache=0&sync_timestamp=1637264753186&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Festree%2Fdownload%2F%40types%2Festree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" + resolved "https://registry.npmmirror.com/@types/estree/download/@types/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" integrity sha1-Hgyqk2TT/M0pMcPtlv2+ql1MyoM= "@types/github-slugger@^1.3.0": @@ -1768,14 +1768,14 @@ "@types/http-proxy@^1.17.5": version "1.17.7" - resolved "https://registry.npmmirror.com/@types/http-proxy/download/@types/http-proxy-1.17.7.tgz?cache=0&sync_timestamp=1637266134966&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fhttp-proxy%2Fdownload%2F%40types%2Fhttp-proxy-1.17.7.tgz#30ea85cc2c868368352a37f0d0d3581e24834c6f" + resolved "https://registry.npmmirror.com/@types/http-proxy/download/@types/http-proxy-1.17.7.tgz#30ea85cc2c868368352a37f0d0d3581e24834c6f" integrity sha1-MOqFzCyGg2g1Kjfw0NNYHiSDTG8= dependencies: "@types/node" "*" "@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.9" - resolved "https://registry.npmmirror.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + resolved "https://registry.npmmirror.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz?cache=0&sync_timestamp=1637266073261&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fjson-schema%2Fdownload%2F%40types%2Fjson-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha1-l+3JA36gw4WFMgsolk3eOznkZg0= "@types/mdast@^3.0.0": @@ -1802,24 +1802,24 @@ "@types/prop-types@*": version "15.7.4" - resolved "https://registry.npmmirror.com/@types/prop-types/download/@types/prop-types-15.7.4.tgz?cache=0&sync_timestamp=1637270164807&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fprop-types%2Fdownload%2F%40types%2Fprop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + resolved "https://registry.npmmirror.com/@types/prop-types/download/@types/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" integrity sha1-/PcgXCXf95Xuea8eMNosl5CAjxE= "@types/q@^1.5.1": version "1.5.5" - resolved "https://registry.npmmirror.com/@types/q/download/@types/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" + resolved "https://registry.npmmirror.com/@types/q/download/@types/q-1.5.5.tgz?cache=0&sync_timestamp=1637268455272&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fq%2Fdownload%2F%40types%2Fq-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" integrity sha1-daKo59irSyMEFFBdkjNdHctTpt8= "@types/react-helmet@*": version "6.1.4" - resolved "https://registry.npmmirror.com/@types/react-helmet/download/@types/react-helmet-6.1.4.tgz?cache=0&sync_timestamp=1637270334903&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Freact-helmet%2Fdownload%2F%40types%2Freact-helmet-6.1.4.tgz#3e54a3eb37ba7fb34ffafc64f425be4e68df03b9" + resolved "https://registry.npmmirror.com/@types/react-helmet/download/@types/react-helmet-6.1.4.tgz#3e54a3eb37ba7fb34ffafc64f425be4e68df03b9" integrity sha1-PlSj6ze6f7NP+vxk9CW+TmjfA7k= dependencies: "@types/react" "*" "@types/react-router-config@*": version "5.0.3" - resolved "https://registry.nlark.com/@types/react-router-config/download/@types/react-router-config-5.0.3.tgz?cache=0&sync_timestamp=1629709032056&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Freact-router-config%2Fdownload%2F%40types%2Freact-router-config-5.0.3.tgz#72a53561bcb5e13b82c576527b818fa2579591c7" + resolved "https://registry.nlark.com/@types/react-router-config/download/@types/react-router-config-5.0.3.tgz?cache=0&sync_timestamp=1629709123097&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Freact-router-config%2Fdownload%2F%40types%2Freact-router-config-5.0.3.tgz#72a53561bcb5e13b82c576527b818fa2579591c7" integrity sha1-cqU1Yby14TuCxXZSe4GPoleVkcc= dependencies: "@types/history" "*" @@ -1828,7 +1828,7 @@ "@types/react-router-dom@*": version "5.3.2" - resolved "https://registry.npmmirror.com/@types/react-router-dom/download/@types/react-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee" + resolved "https://registry.npmmirror.com/@types/react-router-dom/download/@types/react-router-dom-5.3.2.tgz?cache=0&sync_timestamp=1637449508387&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Freact-router-dom%2Fdownload%2F%40types%2Freact-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee" integrity sha1-69jhRc8FbbXGbrHaxjxy9S6FQu4= dependencies: "@types/history" "*" @@ -1854,22 +1854,22 @@ "@types/retry@^0.12.0": version "0.12.1" - resolved "https://registry.npmmirror.com/@types/retry/download/@types/retry-0.12.1.tgz?cache=0&sync_timestamp=1637270319130&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fretry%2Fdownload%2F%40types%2Fretry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" + resolved "https://registry.npmmirror.com/@types/retry/download/@types/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" integrity sha1-2PHA0Nwjr61twWqemToIZXdLQGU= "@types/scheduler@*": version "0.16.2" - resolved "https://registry.npmmirror.com/@types/scheduler/download/@types/scheduler-0.16.2.tgz?cache=0&sync_timestamp=1637270322974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fscheduler%2Fdownload%2F%40types%2Fscheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + resolved "https://registry.npmmirror.com/@types/scheduler/download/@types/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" integrity sha1-GmL4lSVyPd4kuhsBsJK/XfitTTk= "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3": version "2.0.6" - resolved "https://registry.npmmirror.com/@types/unist/download/@types/unist-2.0.6.tgz?cache=0&sync_timestamp=1637272115806&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Funist%2Fdownload%2F%40types%2Funist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" + resolved "https://registry.npmmirror.com/@types/unist/download/@types/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" integrity sha1-JQp7FsO5H2cqJFUuxkZ47rHToI0= "@webassemblyjs/ast@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.1.tgz?cache=0&sync_timestamp=1625473466238&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fast%2Fdownload%2F%40webassemblyjs%2Fast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" + resolved "https://registry.nlark.com/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.1.tgz?cache=0&sync_timestamp=1625473420080&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fast%2Fdownload%2F%40webassemblyjs%2Fast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" integrity sha1-K/12fq4aaZb0Mv9+jX/HVnnAtqc= dependencies: "@webassemblyjs/helper-numbers" "1.11.1" @@ -1877,17 +1877,17 @@ "@webassemblyjs/floating-point-hex-parser@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.11.1.tgz?cache=0&sync_timestamp=1625473463638&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Ffloating-point-hex-parser%2Fdownload%2F%40webassemblyjs%2Ffloating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" + resolved "https://registry.nlark.com/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" integrity sha1-9sYacF8P16auyqToGY8j2dwXnk8= "@webassemblyjs/helper-api-error@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" + resolved "https://registry.nlark.com/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.11.1.tgz?cache=0&sync_timestamp=1625473412127&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-api-error%2Fdownload%2F%40webassemblyjs%2Fhelper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" integrity sha1-GmMZLYeI5cASgAump6RscFKI/RY= "@webassemblyjs/helper-buffer@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" + resolved "https://registry.nlark.com/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.11.1.tgz?cache=0&sync_timestamp=1625473414638&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-buffer%2Fdownload%2F%40webassemblyjs%2Fhelper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" integrity sha1-gyqQDrREiEzemnytRn+BUA9eWrU= "@webassemblyjs/helper-numbers@1.11.1": @@ -1901,12 +1901,12 @@ "@webassemblyjs/helper-wasm-bytecode@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.11.1.tgz?cache=0&sync_timestamp=1625473463016&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-wasm-bytecode%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" + resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.11.1.tgz?cache=0&sync_timestamp=1625473415013&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-wasm-bytecode%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" integrity sha1-8ygkHkHnsZnQsgwY6IQpxEMyleE= "@webassemblyjs/helper-wasm-section@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-section/download/@webassemblyjs/helper-wasm-section-1.11.1.tgz?cache=0&sync_timestamp=1625473466570&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-wasm-section%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" + resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-section/download/@webassemblyjs/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" integrity sha1-Ie4GWntjXzGec48N1zv72igcCXo= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -1930,12 +1930,12 @@ "@webassemblyjs/utf8@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" + resolved "https://registry.nlark.com/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.11.1.tgz?cache=0&sync_timestamp=1625473462317&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Futf8%2Fdownload%2F%40webassemblyjs%2Futf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" integrity sha1-0fi3ZDaefG5rrjUOhU3smlnwo/8= "@webassemblyjs/wasm-edit@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.11.1.tgz?cache=0&sync_timestamp=1625473468202&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-edit%2Fdownload%2F%40webassemblyjs%2Fwasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.11.1.tgz?cache=0&sync_timestamp=1625473490556&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-edit%2Fdownload%2F%40webassemblyjs%2Fwasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" integrity sha1-rSBuv0v5WgWM6YgKjAksXeyBk9Y= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -1949,7 +1949,7 @@ "@webassemblyjs/wasm-gen@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.11.1.tgz?cache=0&sync_timestamp=1625473361759&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-gen%2Fdownload%2F%40webassemblyjs%2Fwasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" integrity sha1-hsXqMEhJdZt9iMR6MvTwOa48j3Y= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -1982,7 +1982,7 @@ "@webassemblyjs/wast-printer@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wast-printer/download/@webassemblyjs/wast-printer-1.11.1.tgz?cache=0&sync_timestamp=1625473465901&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwast-printer%2Fdownload%2F%40webassemblyjs%2Fwast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" + resolved "https://registry.nlark.com/@webassemblyjs/wast-printer/download/@webassemblyjs/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" integrity sha1-0Mc77ajuxUJvEK6O9VzuXnCEwvA= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -1990,7 +1990,7 @@ "@xtuc/ieee754@^1.2.0": version "1.2.0" - resolved "https://registry.npm.taobao.org/@xtuc/ieee754/download/@xtuc/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + resolved "https://registry.nlark.com/@xtuc/ieee754/download/@xtuc/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" integrity sha1-7vAUoxRa5Hehy8AM0eVSM23Ot5A= "@xtuc/long@4.2.2": @@ -2013,7 +2013,7 @@ acorn-dynamic-import@^4.0.0: acorn-import-assertions@^1.7.6: version "1.8.0" - resolved "https://registry.npmmirror.com/acorn-import-assertions/download/acorn-import-assertions-1.8.0.tgz?cache=0&sync_timestamp=1633349301882&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Facorn-import-assertions%2Fdownload%2Facorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" + resolved "https://registry.npmmirror.com/acorn-import-assertions/download/acorn-import-assertions-1.8.0.tgz?cache=0&sync_timestamp=1633349407828&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Facorn-import-assertions%2Fdownload%2Facorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" integrity sha1-uitZOc5iwjjbbZPYHJsRGym4Vek= acorn-jsx@^5.0.1: @@ -2032,12 +2032,12 @@ acorn-node@^1.6.1: acorn-walk@^7.0.0: version "7.2.0" - resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-7.2.0.tgz?cache=0&sync_timestamp=1630916588767&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-7.2.0.tgz?cache=0&sync_timestamp=1630916608758&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha1-DeiJpgEgOQmw++B7iTjcIdLpZ7w= acorn-walk@^8.0.0: version "8.2.0" - resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-8.2.0.tgz?cache=0&sync_timestamp=1630916588767&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-8.2.0.tgz?cache=0&sync_timestamp=1630916608758&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha1-dBIQ8uJCZFRQiFOi9E0KuDt/acE= acorn@^6.1.1: @@ -2062,7 +2062,7 @@ address@^1.0.1, address@^1.1.2: aggregate-error@^3.0.0: version "3.1.0" - resolved "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.1.0.tgz?cache=0&sync_timestamp=1618681496448&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faggregate-error%2Fdownload%2Faggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + resolved "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.1.0.tgz?cache=0&sync_timestamp=1618681553608&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faggregate-error%2Fdownload%2Faggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" integrity sha1-kmcP9Q9TWb23o+DUDQ7DDFc3aHo= dependencies: clean-stack "^2.0.0" @@ -2077,19 +2077,19 @@ ajv-formats@^2.1.1: ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: version "3.5.2" - resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1637523824664&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha1-MfKdpatuANHC0yms97WSlhTVAU0= ajv-keywords@^5.0.0: version "5.1.0" - resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-5.1.0.tgz?cache=0&sync_timestamp=1637523824664&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== dependencies: fast-deep-equal "^3.1.3" ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" - resolved "https://registry.npmmirror.com/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1637522408530&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + resolved "https://registry.npmmirror.com/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1637522259668&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha1-uvWmLoArB9l3A0WG+MO69a3ybfQ= dependencies: fast-deep-equal "^3.1.1" @@ -2099,7 +2099,7 @@ ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: ajv@^8.0.0, ajv@^8.8.0: version "8.8.2" - resolved "https://registry.npmmirror.com/ajv/download/ajv-8.8.2.tgz?cache=0&sync_timestamp=1637522408530&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb" + resolved "https://registry.npmmirror.com/ajv/download/ajv-8.8.2.tgz?cache=0&sync_timestamp=1637522259668&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb" integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw== dependencies: fast-deep-equal "^3.1.1" @@ -2116,7 +2116,7 @@ algoliasearch-helper@^3.5.5: algoliasearch@^4.0.0, algoliasearch@^4.11.0: version "4.11.0" - resolved "https://registry.npmmirror.com/algoliasearch/download/algoliasearch-4.11.0.tgz?cache=0&sync_timestamp=1634739569076&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Falgoliasearch%2Fdownload%2Falgoliasearch-4.11.0.tgz#234befb3ac355c094077f0edf3777240b1ee013c" + resolved "https://registry.npmmirror.com/algoliasearch/download/algoliasearch-4.11.0.tgz?cache=0&sync_timestamp=1634738335372&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Falgoliasearch%2Fdownload%2Falgoliasearch-4.11.0.tgz#234befb3ac355c094077f0edf3777240b1ee013c" integrity sha1-I0vvs6w1XAlAd/Dt83dyQLHuATw= dependencies: "@algolia/cache-browser-local-storage" "4.11.0" @@ -2141,7 +2141,7 @@ alphanum-sort@^1.0.2: ansi-align@^3.0.0: version "3.0.1" - resolved "https://registry.npmmirror.com/ansi-align/download/ansi-align-3.0.1.tgz?cache=0&sync_timestamp=1632743737823&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fansi-align%2Fdownload%2Fansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" + resolved "https://registry.npmmirror.com/ansi-align/download/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" integrity sha1-DN8S4RGs53OobpofrRIlxDyxmlk= dependencies: string-width "^4.1.0" @@ -2153,12 +2153,12 @@ ansi-html-community@^0.0.8: ansi-regex@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-5.0.1.tgz?cache=0&sync_timestamp=1631634988487&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-regex%2Fdownload%2Fansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha1-CCyyyJyf6GWaMRpTvWpNxTAdswQ= ansi-regex@^6.0.1: version "6.0.1" - resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-6.0.1.tgz?cache=0&sync_timestamp=1631634988487&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-regex%2Fdownload%2Fansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" integrity sha1-MYPjj66aZdfLXlOUXNWJfQJgoGo= ansi-styles@^3.2.1: @@ -2177,7 +2177,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: anymatch@~3.1.2: version "3.1.2" - resolved "https://registry.npm.taobao.org/anymatch/download/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + resolved "https://registry.nlark.com/anymatch/download/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" integrity sha1-wFV8CWrzLxBhmPT04qODU343hxY= dependencies: normalize-path "^3.0.0" @@ -2185,19 +2185,19 @@ anymatch@~3.1.2: arg@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/arg/download/arg-5.0.1.tgz?cache=0&sync_timestamp=1629167279295&other_urls=https%3A%2F%2Fregistry.nlark.com%2Farg%2Fdownload%2Farg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb" + resolved "https://registry.nlark.com/arg/download/arg-5.0.1.tgz?cache=0&sync_timestamp=1629166537485&other_urls=https%3A%2F%2Fregistry.nlark.com%2Farg%2Fdownload%2Farg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb" integrity sha1-6wyaj3d4bK0q+P8rhiiZhC17ats= argparse@^1.0.7: version "1.0.10" - resolved "https://registry.npm.taobao.org/argparse/download/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + resolved "https://registry.nlark.com/argparse/download/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE= dependencies: sprintf-js "~1.0.2" argparse@^2.0.1: version "2.0.1" - resolved "https://registry.npm.taobao.org/argparse/download/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + resolved "https://registry.nlark.com/argparse/download/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha1-JG9Q88p4oyQPbJl+ipvR6sSeSzg= array-flatten@1.1.1: @@ -2212,7 +2212,7 @@ array-flatten@^2.1.0: array-union@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/array-union/download/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + resolved "https://registry.npm.taobao.org/array-union/download/array-union-2.1.0.tgz?cache=0&sync_timestamp=1614624262896&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Farray-union%2Fdownload%2Farray-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha1-t5hCCtvrHego2ErNii4j0+/oXo0= async@^2.6.2: @@ -2224,7 +2224,7 @@ async@^2.6.2: at-least-node@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/at-least-node/download/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + resolved "https://registry.nlark.com/at-least-node/download/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha1-YCzUtG6EStTv/JKoARo8RuAjjcI= autoprefixer@^10.3.1, autoprefixer@^10.3.5, autoprefixer@^10.3.7: @@ -2241,14 +2241,14 @@ autoprefixer@^10.3.1, autoprefixer@^10.3.5, autoprefixer@^10.3.7: axios@^0.21.1: version "0.21.4" - resolved "https://registry.npmmirror.com/axios/download/axios-0.21.4.tgz?cache=0&sync_timestamp=1635214905768&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Faxios%2Fdownload%2Faxios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" + resolved "https://registry.npmmirror.com/axios/download/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" integrity sha1-xnuQ3AVo5cHPKwuFjEO6KOLtpXU= dependencies: follow-redirects "^1.14.0" babel-loader@^8.2.2: version "8.2.3" - resolved "https://registry.npmmirror.com/babel-loader/download/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" + resolved "https://registry.npmmirror.com/babel-loader/download/babel-loader-8.2.3.tgz?cache=0&sync_timestamp=1634769533620&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-loader%2Fdownload%2Fbabel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" integrity sha1-iYa0Dxpkys/LS4QpMgCF72ixNC0= dependencies: find-cache-dir "^3.3.1" @@ -2258,7 +2258,7 @@ babel-loader@^8.2.2: babel-plugin-apply-mdx-type-prop@1.6.22: version "1.6.22" - resolved "https://registry.npm.taobao.org/babel-plugin-apply-mdx-type-prop/download/babel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b" + resolved "https://registry.npm.taobao.org/babel-plugin-apply-mdx-type-prop/download/babel-plugin-apply-mdx-type-prop-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-apply-mdx-type-prop%2Fdownload%2Fbabel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b" integrity sha1-0hbo/Q3pHePxR47zIx4FRGvIcFs= dependencies: "@babel/helper-plugin-utils" "7.10.4" @@ -2266,28 +2266,28 @@ babel-plugin-apply-mdx-type-prop@1.6.22: babel-plugin-dynamic-import-node@2.3.0: version "2.3.0" - resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.0.tgz?cache=0&sync_timestamp=1618846790496&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" + resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.0.tgz?cache=0&sync_timestamp=1618846958717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" integrity sha1-8A9Qe9qjw+P/bn5emNkKesq5b38= dependencies: object.assign "^4.1.0" babel-plugin-dynamic-import-node@^2.3.3: version "2.3.3" - resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.3.tgz?cache=0&sync_timestamp=1618846790496&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" + resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.3.tgz?cache=0&sync_timestamp=1618846958717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" integrity sha1-hP2hnJduxcbe/vV/lCez3vZuF6M= dependencies: object.assign "^4.1.0" babel-plugin-extract-import-names@1.6.22: version "1.6.22" - resolved "https://registry.npm.taobao.org/babel-plugin-extract-import-names/download/babel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc" + resolved "https://registry.npm.taobao.org/babel-plugin-extract-import-names/download/babel-plugin-extract-import-names-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-extract-import-names%2Fdownload%2Fbabel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc" integrity sha1-3l+aKOsS8+sleL90RyIE5m0aE9w= dependencies: "@babel/helper-plugin-utils" "7.10.4" babel-plugin-polyfill-corejs2@^0.3.0: version "0.3.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/download/babel-plugin-polyfill-corejs2-0.3.0.tgz?cache=0&sync_timestamp=1636802678201&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs2%2Fdownload%2Fbabel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/download/babel-plugin-polyfill-corejs2-0.3.0.tgz?cache=0&sync_timestamp=1636799843170&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs2%2Fdownload%2Fbabel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd" integrity sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA== dependencies: "@babel/compat-data" "^7.13.11" @@ -2296,7 +2296,7 @@ babel-plugin-polyfill-corejs2@^0.3.0: babel-plugin-polyfill-corejs3@^0.4.0: version "0.4.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/download/babel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/download/babel-plugin-polyfill-corejs3-0.4.0.tgz?cache=0&sync_timestamp=1636799842810&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs3%2Fdownload%2Fbabel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087" integrity sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.0" @@ -2304,24 +2304,24 @@ babel-plugin-polyfill-corejs3@^0.4.0: babel-plugin-polyfill-regenerator@^0.3.0: version "0.3.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/download/babel-plugin-polyfill-regenerator-0.3.0.tgz?cache=0&sync_timestamp=1636802677257&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-regenerator%2Fdownload%2Fbabel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/download/babel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be" integrity sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.0" bail@^1.0.0: version "1.0.5" - resolved "https://registry.npmmirror.com/bail/download/bail-1.0.5.tgz?cache=0&sync_timestamp=1636274668154&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbail%2Fdownload%2Fbail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" + resolved "https://registry.npmmirror.com/bail/download/bail-1.0.5.tgz?cache=0&sync_timestamp=1636274632406&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbail%2Fdownload%2Fbail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" integrity sha1-tvoTNASjksvB+MS/Y/WVM1Hnp3Y= balanced-match@^1.0.0: version "1.0.2" - resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.2.tgz?cache=0&sync_timestamp=1617714233441&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbalanced-match%2Fdownload%2Fbalanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4= batch@0.6.1: version "0.6.1" - resolved "https://registry.npm.taobao.org/batch/download/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" + resolved "https://registry.nlark.com/batch/download/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= big.js@^5.2.2: @@ -2331,17 +2331,17 @@ big.js@^5.2.2: binary-extensions@^2.0.0: version "2.2.0" - resolved "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + resolved "https://registry.nlark.com/binary-extensions/download/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha1-dfUC7q+f/eQvyYgpZFvk6na9ni0= bluebird@^3.7.1: version "3.7.2" - resolved "https://registry.npm.taobao.org/bluebird/download/bluebird-3.7.2.tgz?cache=0&sync_timestamp=1615984338230&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbluebird%2Fdownload%2Fbluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + resolved "https://registry.npm.taobao.org/bluebird/download/bluebird-3.7.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbluebird%2Fdownload%2Fbluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha1-nyKcFb4nJFT/qXOs4NvueaGww28= body-parser@1.19.0: version "1.19.0" - resolved "https://registry.npm.taobao.org/body-parser/download/body-parser-1.19.0.tgz?cache=0&sync_timestamp=1615984442879&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbody-parser%2Fdownload%2Fbody-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + resolved "https://registry.npm.taobao.org/body-parser/download/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" integrity sha1-lrJwnlfJxOCab9Zqj9l5hE9p8Io= dependencies: bytes "3.1.0" @@ -2369,12 +2369,12 @@ bonjour@^3.5.0: boolbase@^1.0.0, boolbase@~1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/boolbase/download/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + resolved "https://registry.nlark.com/boolbase/download/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= boxen@^5.0.0, boxen@^5.0.1: version "5.1.2" - resolved "https://registry.npmmirror.com/boxen/download/boxen-5.1.2.tgz?cache=0&sync_timestamp=1634028569091&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fboxen%2Fdownload%2Fboxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" + resolved "https://registry.npmmirror.com/boxen/download/boxen-5.1.2.tgz?cache=0&sync_timestamp=1634028659618&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fboxen%2Fdownload%2Fboxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" integrity sha1-eIy2hvyDwfSG36ikDGj8K4MdK1A= dependencies: ansi-align "^3.0.0" @@ -2388,7 +2388,7 @@ boxen@^5.0.0, boxen@^5.0.1: brace-expansion@^1.1.7: version "1.1.11" - resolved "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + resolved "https://registry.nlark.com/brace-expansion/download/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" integrity sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0= dependencies: balanced-match "^1.0.0" @@ -2396,14 +2396,14 @@ brace-expansion@^1.1.7: braces@^3.0.1, braces@~3.0.2: version "3.0.2" - resolved "https://registry.npm.taobao.org/braces/download/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + resolved "https://registry.nlark.com/braces/download/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha1-NFThpGLujVmeI23zNs2epPiv4Qc= dependencies: fill-range "^7.0.1" browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.18.1: version "4.18.1" - resolved "https://registry.npmmirror.com/browserslist/download/browserslist-4.18.1.tgz?cache=0&sync_timestamp=1636994406288&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbrowserslist%2Fdownload%2Fbrowserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f" + resolved "https://registry.npmmirror.com/browserslist/download/browserslist-4.18.1.tgz?cache=0&sync_timestamp=1636994462878&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbrowserslist%2Fdownload%2Fbrowserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f" integrity sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ== dependencies: caniuse-lite "^1.0.30001280" @@ -2427,7 +2427,7 @@ buble-jsx-only@^0.19.8: buffer-from@^1.0.0: version "1.1.2" - resolved "https://registry.nlark.com/buffer-from/download/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + resolved "https://registry.nlark.com/buffer-from/download/buffer-from-1.1.2.tgz?cache=0&sync_timestamp=1627578450949&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbuffer-from%2Fdownload%2Fbuffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha1-KxRqb9cugLT1XSVfNe1Zo6mkG9U= buffer-indexof@^1.0.0: @@ -2437,17 +2437,17 @@ buffer-indexof@^1.0.0: bytes@3.0.0: version "3.0.0" - resolved "https://registry.npmmirror.com/bytes/download/bytes-3.0.0.tgz?cache=0&sync_timestamp=1637015063162&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbytes%2Fdownload%2Fbytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + resolved "https://registry.npmmirror.com/bytes/download/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= bytes@3.1.0: version "3.1.0" - resolved "https://registry.npmmirror.com/bytes/download/bytes-3.1.0.tgz?cache=0&sync_timestamp=1637015063162&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbytes%2Fdownload%2Fbytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + resolved "https://registry.npmmirror.com/bytes/download/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha1-9s95M6Ng4FiPqf3oVlHNx/gF0fY= cacheable-request@^6.0.0: version "6.1.0" - resolved "https://registry.nlark.com/cacheable-request/download/cacheable-request-6.1.0.tgz?cache=0&sync_timestamp=1623237504263&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcacheable-request%2Fdownload%2Fcacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" + resolved "https://registry.nlark.com/cacheable-request/download/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" integrity sha1-IP+4vRYrpL4R6VZ9gj22UQUsqRI= dependencies: clone-response "^1.0.2" @@ -2460,7 +2460,7 @@ cacheable-request@^6.0.0: call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/call-bind/download/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + resolved "https://registry.npm.taobao.org/call-bind/download/call-bind-1.0.2.tgz?cache=0&sync_timestamp=1610403020286&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcall-bind%2Fdownload%2Fcall-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha1-sdTonmiBGcPJqQOtMKuy9qkZvjw= dependencies: function-bind "^1.1.1" @@ -2468,12 +2468,12 @@ call-bind@^1.0.0, call-bind@^1.0.2: callsites@^3.0.0: version "3.1.0" - resolved "https://registry.nlark.com/callsites/download/callsites-3.1.0.tgz?cache=0&sync_timestamp=1628464722297&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcallsites%2Fdownload%2Fcallsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + resolved "https://registry.nlark.com/callsites/download/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha1-s2MKvYlDQy9Us/BRkjjjPNffL3M= camel-case@^4.1.2: version "4.1.2" - resolved "https://registry.npm.taobao.org/camel-case/download/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" + resolved "https://registry.nlark.com/camel-case/download/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" integrity sha1-lygHKpVPgFIoIlpt7qazhGHhvVo= dependencies: pascal-case "^3.1.2" @@ -2486,7 +2486,7 @@ camelcase-css@2.0.1, camelcase-css@^2.0.1: camelcase@^6.2.0: version "6.2.1" - resolved "https://registry.npmmirror.com/camelcase/download/camelcase-6.2.1.tgz?cache=0&sync_timestamp=1636945141024&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" + resolved "https://registry.npmmirror.com/camelcase/download/camelcase-6.2.1.tgz?cache=0&sync_timestamp=1636945130104&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== caniuse-api@^3.0.0: @@ -2500,9 +2500,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001280: - version "1.0.30001284" - resolved "https://registry.npmmirror.com/caniuse-lite/download/caniuse-lite-1.0.30001284.tgz#d3653929ded898cd0c1f09a56fd8ca6952df4fca" - integrity sha512-t28SKa7g6kiIQi6NHeOcKrOrGMzCRrXvlasPwWC26TH2QNdglgzQIRUuJ0cR3NeQPH+5jpuveeeSFDLm2zbkEw== + version "1.0.30001285" + resolved "https://registry.npmmirror.com/caniuse-lite/download/caniuse-lite-1.0.30001285.tgz#fe1e52229187e11d6670590790d669b9e03315b7" + integrity sha512-KAOkuUtcQ901MtmvxfKD+ODHH9YVDYnBt+TGYSz2KIfnq22CiArbUxXPN9067gNbgMlnNYRSwho8OPXZPALB9Q== ccount@^1.0.0, ccount@^1.0.3: version "1.1.0" @@ -2528,22 +2528,22 @@ chalk@^4.1.0, chalk@^4.1.2: character-entities-legacy@^1.0.0: version "1.1.4" - resolved "https://registry.npmmirror.com/character-entities-legacy/download/character-entities-legacy-1.1.4.tgz?cache=0&sync_timestamp=1635911965002&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities-legacy%2Fdownload%2Fcharacter-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" + resolved "https://registry.npmmirror.com/character-entities-legacy/download/character-entities-legacy-1.1.4.tgz?cache=0&sync_timestamp=1635911807340&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities-legacy%2Fdownload%2Fcharacter-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" integrity sha1-lLwYRdznClu50uzHSHJWYSk9j8E= character-entities@^1.0.0: version "1.2.4" - resolved "https://registry.npmmirror.com/character-entities/download/character-entities-1.2.4.tgz?cache=0&sync_timestamp=1635869130345&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities%2Fdownload%2Fcharacter-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" + resolved "https://registry.npmmirror.com/character-entities/download/character-entities-1.2.4.tgz?cache=0&sync_timestamp=1635868930605&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities%2Fdownload%2Fcharacter-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" integrity sha1-4Sw5Obfq9OWxXnrUxeKOHUjFsWs= character-reference-invalid@^1.0.0: version "1.1.4" - resolved "https://registry.npmmirror.com/character-reference-invalid/download/character-reference-invalid-1.1.4.tgz?cache=0&sync_timestamp=1636446564128&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-reference-invalid%2Fdownload%2Fcharacter-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" + resolved "https://registry.npmmirror.com/character-reference-invalid/download/character-reference-invalid-1.1.4.tgz?cache=0&sync_timestamp=1636446304022&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-reference-invalid%2Fdownload%2Fcharacter-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" integrity sha1-CDMpzaDq4nKrPbvzfpo4LBOvFWA= cheerio@^0.22.0: version "0.22.0" - resolved "https://registry.nlark.com/cheerio/download/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" + resolved "https://registry.nlark.com/cheerio/download/cheerio-0.22.0.tgz?cache=0&sync_timestamp=1623167648923&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcheerio%2Fdownload%2Fcheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4= dependencies: css-select "~1.2.0" @@ -2580,7 +2580,7 @@ chokidar@^3.4.2, chokidar@^3.5.2: chrome-trace-event@^1.0.2: version "1.0.3" - resolved "https://registry.npm.taobao.org/chrome-trace-event/download/chrome-trace-event-1.0.3.tgz?cache=0&sync_timestamp=1617906586875&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchrome-trace-event%2Fdownload%2Fchrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + resolved "https://registry.nlark.com/chrome-trace-event/download/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" integrity sha1-EBXs7UdB4V0GZkqVfbv1DQQeJqw= ci-info@^2.0.0: @@ -2595,7 +2595,7 @@ ci-info@^3.1.1: clean-css@^5.1.5, clean-css@^5.2.2: version "5.2.2" - resolved "https://registry.npmmirror.com/clean-css/download/clean-css-5.2.2.tgz?cache=0&sync_timestamp=1634992859960&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fclean-css%2Fdownload%2Fclean-css-5.2.2.tgz#d3a7c6ee2511011e051719838bdcf8314dc4548d" + resolved "https://registry.npmmirror.com/clean-css/download/clean-css-5.2.2.tgz?cache=0&sync_timestamp=1634992314911&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fclean-css%2Fdownload%2Fclean-css-5.2.2.tgz#d3a7c6ee2511011e051719838bdcf8314dc4548d" integrity sha1-06fG7iURAR4FFxmDi9z4MU3EVI0= dependencies: source-map "~0.6.0" @@ -2607,12 +2607,12 @@ clean-stack@^2.0.0: cli-boxes@^2.2.1: version "2.2.1" - resolved "https://registry.npm.taobao.org/cli-boxes/download/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" + resolved "https://registry.nlark.com/cli-boxes/download/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha1-3dUDXSUJT84iDpyrQKRYQKRAMY8= clone-deep@^4.0.1: version "4.0.1" - resolved "https://registry.npm.taobao.org/clone-deep/download/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" + resolved "https://registry.nlark.com/clone-deep/download/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" integrity sha1-wZ/Zvbv4WUK0/ZechNz31fB8I4c= dependencies: is-plain-object "^2.0.4" @@ -2642,7 +2642,7 @@ coa@^2.0.2: collapse-white-space@^1.0.2: version "1.0.6" - resolved "https://registry.npm.taobao.org/collapse-white-space/download/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287" + resolved "https://registry.npm.taobao.org/collapse-white-space/download/collapse-white-space-1.0.6.tgz?cache=0&sync_timestamp=1615196586817&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcollapse-white-space%2Fdownload%2Fcollapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287" integrity sha1-5jYpwAFmZXkgYNu+t5xCI50sUoc= color-convert@^1.9.0: @@ -2676,7 +2676,7 @@ colord@^2.9.1: colorette@^2.0.10: version "2.0.16" - resolved "https://registry.npmmirror.com/colorette/download/colorette-2.0.16.tgz?cache=0&sync_timestamp=1633673138036&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcolorette%2Fdownload%2Fcolorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" + resolved "https://registry.npmmirror.com/colorette/download/colorette-2.0.16.tgz?cache=0&sync_timestamp=1633673160250&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcolorette%2Fdownload%2Fcolorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" integrity sha1-cTua+E/bAAE58EVGvUqT9ipQhdo= combine-promises@^1.1.0: @@ -2691,27 +2691,27 @@ comma-separated-tokens@^1.0.0: commander@^2.20.0: version "2.20.3" - resolved "https://registry.npmmirror.com/commander/download/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + resolved "https://registry.npmmirror.com/commander/download/commander-2.20.3.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha1-/UhehMA+tIgcIHIrpIA16FMa6zM= commander@^5.1.0: version "5.1.0" - resolved "https://registry.npmmirror.com/commander/download/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" + resolved "https://registry.npmmirror.com/commander/download/commander-5.1.0.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha1-Rqu9FlL44Fm92u+Zu9yyrZzxea4= commander@^7.2.0: version "7.2.0" - resolved "https://registry.npmmirror.com/commander/download/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + resolved "https://registry.npmmirror.com/commander/download/commander-7.2.0.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha1-o2y1fQtQHOEI5NIFWaFQo5HZerc= commander@^8.3.0: version "8.3.0" - resolved "https://registry.npmmirror.com/commander/download/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" + resolved "https://registry.npmmirror.com/commander/download/commander-8.3.0.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha1-SDfqGy2me5xhamevuw+v7lZ7ymY= commondir@^1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/commondir/download/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + resolved "https://registry.nlark.com/commondir/download/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= compressible@~2.0.16: @@ -2723,7 +2723,7 @@ compressible@~2.0.16: compression@^1.7.4: version "1.7.4" - resolved "https://registry.npm.taobao.org/compression/download/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" + resolved "https://registry.nlark.com/compression/download/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" integrity sha1-lVI+/xcMpXwpoMpB5v4TH0Hlu48= dependencies: accepts "~1.3.5" @@ -2753,7 +2753,7 @@ configstore@^5.0.1: connect-history-api-fallback@^1.6.0: version "1.6.0" - resolved "https://registry.nlark.com/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz?cache=0&sync_timestamp=1618847040596&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fconnect-history-api-fallback%2Fdownload%2Fconnect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" + resolved "https://registry.npm.taobao.org/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha1-izIIk1kwjRERFdgcrT/Oq4iPl7w= consola@^2.15.3: @@ -2763,31 +2763,31 @@ consola@^2.15.3: content-disposition@0.5.2: version "0.5.2" - resolved "https://registry.npm.taobao.org/content-disposition/download/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" + resolved "https://registry.nlark.com/content-disposition/download/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ= content-disposition@0.5.3: version "0.5.3" - resolved "https://registry.npm.taobao.org/content-disposition/download/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" + resolved "https://registry.nlark.com/content-disposition/download/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" integrity sha1-4TDK9+cnkIfFYWwgB9BIVpiYT70= dependencies: safe-buffer "5.1.2" content-type@~1.0.4: version "1.0.4" - resolved "https://registry.npm.taobao.org/content-type/download/content-type-1.0.4.tgz?cache=0&sync_timestamp=1615984448548&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcontent-type%2Fdownload%2Fcontent-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + resolved "https://registry.nlark.com/content-type/download/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha1-4TjMdeBAxyexlm/l5fjJruJW/js= convert-source-map@^1.7.0: version "1.8.0" - resolved "https://registry.nlark.com/convert-source-map/download/convert-source-map-1.8.0.tgz?cache=0&sync_timestamp=1624045304679&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fconvert-source-map%2Fdownload%2Fconvert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + resolved "https://registry.nlark.com/convert-source-map/download/convert-source-map-1.8.0.tgz?cache=0&sync_timestamp=1624045420970&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fconvert-source-map%2Fdownload%2Fconvert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" integrity sha1-8zc8MtIbTXgN2ABFFGhPt5HKQ2k= dependencies: safe-buffer "~5.1.1" cookie-signature@1.0.6: version "1.0.6" - resolved "https://registry.npm.taobao.org/cookie-signature/download/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + resolved "https://registry.nlark.com/cookie-signature/download/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= cookie@0.4.0: @@ -2797,12 +2797,12 @@ cookie@0.4.0: copy-text-to-clipboard@^3.0.1: version "3.0.1" - resolved "https://registry.npm.taobao.org/copy-text-to-clipboard/download/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c" + resolved "https://registry.nlark.com/copy-text-to-clipboard/download/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c" integrity sha1-jL+PkOCkfxLkokdDc2Jl0Ve85pw= copy-webpack-plugin@^9.0.1: version "9.1.0" - resolved "https://registry.npmmirror.com/copy-webpack-plugin/download/copy-webpack-plugin-9.1.0.tgz#2d2c460c4c4695ec0a58afb2801a1205256c4e6b" + resolved "https://registry.npmmirror.com/copy-webpack-plugin/download/copy-webpack-plugin-9.1.0.tgz?cache=0&sync_timestamp=1637161372227&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcopy-webpack-plugin%2Fdownload%2Fcopy-webpack-plugin-9.1.0.tgz#2d2c460c4c4695ec0a58afb2801a1205256c4e6b" integrity sha512-rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA== dependencies: fast-glob "^3.2.7" @@ -2813,22 +2813,22 @@ copy-webpack-plugin@^9.0.1: serialize-javascript "^6.0.0" core-js-compat@^3.18.0, core-js-compat@^3.19.1: - version "3.19.2" - resolved "https://registry.npmmirror.com/core-js-compat/download/core-js-compat-3.19.2.tgz#18066a3404a302433cb0aa8be82dd3d75c76e5c4" - integrity sha512-ObBY1W5vx/LFFMaL1P5Udo4Npib6fu+cMokeziWkA8Tns4FcDemKF5j9JvaI5JhdkW8EQJQGJN1EcrzmEwuAqQ== + version "3.19.3" + resolved "https://registry.npmmirror.com/core-js-compat/download/core-js-compat-3.19.3.tgz#de75e5821c5ce924a0a1e7b7d5c2cb973ff388aa" + integrity sha512-59tYzuWgEEVU9r+SRgceIGXSSUn47JknoiXW6Oq7RW8QHjXWz3/vp8pa7dbtuVu40sewz3OP3JmQEcDdztrLhA== dependencies: browserslist "^4.18.1" semver "7.0.0" core-js-pure@^3.19.0: - version "3.19.2" - resolved "https://registry.npmmirror.com/core-js-pure/download/core-js-pure-3.19.2.tgz#26b5bfb503178cff6e3e115bc2ba6c6419383680" - integrity sha512-5LkcgQEy8pFeVnd/zomkUBSwnmIxuF1C8E9KrMAbOc8f34IBT9RGvTYeNDdp1PnvMJrrVhvk1hg/yVV5h/znlg== + version "3.19.3" + resolved "https://registry.npmmirror.com/core-js-pure/download/core-js-pure-3.19.3.tgz#c69b2b36b58927317824994b532ec3f0f7e49607" + integrity sha512-N3JruInmCyt7EJj5mAq3csCgGYgiSqu7p7TQp2KOztr180/OAIxyIvL1FCjzgmQk/t3Yniua50Fsak7FShI9lA== core-js@^3.18.0: - version "3.19.2" - resolved "https://registry.npmmirror.com/core-js/download/core-js-3.19.2.tgz#ae216d7f4f7e924d9a2e3ff1e4b1940220f9157b" - integrity sha512-ciYCResnLIATSsXuXnIOH4CbdfgV+H1Ltg16hJFN7/v6OxqnFr/IFGeLacaZ+fHLAm0TBbXwNK9/DNBzBUrO/g== + version "3.19.3" + resolved "https://registry.npmmirror.com/core-js/download/core-js-3.19.3.tgz#6df8142a996337503019ff3235a7022d7cdf4559" + integrity sha512-LeLBMgEGSsG7giquSzvgBrTS7V5UL6ks3eQlUSbN8dJStlLFiRzUm5iqsRyzUB8carhfKjkJ2vzKqE6z1Vga9g== core-util-is@~1.0.0: version "1.0.3" @@ -2837,7 +2837,7 @@ core-util-is@~1.0.0: cosmiconfig@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-6.0.0.tgz?cache=0&sync_timestamp=1629585969900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" + resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-6.0.0.tgz?cache=0&sync_timestamp=1629586119976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" integrity sha1-2k/uhTxS9rHmk19BwaL8UL1KmYI= dependencies: "@types/parse-json" "^4.0.0" @@ -2848,7 +2848,7 @@ cosmiconfig@^6.0.0: cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: version "7.0.1" - resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz?cache=0&sync_timestamp=1629585969900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz?cache=0&sync_timestamp=1629586119976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" integrity sha1-cU11ZSLKzoZ4Z8y0R0xdAbuuXW0= dependencies: "@types/parse-json" "^4.0.0" @@ -2866,7 +2866,7 @@ cross-env@^7.0.3: cross-spawn@^7.0.1, cross-spawn@^7.0.3: version "7.0.3" - resolved "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-7.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcross-spawn%2Fdownload%2Fcross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + resolved "https://registry.nlark.com/cross-spawn/download/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha1-9zqFudXUHQRVUcF34ogtSshXKKY= dependencies: path-key "^3.1.0" @@ -2875,19 +2875,19 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.3: crypto-random-string@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/crypto-random-string/download/crypto-random-string-2.0.0.tgz?cache=0&sync_timestamp=1617610467993&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcrypto-random-string%2Fdownload%2Fcrypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" + resolved "https://registry.nlark.com/crypto-random-string/download/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha1-7yp6lm7BEIM4g2m6oC6+rSKbMNU= css-declaration-sorter@^6.0.3: version "6.1.3" - resolved "https://registry.nlark.com/css-declaration-sorter/download/css-declaration-sorter-6.1.3.tgz?cache=0&sync_timestamp=1630965563343&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcss-declaration-sorter%2Fdownload%2Fcss-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2" + resolved "https://registry.nlark.com/css-declaration-sorter/download/css-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2" integrity sha1-6YUuTPlAunn1CdlCWxN9H5RDjcI= dependencies: timsort "^0.3.0" css-loader@^5.1.1: version "5.2.7" - resolved "https://registry.npmmirror.com/css-loader/download/css-loader-5.2.7.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-loader%2Fdownload%2Fcss-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" + resolved "https://registry.npmmirror.com/css-loader/download/css-loader-5.2.7.tgz?cache=0&sync_timestamp=1635967924209&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-loader%2Fdownload%2Fcss-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" integrity sha1-m58RHt9vsr5dxiUlZEy8nCMgZK4= dependencies: icss-utils "^5.1.0" @@ -2952,7 +2952,7 @@ css-select@~1.2.0: css-tree@1.0.0-alpha.37: version "1.0.0-alpha.37" - resolved "https://registry.npm.taobao.org/css-tree/download/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" + resolved "https://registry.npmmirror.com/css-tree/download/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" integrity sha1-mL69YsTB2flg7DQM+fdSLjBwmiI= dependencies: mdn-data "2.0.4" @@ -2960,7 +2960,7 @@ css-tree@1.0.0-alpha.37: css-tree@^1.1.2, css-tree@^1.1.3: version "1.1.3" - resolved "https://registry.npm.taobao.org/css-tree/download/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" + resolved "https://registry.npmmirror.com/css-tree/download/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" integrity sha1-60hw+2/XcHMn7JXC/yqwm16NuR0= dependencies: mdn-data "2.0.14" @@ -2968,22 +2968,22 @@ css-tree@^1.1.2, css-tree@^1.1.3: css-what@2.1: version "2.1.3" - resolved "https://registry.npmmirror.com/css-what/download/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" + resolved "https://registry.npmmirror.com/css-what/download/css-what-2.1.3.tgz?cache=0&sync_timestamp=1633863955744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-what%2Fdownload%2Fcss-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" integrity sha1-ptdgRXM2X+dGhsPzEcVlE9iChfI= css-what@^3.2.1: version "3.4.2" - resolved "https://registry.npmmirror.com/css-what/download/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" + resolved "https://registry.npmmirror.com/css-what/download/css-what-3.4.2.tgz?cache=0&sync_timestamp=1633863955744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-what%2Fdownload%2Fcss-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" integrity sha1-6nAm/LAXd+295SEk4h8yfnrpUOQ= css-what@^5.0.0: version "5.1.0" - resolved "https://registry.npmmirror.com/css-what/download/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" + resolved "https://registry.npmmirror.com/css-what/download/css-what-5.1.0.tgz?cache=0&sync_timestamp=1633863955744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-what%2Fdownload%2Fcss-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" integrity sha1-P3tweq32M7r2LCzrhXm1RbtA9/4= cssesc@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/cssesc/download/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + resolved "https://registry.nlark.com/cssesc/download/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4= cssnano-preset-advanced@^5.1.4: @@ -3050,7 +3050,7 @@ cssnano@^5.0.6, cssnano@^5.0.8: csso@^4.0.2, csso@^4.2.0: version "4.2.0" - resolved "https://registry.npm.taobao.org/csso/download/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" + resolved "https://registry.npmmirror.com/csso/download/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" integrity sha1-6jpWE0bo3J9UbW/r7dUBh884lSk= dependencies: css-tree "^1.1.2" @@ -3083,14 +3083,14 @@ debug@^4.1.0, debug@^4.1.1: decompress-response@^3.3.0: version "3.3.0" - resolved "https://registry.npm.taobao.org/decompress-response/download/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" + resolved "https://registry.npm.taobao.org/decompress-response/download/decompress-response-3.3.0.tgz?cache=0&sync_timestamp=1613125280468&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdecompress-response%2Fdownload%2Fdecompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= dependencies: mimic-response "^1.0.0" deep-equal@^1.0.1: version "1.1.1" - resolved "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + resolved "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz?cache=0&sync_timestamp=1606860754950&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeep-equal%2Fdownload%2Fdeep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" integrity sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o= dependencies: is-arguments "^1.0.4" @@ -3102,12 +3102,12 @@ deep-equal@^1.0.1: deep-extend@^0.6.0: version "0.6.0" - resolved "https://registry.npm.taobao.org/deep-extend/download/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + resolved "https://registry.nlark.com/deep-extend/download/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha1-xPp8lUBKF6nD6Mp+FTcxK3NjMKw= deepmerge@^4.2.2: version "4.2.2" - resolved "https://registry.npm.taobao.org/deepmerge/download/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + resolved "https://registry.nlark.com/deepmerge/download/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha1-RNLqNnm49NT/ujPwPYZfwee/SVU= default-gateway@^6.0.3: @@ -3124,7 +3124,7 @@ defer-to-connect@^1.0.1: define-lazy-prop@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/define-lazy-prop/download/define-lazy-prop-2.0.0.tgz?cache=0&sync_timestamp=1618387627365&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdefine-lazy-prop%2Fdownload%2Fdefine-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + resolved "https://registry.npmmirror.com/define-lazy-prop/download/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha1-P3rkIRKbyqrJvHSQXJigAJ7J7n8= define-properties@^1.1.3: @@ -3141,7 +3141,7 @@ defined@^1.0.0: del@^6.0.0: version "6.0.0" - resolved "https://registry.npm.taobao.org/del/download/del-6.0.0.tgz?cache=0&sync_timestamp=1615984345486&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdel%2Fdownload%2Fdel-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" + resolved "https://registry.npm.taobao.org/del/download/del-6.0.0.tgz?cache=0&sync_timestamp=1618321540358&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdel%2Fdownload%2Fdel-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" integrity sha1-C0DQMyzqdD8WFPgYvk/rcXcUyVI= dependencies: globby "^11.0.1" @@ -3155,24 +3155,24 @@ del@^6.0.0: depd@~1.1.2: version "1.1.2" - resolved "https://registry.npm.taobao.org/depd/download/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + resolved "https://registry.nlark.com/depd/download/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= destroy@~1.0.4: version "1.0.4" - resolved "https://registry.npm.taobao.org/destroy/download/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + resolved "https://registry.nlark.com/destroy/download/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= detab@2.0.4: version "2.0.4" - resolved "https://registry.nlark.com/detab/download/detab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43" + resolved "https://registry.nlark.com/detab/download/detab-2.0.4.tgz?cache=0&sync_timestamp=1629724300992&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdetab%2Fdownload%2Fdetab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43" integrity sha1-uSeJIGmv9AX7uaGG/pekSpKpS0M= dependencies: repeat-string "^1.5.4" detect-node@^2.0.4: version "2.1.0" - resolved "https://registry.nlark.com/detect-node/download/detect-node-2.1.0.tgz?cache=0&sync_timestamp=1621146954463&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdetect-node%2Fdownload%2Fdetect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + resolved "https://registry.nlark.com/detect-node/download/detect-node-2.1.0.tgz?cache=0&sync_timestamp=1621146902208&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdetect-node%2Fdownload%2Fdetect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha1-yccHdaScPQO8LAbZpzvlUPl4+LE= detect-port-alt@^1.1.6: @@ -3185,7 +3185,7 @@ detect-port-alt@^1.1.6: detect-port@^1.3.0: version "1.3.0" - resolved "https://registry.npm.taobao.org/detect-port/download/detect-port-1.3.0.tgz?cache=0&sync_timestamp=1615984907558&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdetect-port%2Fdownload%2Fdetect-port-1.3.0.tgz#d9c40e9accadd4df5cac6a782aefd014d573d1f1" + resolved "https://registry.nlark.com/detect-port/download/detect-port-1.3.0.tgz#d9c40e9accadd4df5cac6a782aefd014d573d1f1" integrity sha1-2cQOmsyt1N9crGp4Ku/QFNVz0fE= dependencies: address "^1.0.1" @@ -3202,7 +3202,7 @@ detective@^5.2.0: didyoumean@^1.2.2: version "1.2.2" - resolved "https://registry.nlark.com/didyoumean/download/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" + resolved "https://registry.nlark.com/didyoumean/download/didyoumean-1.2.2.tgz?cache=0&sync_timestamp=1624543452248&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdidyoumean%2Fdownload%2Fdidyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" integrity sha1-mJNG/+noObRVXs9WZu3qDT6K0Dc= dir-glob@^3.0.1: @@ -3219,12 +3219,12 @@ dlv@^1.1.3: dns-equal@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/dns-equal/download/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" + resolved "https://registry.npm.taobao.org/dns-equal/download/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= dns-packet@^1.3.1: version "1.3.4" - resolved "https://registry.nlark.com/dns-packet/download/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" + resolved "https://registry.nlark.com/dns-packet/download/dns-packet-1.3.4.tgz?cache=0&sync_timestamp=1625480066754&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdns-packet%2Fdownload%2Fdns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" integrity sha1-40VQZYJKJQe6iGxVqJljuxB97G8= dependencies: ip "^1.1.0" @@ -3232,25 +3232,25 @@ dns-packet@^1.3.1: dns-txt@^2.0.2: version "2.0.2" - resolved "https://registry.npm.taobao.org/dns-txt/download/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" + resolved "https://registry.nlark.com/dns-txt/download/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= dependencies: buffer-indexof "^1.0.0" docusaurus-preset-nonepress@canary: - version "0.0.0-116" - resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-116.tgz#afa053d218666f6a532d76e44bba6e650657e3f0" - integrity sha512-5UmZVhR50qjahlwKl7kLy7PATKjOIxfiXvL16p9kQ0Xd57DkkoOHnueeVdVHRxDSH5Dpgje/ouX+8D/LqsugdA== + version "0.0.0-121" + resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-121.tgz#5a4c0e674f08732bd12848622373e54978a3facd" + integrity sha512-7en9+oUzYC2rws7bPJj+qW5piflQp1iK5tq3ApZuiA8ceQHGY8RWmQeR5cRITfEpkf9BKzcyKR3gIvkii8vj1g== dependencies: "@docusaurus/core" "2.0.0-beta.9" "@docusaurus/plugin-content-docs" "2.0.0-beta.9" "@docusaurus/plugin-content-pages" "2.0.0-beta.9" - docusaurus-theme-nonepress "0.0.0-116" + docusaurus-theme-nonepress "0.0.0-121" -docusaurus-theme-nonepress@0.0.0-116: - version "0.0.0-116" - resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-116.tgz#4e7b8463738c0557118c33ecadc761e9c1ef485f" - integrity sha512-9kv6LoQKe2pfKToKPLYHuT2nwF2cMAFQgRhijQg2lu4YNvXDQ/rHzSbuuBIJp/NRYZfPH3LPwEGEREOe2VXJLQ== +docusaurus-theme-nonepress@0.0.0-121: + version "0.0.0-121" + resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-121.tgz#cea842b9bff63b4ce52130f37555d068be1d106e" + integrity sha512-hxYbbRlUef5JYGWMtS0aS5vh+1+9WXUl+3ljD4Oaq0ATp93L+q7F9q7+i+YJTl3d0Z2/i2xH9ms8Vvt4sID0dQ== dependencies: "@docsearch/react" "^3.0.0-alpha.39" "@docusaurus/core" "2.0.0-beta.9" @@ -3321,12 +3321,12 @@ dom-serializer@~0.1.0: domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: version "1.3.1" - resolved "https://registry.npm.taobao.org/domelementtype/download/domelementtype-1.3.1.tgz?cache=0&sync_timestamp=1617298545989&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomelementtype%2Fdownload%2Fdomelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" + resolved "https://registry.nlark.com/domelementtype/download/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha1-0EjESzew0Qp/Kj1f7j9DM9eQSB8= domelementtype@^2.0.1, domelementtype@^2.2.0: version "2.2.0" - resolved "https://registry.npm.taobao.org/domelementtype/download/domelementtype-2.2.0.tgz?cache=0&sync_timestamp=1617298545989&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomelementtype%2Fdownload%2Fdomelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + resolved "https://registry.nlark.com/domelementtype/download/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" integrity sha1-mgtsJ4LtahxzI9QiZxg9+b2LHVc= domhandler@^2.3.0: @@ -3345,7 +3345,7 @@ domhandler@^4.0.0, domhandler@^4.2.0: domutils@1.5.1: version "1.5.1" - resolved "https://registry.nlark.com/domutils/download/domutils-1.5.1.tgz?cache=0&sync_timestamp=1630106606599&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdomutils%2Fdownload%2Fdomutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" + resolved "https://registry.nlark.com/domutils/download/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8= dependencies: dom-serializer "0" @@ -3353,7 +3353,7 @@ domutils@1.5.1: domutils@^1.5.1, domutils@^1.7.0: version "1.7.0" - resolved "https://registry.nlark.com/domutils/download/domutils-1.7.0.tgz?cache=0&sync_timestamp=1630106606599&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdomutils%2Fdownload%2Fdomutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" + resolved "https://registry.nlark.com/domutils/download/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" integrity sha1-Vuo0HoNOBuZ0ivehyyXaZ+qfjCo= dependencies: dom-serializer "0" @@ -3361,7 +3361,7 @@ domutils@^1.5.1, domutils@^1.7.0: domutils@^2.5.2, domutils@^2.6.0: version "2.8.0" - resolved "https://registry.nlark.com/domutils/download/domutils-2.8.0.tgz?cache=0&sync_timestamp=1630106606599&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdomutils%2Fdownload%2Fdomutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" + resolved "https://registry.nlark.com/domutils/download/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" integrity sha1-RDfe9dtuLR9dbuhZvZXKfQIEgTU= dependencies: dom-serializer "^1.0.1" @@ -3378,7 +3378,7 @@ dot-case@^3.0.4: dot-prop@^5.2.0: version "5.3.0" - resolved "https://registry.npm.taobao.org/dot-prop/download/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + resolved "https://registry.npm.taobao.org/dot-prop/download/dot-prop-5.3.0.tgz?cache=0&sync_timestamp=1605778245785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdot-prop%2Fdownload%2Fdot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" integrity sha1-kMzOcIzZzYLMTcjD3dmr3VWyDog= dependencies: is-obj "^2.0.0" @@ -3390,7 +3390,7 @@ duplexer3@^0.1.4: duplexer@^0.1.1, duplexer@^0.1.2: version "0.1.2" - resolved "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" + resolved "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fduplexer%2Fdownload%2Fduplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha1-Or5DrvODX4rgd9E23c4PJ2sEAOY= ee-first@1.1.1: @@ -3399,40 +3399,40 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.896: - version "1.4.10" - resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.10.tgz#5f44ae6f6725b1949d6e8d34352f80d4c1880734" - integrity sha512-tFgA40Iq2oy4k2PnZrLJowbgpij+lD6ZLxkw8Ht1NKTYyN8dvSvC5xlo8X0WW2jqhKSzITrbr5mpB4/AZ/8OUA== + version "1.4.11" + resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.11.tgz#303c9deebbe90c68bf5c2c81a88a3bf4522c8810" + integrity sha512-2OhsaYgsWGhWjx2et8kaUcdktPbBGjKM2X0BReUCKcSCPttEY+hz2zie820JLbttU8jwL92+JJysWwkut3wZgA== emoji-regex@^8.0.0: version "8.0.0" - resolved "https://registry.npmmirror.com/emoji-regex/download/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + resolved "https://registry.npmmirror.com/emoji-regex/download/emoji-regex-8.0.0.tgz?cache=0&sync_timestamp=1632751333727&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Femoji-regex%2Fdownload%2Femoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha1-6Bj9ac5cz8tARZT4QpY79TFkzDc= emojis-list@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + resolved "https://registry.nlark.com/emojis-list/download/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" integrity sha1-VXBmIEatKeLpFucariYKvf9Pang= emoticon@^3.2.0: version "3.2.0" - resolved "https://registry.npmmirror.com/emoticon/download/emoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f" + resolved "https://registry.npmmirror.com/emoticon/download/emoticon-3.2.0.tgz?cache=0&sync_timestamp=1636290949842&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Femoticon%2Fdownload%2Femoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f" integrity sha1-wAjKfXYg+sdC/hv0r4/4/tFUrn8= encodeurl@~1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/encodeurl/download/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + resolved "https://registry.nlark.com/encodeurl/download/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= end-of-stream@^1.1.0: version "1.4.4" - resolved "https://registry.npm.taobao.org/end-of-stream/download/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + resolved "https://registry.nlark.com/end-of-stream/download/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" integrity sha1-WuZKX0UFe682JuwU2gyl5LJDHrA= dependencies: once "^1.4.0" enhanced-resolve@^5.8.3: version "5.8.3" - resolved "https://registry.nlark.com/enhanced-resolve/download/enhanced-resolve-5.8.3.tgz?cache=0&sync_timestamp=1632130769099&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" + resolved "https://registry.nlark.com/enhanced-resolve/download/enhanced-resolve-5.8.3.tgz?cache=0&sync_timestamp=1632130840337&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" integrity sha1-bVUtRlzOBCP1s9cYUR6lOCansvA= dependencies: graceful-fs "^4.2.4" @@ -3457,7 +3457,7 @@ error-ex@^1.3.1: es-abstract@^1.17.2, es-abstract@^1.19.1: version "1.19.1" - resolved "https://registry.npmmirror.com/es-abstract/download/es-abstract-1.19.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-abstract%2Fdownload%2Fes-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" + resolved "https://registry.npmmirror.com/es-abstract/download/es-abstract-1.19.1.tgz?cache=0&sync_timestamp=1633234313248&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-abstract%2Fdownload%2Fes-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" integrity sha1-1IhXlodpFpWd547aoN9FZicRXsM= dependencies: call-bind "^1.0.2" @@ -3483,7 +3483,7 @@ es-abstract@^1.17.2, es-abstract@^1.19.1: es-module-lexer@^0.9.0: version "0.9.3" - resolved "https://registry.npmmirror.com/es-module-lexer/download/es-module-lexer-0.9.3.tgz?cache=0&sync_timestamp=1633649003753&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-module-lexer%2Fdownload%2Fes-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" + resolved "https://registry.npmmirror.com/es-module-lexer/download/es-module-lexer-0.9.3.tgz?cache=0&sync_timestamp=1633646154044&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-module-lexer%2Fdownload%2Fes-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" integrity sha1-bxPbAMw4QXE32vdDZvU1yOtDjxk= es-to-primitive@^1.2.1: @@ -3502,32 +3502,32 @@ escalade@^3.1.1: escape-goat@^2.0.0: version "2.1.1" - resolved "https://registry.npm.taobao.org/escape-goat/download/escape-goat-2.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fescape-goat%2Fdownload%2Fescape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" + resolved "https://registry.npm.taobao.org/escape-goat/download/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" integrity sha1-Gy3HcANnbEV+x2Cy3GjttkgYhnU= escape-html@^1.0.3, escape-html@~1.0.3: version "1.0.3" - resolved "https://registry.npm.taobao.org/escape-html/download/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + resolved "https://registry.nlark.com/escape-html/download/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= escape-string-regexp@^1.0.5: version "1.0.5" - resolved "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz?cache=0&sync_timestamp=1618677243201&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fescape-string-regexp%2Fdownload%2Fescape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + resolved "https://registry.nlark.com/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= escape-string-regexp@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-2.0.0.tgz?cache=0&sync_timestamp=1618677243201&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fescape-string-regexp%2Fdownload%2Fescape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + resolved "https://registry.nlark.com/escape-string-regexp/download/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha1-owME6Z2qMuI7L9IPUbq9B8/8o0Q= escape-string-regexp@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-4.0.0.tgz?cache=0&sync_timestamp=1618677243201&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fescape-string-regexp%2Fdownload%2Fescape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + resolved "https://registry.nlark.com/escape-string-regexp/download/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha1-FLqDpdNz49MR5a/KKc9b+tllvzQ= eslint-scope@5.1.1: version "5.1.1" - resolved "https://registry.npmmirror.com/eslint-scope/download/eslint-scope-5.1.1.tgz?cache=0&sync_timestamp=1637466929956&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Feslint-scope%2Fdownload%2Feslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + resolved "https://registry.npmmirror.com/eslint-scope/download/eslint-scope-5.1.1.tgz?cache=0&sync_timestamp=1637466913662&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Feslint-scope%2Fdownload%2Feslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha1-54blmmbLkrP2wfsNUIqrF0hI9Iw= dependencies: esrecurse "^4.3.0" @@ -3535,7 +3535,7 @@ eslint-scope@5.1.1: esprima@^4.0.0: version "4.0.1" - resolved "https://registry.npm.taobao.org/esprima/download/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + resolved "https://registry.nlark.com/esprima/download/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha1-E7BM2z5sXRnfkatph6hpVhmwqnE= esrecurse@^4.3.0: @@ -3547,17 +3547,17 @@ esrecurse@^4.3.0: estraverse@^4.1.1: version "4.3.0" - resolved "https://registry.npmmirror.com/estraverse/download/estraverse-4.3.0.tgz?cache=0&sync_timestamp=1635237907922&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + resolved "https://registry.npmmirror.com/estraverse/download/estraverse-4.3.0.tgz?cache=0&sync_timestamp=1635237716974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha1-OYrT88WiSUi+dyXoPRGn3ijNvR0= estraverse@^5.2.0: version "5.3.0" - resolved "https://registry.npmmirror.com/estraverse/download/estraverse-5.3.0.tgz?cache=0&sync_timestamp=1635237907922&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + resolved "https://registry.npmmirror.com/estraverse/download/estraverse-5.3.0.tgz?cache=0&sync_timestamp=1635237716974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" integrity sha1-LupSkHAvJquP5TcDcP+GyWXSESM= esutils@^2.0.2: version "2.0.3" - resolved "https://registry.nlark.com/esutils/download/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + resolved "https://registry.npm.taobao.org/esutils/download/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q= eta@^1.12.3: @@ -3567,34 +3567,34 @@ eta@^1.12.3: etag@~1.8.1: version "1.8.1" - resolved "https://registry.npm.taobao.org/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + resolved "https://registry.nlark.com/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= eval@^0.1.4: version "0.1.6" - resolved "https://registry.nlark.com/eval/download/eval-0.1.6.tgz#9620d7d8c85515e97e6b47c5814f46ae381cb3cc" + resolved "https://registry.npm.taobao.org/eval/download/eval-0.1.6.tgz#9620d7d8c85515e97e6b47c5814f46ae381cb3cc" integrity sha1-liDX2MhVFel+a0fFgU9Grjgcs8w= dependencies: require-like ">= 0.1.1" eventemitter3@^4.0.0: version "4.0.7" - resolved "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + resolved "https://registry.nlark.com/eventemitter3/download/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha1-Lem2j2Uo1WRO9cWVJqG0oHMGFp8= events@^1.1.1: version "1.1.1" - resolved "https://registry.npmmirror.com/events/download/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" + resolved "https://registry.npmmirror.com/events/download/events-1.1.1.tgz?cache=0&sync_timestamp=1636449286836&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fevents%2Fdownload%2Fevents-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= events@^3.2.0: version "3.3.0" - resolved "https://registry.npmmirror.com/events/download/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + resolved "https://registry.npmmirror.com/events/download/events-3.3.0.tgz?cache=0&sync_timestamp=1636449286836&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fevents%2Fdownload%2Fevents-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha1-Mala0Kkk4tLEGagTrrLE6HjqdAA= execa@^5.0.0: version "5.1.1" - resolved "https://registry.npmmirror.com/execa/download/execa-5.1.1.tgz?cache=0&sync_timestamp=1637147207309&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fexeca%2Fdownload%2Fexeca-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + resolved "https://registry.npmmirror.com/execa/download/execa-5.1.1.tgz?cache=0&sync_timestamp=1637147188673&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fexeca%2Fdownload%2Fexeca-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" integrity sha1-+ArZy/Qpj3vR1MlVXCHpN0HEEd0= dependencies: cross-spawn "^7.0.3" @@ -3609,7 +3609,7 @@ execa@^5.0.0: express@^4.17.1: version "4.17.1" - resolved "https://registry.npm.taobao.org/express/download/express-4.17.1.tgz?cache=0&sync_timestamp=1615984406685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fexpress%2Fdownload%2Fexpress-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + resolved "https://registry.nlark.com/express/download/express-4.17.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fexpress%2Fdownload%2Fexpress-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" integrity sha1-RJH8OGBc9R+GKdOcK10Cb5ikwTQ= dependencies: accepts "~1.3.7" @@ -3645,7 +3645,7 @@ express@^4.17.1: extend-shallow@^2.0.1: version "2.0.1" - resolved "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + resolved "https://registry.nlark.com/extend-shallow/download/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= dependencies: is-extendable "^0.1.0" @@ -3657,7 +3657,7 @@ extend@^3.0.0: fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" - resolved "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + resolved "https://registry.nlark.com/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU= fast-glob@^3.1.1, fast-glob@^3.2.7: @@ -3673,12 +3673,12 @@ fast-glob@^3.1.1, fast-glob@^3.2.7: fast-json-stable-stringify@^2.0.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + resolved "https://registry.nlark.com/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM= fast-url-parser@1.1.3: version "1.1.3" - resolved "https://registry.npm.taobao.org/fast-url-parser/download/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" + resolved "https://registry.nlark.com/fast-url-parser/download/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" integrity sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0= dependencies: punycode "^1.3.2" @@ -3706,7 +3706,7 @@ feed@^4.2.2: file-loader@^6.2.0: version "6.2.0" - resolved "https://registry.npm.taobao.org/file-loader/download/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" + resolved "https://registry.nlark.com/file-loader/download/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" integrity sha1-uu98+OGEDfMl5DkLRISHlIDuvk0= dependencies: loader-utils "^2.0.0" @@ -3714,7 +3714,7 @@ file-loader@^6.2.0: filesize@^6.1.0: version "6.4.0" - resolved "https://registry.npmmirror.com/filesize/download/filesize-6.4.0.tgz#914f50471dd66fdca3cefe628bd0cde4ef769bcd" + resolved "https://registry.npmmirror.com/filesize/download/filesize-6.4.0.tgz?cache=0&sync_timestamp=1635763993879&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffilesize%2Fdownload%2Ffilesize-6.4.0.tgz#914f50471dd66fdca3cefe628bd0cde4ef769bcd" integrity sha1-kU9QRx3Wb9yjzv5ii9DN5O92m80= fill-range@^7.0.1: @@ -3726,7 +3726,7 @@ fill-range@^7.0.1: finalhandler@~1.1.2: version "1.1.2" - resolved "https://registry.npm.taobao.org/finalhandler/download/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + resolved "https://registry.nlark.com/finalhandler/download/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" integrity sha1-t+fQAP/RGTjQ/bBTUG9uur6fWH0= dependencies: debug "2.6.9" @@ -3739,7 +3739,7 @@ finalhandler@~1.1.2: find-cache-dir@^3.3.1: version "3.3.2" - resolved "https://registry.nlark.com/find-cache-dir/download/find-cache-dir-3.3.2.tgz?cache=0&sync_timestamp=1630260009898&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffind-cache-dir%2Fdownload%2Ffind-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + resolved "https://registry.nlark.com/find-cache-dir/download/find-cache-dir-3.3.2.tgz?cache=0&sync_timestamp=1630259965392&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffind-cache-dir%2Fdownload%2Ffind-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" integrity sha1-swxbbv8HMHMa6pu9nb7L2AJW1ks= dependencies: commondir "^1.0.1" @@ -3748,14 +3748,14 @@ find-cache-dir@^3.3.1: find-up@^3.0.0: version "3.0.0" - resolved "https://registry.npmmirror.com/find-up/download/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + resolved "https://registry.npmmirror.com/find-up/download/find-up-3.0.0.tgz?cache=0&sync_timestamp=1633620747957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffind-up%2Fdownload%2Ffind-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" integrity sha1-SRafHXmTQwZG2mHsxa41XCHJe3M= dependencies: locate-path "^3.0.0" find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" - resolved "https://registry.npmmirror.com/find-up/download/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + resolved "https://registry.npmmirror.com/find-up/download/find-up-4.1.0.tgz?cache=0&sync_timestamp=1633620747957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffind-up%2Fdownload%2Ffind-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" integrity sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk= dependencies: locate-path "^5.0.0" @@ -3821,12 +3821,12 @@ fs-extra@^9.0.0: fs-monkey@1.0.3: version "1.0.3" - resolved "https://registry.npm.taobao.org/fs-monkey/download/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" + resolved "https://registry.npm.taobao.org/fs-monkey/download/fs-monkey-1.0.3.tgz?cache=0&sync_timestamp=1617593422622&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-monkey%2Fdownload%2Ffs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" integrity sha1-rjrJLVO7Mo7+DpodlUH2rY1I4tM= fs.realpath@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + resolved "https://registry.nlark.com/fs.realpath/download/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= fsevents@~2.3.2: @@ -3836,12 +3836,12 @@ fsevents@~2.3.2: function-bind@^1.1.1: version "1.1.1" - resolved "https://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + resolved "https://registry.nlark.com/function-bind/download/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0= gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2: version "1.0.0-beta.2" - resolved "https://registry.npm.taobao.org/gensync/download/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + resolved "https://registry.nlark.com/gensync/download/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha1-MqbudsPX9S1GsrGuXZP+qFgKJeA= get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: @@ -3855,7 +3855,7 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: get-own-enumerable-property-symbols@^3.0.0: version "3.0.2" - resolved "https://registry.nlark.com/get-own-enumerable-property-symbols/download/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" + resolved "https://registry.npm.taobao.org/get-own-enumerable-property-symbols/download/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" integrity sha1-tf3nfyLL4185C04ImSLFC85u9mQ= get-stream@^4.1.0: @@ -3887,26 +3887,26 @@ get-symbol-description@^1.0.0: github-slugger@^1.4.0: version "1.4.0" - resolved "https://registry.nlark.com/github-slugger/download/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" + resolved "https://registry.nlark.com/github-slugger/download/github-slugger-1.4.0.tgz?cache=0&sync_timestamp=1629817837468&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fgithub-slugger%2Fdownload%2Fgithub-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" integrity sha1-IG65bNsi7lb9xToo1aMCM4RjRE4= glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" - resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-5.1.2.tgz?cache=0&sync_timestamp=1632954501757&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha1-hpgyxYA0/mikCTwX3BXoNA2EAcQ= dependencies: is-glob "^4.0.1" glob-parent@^6.0.1, glob-parent@^6.0.2: version "6.0.2" - resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-6.0.2.tgz?cache=0&sync_timestamp=1632954501757&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" integrity sha1-bSN9mQg5UMeSkPJMdkKj3poo+eM= dependencies: is-glob "^4.0.3" glob-to-regexp@^0.4.1: version "0.4.1" - resolved "https://registry.npm.taobao.org/glob-to-regexp/download/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + resolved "https://registry.nlark.com/glob-to-regexp/download/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha1-x1KXCHyFG5pXi9IX3VmpL1n+VG4= glob@^7.0.0, glob@^7.1.3, glob@^7.1.6: @@ -3923,21 +3923,21 @@ glob@^7.0.0, glob@^7.1.3, glob@^7.1.6: global-dirs@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/global-dirs/download/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" + resolved "https://registry.npm.taobao.org/global-dirs/download/global-dirs-3.0.0.tgz?cache=0&sync_timestamp=1610454716901&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobal-dirs%2Fdownload%2Fglobal-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" integrity sha1-cKdv6E6jFas3sfVXbL3n1I73JoY= dependencies: ini "2.0.0" global-modules@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/global-modules/download/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" + resolved "https://registry.nlark.com/global-modules/download/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" integrity sha1-mXYFrSNF8n9RU5vqJldEISFcd4A= dependencies: global-prefix "^3.0.0" global-prefix@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/global-prefix/download/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" + resolved "https://registry.nlark.com/global-prefix/download/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" integrity sha1-/IX3MGTfafUEIfR/iD/luRO6m5c= dependencies: ini "^1.3.5" @@ -4010,32 +4010,32 @@ gzip-size@^6.0.0: handle-thing@^2.0.0: version "2.0.1" - resolved "https://registry.npm.taobao.org/handle-thing/download/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" + resolved "https://registry.nlark.com/handle-thing/download/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" integrity sha1-hX95zjWVgMNA1DCBzGSJcNC7I04= has-bigints@^1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/has-bigints/download/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + resolved "https://registry.nlark.com/has-bigints/download/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" integrity sha1-ZP5qywIGc+O3jbA1pa9pqp0HsRM= has-flag@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/has-flag/download/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + resolved "https://registry.nlark.com/has-flag/download/has-flag-3.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= has-flag@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + resolved "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s= has-symbols@^1.0.1, has-symbols@^1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + resolved "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.2.tgz?cache=0&sync_timestamp=1614443557459&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhas-symbols%2Fdownload%2Fhas-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha1-Fl0wcMADCXUqEjakeTMeOsVvFCM= has-tostringtag@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/has-tostringtag/download/has-tostringtag-1.0.0.tgz?cache=0&sync_timestamp=1628196402801&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-tostringtag%2Fdownload%2Fhas-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + resolved "https://registry.nlark.com/has-tostringtag/download/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" integrity sha1-fhM4GKfTlHNPlB5zw9P5KR5liyU= dependencies: has-symbols "^1.0.2" @@ -4047,7 +4047,7 @@ has-yarn@^2.1.0: has@^1.0.3: version "1.0.3" - resolved "https://registry.npm.taobao.org/has/download/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + resolved "https://registry.nlark.com/has/download/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" integrity sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y= dependencies: function-bind "^1.1.1" @@ -4067,7 +4067,7 @@ hast-to-hyperscript@^9.0.0: hast-util-from-parse5@^5.0.0: version "5.0.3" - resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-5.0.3.tgz?cache=0&sync_timestamp=1627032098094&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-util-from-parse5%2Fdownload%2Fhast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" + resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" integrity sha1-MIncDuLM9uyLxBaRm1GlSlieCXw= dependencies: ccount "^1.0.3" @@ -4078,7 +4078,7 @@ hast-util-from-parse5@^5.0.0: hast-util-from-parse5@^6.0.0: version "6.0.1" - resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-6.0.1.tgz?cache=0&sync_timestamp=1627032098094&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-util-from-parse5%2Fdownload%2Fhast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" + resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" integrity sha1-VU40q97qJax29b2VCh8BgOCzvCo= dependencies: "@types/parse5" "^5.0.0" @@ -4095,7 +4095,7 @@ hast-util-parse-selector@^2.0.0: hast-util-raw@6.0.1: version "6.0.1" - resolved "https://registry.npmmirror.com/hast-util-raw/download/hast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977" + resolved "https://registry.npmmirror.com/hast-util-raw/download/hast-util-raw-6.0.1.tgz?cache=0&sync_timestamp=1636450214370&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhast-util-raw%2Fdownload%2Fhast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977" integrity sha1-lzsVkwt1Kae2aYTJgUi0ZSaIWXc= dependencies: "@types/hast" "^2.0.0" @@ -4122,7 +4122,7 @@ hast-util-to-parse5@^6.0.0: hastscript@^5.0.0: version "5.1.2" - resolved "https://registry.nlark.com/hastscript/download/hastscript-5.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhastscript%2Fdownload%2Fhastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a" + resolved "https://registry.nlark.com/hastscript/download/hastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a" integrity sha1-veLC5W0Exi3SToxd8ojQUKNV+4o= dependencies: comma-separated-tokens "^1.0.0" @@ -4132,7 +4132,7 @@ hastscript@^5.0.0: hastscript@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/hastscript/download/hastscript-6.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhastscript%2Fdownload%2Fhastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" + resolved "https://registry.nlark.com/hastscript/download/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" integrity sha1-6HaNfqxWw/3qyKkoMNWOgR5b9kA= dependencies: "@types/hast" "^2.0.0" @@ -4143,7 +4143,7 @@ hastscript@^6.0.0: he@^1.2.0: version "1.2.0" - resolved "https://registry.npm.taobao.org/he/download/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + resolved "https://registry.nlark.com/he/download/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha1-hK5l+n6vsWX922FWauFLrwVmTw8= history@^4.9.0: @@ -4160,7 +4160,7 @@ history@^4.9.0: hoist-non-react-statics@^3.1.0: version "3.3.2" - resolved "https://registry.npm.taobao.org/hoist-non-react-statics/download/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" + resolved "https://registry.nlark.com/hoist-non-react-statics/download/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha1-7OCsr3HWLClpwuxZ/v9CpLGoW0U= dependencies: react-is "^16.7.0" @@ -4177,7 +4177,7 @@ hpack.js@^2.1.6: html-entities@^2.3.2: version "2.3.2" - resolved "https://registry.nlark.com/html-entities/download/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" + resolved "https://registry.npm.taobao.org/html-entities/download/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" integrity sha1-dgtARoXLHXlOT0t0QzLjsA3P5Ig= html-minifier-terser@^6.0.2: @@ -4195,7 +4195,7 @@ html-minifier-terser@^6.0.2: html-tags@^3.1.0: version "3.1.0" - resolved "https://registry.npm.taobao.org/html-tags/download/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" + resolved "https://registry.nlark.com/html-tags/download/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" integrity sha1-e15vfmZen7QfMAB+2eDUHpf7IUA= html-void-elements@^1.0.0: @@ -4205,7 +4205,7 @@ html-void-elements@^1.0.0: html-webpack-plugin@^5.4.0: version "5.5.0" - resolved "https://registry.npmmirror.com/html-webpack-plugin/download/html-webpack-plugin-5.5.0.tgz?cache=0&sync_timestamp=1635212553430&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtml-webpack-plugin%2Fdownload%2Fhtml-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" + resolved "https://registry.npmmirror.com/html-webpack-plugin/download/html-webpack-plugin-5.5.0.tgz?cache=0&sync_timestamp=1635212582127&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtml-webpack-plugin%2Fdownload%2Fhtml-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" integrity sha1-w5EZNvV2gcH59Ni2jBWM2d/lL1A= dependencies: "@types/html-minifier-terser" "^6.0.0" @@ -4216,7 +4216,7 @@ html-webpack-plugin@^5.4.0: htmlparser2@^3.9.1: version "3.10.1" - resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-3.10.1.tgz?cache=0&sync_timestamp=1636641539121&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" + resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-3.10.1.tgz?cache=0&sync_timestamp=1636640841489&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" integrity sha1-vWedw/WYl7ajS7EHSchVu1OpOS8= dependencies: domelementtype "^1.3.1" @@ -4228,7 +4228,7 @@ htmlparser2@^3.9.1: htmlparser2@^6.1.0: version "6.1.0" - resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-6.1.0.tgz?cache=0&sync_timestamp=1636641539121&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" + resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-6.1.0.tgz?cache=0&sync_timestamp=1636640841489&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" integrity sha1-xNditsM3GgXb5l6UrkOp+EX7j7c= dependencies: domelementtype "^2.0.1" @@ -4248,7 +4248,7 @@ http-deceiver@^1.2.7: http-errors@1.7.2: version "1.7.2" - resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.7.2.tgz?cache=0&sync_timestamp=1636932154238&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.7.2.tgz?cache=0&sync_timestamp=1636932216570&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" integrity sha1-T1ApzxMjnzEDblsuVSkrz7zIXI8= dependencies: depd "~1.1.2" @@ -4259,7 +4259,7 @@ http-errors@1.7.2: http-errors@~1.6.2: version "1.6.3" - resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.6.3.tgz?cache=0&sync_timestamp=1636932154238&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" + resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.6.3.tgz?cache=0&sync_timestamp=1636932216570&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= dependencies: depd "~1.1.2" @@ -4269,7 +4269,7 @@ http-errors@~1.6.2: http-errors@~1.7.2: version "1.7.3" - resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.7.3.tgz?cache=0&sync_timestamp=1636932154238&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.7.3.tgz?cache=0&sync_timestamp=1636932216570&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" integrity sha1-bGGeT5xgMIw4UZSYwU+7EKrOuwY= dependencies: depd "~1.1.2" @@ -4285,7 +4285,7 @@ http-parser-js@>=0.5.1: http-proxy-middleware@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/http-proxy-middleware/download/http-proxy-middleware-2.0.1.tgz#7ef3417a479fb7666a571e09966c66a39bd2c15f" + resolved "https://registry.nlark.com/http-proxy-middleware/download/http-proxy-middleware-2.0.1.tgz?cache=0&sync_timestamp=1625172260511&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhttp-proxy-middleware%2Fdownload%2Fhttp-proxy-middleware-2.0.1.tgz#7ef3417a479fb7666a571e09966c66a39bd2c15f" integrity sha1-fvNBekeft2ZqVx4Jlmxmo5vSwV8= dependencies: "@types/http-proxy" "^1.17.5" @@ -4296,7 +4296,7 @@ http-proxy-middleware@^2.0.0: http-proxy@^1.18.1: version "1.18.1" - resolved "https://registry.nlark.com/http-proxy/download/http-proxy-1.18.1.tgz?cache=0&sync_timestamp=1618847045732&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhttp-proxy%2Fdownload%2Fhttp-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + resolved "https://registry.npm.taobao.org/http-proxy/download/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" integrity sha1-QBVB8FNIhLv5UmAzTnL4juOXZUk= dependencies: eventemitter3 "^4.0.0" @@ -4305,7 +4305,7 @@ http-proxy@^1.18.1: human-signals@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/human-signals/download/human-signals-2.1.0.tgz?cache=0&sync_timestamp=1624364695595&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhuman-signals%2Fdownload%2Fhuman-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + resolved "https://registry.nlark.com/human-signals/download/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha1-3JH8ukLk0G5Kuu0zs+ejwC9RTqA= iconv-lite@0.4.24: @@ -4317,12 +4317,12 @@ iconv-lite@0.4.24: icss-utils@^5.0.0, icss-utils@^5.1.0: version "5.1.0" - resolved "https://registry.npm.taobao.org/icss-utils/download/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + resolved "https://registry.nlark.com/icss-utils/download/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" integrity sha1-xr5oWKvQE9do6YNmrkfiXViHsa4= ignore@^5.1.4: version "5.1.9" - resolved "https://registry.npmmirror.com/ignore/download/ignore-5.1.9.tgz?cache=0&sync_timestamp=1635926632542&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fignore%2Fdownload%2Fignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb" + resolved "https://registry.npmmirror.com/ignore/download/ignore-5.1.9.tgz?cache=0&sync_timestamp=1635926740448&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fignore%2Fdownload%2Fignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb" integrity sha1-nsGly+jhRG7GDUQgBg1Dqm5zgvs= immer@^9.0.6: @@ -4332,14 +4332,14 @@ immer@^9.0.6: import-cwd@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/import-cwd/download/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92" + resolved "https://registry.nlark.com/import-cwd/download/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92" integrity sha1-IIRVR3GAFRJuqbNna3WS+4vUz5I= dependencies: import-from "^3.0.0" import-fresh@^3.1.0, import-fresh@^3.2.1, import-fresh@^3.2.2, import-fresh@^3.3.0: version "3.3.0" - resolved "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + resolved "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz?cache=0&sync_timestamp=1608469579940&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimport-fresh%2Fdownload%2Fimport-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha1-NxYsJfy566oublPVtNiM4X2eDCs= dependencies: parent-module "^1.0.0" @@ -4354,17 +4354,17 @@ import-from@^3.0.0: import-lazy@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/import-lazy/download/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + resolved "https://registry.npm.taobao.org/import-lazy/download/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= imurmurhash@^0.1.4: version "0.1.4" - resolved "https://registry.npm.taobao.org/imurmurhash/download/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + resolved "https://registry.nlark.com/imurmurhash/download/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= indent-string@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/indent-string/download/indent-string-4.0.0.tgz?cache=0&sync_timestamp=1618679561483&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Findent-string%2Fdownload%2Findent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + resolved "https://registry.nlark.com/indent-string/download/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha1-Yk+PRJfWGbLZdoUx1Y9BIoVNclE= inflight@^1.0.4: @@ -4387,12 +4387,12 @@ inherits@2.0.3: ini@2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/ini/download/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" + resolved "https://registry.nlark.com/ini/download/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" integrity sha1-5f1Vbs3VcmvpePoQAYYurLCpS8U= ini@^1.3.5, ini@~1.3.0: version "1.3.8" - resolved "https://registry.npm.taobao.org/ini/download/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + resolved "https://registry.nlark.com/ini/download/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha1-op2kJbSIBvNHZ6Tvzjlyaa8oQyw= inline-style-parser@0.1.1: @@ -4402,7 +4402,7 @@ inline-style-parser@0.1.1: internal-slot@^1.0.3: version "1.0.3" - resolved "https://registry.npm.taobao.org/internal-slot/download/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + resolved "https://registry.nlark.com/internal-slot/download/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" integrity sha1-c0fjB97uovqsKsYgXUvH00ln9Zw= dependencies: get-intrinsic "^1.1.0" @@ -4411,12 +4411,12 @@ internal-slot@^1.0.3: interpret@^1.0.0: version "1.4.0" - resolved "https://registry.npm.taobao.org/interpret/download/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + resolved "https://registry.nlark.com/interpret/download/interpret-1.4.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Finterpret%2Fdownload%2Finterpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha1-Zlq4vE2iendKQFhOgS4+D6RbGh4= ip@^1.1.0: version "1.1.5" - resolved "https://registry.npm.taobao.org/ip/download/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" + resolved "https://registry.nlark.com/ip/download/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= ipaddr.js@1.9.1: @@ -4431,7 +4431,7 @@ ipaddr.js@^2.0.1: is-absolute-url@^3.0.3: version "3.0.3" - resolved "https://registry.nlark.com/is-absolute-url/download/is-absolute-url-3.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-absolute-url%2Fdownload%2Fis-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" + resolved "https://registry.nlark.com/is-absolute-url/download/is-absolute-url-3.0.3.tgz?cache=0&sync_timestamp=1628691816236&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-absolute-url%2Fdownload%2Fis-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" integrity sha1-lsaiK2ojkpsR6gr7GDbDatSl1pg= is-alphabetical@1.0.4, is-alphabetical@^1.0.0: @@ -4449,7 +4449,7 @@ is-alphanumerical@^1.0.0: is-arguments@^1.0.4: version "1.1.1" - resolved "https://registry.nlark.com/is-arguments/download/is-arguments-1.1.1.tgz?cache=0&sync_timestamp=1628201919104&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-arguments%2Fdownload%2Fis-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + resolved "https://registry.nlark.com/is-arguments/download/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" integrity sha1-FbP4j9oB8ql/7ITKdhpWDxI++ps= dependencies: call-bind "^1.0.2" @@ -4469,14 +4469,14 @@ is-bigint@^1.0.1: is-binary-path@~2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + resolved "https://registry.nlark.com/is-binary-path/download/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" integrity sha1-6h9/O4DwZCNug0cPhsCcJU+0Wwk= dependencies: binary-extensions "^2.0.0" is-boolean-object@^1.1.0: version "1.1.2" - resolved "https://registry.nlark.com/is-boolean-object/download/is-boolean-object-1.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-boolean-object%2Fdownload%2Fis-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + resolved "https://registry.nlark.com/is-boolean-object/download/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" integrity sha1-XG3CACRt2TIa5LiFoRS7H3X2Nxk= dependencies: call-bind "^1.0.2" @@ -4484,43 +4484,43 @@ is-boolean-object@^1.1.0: is-buffer@^2.0.0: version "2.0.5" - resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" + resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.5.tgz?cache=0&sync_timestamp=1604429876103&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-buffer%2Fdownload%2Fis-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha1-68JS5ADSL/jXf6CYiIIaJKZYwZE= is-callable@^1.1.4, is-callable@^1.2.4: version "1.2.4" - resolved "https://registry.nlark.com/is-callable/download/is-callable-1.2.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-callable%2Fdownload%2Fis-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + resolved "https://registry.nlark.com/is-callable/download/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha1-RzAdWN0CWUB4ZVR4U99tYf5HGUU= is-ci@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/is-ci/download/is-ci-2.0.0.tgz?cache=0&sync_timestamp=1635261984879&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-ci%2Fdownload%2Fis-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + resolved "https://registry.npmmirror.com/is-ci/download/is-ci-2.0.0.tgz?cache=0&sync_timestamp=1635261114993&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-ci%2Fdownload%2Fis-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" integrity sha1-a8YzQYGBDgS1wis9WJ/cpVAmQEw= dependencies: ci-info "^2.0.0" is-core-module@^2.2.0: version "2.8.0" - resolved "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz?cache=0&sync_timestamp=1634236731601&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-core-module%2Fdownload%2Fis-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" + resolved "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" integrity sha1-AyEzbD0JJeSX/Zf12VyxFKXM1Ug= dependencies: has "^1.0.3" is-date-object@^1.0.1: version "1.0.5" - resolved "https://registry.nlark.com/is-date-object/download/is-date-object-1.0.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-date-object%2Fdownload%2Fis-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + resolved "https://registry.nlark.com/is-date-object/download/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" integrity sha1-CEHVU25yTCVZe/bqYuG9OCmN8x8= dependencies: has-tostringtag "^1.0.0" is-decimal@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-decimal/download/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" + resolved "https://registry.npmmirror.com/is-decimal/download/is-decimal-1.0.4.tgz?cache=0&sync_timestamp=1636008960795&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-decimal%2Fdownload%2Fis-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" integrity sha1-ZaOllYocW2OnBuGzM9fNn2MNP6U= is-docker@^2.0.0, is-docker@^2.1.1: version "2.2.1" - resolved "https://registry.nlark.com/is-docker/download/is-docker-2.2.1.tgz?cache=0&sync_timestamp=1630451108035&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-docker%2Fdownload%2Fis-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + resolved "https://registry.nlark.com/is-docker/download/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha1-M+6r4jz+hvFL3kQIoCwM+4U6zao= is-extendable@^0.1.0: @@ -4530,29 +4530,29 @@ is-extendable@^0.1.0: is-extglob@^2.1.1: version "2.1.1" - resolved "https://registry.nlark.com/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + resolved "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= is-fullwidth-code-point@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + resolved "https://registry.nlark.com/is-fullwidth-code-point/download/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0= is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" - resolved "https://registry.npmmirror.com/is-glob/download/is-glob-4.0.3.tgz?cache=0&sync_timestamp=1632934512076&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-glob%2Fdownload%2Fis-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + resolved "https://registry.npmmirror.com/is-glob/download/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha1-ZPYeQsu7LuwgcanawLKLoeZdUIQ= dependencies: is-extglob "^2.1.1" is-hexadecimal@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-hexadecimal/download/is-hexadecimal-1.0.4.tgz?cache=0&sync_timestamp=1636011905161&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-hexadecimal%2Fdownload%2Fis-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" + resolved "https://registry.npmmirror.com/is-hexadecimal/download/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" integrity sha1-zDXJdYjaS9Saju3WvECC1E3LI6c= is-installed-globally@^0.4.0: version "0.4.0" - resolved "https://registry.npm.taobao.org/is-installed-globally/download/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" + resolved "https://registry.npm.taobao.org/is-installed-globally/download/is-installed-globally-0.4.0.tgz?cache=0&sync_timestamp=1610875398433&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-installed-globally%2Fdownload%2Fis-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" integrity sha1-mg/UB5ScMPhutpWe8beZTtC3tSA= dependencies: global-dirs "^3.0.0" @@ -4560,7 +4560,7 @@ is-installed-globally@^0.4.0: is-negative-zero@^2.0.1: version "2.0.1" - resolved "https://registry.npm.taobao.org/is-negative-zero/download/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" + resolved "https://registry.nlark.com/is-negative-zero/download/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" integrity sha1-PedGwY3aIxkkGlNnWQjY92bxHCQ= is-npm@^5.0.0: @@ -4582,12 +4582,12 @@ is-number@^7.0.0: is-obj@^1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/is-obj/download/is-obj-1.0.1.tgz?cache=0&sync_timestamp=1618600919478&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-obj%2Fdownload%2Fis-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + resolved "https://registry.nlark.com/is-obj/download/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= is-obj@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/is-obj/download/is-obj-2.0.0.tgz?cache=0&sync_timestamp=1618600919478&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-obj%2Fdownload%2Fis-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + resolved "https://registry.nlark.com/is-obj/download/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha1-Rz+wXZc3BeP9liBUUBjKjiLvSYI= is-path-cwd@^2.2.0: @@ -4602,12 +4602,12 @@ is-path-inside@^3.0.2: is-plain-obj@^2.0.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" + resolved "https://registry.nlark.com/is-plain-obj/download/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" integrity sha1-ReQuN/zPH0Dajl927iFRWEDAkoc= is-plain-obj@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" + resolved "https://registry.nlark.com/is-plain-obj/download/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" integrity sha1-r28uoUrFpkYYOlu9tbqrvBVq2dc= is-plain-object@^2.0.4: @@ -4619,7 +4619,7 @@ is-plain-object@^2.0.4: is-regex@^1.0.4, is-regex@^1.1.4: version "1.1.4" - resolved "https://registry.nlark.com/is-regex/download/is-regex-1.1.4.tgz?cache=0&sync_timestamp=1628221853554&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-regex%2Fdownload%2Fis-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + resolved "https://registry.nlark.com/is-regex/download/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" integrity sha1-7vVmPNWfpMCuM5UFMj32hUuxWVg= dependencies: call-bind "^1.0.2" @@ -4627,7 +4627,7 @@ is-regex@^1.0.4, is-regex@^1.1.4: is-regexp@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/is-regexp/download/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" + resolved "https://registry.npm.taobao.org/is-regexp/download/is-regexp-1.0.0.tgz?cache=0&sync_timestamp=1617816768041&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-regexp%2Fdownload%2Fis-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= is-resolvable@^1.1.0: @@ -4637,7 +4637,7 @@ is-resolvable@^1.1.0: is-root@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/is-root/download/is-root-2.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-root%2Fdownload%2Fis-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" + resolved "https://registry.npm.taobao.org/is-root/download/is-root-2.1.0.tgz?cache=0&sync_timestamp=1617783382597&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-root%2Fdownload%2Fis-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" integrity sha1-gJ4YEpzxEpZEMCpPhUQDXVGYSpw= is-shared-array-buffer@^1.0.1: @@ -4659,7 +4659,7 @@ is-string@^1.0.5, is-string@^1.0.7: is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" - resolved "https://registry.nlark.com/is-symbol/download/is-symbol-1.0.4.tgz?cache=0&sync_timestamp=1620501174327&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-symbol%2Fdownload%2Fis-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + resolved "https://registry.nlark.com/is-symbol/download/is-symbol-1.0.4.tgz?cache=0&sync_timestamp=1620501182675&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-symbol%2Fdownload%2Fis-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" integrity sha1-ptrJO2NbBjymhyI23oiRClevE5w= dependencies: has-symbols "^1.0.2" @@ -4678,44 +4678,44 @@ is-weakref@^1.0.1: is-whitespace-character@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-whitespace-character/download/is-whitespace-character-1.0.4.tgz?cache=0&sync_timestamp=1636008961129&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-whitespace-character%2Fdownload%2Fis-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7" + resolved "https://registry.npmmirror.com/is-whitespace-character/download/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7" integrity sha1-CFjt2UqVWUx8ndC1wXTsbkXuSqc= is-word-character@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-word-character/download/is-word-character-1.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-word-character%2Fdownload%2Fis-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230" + resolved "https://registry.npmmirror.com/is-word-character/download/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230" integrity sha1-zg5zIW+YWZBgWS9i/zE1TdvrAjA= is-wsl@^2.1.1, is-wsl@^2.2.0: version "2.2.0" - resolved "https://registry.npm.taobao.org/is-wsl/download/is-wsl-2.2.0.tgz?cache=0&sync_timestamp=1615984417335&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-wsl%2Fdownload%2Fis-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + resolved "https://registry.npm.taobao.org/is-wsl/download/is-wsl-2.2.0.tgz?cache=0&sync_timestamp=1592843177178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-wsl%2Fdownload%2Fis-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" integrity sha1-dKTHbnfKn9P5MvKQwX6jJs0VcnE= dependencies: is-docker "^2.0.0" is-yarn-global@^0.3.0: version "0.3.0" - resolved "https://registry.nlark.com/is-yarn-global/download/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" + resolved "https://registry.nlark.com/is-yarn-global/download/is-yarn-global-0.3.0.tgz?cache=0&sync_timestamp=1619356824740&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-yarn-global%2Fdownload%2Fis-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" integrity sha1-1QLTOCWQ6jAEiTdGdUyJE5lz4jI= isarray@0.0.1: version "0.0.1" - resolved "https://registry.npm.taobao.org/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + resolved "https://registry.nlark.com/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= isarray@~1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + resolved "https://registry.nlark.com/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= isexe@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + resolved "https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= isobject@^3.0.1: version "3.0.1" - resolved "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + resolved "https://registry.nlark.com/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= jest-worker@^27.0.2, jest-worker@^27.0.6: @@ -4740,12 +4740,12 @@ joi@^17.4.0, joi@^17.4.2: "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/js-tokens/download/js-tokens-4.0.0.tgz?cache=0&sync_timestamp=1619345098261&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-tokens%2Fdownload%2Fjs-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + resolved "https://registry.nlark.com/js-tokens/download/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha1-GSA/tZmR35jjoocFDUZHzerzJJk= js-yaml@^3.13.1: version "3.14.1" - resolved "https://registry.npm.taobao.org/js-yaml/download/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + resolved "https://registry.nlark.com/js-yaml/download/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha1-2ugS/bOCX6MGYJqHFzg8UMNqBTc= dependencies: argparse "^1.0.7" @@ -4753,19 +4753,19 @@ js-yaml@^3.13.1: js-yaml@^4.0.0: version "4.1.0" - resolved "https://registry.npm.taobao.org/js-yaml/download/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + resolved "https://registry.nlark.com/js-yaml/download/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" integrity sha1-wftl+PUBeQHN0slRhkuhhFihBgI= dependencies: argparse "^2.0.1" jsesc@^2.5.1: version "2.5.2" - resolved "https://registry.npm.taobao.org/jsesc/download/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + resolved "https://registry.nlark.com/jsesc/download/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha1-gFZNLkg9rPbo7yCWUKZ98/DCg6Q= jsesc@~0.5.0: version "0.5.0" - resolved "https://registry.npm.taobao.org/jsesc/download/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + resolved "https://registry.nlark.com/jsesc/download/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= json-buffer@3.0.0: @@ -4775,7 +4775,7 @@ json-buffer@3.0.0: json-parse-better-errors@^1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/json-parse-better-errors/download/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + resolved "https://registry.nlark.com/json-parse-better-errors/download/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk= json-parse-even-better-errors@^2.3.0: @@ -4809,7 +4809,7 @@ json5@^2.1.2: jsonfile@^6.0.1: version "6.1.0" - resolved "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + resolved "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" integrity sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4= dependencies: universalify "^2.0.0" @@ -4825,34 +4825,34 @@ keyv@^3.0.0: kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.3" - resolved "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + resolved "https://registry.nlark.com/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0= kleur@^3.0.3: version "3.0.3" - resolved "https://registry.npm.taobao.org/kleur/download/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" + resolved "https://registry.nlark.com/kleur/download/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha1-p5yezIbuHOP6YgbRIWxQHxR/wH4= klona@^2.0.5: version "2.0.5" - resolved "https://registry.npmmirror.com/klona/download/klona-2.0.5.tgz?cache=0&sync_timestamp=1635386077088&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fklona%2Fdownload%2Fklona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" + resolved "https://registry.npmmirror.com/klona/download/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" integrity sha1-0WZXTZAHY5XZljqnqSj6u412r7w= latest-version@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/latest-version/download/latest-version-5.1.0.tgz?cache=0&sync_timestamp=1626951703884&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flatest-version%2Fdownload%2Flatest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + resolved "https://registry.nlark.com/latest-version/download/latest-version-5.1.0.tgz?cache=0&sync_timestamp=1626951682795&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flatest-version%2Fdownload%2Flatest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" integrity sha1-EZ3+kI/jjRXfpD7NE/oS7Igy+s4= dependencies: package-json "^6.3.0" leven@^3.1.0: version "3.1.0" - resolved "https://registry.nlark.com/leven/download/leven-3.1.0.tgz?cache=0&sync_timestamp=1628597847220&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fleven%2Fdownload%2Fleven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + resolved "https://registry.nlark.com/leven/download/leven-3.1.0.tgz?cache=0&sync_timestamp=1628597917913&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fleven%2Fdownload%2Fleven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" integrity sha1-d4kd6DQGTMy6gq54QrtrFKE+1/I= lilconfig@^2.0.3: version "2.0.4" - resolved "https://registry.npmmirror.com/lilconfig/download/lilconfig-2.0.4.tgz?cache=0&sync_timestamp=1636150747257&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flilconfig%2Fdownload%2Flilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" + resolved "https://registry.npmmirror.com/lilconfig/download/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" integrity sha1-9FB9BD1wWLOAtqj1y3vNSzTO4II= lines-and-columns@^1.1.6: @@ -4862,12 +4862,12 @@ lines-and-columns@^1.1.6: loader-runner@^4.2.0: version "4.2.0" - resolved "https://registry.npm.taobao.org/loader-runner/download/loader-runner-4.2.0.tgz?cache=0&sync_timestamp=1610027852811&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floader-runner%2Fdownload%2Floader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" + resolved "https://registry.nlark.com/loader-runner/download/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" integrity sha1-1wIjgNZtFMX7HUlriYZOvP1Hg4Q= loader-utils@^1.4.0: version "1.4.0" - resolved "https://registry.npmmirror.com/loader-utils/download/loader-utils-1.4.0.tgz?cache=0&sync_timestamp=1636687952505&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + resolved "https://registry.npmmirror.com/loader-utils/download/loader-utils-1.4.0.tgz?cache=0&sync_timestamp=1636687889409&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" integrity sha1-xXm140yzSxp07cbB+za/o3HVphM= dependencies: big.js "^5.2.2" @@ -4876,7 +4876,7 @@ loader-utils@^1.4.0: loader-utils@^2.0.0: version "2.0.2" - resolved "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz?cache=0&sync_timestamp=1636687952505&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" + resolved "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz?cache=0&sync_timestamp=1636687889409&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" integrity sha1-1uO0+4GHByGuTghoqxHdY4NowSk= dependencies: big.js "^5.2.2" @@ -4885,7 +4885,7 @@ loader-utils@^2.0.0: locate-path@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/locate-path/download/locate-path-3.0.0.tgz?cache=0&sync_timestamp=1629895618224&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flocate-path%2Fdownload%2Flocate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + resolved "https://registry.nlark.com/locate-path/download/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" integrity sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4= dependencies: p-locate "^3.0.0" @@ -4893,7 +4893,7 @@ locate-path@^3.0.0: locate-path@^5.0.0: version "5.0.0" - resolved "https://registry.nlark.com/locate-path/download/locate-path-5.0.0.tgz?cache=0&sync_timestamp=1629895618224&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flocate-path%2Fdownload%2Flocate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + resolved "https://registry.nlark.com/locate-path/download/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" integrity sha1-Gvujlq/WdqbUJQTQpno6frn2KqA= dependencies: p-locate "^4.1.0" @@ -4910,12 +4910,12 @@ lodash.bind@^4.1.4: lodash.castarray@^4.4.0: version "4.4.0" - resolved "https://registry.nlark.com/lodash.castarray/download/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" + resolved "https://registry.npm.taobao.org/lodash.castarray/download/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU= lodash.debounce@^4.0.8: version "4.0.8" - resolved "https://registry.npm.taobao.org/lodash.debounce/download/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + resolved "https://registry.nlark.com/lodash.debounce/download/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= lodash.defaults@^4.0.1: @@ -4925,12 +4925,12 @@ lodash.defaults@^4.0.1: lodash.filter@^4.4.0: version "4.6.0" - resolved "https://registry.nlark.com/lodash.filter/download/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" + resolved "https://registry.npm.taobao.org/lodash.filter/download/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4= lodash.flatten@^4.2.0: version "4.4.0" - resolved "https://registry.nlark.com/lodash.flatten/download/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" + resolved "https://registry.npm.taobao.org/lodash.flatten/download/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= lodash.foreach@^4.3.0: @@ -4950,7 +4950,7 @@ lodash.map@^4.4.0: lodash.memoize@^4.1.2: version "4.1.2" - resolved "https://registry.npm.taobao.org/lodash.memoize/download/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + resolved "https://registry.nlark.com/lodash.memoize/download/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= lodash.merge@^4.4.0, lodash.merge@^4.6.2: @@ -4985,36 +4985,36 @@ lodash.uniq@4.5.0, lodash.uniq@^4.5.0: lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" - resolved "https://registry.npm.taobao.org/lodash/download/lodash-4.17.21.tgz?cache=0&sync_timestamp=1615982514995&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + resolved "https://registry.nlark.com/lodash/download/lodash-4.17.21.tgz?cache=0&sync_timestamp=1618847150612&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flodash%2Fdownload%2Flodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw= loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" - resolved "https://registry.nlark.com/loose-envify/download/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + resolved "https://registry.nlark.com/loose-envify/download/loose-envify-1.4.0.tgz?cache=0&sync_timestamp=1627566748051&other_urls=https%3A%2F%2Fregistry.nlark.com%2Floose-envify%2Fdownload%2Floose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8= dependencies: js-tokens "^3.0.0 || ^4.0.0" lower-case@^2.0.2: version "2.0.2" - resolved "https://registry.npm.taobao.org/lower-case/download/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" + resolved "https://registry.npm.taobao.org/lower-case/download/lower-case-2.0.2.tgz?cache=0&sync_timestamp=1606867514181&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flower-case%2Fdownload%2Flower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" integrity sha1-b6I3xj29xKgsoP2ILkci3F5jTig= dependencies: tslib "^2.0.3" lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-1.0.1.tgz?cache=0&sync_timestamp=1634552902598&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flowercase-keys%2Fdownload%2Flowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" integrity sha1-b54wtHCE2XGnyCD/FabFFnt0wm8= lowercase-keys@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-2.0.0.tgz?cache=0&sync_timestamp=1634552902598&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flowercase-keys%2Fdownload%2Flowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha1-JgPni3tLAAbLyi+8yKMgJVislHk= lru-cache@^6.0.0: version "6.0.0" - resolved "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz?cache=0&sync_timestamp=1615982572805&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flru-cache%2Fdownload%2Flru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + resolved "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" integrity sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ= dependencies: yallist "^4.0.0" @@ -5028,14 +5028,14 @@ magic-string@^0.25.3: make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" - resolved "https://registry.npm.taobao.org/make-dir/download/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + resolved "https://registry.nlark.com/make-dir/download/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha1-QV6WcEazp/HRhSd9hKpYIDcmoT8= dependencies: semver "^6.0.0" markdown-escapes@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/markdown-escapes/download/markdown-escapes-1.0.4.tgz?cache=0&sync_timestamp=1635887464232&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmarkdown-escapes%2Fdownload%2Fmarkdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" + resolved "https://registry.npmmirror.com/markdown-escapes/download/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" integrity sha1-yVQV70UUmddgK5EJXzyOiXX3hTU= mdast-squeeze-paragraphs@^4.0.0: @@ -5068,7 +5068,7 @@ mdast-util-to-hast@10.0.1: mdast-util-to-string@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/mdast-util-to-string/download/mdast-util-to-string-2.0.0.tgz?cache=0&sync_timestamp=1619426294961&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-util-to-string%2Fdownload%2Fmdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" + resolved "https://registry.nlark.com/mdast-util-to-string/download/mdast-util-to-string-2.0.0.tgz?cache=0&sync_timestamp=1619426190900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-util-to-string%2Fdownload%2Fmdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" integrity sha1-uM/mpxPhCRy1tyj8SIhaR2f4uXs= mdn-data@2.0.14: @@ -5088,7 +5088,7 @@ mdurl@^1.0.0: media-typer@0.3.0: version "0.3.0" - resolved "https://registry.npm.taobao.org/media-typer/download/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + resolved "https://registry.nlark.com/media-typer/download/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= memfs@^3.1.2, memfs@^3.2.2: @@ -5100,12 +5100,12 @@ memfs@^3.1.2, memfs@^3.2.2: merge-descriptors@1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/merge-descriptors/download/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + resolved "https://registry.nlark.com/merge-descriptors/download/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= merge-stream@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/merge-stream/download/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + resolved "https://registry.nlark.com/merge-stream/download/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha1-UoI2KaFN0AyXcPtq1H3GMQ8sH2A= merge2@^1.3.0: @@ -5115,12 +5115,12 @@ merge2@^1.3.0: methods@~1.1.2: version "1.1.2" - resolved "https://registry.npm.taobao.org/methods/download/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + resolved "https://registry.nlark.com/methods/download/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= micromatch@^4.0.2, micromatch@^4.0.4: version "4.0.4" - resolved "https://registry.npm.taobao.org/micromatch/download/micromatch-4.0.4.tgz?cache=0&sync_timestamp=1618054787196&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmicromatch%2Fdownload%2Fmicromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + resolved "https://registry.nlark.com/micromatch/download/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" integrity sha1-iW1Rnf6dsl/OlM63pQCRm/iB6/k= dependencies: braces "^3.0.1" @@ -5128,24 +5128,24 @@ micromatch@^4.0.2, micromatch@^4.0.4: mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": version "1.51.0" - resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.51.0.tgz?cache=0&sync_timestamp=1636425960744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.51.0.tgz?cache=0&sync_timestamp=1636425932298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== mime-db@~1.33.0: version "1.33.0" - resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.33.0.tgz?cache=0&sync_timestamp=1636425960744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" + resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.33.0.tgz?cache=0&sync_timestamp=1636425932298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" integrity sha1-o0kgUKXLm2NFBUHjnZeI0icng9s= mime-types@2.1.18: version "2.1.18" - resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.18.tgz?cache=0&sync_timestamp=1636432342687&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" + resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.18.tgz?cache=0&sync_timestamp=1636432275511&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" integrity sha1-bzI/YKg9ERRvgx/xH9ZuL+VQO7g= dependencies: mime-db "~1.33.0" mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24: version "2.1.34" - resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.34.tgz?cache=0&sync_timestamp=1636432342687&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" + resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.34.tgz?cache=0&sync_timestamp=1636432275511&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== dependencies: mime-db "1.51.0" @@ -5157,7 +5157,7 @@ mime@1.6.0: mimic-fn@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + resolved "https://registry.nlark.com/mimic-fn/download/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs= mimic-response@^1.0.0, mimic-response@^1.0.1: @@ -5167,7 +5167,7 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: mini-create-react-context@^0.4.0: version "0.4.1" - resolved "https://registry.npm.taobao.org/mini-create-react-context/download/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" + resolved "https://registry.nlark.com/mini-create-react-context/download/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" integrity sha1-ByFxVhv9ySLaCKYMIZekl8wtHV4= dependencies: "@babel/runtime" "^7.12.1" @@ -5175,7 +5175,7 @@ mini-create-react-context@^0.4.0: mini-css-extract-plugin@^1.6.0: version "1.6.2" - resolved "https://registry.npmmirror.com/mini-css-extract-plugin/download/mini-css-extract-plugin-1.6.2.tgz?cache=0&sync_timestamp=1637170561761&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" + resolved "https://registry.npmmirror.com/mini-css-extract-plugin/download/mini-css-extract-plugin-1.6.2.tgz?cache=0&sync_timestamp=1637170529830&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" integrity sha1-gxcrT9gS+PxKCdb20W+ST1OZDKg= dependencies: loader-utils "^2.0.0" @@ -5184,7 +5184,7 @@ mini-css-extract-plugin@^1.6.0: minimalistic-assert@^1.0.0: version "1.0.1" - resolved "https://registry.npm.taobao.org/minimalistic-assert/download/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" + resolved "https://registry.nlark.com/minimalistic-assert/download/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" integrity sha1-LhlN4ERibUoQ5/f7wAznPoPk1cc= minimatch@3.0.4, minimatch@^3.0.4: @@ -5238,7 +5238,7 @@ multicast-dns-service-types@^1.1.0: multicast-dns@^6.0.1: version "6.2.3" - resolved "https://registry.npmmirror.com/multicast-dns/download/multicast-dns-6.2.3.tgz?cache=0&sync_timestamp=1633354925402&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmulticast-dns%2Fdownload%2Fmulticast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" + resolved "https://registry.npmmirror.com/multicast-dns/download/multicast-dns-6.2.3.tgz?cache=0&sync_timestamp=1633354862495&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmulticast-dns%2Fdownload%2Fmulticast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" integrity sha1-oOx72QVcQoL3kMPIL04o2zsxsik= dependencies: dns-packet "^1.3.1" @@ -5261,7 +5261,7 @@ neo-async@^2.6.2: no-case@^3.0.4: version "3.0.4" - resolved "https://registry.npm.taobao.org/no-case/download/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" + resolved "https://registry.nlark.com/no-case/download/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" integrity sha1-02H9XJgA9VhVGoNp/A3NRmK2Ek0= dependencies: lower-case "^2.0.2" @@ -5269,39 +5269,39 @@ no-case@^3.0.4: node-emoji@^1.10.0: version "1.11.0" - resolved "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" + resolved "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz?cache=0&sync_timestamp=1628672555671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-emoji%2Fdownload%2Fnode-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" integrity sha1-aaAVDmlG4vEV6dfqTfeXHiYoMBw= dependencies: lodash "^4.17.21" node-forge@^0.10.0: version "0.10.0" - resolved "https://registry.nlark.com/node-forge/download/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" + resolved "https://registry.npm.taobao.org/node-forge/download/node-forge-0.10.0.tgz?cache=0&sync_timestamp=1599010726129&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-forge%2Fdownload%2Fnode-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha1-Mt6ir7Ppkm8C7lzoeUkCaRpna/M= node-releases@^2.0.1: version "2.0.1" - resolved "https://registry.npmmirror.com/node-releases/download/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" + resolved "https://registry.npmmirror.com/node-releases/download/node-releases-2.0.1.tgz?cache=0&sync_timestamp=1634806914912&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnode-releases%2Fdownload%2Fnode-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" integrity sha1-PR05XyBPHy8ppUNYuftnh2WtL8U= normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/normalize-path/download/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + resolved "https://registry.npm.taobao.org/normalize-path/download/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU= normalize-range@^0.1.2: version "0.1.2" - resolved "https://registry.npm.taobao.org/normalize-range/download/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" + resolved "https://registry.nlark.com/normalize-range/download/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= normalize-url@^4.1.0: version "4.5.1" - resolved "https://registry.nlark.com/normalize-url/download/normalize-url-4.5.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnormalize-url%2Fdownload%2Fnormalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + resolved "https://registry.nlark.com/normalize-url/download/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" integrity sha1-DdkM8SiO4dExO4cIHJpZMu5IUYo= normalize-url@^6.0.1: version "6.1.0" - resolved "https://registry.nlark.com/normalize-url/download/normalize-url-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnormalize-url%2Fdownload%2Fnormalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + resolved "https://registry.nlark.com/normalize-url/download/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" integrity sha1-QNCIW1Nd7/4/MUe+yHfQX+TFZoo= npm-run-path@^4.0.1: @@ -5318,14 +5318,14 @@ nprogress@^0.2.0: nth-check@^1.0.2, nth-check@~1.0.1: version "1.0.2" - resolved "https://registry.nlark.com/nth-check/download/nth-check-1.0.2.tgz?cache=0&sync_timestamp=1631793807802&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" + resolved "https://registry.nlark.com/nth-check/download/nth-check-1.0.2.tgz?cache=0&sync_timestamp=1631793617973&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" integrity sha1-sr0pXDfj3VijvwcAN2Zjuk2c8Fw= dependencies: boolbase "~1.0.0" nth-check@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/nth-check/download/nth-check-2.0.1.tgz?cache=0&sync_timestamp=1631793807802&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" + resolved "https://registry.nlark.com/nth-check/download/nth-check-2.0.1.tgz?cache=0&sync_timestamp=1631793617973&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" integrity sha1-Lv4WL1w9oGoolZ+9PbddvuqfD8I= dependencies: boolbase "^1.0.0" @@ -5341,13 +5341,13 @@ object-hash@^2.2.0: integrity sha1-WtUYWB7vxEO9djRyuP8unCwNVKU= object-inspect@^1.11.0, object-inspect@^1.9.0: - version "1.11.0" - resolved "https://registry.nlark.com/object-inspect/download/object-inspect-1.11.0.tgz?cache=0&sync_timestamp=1626120241132&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fobject-inspect%2Fdownload%2Fobject-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" - integrity sha1-nc6xRs7dQUig2eUauI00z1CZIrE= + version "1.11.1" + resolved "https://registry.npmmirror.com/object-inspect/download/object-inspect-1.11.1.tgz#d4bd7d7de54b9a75599f59a00bd698c1f1c6549b" + integrity sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA== object-is@^1.0.1: version "1.1.5" - resolved "https://registry.npm.taobao.org/object-is/download/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + resolved "https://registry.nlark.com/object-is/download/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" integrity sha1-ud7qpfx/GEag+uzc7sE45XePU6w= dependencies: call-bind "^1.0.2" @@ -5355,7 +5355,7 @@ object-is@^1.0.1: object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" - resolved "https://registry.npm.taobao.org/object-keys/download/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + resolved "https://registry.nlark.com/object-keys/download/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha1-HEfyct8nfzsdrwYWd9nILiMixg4= object.assign@^4.1.0, object.assign@^4.1.2: @@ -5370,7 +5370,7 @@ object.assign@^4.1.0, object.assign@^4.1.2: object.getownpropertydescriptors@^2.1.0: version "2.1.3" - resolved "https://registry.npmmirror.com/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.1.3.tgz?cache=0&sync_timestamp=1633321729644&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" + resolved "https://registry.npmmirror.com/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.1.3.tgz?cache=0&sync_timestamp=1633321822200&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" integrity sha1-siPPOOF/77l6Y8EMkd9yzLOG354= dependencies: call-bind "^1.0.2" @@ -5379,7 +5379,7 @@ object.getownpropertydescriptors@^2.1.0: object.values@^1.1.0: version "1.1.5" - resolved "https://registry.npmmirror.com/object.values/download/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" + resolved "https://registry.npmmirror.com/object.values/download/object.values-1.1.5.tgz?cache=0&sync_timestamp=1633326898457&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.values%2Fdownload%2Fobject.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" integrity sha1-lZ9j486e8QhyAzMIITHkpFm3Fqw= dependencies: call-bind "^1.0.2" @@ -5388,7 +5388,7 @@ object.values@^1.1.0: obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" - resolved "https://registry.nlark.com/obuf/download/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" + resolved "https://registry.npm.taobao.org/obuf/download/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha1-Cb6jND1BhZ69RGKS0RydTbYZCE4= on-finished@~2.3.0: @@ -5412,7 +5412,7 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: onetime@^5.1.2: version "5.1.2" - resolved "https://registry.npm.taobao.org/onetime/download/onetime-5.1.2.tgz?cache=0&sync_timestamp=1617889724435&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fonetime%2Fdownload%2Fonetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + resolved "https://registry.nlark.com/onetime/download/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha1-0Oluu1awdHbfHdnEgG5SN5hcpF4= dependencies: mimic-fn "^2.1.0" @@ -5441,12 +5441,12 @@ opener@^1.5.2: p-cancelable@^1.0.0: version "1.1.0" - resolved "https://registry.nlark.com/p-cancelable/download/p-cancelable-1.1.0.tgz?cache=0&sync_timestamp=1622467988667&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-cancelable%2Fdownload%2Fp-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" + resolved "https://registry.nlark.com/p-cancelable/download/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" integrity sha1-0HjRWjr0CSIMiG8dmgyi5EGrJsw= p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" - resolved "https://registry.nlark.com/p-limit/download/p-limit-2.3.0.tgz?cache=0&sync_timestamp=1628812721654&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-limit%2Fdownload%2Fp-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + resolved "https://registry.nlark.com/p-limit/download/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" integrity sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE= dependencies: p-try "^2.0.0" @@ -5467,14 +5467,14 @@ p-locate@^4.1.0: p-map@^4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/p-map/download/p-map-4.0.0.tgz?cache=0&sync_timestamp=1635931906744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-map%2Fdownload%2Fp-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + resolved "https://registry.npmmirror.com/p-map/download/p-map-4.0.0.tgz?cache=0&sync_timestamp=1635931861684&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-map%2Fdownload%2Fp-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" integrity sha1-uy+Vpe2i7BaOySdOBqdHw+KQTSs= dependencies: aggregate-error "^3.0.0" p-retry@^4.5.0: version "4.6.1" - resolved "https://registry.npmmirror.com/p-retry/download/p-retry-4.6.1.tgz?cache=0&sync_timestamp=1635967279748&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-retry%2Fdownload%2Fp-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" + resolved "https://registry.npmmirror.com/p-retry/download/p-retry-4.6.1.tgz?cache=0&sync_timestamp=1635967027504&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-retry%2Fdownload%2Fp-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" integrity sha1-j83dXN96Z6CRGpzy7w5d9/YCMWw= dependencies: "@types/retry" "^0.12.0" @@ -5482,12 +5482,12 @@ p-retry@^4.5.0: p-try@^2.0.0: version "2.2.0" - resolved "https://registry.npmmirror.com/p-try/download/p-try-2.2.0.tgz?cache=0&sync_timestamp=1633364506847&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-try%2Fdownload%2Fp-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + resolved "https://registry.npmmirror.com/p-try/download/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha1-yyhoVA4xPWHeWPr741zpAE1VQOY= package-json@^6.3.0: version "6.5.0" - resolved "https://registry.nlark.com/package-json/download/package-json-6.5.0.tgz?cache=0&sync_timestamp=1624549851966&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpackage-json%2Fdownload%2Fpackage-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" + resolved "https://registry.nlark.com/package-json/download/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" integrity sha1-b+7ayjXnVyWHbQsOZJdGl/7RRbA= dependencies: got "^9.6.0" @@ -5497,7 +5497,7 @@ package-json@^6.3.0: param-case@^3.0.4: version "3.0.4" - resolved "https://registry.npm.taobao.org/param-case/download/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" + resolved "https://registry.nlark.com/param-case/download/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" integrity sha1-fRf+SqEr3jTUp32RrPtiGcqtAcU= dependencies: dot-case "^3.0.4" @@ -5539,17 +5539,17 @@ parse-numeric-range@^1.2.0: parse5@^5.0.0: version "5.1.1" - resolved "https://registry.npm.taobao.org/parse5/download/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" + resolved "https://registry.nlark.com/parse5/download/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" integrity sha1-9o5OW6GFKsLK3AD0VV//bCq7YXg= parse5@^6.0.0: version "6.0.1" - resolved "https://registry.npm.taobao.org/parse5/download/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + resolved "https://registry.nlark.com/parse5/download/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha1-4aHAhcVps9wIMhGE8Zo5zCf3wws= parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" - resolved "https://registry.npm.taobao.org/parseurl/download/parseurl-1.3.3.tgz?cache=0&sync_timestamp=1615984376007&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparseurl%2Fdownload%2Fparseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + resolved "https://registry.npm.taobao.org/parseurl/download/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ= pascal-case@^3.1.2: @@ -5572,7 +5572,7 @@ path-exists@^4.0.0: path-is-absolute@^1.0.0: version "1.0.1" - resolved "https://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + resolved "https://registry.nlark.com/path-is-absolute/download/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= path-is-inside@1.0.2: @@ -5582,7 +5582,7 @@ path-is-inside@1.0.2: path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" - resolved "https://registry.npm.taobao.org/path-key/download/path-key-3.1.1.tgz?cache=0&sync_timestamp=1617971632960&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpath-key%2Fdownload%2Fpath-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + resolved "https://registry.nlark.com/path-key/download/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha1-WB9q3mWMu6ZaDTOA3ndTKVBU83U= path-parse@^1.0.6: @@ -5592,34 +5592,34 @@ path-parse@^1.0.6: path-to-regexp@0.1.7: version "0.1.7" - resolved "https://registry.npmmirror.com/path-to-regexp/download/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= path-to-regexp@2.2.1: version "2.2.1" - resolved "https://registry.npmmirror.com/path-to-regexp/download/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" + resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" integrity sha1-kLYXAloWOBqHm8gqONTovesrz0U= path-to-regexp@^1.7.0: version "1.8.0" - resolved "https://registry.npmmirror.com/path-to-regexp/download/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" + resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" integrity sha1-iHs7qdhDk+h6CgufTLdWGYtTVIo= dependencies: isarray "0.0.1" path-type@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/path-type/download/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + resolved "https://registry.nlark.com/path-type/download/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs= picocolors@^0.2.1: version "0.2.1" - resolved "https://registry.npmmirror.com/picocolors/download/picocolors-0.2.1.tgz?cache=0&sync_timestamp=1634093415681&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" + resolved "https://registry.npmmirror.com/picocolors/download/picocolors-0.2.1.tgz?cache=0&sync_timestamp=1634093378416&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" integrity sha1-VwZw95NkaFHRuhNZlpYqutWHhZ8= picocolors@^1.0.0: version "1.0.0" - resolved "https://registry.npmmirror.com/picocolors/download/picocolors-1.0.0.tgz?cache=0&sync_timestamp=1634093415681&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + resolved "https://registry.npmmirror.com/picocolors/download/picocolors-1.0.0.tgz?cache=0&sync_timestamp=1634093378416&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha1-y1vcdP8/UYkiNur3nWi8RFZKuBw= picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: @@ -5629,24 +5629,24 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: pify@^2.3.0: version "2.3.0" - resolved "https://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + resolved "https://registry.nlark.com/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= pify@^4.0.1: version "4.0.1" - resolved "https://registry.npm.taobao.org/pify/download/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + resolved "https://registry.nlark.com/pify/download/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE= pkg-dir@^4.1.0: version "4.2.0" - resolved "https://registry.npmmirror.com/pkg-dir/download/pkg-dir-4.2.0.tgz?cache=0&sync_timestamp=1633498116014&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-dir%2Fdownload%2Fpkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + resolved "https://registry.npmmirror.com/pkg-dir/download/pkg-dir-4.2.0.tgz?cache=0&sync_timestamp=1633498133295&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-dir%2Fdownload%2Fpkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" integrity sha1-8JkTPfft5CLoHR2ESCcO6z5CYfM= dependencies: find-up "^4.0.0" pkg-up@^3.1.0: version "3.1.0" - resolved "https://registry.npmmirror.com/pkg-up/download/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" + resolved "https://registry.npmmirror.com/pkg-up/download/pkg-up-3.1.0.tgz?cache=0&sync_timestamp=1636035118070&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-up%2Fdownload%2Fpkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" integrity sha1-EA7CNcwVDk/UJRlBJZaihRKg3vU= dependencies: find-up "^3.0.0" @@ -5662,7 +5662,7 @@ portfinder@^1.0.28: postcss-calc@^8.0.0: version "8.0.0" - resolved "https://registry.npm.taobao.org/postcss-calc/download/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a" + resolved "https://registry.nlark.com/postcss-calc/download/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a" integrity sha1-oFuHqs0TJ0Cl2wlGKjYSRT5d+Qo= dependencies: postcss-selector-parser "^6.0.2" @@ -5670,7 +5670,7 @@ postcss-calc@^8.0.0: postcss-colormin@^5.2.1: version "5.2.1" - resolved "https://registry.npmmirror.com/postcss-colormin/download/postcss-colormin-5.2.1.tgz#6e444a806fd3c578827dbad022762df19334414d" + resolved "https://registry.npmmirror.com/postcss-colormin/download/postcss-colormin-5.2.1.tgz?cache=0&sync_timestamp=1635857516973&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-colormin%2Fdownload%2Fpostcss-colormin-5.2.1.tgz#6e444a806fd3c578827dbad022762df19334414d" integrity sha1-bkRKgG/TxXiCfbrQInYt8ZM0QU0= dependencies: browserslist "^4.16.6" @@ -5680,41 +5680,41 @@ postcss-colormin@^5.2.1: postcss-convert-values@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-convert-values/download/postcss-convert-values-5.0.2.tgz#879b849dc3677c7d6bc94b6a2c1a3f0808798059" + resolved "https://registry.npmmirror.com/postcss-convert-values/download/postcss-convert-values-5.0.2.tgz?cache=0&sync_timestamp=1635857664165&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-convert-values%2Fdownload%2Fpostcss-convert-values-5.0.2.tgz#879b849dc3677c7d6bc94b6a2c1a3f0808798059" integrity sha1-h5uEncNnfH1ryUtqLBo/CAh5gFk= dependencies: postcss-value-parser "^4.1.0" postcss-discard-comments@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-comments/download/postcss-discard-comments-5.0.1.tgz?cache=0&sync_timestamp=1621449558287&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-comments%2Fdownload%2Fpostcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" + resolved "https://registry.nlark.com/postcss-discard-comments/download/postcss-discard-comments-5.0.1.tgz?cache=0&sync_timestamp=1621449592883&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-comments%2Fdownload%2Fpostcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" integrity sha1-nq5LdHz3YNMfJEfCfwYZ1XGJAf4= postcss-discard-duplicates@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-duplicates/download/postcss-discard-duplicates-5.0.1.tgz?cache=0&sync_timestamp=1621449558296&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-duplicates%2Fdownload%2Fpostcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" + resolved "https://registry.nlark.com/postcss-discard-duplicates/download/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" integrity sha1-aPfMZFj+a6suRsn1WuUoafaA5m0= postcss-discard-empty@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-empty/download/postcss-discard-empty-5.0.1.tgz?cache=0&sync_timestamp=1621449733074&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-empty%2Fdownload%2Fpostcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8" + resolved "https://registry.nlark.com/postcss-discard-empty/download/postcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8" integrity sha1-7hNsOeJ9XS7U2g7l7QK8ip+L9tg= postcss-discard-overridden@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-overridden/download/postcss-discard-overridden-5.0.1.tgz?cache=0&sync_timestamp=1621449732464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-overridden%2Fdownload%2Fpostcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" + resolved "https://registry.nlark.com/postcss-discard-overridden/download/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" integrity sha1-RUtB9wcwC5gQmnUAXKSrD/J0OsY= postcss-discard-unused@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-unused/download/postcss-discard-unused-5.0.1.tgz?cache=0&sync_timestamp=1621449732186&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-unused%2Fdownload%2Fpostcss-discard-unused-5.0.1.tgz#63e35a74a154912f93d4e75a1e6ff3cc146f934b" + resolved "https://registry.nlark.com/postcss-discard-unused/download/postcss-discard-unused-5.0.1.tgz#63e35a74a154912f93d4e75a1e6ff3cc146f934b" integrity sha1-Y+NadKFUkS+T1OdaHm/zzBRvk0s= dependencies: postcss-selector-parser "^6.0.5" postcss-import@^14.0.2: version "14.0.2" - resolved "https://registry.nlark.com/postcss-import/download/postcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1" + resolved "https://registry.nlark.com/postcss-import/download/postcss-import-14.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-import%2Fdownload%2Fpostcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1" integrity sha1-YO/3fmvpLntn/kaex5fZQkyuGqE= dependencies: postcss-value-parser "^4.0.0" @@ -5723,7 +5723,7 @@ postcss-import@^14.0.2: postcss-js@^3.0.3: version "3.0.3" - resolved "https://registry.npm.taobao.org/postcss-js/download/postcss-js-3.0.3.tgz#2f0bd370a2e8599d45439f6970403b5873abda33" + resolved "https://registry.nlark.com/postcss-js/download/postcss-js-3.0.3.tgz#2f0bd370a2e8599d45439f6970403b5873abda33" integrity sha1-LwvTcKLoWZ1FQ59pcEA7WHOr2jM= dependencies: camelcase-css "^2.0.1" @@ -5757,7 +5757,7 @@ postcss-merge-idents@^5.0.1: postcss-merge-longhand@^5.0.4: version "5.0.4" - resolved "https://registry.npmmirror.com/postcss-merge-longhand/download/postcss-merge-longhand-5.0.4.tgz?cache=0&sync_timestamp=1637084835421&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-longhand%2Fdownload%2Fpostcss-merge-longhand-5.0.4.tgz#41f4f3270282ea1a145ece078b7679f0cef21c32" + resolved "https://registry.npmmirror.com/postcss-merge-longhand/download/postcss-merge-longhand-5.0.4.tgz#41f4f3270282ea1a145ece078b7679f0cef21c32" integrity sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw== dependencies: postcss-value-parser "^4.1.0" @@ -5765,7 +5765,7 @@ postcss-merge-longhand@^5.0.4: postcss-merge-rules@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-merge-rules/download/postcss-merge-rules-5.0.3.tgz?cache=0&sync_timestamp=1637085530842&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-rules%2Fdownload%2Fpostcss-merge-rules-5.0.3.tgz#b5cae31f53129812a77e3eb1eeee448f8cf1a1db" + resolved "https://registry.npmmirror.com/postcss-merge-rules/download/postcss-merge-rules-5.0.3.tgz?cache=0&sync_timestamp=1637085394901&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-rules%2Fdownload%2Fpostcss-merge-rules-5.0.3.tgz#b5cae31f53129812a77e3eb1eeee448f8cf1a1db" integrity sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg== dependencies: browserslist "^4.16.6" @@ -5775,7 +5775,7 @@ postcss-merge-rules@^5.0.3: postcss-minify-font-values@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-minify-font-values/download/postcss-minify-font-values-5.0.1.tgz?cache=0&sync_timestamp=1621449734134&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-minify-font-values%2Fdownload%2Fpostcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf" + resolved "https://registry.nlark.com/postcss-minify-font-values/download/postcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf" integrity sha1-qQzvv9qgdb09uqGzNYi7TcJord8= dependencies: postcss-value-parser "^4.1.0" @@ -5791,7 +5791,7 @@ postcss-minify-gradients@^5.0.3: postcss-minify-params@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-minify-params/download/postcss-minify-params-5.0.2.tgz?cache=0&sync_timestamp=1637084835630&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-minify-params%2Fdownload%2Fpostcss-minify-params-5.0.2.tgz#1b644da903473fbbb18fbe07b8e239883684b85c" + resolved "https://registry.npmmirror.com/postcss-minify-params/download/postcss-minify-params-5.0.2.tgz#1b644da903473fbbb18fbe07b8e239883684b85c" integrity sha512-qJAPuBzxO1yhLad7h2Dzk/F7n1vPyfHfCCh5grjGfjhi1ttCnq4ZXGIW77GSrEbh9Hus9Lc/e/+tB4vh3/GpDg== dependencies: alphanum-sort "^1.0.2" @@ -5801,7 +5801,7 @@ postcss-minify-params@^5.0.2: postcss-minify-selectors@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/postcss-minify-selectors/download/postcss-minify-selectors-5.1.0.tgz?cache=0&sync_timestamp=1621449558355&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-minify-selectors%2Fdownload%2Fpostcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" + resolved "https://registry.nlark.com/postcss-minify-selectors/download/postcss-minify-selectors-5.1.0.tgz?cache=0&sync_timestamp=1621449593365&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-minify-selectors%2Fdownload%2Fpostcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" integrity sha1-Q4XIRdOXn/FgKRd0Uj/6VOr9WlQ= dependencies: alphanum-sort "^1.0.2" @@ -5814,7 +5814,7 @@ postcss-modules-extract-imports@^3.0.0: postcss-modules-local-by-default@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/postcss-modules-local-by-default/download/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" + resolved "https://registry.npm.taobao.org/postcss-modules-local-by-default/download/postcss-modules-local-by-default-4.0.0.tgz?cache=0&sync_timestamp=1602587625149&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-local-by-default%2Fdownload%2Fpostcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" integrity sha1-67tU+uFZjuz99pGgKz/zs5ClpRw= dependencies: icss-utils "^5.0.0" @@ -5830,26 +5830,26 @@ postcss-modules-scope@^3.0.0: postcss-modules-values@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/postcss-modules-values/download/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + resolved "https://registry.nlark.com/postcss-modules-values/download/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" integrity sha1-18Xn5ow7s8myfL9Iyguz/7RgLJw= dependencies: icss-utils "^5.0.0" postcss-nested@5.0.6: version "5.0.6" - resolved "https://registry.nlark.com/postcss-nested/download/postcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" + resolved "https://registry.nlark.com/postcss-nested/download/postcss-nested-5.0.6.tgz?cache=0&sync_timestamp=1627468122159&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-nested%2Fdownload%2Fpostcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" integrity sha1-RmND9/yNPUavPn26P81H0FKpRbw= dependencies: postcss-selector-parser "^6.0.6" postcss-normalize-charset@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-charset/download/postcss-normalize-charset-5.0.1.tgz?cache=0&sync_timestamp=1621449558308&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-charset%2Fdownload%2Fpostcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" + resolved "https://registry.nlark.com/postcss-normalize-charset/download/postcss-normalize-charset-5.0.1.tgz?cache=0&sync_timestamp=1621449593655&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-charset%2Fdownload%2Fpostcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" integrity sha1-EhVZ0b68VayNJK839nvU2p79kdA= postcss-normalize-display-values@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-display-values/download/postcss-normalize-display-values-5.0.1.tgz?cache=0&sync_timestamp=1621449652268&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-display-values%2Fdownload%2Fpostcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" + resolved "https://registry.nlark.com/postcss-normalize-display-values/download/postcss-normalize-display-values-5.0.1.tgz?cache=0&sync_timestamp=1621449599414&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-display-values%2Fdownload%2Fpostcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" integrity sha1-YmULllmBqVXf/ugzY0U9uC9q0f0= dependencies: cssnano-utils "^2.0.1" @@ -5864,7 +5864,7 @@ postcss-normalize-positions@^5.0.1: postcss-normalize-repeat-style@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-repeat-style/download/postcss-normalize-repeat-style-5.0.1.tgz?cache=0&sync_timestamp=1621449651580&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-repeat-style%2Fdownload%2Fpostcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" + resolved "https://registry.nlark.com/postcss-normalize-repeat-style/download/postcss-normalize-repeat-style-5.0.1.tgz?cache=0&sync_timestamp=1621449596114&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-repeat-style%2Fdownload%2Fpostcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" integrity sha1-y8DeE4O1f1u2Hd1qhGU7XoZlsrU= dependencies: cssnano-utils "^2.0.1" @@ -5872,14 +5872,14 @@ postcss-normalize-repeat-style@^5.0.1: postcss-normalize-string@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-string/download/postcss-normalize-string-5.0.1.tgz?cache=0&sync_timestamp=1621449646930&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-string%2Fdownload%2Fpostcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0" + resolved "https://registry.nlark.com/postcss-normalize-string/download/postcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0" integrity sha1-2er6pN94x6O5c640bvDkfFVJhbA= dependencies: postcss-value-parser "^4.1.0" postcss-normalize-timing-functions@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-timing-functions/download/postcss-normalize-timing-functions-5.0.1.tgz?cache=0&sync_timestamp=1621449827577&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-timing-functions%2Fdownload%2Fpostcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c" + resolved "https://registry.nlark.com/postcss-normalize-timing-functions/download/postcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c" integrity sha1-juQRA7kTBCnGy7pzaTK3XF4ssIw= dependencies: cssnano-utils "^2.0.1" @@ -5887,7 +5887,7 @@ postcss-normalize-timing-functions@^5.0.1: postcss-normalize-unicode@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-unicode/download/postcss-normalize-unicode-5.0.1.tgz?cache=0&sync_timestamp=1621449825612&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-unicode%2Fdownload%2Fpostcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37" + resolved "https://registry.nlark.com/postcss-normalize-unicode/download/postcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37" integrity sha1-gtZy1kikEYFKpb865WU3nM2fXjc= dependencies: browserslist "^4.16.0" @@ -5895,7 +5895,7 @@ postcss-normalize-unicode@^5.0.1: postcss-normalize-url@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-normalize-url/download/postcss-normalize-url-5.0.3.tgz?cache=0&sync_timestamp=1637084835796&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-normalize-url%2Fdownload%2Fpostcss-normalize-url-5.0.3.tgz#42eca6ede57fe69075fab0f88ac8e48916ef931c" + resolved "https://registry.npmmirror.com/postcss-normalize-url/download/postcss-normalize-url-5.0.3.tgz#42eca6ede57fe69075fab0f88ac8e48916ef931c" integrity sha512-qWiUMbvkRx3kc1Dp5opzUwc7MBWZcSDK2yofCmdvFBCpx+zFPkxBC1FASQ59Pt+flYfj/nTZSkmF56+XG5elSg== dependencies: is-absolute-url "^3.0.3" @@ -5904,14 +5904,14 @@ postcss-normalize-url@^5.0.3: postcss-normalize-whitespace@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-whitespace/download/postcss-normalize-whitespace-5.0.1.tgz?cache=0&sync_timestamp=1621449646853&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-whitespace%2Fdownload%2Fpostcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" + resolved "https://registry.nlark.com/postcss-normalize-whitespace/download/postcss-normalize-whitespace-5.0.1.tgz?cache=0&sync_timestamp=1621449593892&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-whitespace%2Fdownload%2Fpostcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" integrity sha1-sLQLW8rINYX/B+rS2vLc++7vjpo= dependencies: postcss-value-parser "^4.1.0" postcss-ordered-values@^5.0.2: version "5.0.2" - resolved "https://registry.nlark.com/postcss-ordered-values/download/postcss-ordered-values-5.0.2.tgz?cache=0&sync_timestamp=1623330460500&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-ordered-values%2Fdownload%2Fpostcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" + resolved "https://registry.nlark.com/postcss-ordered-values/download/postcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" integrity sha1-HzUUJpd74A4PdlsxZK11PayO0EQ= dependencies: cssnano-utils "^2.0.1" @@ -5919,7 +5919,7 @@ postcss-ordered-values@^5.0.2: postcss-reduce-idents@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-reduce-idents/download/postcss-reduce-idents-5.0.1.tgz?cache=0&sync_timestamp=1621449563205&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-reduce-idents%2Fdownload%2Fpostcss-reduce-idents-5.0.1.tgz#99b49ce8ee6f9c179447671cc9693e198e877bb7" + resolved "https://registry.nlark.com/postcss-reduce-idents/download/postcss-reduce-idents-5.0.1.tgz#99b49ce8ee6f9c179447671cc9693e198e877bb7" integrity sha1-mbSc6O5vnBeUR2ccyWk+GY6He7c= dependencies: postcss-value-parser "^4.1.0" @@ -5942,7 +5942,7 @@ postcss-reduce-transforms@^5.0.1: postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6: version "6.0.6" - resolved "https://registry.nlark.com/postcss-selector-parser/download/postcss-selector-parser-6.0.6.tgz?cache=0&sync_timestamp=1620752939806&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-selector-parser%2Fdownload%2Fpostcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" + resolved "https://registry.nlark.com/postcss-selector-parser/download/postcss-selector-parser-6.0.6.tgz?cache=0&sync_timestamp=1620752924836&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-selector-parser%2Fdownload%2Fpostcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" integrity sha1-LFu6gXSsL2mBq2MaQqsO5UrzMuo= dependencies: cssesc "^3.0.0" @@ -5957,7 +5957,7 @@ postcss-sort-media-queries@^4.1.0: postcss-svgo@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-svgo/download/postcss-svgo-5.0.3.tgz?cache=0&sync_timestamp=1635857761721&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-svgo%2Fdownload%2Fpostcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30" + resolved "https://registry.npmmirror.com/postcss-svgo/download/postcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30" integrity sha1-2UUYV1bl36rgf57bDTyuf/efmzA= dependencies: postcss-value-parser "^4.1.0" @@ -5965,7 +5965,7 @@ postcss-svgo@^5.0.3: postcss-unique-selectors@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-unique-selectors/download/postcss-unique-selectors-5.0.2.tgz?cache=0&sync_timestamp=1637084835538&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-unique-selectors%2Fdownload%2Fpostcss-unique-selectors-5.0.2.tgz#5d6893daf534ae52626708e0d62250890108c0c1" + resolved "https://registry.npmmirror.com/postcss-unique-selectors/download/postcss-unique-selectors-5.0.2.tgz#5d6893daf534ae52626708e0d62250890108c0c1" integrity sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA== dependencies: alphanum-sort "^1.0.2" @@ -5978,7 +5978,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^ postcss-zindex@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-zindex/download/postcss-zindex-5.0.1.tgz?cache=0&sync_timestamp=1621449734732&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-zindex%2Fdownload%2Fpostcss-zindex-5.0.1.tgz#c585724beb69d356af8c7e68847b28d6298ece03" + resolved "https://registry.nlark.com/postcss-zindex/download/postcss-zindex-5.0.1.tgz#c585724beb69d356af8c7e68847b28d6298ece03" integrity sha1-xYVyS+tp01avjH5ohHso1imOzgM= "postcss@5 - 7": @@ -6000,13 +6000,13 @@ postcss@^8.1.6, postcss@^8.2.15, postcss@^8.3.5, postcss@^8.3.7: prepend-http@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/prepend-http/download/prepend-http-2.0.0.tgz?cache=0&sync_timestamp=1628547439455&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fprepend-http%2Fdownload%2Fprepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + resolved "https://registry.nlark.com/prepend-http/download/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= prettier@^2.5.0: - version "2.5.0" - resolved "https://registry.npmmirror.com/prettier/download/prettier-2.5.0.tgz#a6370e2d4594e093270419d9cc47f7670488f893" - integrity sha512-FM/zAKgWTxj40rH03VxzIPdXmj39SwSjwG0heUcNFwI+EMZJnY93yAiKXM3dObIKAM5TA88werc8T/EwhB45eg== + version "2.5.1" + resolved "https://registry.npmmirror.com/prettier/download/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a" + integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg== pretty-error@^4.0.0: version "4.0.0" @@ -6028,7 +6028,7 @@ prism-react-renderer@^1.2.1: prismjs@^1.23.0: version "1.25.0" - resolved "https://registry.npmmirror.com/prismjs/download/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756" + resolved "https://registry.nlark.com/prismjs/download/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756" integrity sha1-b4It8b2tllc0sxCzFaIzFc+Zl1Y= process-nextick-args@~2.0.0: @@ -6038,7 +6038,7 @@ process-nextick-args@~2.0.0: prompts@^2.4.0, prompts@^2.4.1: version "2.4.2" - resolved "https://registry.npmmirror.com/prompts/download/prompts-2.4.2.tgz?cache=0&sync_timestamp=1633642560605&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fprompts%2Fdownload%2Fprompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" + resolved "https://registry.npmmirror.com/prompts/download/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" integrity sha1-e1fnOzpIAprRDr1E90sBcipMsGk= dependencies: kleur "^3.0.3" @@ -6046,7 +6046,7 @@ prompts@^2.4.0, prompts@^2.4.1: prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" - resolved "https://registry.npm.taobao.org/prop-types/download/prop-types-15.7.2.tgz?cache=0&sync_timestamp=1615984425557&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fprop-types%2Fdownload%2Fprop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" + resolved "https://registry.nlark.com/prop-types/download/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha1-UsQedbjIfnK52TYOAga5ncv/psU= dependencies: loose-envify "^1.4.0" @@ -6055,14 +6055,14 @@ prop-types@^15.6.2, prop-types@^15.7.2: property-information@^5.0.0, property-information@^5.3.0: version "5.6.0" - resolved "https://registry.npmmirror.com/property-information/download/property-information-5.6.0.tgz?cache=0&sync_timestamp=1636733749352&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fproperty-information%2Fdownload%2Fproperty-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69" + resolved "https://registry.npmmirror.com/property-information/download/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69" integrity sha1-YWdVRfsjAC8kXGVA7EYHfU2j7Wk= dependencies: xtend "^4.0.0" proxy-addr@~2.0.5: version "2.0.7" - resolved "https://registry.nlark.com/proxy-addr/download/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + resolved "https://registry.nlark.com/proxy-addr/download/proxy-addr-2.0.7.tgz?cache=0&sync_timestamp=1622509170257&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fproxy-addr%2Fdownload%2Fproxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" integrity sha1-8Z/mnOqzEe65S0LnDowgcPm6ECU= dependencies: forwarded "0.2.0" @@ -6070,7 +6070,7 @@ proxy-addr@~2.0.5: pump@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + resolved "https://registry.nlark.com/pump/download/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" integrity sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ= dependencies: end-of-stream "^1.1.0" @@ -6078,17 +6078,17 @@ pump@^3.0.0: punycode@1.3.2: version "1.3.2" - resolved "https://registry.npm.taobao.org/punycode/download/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" + resolved "https://registry.nlark.com/punycode/download/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= punycode@^1.3.2: version "1.4.1" - resolved "https://registry.npm.taobao.org/punycode/download/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" + resolved "https://registry.nlark.com/punycode/download/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= punycode@^2.1.0: version "2.1.1" - resolved "https://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + resolved "https://registry.nlark.com/punycode/download/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha1-tYsBCsQMIsVldhbI0sLALHv0eew= pupa@^2.1.1: @@ -6100,12 +6100,12 @@ pupa@^2.1.1: q@^1.1.2: version "1.5.1" - resolved "https://registry.npm.taobao.org/q/download/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" + resolved "https://registry.nlark.com/q/download/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= qs@6.7.0: version "6.7.0" - resolved "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz?cache=0&sync_timestamp=1616385315895&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqs%2Fdownload%2Fqs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" + resolved "https://registry.npmmirror.com/qs/download/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha1-QdwaAV49WB8WIXdr4xr7KHapsbw= querystring@0.2.0: @@ -6115,34 +6115,34 @@ querystring@0.2.0: queue-microtask@^1.2.2: version "1.2.3" - resolved "https://registry.npm.taobao.org/queue-microtask/download/queue-microtask-1.2.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqueue-microtask%2Fdownload%2Fqueue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + resolved "https://registry.nlark.com/queue-microtask/download/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" integrity sha1-SSkii7xyTfrEPg77BYyve2z7YkM= quick-lru@^5.1.1: version "5.1.1" - resolved "https://registry.npmmirror.com/quick-lru/download/quick-lru-5.1.1.tgz?cache=0&sync_timestamp=1637478663596&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fquick-lru%2Fdownload%2Fquick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + resolved "https://registry.npmmirror.com/quick-lru/download/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" integrity sha1-NmST5rPkKjpoheLpnRj4D7eoyTI= randombytes@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + resolved "https://registry.nlark.com/randombytes/download/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" integrity sha1-32+ENy8CcNxlzfYpE0mrekc9Tyo= dependencies: safe-buffer "^5.1.0" range-parser@1.2.0: version "1.2.0" - resolved "https://registry.npm.taobao.org/range-parser/download/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" + resolved "https://registry.nlark.com/range-parser/download/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4= range-parser@^1.2.1, range-parser@~1.2.1: version "1.2.1" - resolved "https://registry.npm.taobao.org/range-parser/download/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + resolved "https://registry.nlark.com/range-parser/download/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE= raw-body@2.4.0: version "2.4.0" - resolved "https://registry.npmmirror.com/raw-body/download/raw-body-2.4.0.tgz?cache=0&sync_timestamp=1637116875777&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fraw-body%2Fdownload%2Fraw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + resolved "https://registry.npmmirror.com/raw-body/download/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" integrity sha1-oc5vucm8NWylLoklarWQWeE9AzI= dependencies: bytes "3.1.0" @@ -6152,7 +6152,7 @@ raw-body@2.4.0: rc@^1.2.8: version "1.2.8" - resolved "https://registry.npm.taobao.org/rc/download/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + resolved "https://registry.nlark.com/rc/download/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha1-zZJL9SAKB1uDwYjNa54hG3/A0+0= dependencies: deep-extend "^0.6.0" @@ -6167,7 +6167,7 @@ react-cool-onclickoutside@^1.6.2: react-dev-utils@12.0.0-next.47: version "12.0.0-next.47" - resolved "https://registry.npmmirror.com/react-dev-utils/download/react-dev-utils-12.0.0-next.47.tgz?cache=0&sync_timestamp=1633373304881&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-dev-utils%2Fdownload%2Freact-dev-utils-12.0.0-next.47.tgz#e55c31a05eb30cfd69ca516e8b87d61724e880fb" + resolved "https://registry.npmmirror.com/react-dev-utils/download/react-dev-utils-12.0.0-next.47.tgz#e55c31a05eb30cfd69ca516e8b87d61724e880fb" integrity sha1-5VwxoF6zDP1pylFui4fWFyTogPs= dependencies: "@babel/code-frame" "^7.10.4" @@ -6206,17 +6206,17 @@ react-dom@^17.0.1: react-error-overlay@7.0.0-next.54+1465357b: version "7.0.0-next.54" - resolved "https://registry.npmmirror.com/react-error-overlay/download/react-error-overlay-7.0.0-next.54.tgz?cache=0&sync_timestamp=1633373304252&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-error-overlay%2Fdownload%2Freact-error-overlay-7.0.0-next.54.tgz#c1eb5ab86aee15e9552e6d97897b08f2bd06d140" + resolved "https://registry.npmmirror.com/react-error-overlay/download/react-error-overlay-7.0.0-next.54.tgz?cache=0&sync_timestamp=1633373332600&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-error-overlay%2Fdownload%2Freact-error-overlay-7.0.0-next.54.tgz#c1eb5ab86aee15e9552e6d97897b08f2bd06d140" integrity sha1-wetauGruFelVLm2XiXsI8r0G0UA= react-error-overlay@^6.0.9: version "6.0.9" - resolved "https://registry.npmmirror.com/react-error-overlay/download/react-error-overlay-6.0.9.tgz?cache=0&sync_timestamp=1633373304252&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-error-overlay%2Fdownload%2Freact-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a" + resolved "https://registry.npmmirror.com/react-error-overlay/download/react-error-overlay-6.0.9.tgz?cache=0&sync_timestamp=1633373332600&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-error-overlay%2Fdownload%2Freact-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a" integrity sha1-PHQwEMk1lgjDdezWvHbzXZOZWwo= react-fast-compare@^3.1.1: version "3.2.0" - resolved "https://registry.npmmirror.com/react-fast-compare/download/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" + resolved "https://registry.nlark.com/react-fast-compare/download/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" integrity sha1-ZBqdqBtqYyDycOiXJPtFoLOeQ7s= react-helmet@^6.1.0: @@ -6243,14 +6243,14 @@ react-loadable-ssr-addon-v5-slorber@^1.0.1: react-router-config@^5.1.1: version "5.1.1" - resolved "https://registry.npm.taobao.org/react-router-config/download/react-router-config-5.1.1.tgz#0f4263d1a80c6b2dc7b9c1902c9526478194a988" + resolved "https://registry.nlark.com/react-router-config/download/react-router-config-5.1.1.tgz#0f4263d1a80c6b2dc7b9c1902c9526478194a988" integrity sha1-D0Jj0agMay3HucGQLJUmR4GUqYg= dependencies: "@babel/runtime" "^7.1.2" react-router-dom@^5.2.0: version "5.3.0" - resolved "https://registry.npmmirror.com/react-router-dom/download/react-router-dom-5.3.0.tgz?cache=0&sync_timestamp=1636499761778&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-router-dom%2Fdownload%2Freact-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363" + resolved "https://registry.npmmirror.com/react-router-dom/download/react-router-dom-5.3.0.tgz?cache=0&sync_timestamp=1636500332816&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-router-dom%2Fdownload%2Freact-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363" integrity sha1-2hv7U1oOiacSqTuX3Xb0etHzI2M= dependencies: "@babel/runtime" "^7.12.13" @@ -6263,7 +6263,7 @@ react-router-dom@^5.2.0: react-router@5.2.1, react-router@^5.2.0: version "5.2.1" - resolved "https://registry.npmmirror.com/react-router/download/react-router-5.2.1.tgz?cache=0&sync_timestamp=1636499760632&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-router%2Fdownload%2Freact-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d" + resolved "https://registry.npmmirror.com/react-router/download/react-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d" integrity sha1-TS5OnVrpQlCRhFuNvG2dJ2I5d00= dependencies: "@babel/runtime" "^7.12.13" @@ -6299,7 +6299,7 @@ read-cache@^1.0.0: readable-stream@^2.0.1: version "2.3.7" - resolved "https://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + resolved "https://registry.nlark.com/readable-stream/download/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha1-Hsoc9xGu+BTAT2IlKjamL2yyO1c= dependencies: core-util-is "~1.0.0" @@ -6312,7 +6312,7 @@ readable-stream@^2.0.1: readable-stream@^3.0.6, readable-stream@^3.1.1: version "3.6.0" - resolved "https://registry.npm.taobao.org/readable-stream/download/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + resolved "https://registry.nlark.com/readable-stream/download/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha1-M3u9o63AcGvT4CRCaihtS0sskZg= dependencies: inherits "^2.0.3" @@ -6333,7 +6333,7 @@ reading-time@^1.5.0: rechoir@^0.6.2: version "0.6.2" - resolved "https://registry.nlark.com/rechoir/download/rechoir-0.6.2.tgz?cache=0&sync_timestamp=1627101702123&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frechoir%2Fdownload%2Frechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" + resolved "https://registry.nlark.com/rechoir/download/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= dependencies: resolve "^1.1.6" @@ -6347,14 +6347,14 @@ recursive-readdir@^2.2.2: regenerate-unicode-properties@^9.0.0: version "9.0.0" - resolved "https://registry.nlark.com/regenerate-unicode-properties/download/regenerate-unicode-properties-9.0.0.tgz?cache=0&sync_timestamp=1631617161322&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerate-unicode-properties%2Fdownload%2Fregenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" + resolved "https://registry.nlark.com/regenerate-unicode-properties/download/regenerate-unicode-properties-9.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerate-unicode-properties%2Fdownload%2Fregenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" integrity sha1-VNCccRXh9T3CMUqXSzLBw0Tv4yY= dependencies: regenerate "^1.4.2" regenerate@^1.4.2: version "1.4.2" - resolved "https://registry.npm.taobao.org/regenerate/download/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" + resolved "https://registry.nlark.com/regenerate/download/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha1-uTRtiCfo9aMve6KWN9OYtpAUhIo= regenerator-runtime@^0.13.4: @@ -6371,7 +6371,7 @@ regenerator-transform@^0.14.2: regexp.prototype.flags@^1.2.0: version "1.3.1" - resolved "https://registry.npm.taobao.org/regexp.prototype.flags/download/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" + resolved "https://registry.nlark.com/regexp.prototype.flags/download/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" integrity sha1-fvNSro0VnnWMDq3Kb4/LTu8HviY= dependencies: call-bind "^1.0.2" @@ -6379,7 +6379,7 @@ regexp.prototype.flags@^1.2.0: regexpu-core@^4.5.4, regexpu-core@^4.7.1: version "4.8.0" - resolved "https://registry.nlark.com/regexpu-core/download/regexpu-core-4.8.0.tgz?cache=0&sync_timestamp=1631619113277&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregexpu-core%2Fdownload%2Fregexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" + resolved "https://registry.nlark.com/regexpu-core/download/regexpu-core-4.8.0.tgz?cache=0&sync_timestamp=1631619103170&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregexpu-core%2Fdownload%2Fregexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" integrity sha1-5WBbo2G2excYR4UBMnUC9EeamPA= dependencies: regenerate "^1.4.2" @@ -6398,14 +6398,14 @@ registry-auth-token@^4.0.0: registry-url@^5.0.0: version "5.1.0" - resolved "https://registry.npm.taobao.org/registry-url/download/registry-url-5.1.0.tgz?cache=0&sync_timestamp=1618682318998&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregistry-url%2Fdownload%2Fregistry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + resolved "https://registry.npm.taobao.org/registry-url/download/registry-url-5.1.0.tgz?cache=0&sync_timestamp=1618681893788&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregistry-url%2Fdownload%2Fregistry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" integrity sha1-6YM0tQ1UNLgRNrROxjjZwgCcUAk= dependencies: rc "^1.2.8" regjsgen@^0.5.2: version "0.5.2" - resolved "https://registry.npmmirror.com/regjsgen/download/regjsgen-0.5.2.tgz?cache=0&sync_timestamp=1633097440621&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fregjsgen%2Fdownload%2Fregjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" + resolved "https://registry.npmmirror.com/regjsgen/download/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" integrity sha1-kv8pX7He7L9uzaslQ9IH6RqjNzM= regjsparser@^0.7.0: @@ -6417,7 +6417,7 @@ regjsparser@^0.7.0: rehype-parse@^6.0.2: version "6.0.2" - resolved "https://registry.nlark.com/rehype-parse/download/rehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" + resolved "https://registry.nlark.com/rehype-parse/download/rehype-parse-6.0.2.tgz?cache=0&sync_timestamp=1630413716153&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frehype-parse%2Fdownload%2Frehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" integrity sha1-rrP91oCF+feW8dMTeuK4WphAaWQ= dependencies: hast-util-from-parse5 "^5.0.0" @@ -6426,12 +6426,12 @@ rehype-parse@^6.0.2: relateurl@^0.2.7: version "0.2.7" - resolved "https://registry.npm.taobao.org/relateurl/download/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" + resolved "https://registry.nlark.com/relateurl/download/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= remark-admonitions@^1.2.1: version "1.2.1" - resolved "https://registry.nlark.com/remark-admonitions/download/remark-admonitions-1.2.1.tgz#87caa1a442aa7b4c0cafa04798ed58a342307870" + resolved "https://registry.npm.taobao.org/remark-admonitions/download/remark-admonitions-1.2.1.tgz#87caa1a442aa7b4c0cafa04798ed58a342307870" integrity sha1-h8qhpEKqe0wMr6BHmO1Yo0IweHA= dependencies: rehype-parse "^6.0.2" @@ -6440,7 +6440,7 @@ remark-admonitions@^1.2.1: remark-emoji@^2.1.0: version "2.2.0" - resolved "https://registry.npmmirror.com/remark-emoji/download/remark-emoji-2.2.0.tgz?cache=0&sync_timestamp=1636044582007&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-emoji%2Fdownload%2Fremark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" + resolved "https://registry.npmmirror.com/remark-emoji/download/remark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" integrity sha1-HHAgkKFSXaW4DhWo+WPvLII2ysc= dependencies: emoticon "^3.2.0" @@ -6468,7 +6468,7 @@ remark-mdx-remove-imports@^1.6.22: remark-mdx@1.6.22: version "1.6.22" - resolved "https://registry.npmmirror.com/remark-mdx/download/remark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd" + resolved "https://registry.npmmirror.com/remark-mdx/download/remark-mdx-1.6.22.tgz?cache=0&sync_timestamp=1637012565094&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-mdx%2Fdownload%2Fremark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd" integrity sha1-BqjasH3P3VfzNzr3+GvQ6ZIQi70= dependencies: "@babel/core" "7.12.9" @@ -6482,7 +6482,7 @@ remark-mdx@1.6.22: remark-parse@8.0.3: version "8.0.3" - resolved "https://registry.npmmirror.com/remark-parse/download/remark-parse-8.0.3.tgz?cache=0&sync_timestamp=1637259967297&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-parse%2Fdownload%2Fremark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1" + resolved "https://registry.npmmirror.com/remark-parse/download/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1" integrity sha1-nGKqOzW3mkhkVMaQRykGB19Ax+E= dependencies: ccount "^1.0.0" @@ -6522,32 +6522,32 @@ renderkid@^3.0.0: repeat-string@^1.5.4: version "1.6.1" - resolved "https://registry.npm.taobao.org/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + resolved "https://registry.nlark.com/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= require-from-string@^2.0.2: version "2.0.2" - resolved "https://registry.npm.taobao.org/require-from-string/download/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + resolved "https://registry.nlark.com/require-from-string/download/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha1-iaf92TgmEmcxjq/hT5wy5ZjDaQk= "require-like@>= 0.1.1": version "0.1.2" - resolved "https://registry.nlark.com/require-like/download/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa" + resolved "https://registry.npm.taobao.org/require-like/download/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa" integrity sha1-rW8wwTvs15cBDEaK+ndcDAprR/o= requires-port@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/requires-port/download/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + resolved "https://registry.nlark.com/requires-port/download/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= resolve-from@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/resolve-from/download/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + resolved "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY= resolve-from@^5.0.0: version "5.0.0" - resolved "https://registry.npm.taobao.org/resolve-from/download/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + resolved "https://registry.nlark.com/resolve-from/download/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha1-w1IlhD3493bfIcV1V7wIfp39/Gk= resolve-pathname@^3.0.0: @@ -6557,7 +6557,7 @@ resolve-pathname@^3.0.0: resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2: version "1.20.0" - resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.20.0.tgz?cache=0&sync_timestamp=1615982599966&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fresolve%2Fdownload%2Fresolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha1-YpoBP7P3B1XW8LeTXMHCxTeLGXU= dependencies: is-core-module "^2.2.0" @@ -6565,7 +6565,7 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2 responselike@^1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/responselike/download/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + resolved "https://registry.npm.taobao.org/responselike/download/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= dependencies: lowercase-keys "^1.0.0" @@ -6594,31 +6594,31 @@ rtl-detect@^1.0.4: run-parallel@^1.1.9: version "1.2.0" - resolved "https://registry.npm.taobao.org/run-parallel/download/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + resolved "https://registry.nlark.com/run-parallel/download/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" integrity sha1-ZtE2jae9+SHrnZW9GpIp5/IaQ+4= dependencies: queue-microtask "^1.2.2" rxjs@^7.1.0: version "7.4.0" - resolved "https://registry.npmmirror.com/rxjs/download/rxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68" + resolved "https://registry.npmmirror.com/rxjs/download/rxjs-7.4.0.tgz?cache=0&sync_timestamp=1633556708772&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Frxjs%2Fdownload%2Frxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68" integrity sha1-oSpE1+6/AW9f8kQbh/KMmlHOvGg= dependencies: tslib "~2.1.0" safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" - resolved "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha1-mR7GnSluAxN0fVm9/St0XDX4go0= safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: version "5.2.1" - resolved "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha1-Hq+fqb2x/dTsdfWPnNtOa3gn7sY= "safer-buffer@>= 2.1.2 < 3": version "2.1.2" - resolved "https://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + resolved "https://registry.nlark.com/safer-buffer/download/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo= sax@^1.2.4, sax@~1.2.4: @@ -6636,7 +6636,7 @@ scheduler@^0.20.2: schema-utils@2.7.0: version "2.7.0" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" integrity sha1-FxUfdtjq5n+793lgwzxnatn078c= dependencies: "@types/json-schema" "^7.0.4" @@ -6645,7 +6645,7 @@ schema-utils@2.7.0: schema-utils@^2.6.5: version "2.7.1" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha1-HKTzLRskxZDCA7jnpQvw6kzTlNc= dependencies: "@types/json-schema" "^7.0.5" @@ -6654,7 +6654,7 @@ schema-utils@^2.6.5: schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: version "3.1.1" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-3.1.1.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-3.1.1.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" integrity sha1-vHTEtraZXB2I92qLd76nIZ4MgoE= dependencies: "@types/json-schema" "^7.0.8" @@ -6663,7 +6663,7 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: schema-utils@^4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-4.0.0.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-4.0.0.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== dependencies: "@types/json-schema" "^7.0.9" @@ -6693,36 +6693,36 @@ selfsigned@^1.10.11: semver-diff@^3.1.1: version "3.1.1" - resolved "https://registry.nlark.com/semver-diff/download/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" + resolved "https://registry.nlark.com/semver-diff/download/semver-diff-3.1.1.tgz?cache=0&sync_timestamp=1620044887257&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver-diff%2Fdownload%2Fsemver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" integrity sha1-Bfd85Z8yXgDicGr9Z7tQbdscoys= dependencies: semver "^6.3.0" semver@7.0.0: version "7.0.0" - resolved "https://registry.npm.taobao.org/semver/download/semver-7.0.0.tgz?cache=0&sync_timestamp=1616463641178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + resolved "https://registry.nlark.com/semver/download/semver-7.0.0.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha1-XzyjV2HkfgWyBsba/yz4FPAxa44= semver@^5.4.1: version "5.7.1" - resolved "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1616463641178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + resolved "https://registry.nlark.com/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha1-qVT5Ma66UI0we78Gnv8MAclhFvc= semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" - resolved "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1616463641178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + resolved "https://registry.nlark.com/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0= semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.5" - resolved "https://registry.npm.taobao.org/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1616463641178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + resolved "https://registry.nlark.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc= dependencies: lru-cache "^6.0.0" send@0.17.1: version "0.17.1" - resolved "https://registry.npm.taobao.org/send/download/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" + resolved "https://registry.nlark.com/send/download/send-0.17.1.tgz?cache=0&sync_timestamp=1618846901933&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsend%2Fdownload%2Fsend-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" integrity sha1-wdiwWfeQD3Rm3Uk4vcROEd2zdsg= dependencies: debug "2.6.9" @@ -6741,7 +6741,7 @@ send@0.17.1: serialize-javascript@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/serialize-javascript/download/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + resolved "https://registry.nlark.com/serialize-javascript/download/serialize-javascript-6.0.0.tgz?cache=0&sync_timestamp=1624284111898&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" integrity sha1-765diPRdeSQUHai1w6en5mP+/rg= dependencies: randombytes "^2.1.0" @@ -6775,7 +6775,7 @@ serve-index@^1.9.1: serve-static@1.14.1: version "1.14.1" - resolved "https://registry.npm.taobao.org/serve-static/download/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" + resolved "https://registry.nlark.com/serve-static/download/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" integrity sha1-Zm5jbcTwEPfvKZcKiKZ0MgiYsvk= dependencies: encodeurl "~1.0.2" @@ -6785,12 +6785,12 @@ serve-static@1.14.1: setprototypeof@1.1.0: version "1.1.0" - resolved "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" + resolved "https://registry.nlark.com/setprototypeof/download/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" integrity sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY= setprototypeof@1.1.1: version "1.1.1" - resolved "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + resolved "https://registry.nlark.com/setprototypeof/download/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha1-fpWsskqpL1iF4KvvW6ExMw1K5oM= shallow-clone@^3.0.0: @@ -6802,24 +6802,24 @@ shallow-clone@^3.0.0: shebang-command@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/shebang-command/download/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + resolved "https://registry.nlark.com/shebang-command/download/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" integrity sha1-zNCvT4g1+9wmW4JGGq8MNmY/NOo= dependencies: shebang-regex "^3.0.0" shebang-regex@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/shebang-regex/download/shebang-regex-3.0.0.tgz?cache=0&sync_timestamp=1628896299850&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fshebang-regex%2Fdownload%2Fshebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + resolved "https://registry.nlark.com/shebang-regex/download/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha1-rhbxZE2HPsrYQ7AwexQzYtTEIXI= shell-quote@^1.7.2: version "1.7.3" - resolved "https://registry.npmmirror.com/shell-quote/download/shell-quote-1.7.3.tgz?cache=0&sync_timestamp=1634798333958&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fshell-quote%2Fdownload%2Fshell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" + resolved "https://registry.npmmirror.com/shell-quote/download/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" integrity sha1-qkDtrBcERbmkMeF7tiwLiBucQSM= shelljs@^0.8.4: version "0.8.4" - resolved "https://registry.npm.taobao.org/shelljs/download/shelljs-0.8.4.tgz?cache=0&sync_timestamp=1615984409294&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fshelljs%2Fdownload%2Fshelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2" + resolved "https://registry.npm.taobao.org/shelljs/download/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2" integrity sha1-3naE/ut2f4cWsyYHiooAh1iQ48I= dependencies: glob "^7.0.0" @@ -6837,7 +6837,7 @@ side-channel@^1.0.4: signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.6" - resolved "https://registry.npmmirror.com/signal-exit/download/signal-exit-3.0.6.tgz?cache=0&sync_timestamp=1637255687504&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsignal-exit%2Fdownload%2Fsignal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + resolved "https://registry.npmmirror.com/signal-exit/download/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== sirv@^1.0.7: @@ -6856,7 +6856,7 @@ sisteransi@^1.0.5: slash@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/slash/download/slash-3.0.0.tgz?cache=0&sync_timestamp=1618384496016&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fslash%2Fdownload%2Fslash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + resolved "https://registry.nlark.com/slash/download/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha1-ZTm+hwwWWtvVJAIg2+Nh8bxNRjQ= sockjs@^0.3.21: @@ -6875,17 +6875,17 @@ sort-css-media-queries@2.0.4: source-list-map@^2.0.0: version "2.0.1" - resolved "https://registry.npm.taobao.org/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" + resolved "https://registry.nlark.com/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha1-OZO9hzv8SEecyp6jpUeDXHwVSzQ= source-map-js@^1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/source-map-js/download/source-map-js-1.0.1.tgz?cache=0&sync_timestamp=1636400772640&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-js%2Fdownload%2Fsource-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" + resolved "https://registry.npmmirror.com/source-map-js/download/source-map-js-1.0.1.tgz?cache=0&sync_timestamp=1636400753943&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-js%2Fdownload%2Fsource-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA== source-map-support@~0.5.20: version "0.5.21" - resolved "https://registry.npmmirror.com/source-map-support/download/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + resolved "https://registry.npmmirror.com/source-map-support/download/source-map-support-0.5.21.tgz?cache=0&sync_timestamp=1637320298732&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-support%2Fdownload%2Fsource-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" @@ -6893,17 +6893,17 @@ source-map-support@~0.5.20: source-map@^0.5.0: version "0.5.7" - resolved "https://registry.nlark.com/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" - resolved "https://registry.nlark.com/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM= source-map@~0.7.2: version "0.7.3" - resolved "https://registry.nlark.com/source-map/download/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha1-UwL4FpAxc1ImVECS5kmB91F1A4M= sourcemap-codec@^1.4.4: @@ -6918,7 +6918,7 @@ space-separated-tokens@^1.0.0: spdy-transport@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/spdy-transport/download/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" + resolved "https://registry.nlark.com/spdy-transport/download/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" integrity sha1-ANSGOmQArXXfkzYaFghgXl3NzzE= dependencies: debug "^4.1.0" @@ -6930,7 +6930,7 @@ spdy-transport@^3.0.0: spdy@^4.0.2: version "4.0.2" - resolved "https://registry.npm.taobao.org/spdy/download/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" + resolved "https://registry.nlark.com/spdy/download/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" integrity sha1-t09GYgOj7aRSwCSSuR+56EonZ3s= dependencies: debug "^4.1.0" @@ -6941,7 +6941,7 @@ spdy@^4.0.2: sprintf-js@~1.0.2: version "1.0.3" - resolved "https://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + resolved "https://registry.nlark.com/sprintf-js/download/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= stable@^0.1.8: @@ -6951,29 +6951,29 @@ stable@^0.1.8: state-toggle@^1.0.0: version "1.0.3" - resolved "https://registry.npm.taobao.org/state-toggle/download/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" + resolved "https://registry.npm.taobao.org/state-toggle/download/state-toggle-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstate-toggle%2Fdownload%2Fstate-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" integrity sha1-4SOxaojhQxObCcaFIiG8mBWRff4= "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" - resolved "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + resolved "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz?cache=0&sync_timestamp=1609654090567&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstatuses%2Fdownload%2Fstatuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= std-env@^2.2.1: version "2.3.1" - resolved "https://registry.npmmirror.com/std-env/download/std-env-2.3.1.tgz#d42271908819c243f8defc77a140fc1fcee336a1" + resolved "https://registry.npmmirror.com/std-env/download/std-env-2.3.1.tgz?cache=0&sync_timestamp=1636124771178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-2.3.1.tgz#d42271908819c243f8defc77a140fc1fcee336a1" integrity sha1-1CJxkIgZwkP43vx3oUD8H87jNqE= dependencies: ci-info "^3.1.1" std-env@^3.0.1: version "3.0.1" - resolved "https://registry.npmmirror.com/std-env/download/std-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" + resolved "https://registry.npmmirror.com/std-env/download/std-env-3.0.1.tgz?cache=0&sync_timestamp=1636124771178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" integrity sha1-vEy8DkOGEBl+NMLXnD3zC0kfUYI= string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.2: version "4.2.3" - resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz?cache=0&sync_timestamp=1632421309919&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstring-width%2Fdownload%2Fstring-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha1-JpxxF9J7Ba0uU2gwqOyJXvnG0BA= dependencies: emoji-regex "^8.0.0" @@ -6982,7 +6982,7 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.2: string.prototype.trimend@^1.0.4: version "1.0.4" - resolved "https://registry.npm.taobao.org/string.prototype.trimend/download/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" + resolved "https://registry.nlark.com/string.prototype.trimend/download/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" integrity sha1-51rpDClCxjUEaGwYsoe0oLGkX4A= dependencies: call-bind "^1.0.2" @@ -6990,7 +6990,7 @@ string.prototype.trimend@^1.0.4: string.prototype.trimstart@^1.0.4: version "1.0.4" - resolved "https://registry.npm.taobao.org/string.prototype.trimstart/download/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + resolved "https://registry.npm.taobao.org/string.prototype.trimstart/download/string.prototype.trimstart-1.0.4.tgz?cache=0&sync_timestamp=1614127232940&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring.prototype.trimstart%2Fdownload%2Fstring.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" integrity sha1-s2OZr0qymZtMnGSL16P7K7Jv7u0= dependencies: call-bind "^1.0.2" @@ -6998,21 +6998,21 @@ string.prototype.trimstart@^1.0.4: string_decoder@^1.1.1: version "1.3.0" - resolved "https://registry.npm.taobao.org/string_decoder/download/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + resolved "https://registry.nlark.com/string_decoder/download/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" integrity sha1-QvEUWUpGzxqOMLCoT1bHjD7awh4= dependencies: safe-buffer "~5.2.0" string_decoder@~1.1.1: version "1.1.1" - resolved "https://registry.npm.taobao.org/string_decoder/download/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + resolved "https://registry.nlark.com/string_decoder/download/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" integrity sha1-nPFhG6YmhdcDCunkujQUnDrwP8g= dependencies: safe-buffer "~5.1.0" stringify-object@^3.3.0: version "3.3.0" - resolved "https://registry.nlark.com/stringify-object/download/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" + resolved "https://registry.nlark.com/stringify-object/download/stringify-object-3.3.0.tgz?cache=0&sync_timestamp=1629673547261&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstringify-object%2Fdownload%2Fstringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" integrity sha1-cDBlrvyhkwDTzoivT1s5VtdVZik= dependencies: get-own-enumerable-property-symbols "^3.0.0" @@ -7040,7 +7040,7 @@ strip-bom-string@^1.0.0: strip-final-newline@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/strip-final-newline/download/strip-final-newline-2.0.0.tgz?cache=0&sync_timestamp=1620046435959&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstrip-final-newline%2Fdownload%2Fstrip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + resolved "https://registry.nlark.com/strip-final-newline/download/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha1-ibhS+y/L6Tb29LMYevsKEsGrWK0= strip-json-comments@~2.0.1: @@ -7050,14 +7050,14 @@ strip-json-comments@~2.0.1: style-to-object@0.3.0, style-to-object@^0.3.0: version "0.3.0" - resolved "https://registry.npm.taobao.org/style-to-object/download/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" + resolved "https://registry.nlark.com/style-to-object/download/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" integrity sha1-sbeQ0gWZHMeDgBlnIUl57hmnbkY= dependencies: inline-style-parser "0.1.1" stylehacks@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/stylehacks/download/stylehacks-5.0.1.tgz?cache=0&sync_timestamp=1621449652268&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstylehacks%2Fdownload%2Fstylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" + resolved "https://registry.nlark.com/stylehacks/download/stylehacks-5.0.1.tgz?cache=0&sync_timestamp=1621449595596&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstylehacks%2Fdownload%2Fstylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" integrity sha1-Mj7FVBmFIJhoBjiMf9rrw40sBvs= dependencies: browserslist "^4.16.0" @@ -7091,7 +7091,7 @@ svg-parser@^2.0.2: svgo@^1.2.2: version "1.3.2" - resolved "https://registry.npmmirror.com/svgo/download/svgo-1.3.2.tgz?cache=0&sync_timestamp=1635850398965&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsvgo%2Fdownload%2Fsvgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" + resolved "https://registry.npmmirror.com/svgo/download/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" integrity sha1-ttxRHAYzRsnkFbgeQ0ARRbltQWc= dependencies: chalk "^2.4.1" @@ -7110,7 +7110,7 @@ svgo@^1.2.2: svgo@^2.7.0: version "2.8.0" - resolved "https://registry.npmmirror.com/svgo/download/svgo-2.8.0.tgz?cache=0&sync_timestamp=1635850398965&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsvgo%2Fdownload%2Fsvgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" + resolved "https://registry.npmmirror.com/svgo/download/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" integrity sha1-T/gMzmcQ3CeV8MfHQQHmdkz8zSQ= dependencies: "@trysound/sax" "0.2.0" @@ -7150,17 +7150,17 @@ svgo@^2.7.0: tapable@^1.0.0: version "1.1.3" - resolved "https://registry.nlark.com/tapable/download/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" + resolved "https://registry.nlark.com/tapable/download/tapable-1.1.3.tgz?cache=0&sync_timestamp=1631526982870&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftapable%2Fdownload%2Ftapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha1-ofzMBrWNth/XpF2i2kT186Pme6I= tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0: version "2.2.1" - resolved "https://registry.nlark.com/tapable/download/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" + resolved "https://registry.nlark.com/tapable/download/tapable-2.2.1.tgz?cache=0&sync_timestamp=1631526982870&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftapable%2Fdownload%2Ftapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha1-GWenPvQGCoLxKrlq+G1S/bdu7KA= terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.4: version "5.2.5" - resolved "https://registry.npmmirror.com/terser-webpack-plugin/download/terser-webpack-plugin-5.2.5.tgz?cache=0&sync_timestamp=1636386017045&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-5.2.5.tgz#ce65b9880a0c36872555c4874f45bbdb02ee32c9" + resolved "https://registry.npmmirror.com/terser-webpack-plugin/download/terser-webpack-plugin-5.2.5.tgz?cache=0&sync_timestamp=1636385968704&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-5.2.5.tgz#ce65b9880a0c36872555c4874f45bbdb02ee32c9" integrity sha512-3luOVHku5l0QBeYS8r4CdHYWEGMmIj3H1U64jgkdZzECcSOJAyJ9TjuqcQZvw1Y+4AOBN9SeYJPJmFn2cM4/2g== dependencies: jest-worker "^27.0.6" @@ -7171,7 +7171,7 @@ terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.4: terser@^5.10.0, terser@^5.7.2: version "5.10.0" - resolved "https://registry.npmmirror.com/terser/download/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" + resolved "https://registry.npmmirror.com/terser/download/terser-5.10.0.tgz?cache=0&sync_timestamp=1636988229781&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fterser%2Fdownload%2Fterser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA== dependencies: commander "^2.20.0" @@ -7185,17 +7185,17 @@ text-table@^0.2.0: thunky@^1.0.2: version "1.1.0" - resolved "https://registry.npm.taobao.org/thunky/download/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" + resolved "https://registry.nlark.com/thunky/download/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" integrity sha1-Wrr3FKlAXbBQRzK7zNLO3Z75U30= timsort@^0.3.0: version "0.3.0" - resolved "https://registry.nlark.com/timsort/download/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" + resolved "https://registry.npm.taobao.org/timsort/download/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= tiny-invariant@^1.0.2: version "1.2.0" - resolved "https://registry.npmmirror.com/tiny-invariant/download/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" + resolved "https://registry.npmmirror.com/tiny-invariant/download/tiny-invariant-1.2.0.tgz?cache=0&sync_timestamp=1635822367356&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftiny-invariant%2Fdownload%2Ftiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" integrity sha1-oRQfhrZyqRSMcul4oZpzublKFak= tiny-warning@^1.0.0, tiny-warning@^1.0.3: @@ -7205,7 +7205,7 @@ tiny-warning@^1.0.0, tiny-warning@^1.0.3: tmp@^0.2.1: version "0.2.1" - resolved "https://registry.npm.taobao.org/tmp/download/tmp-0.2.1.tgz?cache=0&sync_timestamp=1615984440866&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftmp%2Fdownload%2Ftmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + resolved "https://registry.nlark.com/tmp/download/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" integrity sha1-hFf8MDfc9HGcJRNnoa9lAO4czxQ= dependencies: rimraf "^3.0.0" @@ -7217,19 +7217,19 @@ to-fast-properties@^2.0.0: to-readable-stream@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/to-readable-stream/download/to-readable-stream-1.0.0.tgz?cache=0&sync_timestamp=1619072442497&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fto-readable-stream%2Fdownload%2Fto-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" + resolved "https://registry.nlark.com/to-readable-stream/download/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" integrity sha1-zgqgwvPfat+FLvtASng+d8BHV3E= to-regex-range@^5.0.1: version "5.0.1" - resolved "https://registry.npm.taobao.org/to-regex-range/download/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + resolved "https://registry.nlark.com/to-regex-range/download/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" integrity sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ= dependencies: is-number "^7.0.0" toidentifier@1.0.0: version "1.0.0" - resolved "https://registry.npmmirror.com/toidentifier/download/toidentifier-1.0.0.tgz?cache=0&sync_timestamp=1636938512912&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftoidentifier%2Fdownload%2Ftoidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + resolved "https://registry.npmmirror.com/toidentifier/download/toidentifier-1.0.0.tgz?cache=0&sync_timestamp=1636938467744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftoidentifier%2Fdownload%2Ftoidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha1-fhvjRw8ed5SLxD2Uo8j013UrpVM= totalist@^1.0.0: @@ -7244,7 +7244,7 @@ trim-trailing-lines@^1.0.0: trim@0.0.1: version "0.0.1" - resolved "https://registry.npm.taobao.org/trim/download/trim-0.0.1.tgz?cache=0&sync_timestamp=1617312392149&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftrim%2Fdownload%2Ftrim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" + resolved "https://registry.npm.taobao.org/trim/download/trim-0.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftrim%2Fdownload%2Ftrim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0= trough@^1.0.0: @@ -7254,12 +7254,12 @@ trough@^1.0.0: tslib@^2.0.3, tslib@^2.3.1: version "2.3.1" - resolved "https://registry.nlark.com/tslib/download/tslib-2.3.1.tgz?cache=0&sync_timestamp=1628722556410&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftslib%2Fdownload%2Ftslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + resolved "https://registry.nlark.com/tslib/download/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha1-6KM1rdXOrlGqJh0ypJAVjvBC7wE= tslib@~2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/tslib/download/tslib-2.1.0.tgz?cache=0&sync_timestamp=1628722556410&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftslib%2Fdownload%2Ftslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" + resolved "https://registry.nlark.com/tslib/download/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" integrity sha1-2mCGDxwuyqVwOrfTm8Bba/mIuXo= type-fest@^0.20.2: @@ -7289,7 +7289,7 @@ typescript@^4.3.5: unbox-primitive@^1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/unbox-primitive/download/unbox-primitive-1.0.1.tgz?cache=0&sync_timestamp=1616706319488&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funbox-primitive%2Fdownload%2Funbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + resolved "https://registry.npm.taobao.org/unbox-primitive/download/unbox-primitive-1.0.1.tgz?cache=0&sync_timestamp=1616706302651&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funbox-primitive%2Fdownload%2Funbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" integrity sha1-CF4hViXsMWJXTciFmr7nilmxRHE= dependencies: function-bind "^1.1.1" @@ -7299,7 +7299,7 @@ unbox-primitive@^1.0.1: unherit@^1.0.4: version "1.1.3" - resolved "https://registry.nlark.com/unherit/download/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" + resolved "https://registry.nlark.com/unherit/download/unherit-1.1.3.tgz?cache=0&sync_timestamp=1626423419302&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funherit%2Fdownload%2Funherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" integrity sha1-bJtQPytBsmIzDIDpHIYUq9qmnCI= dependencies: inherits "^2.0.0" @@ -7307,12 +7307,12 @@ unherit@^1.0.4: unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" + resolved "https://registry.nlark.com/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631615505724&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-canonical-property-names-ecmascript%2Fdownload%2Funicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" integrity sha1-MBrNxSVjFnDTn2FG4Od/9rvevdw= unicode-match-property-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-match-property-ecmascript/download/unicode-match-property-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618696521&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-ecmascript%2Fdownload%2Funicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" + resolved "https://registry.nlark.com/unicode-match-property-ecmascript/download/unicode-match-property-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618607567&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-ecmascript%2Fdownload%2Funicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" integrity sha1-VP0W4OyxZ88Ezx91a9zJLrp5dsM= dependencies: unicode-canonical-property-names-ecmascript "^2.0.0" @@ -7320,7 +7320,7 @@ unicode-match-property-ecmascript@^2.0.0: unicode-match-property-value-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-match-property-value-ecmascript/download/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" + resolved "https://registry.nlark.com/unicode-match-property-value-ecmascript/download/unicode-match-property-value-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618107717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-value-ecmascript%2Fdownload%2Funicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" integrity sha1-GgGqVyR8FMVouJd1pUk4eIGJpxQ= unicode-property-aliases-ecmascript@^2.0.0: @@ -7330,7 +7330,7 @@ unicode-property-aliases-ecmascript@^2.0.0: unified@9.2.0: version "9.2.0" - resolved "https://registry.npmmirror.com/unified/download/unified-9.2.0.tgz?cache=0&sync_timestamp=1637256247526&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" + resolved "https://registry.npmmirror.com/unified/download/unified-9.2.0.tgz?cache=0&sync_timestamp=1637256334405&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" integrity sha1-Z6YsYnxAWJ7eu/YPU+39TYIgJ/g= dependencies: bail "^1.0.0" @@ -7342,7 +7342,7 @@ unified@9.2.0: unified@^8.4.2: version "8.4.2" - resolved "https://registry.npmmirror.com/unified/download/unified-8.4.2.tgz?cache=0&sync_timestamp=1637256247526&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" + resolved "https://registry.npmmirror.com/unified/download/unified-8.4.2.tgz?cache=0&sync_timestamp=1637256334405&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" integrity sha1-E61YtKQ3+qJ1GkpMahb2gMUA//E= dependencies: bail "^1.0.0" @@ -7353,19 +7353,19 @@ unified@^8.4.2: unique-string@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/unique-string/download/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" + resolved "https://registry.nlark.com/unique-string/download/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" integrity sha1-OcZFH4GvsnSd4rIz4/fF6IQ72J0= dependencies: crypto-random-string "^2.0.0" unist-builder@2.0.3, unist-builder@^2.0.0: version "2.0.3" - resolved "https://registry.nlark.com/unist-builder/download/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436" + resolved "https://registry.nlark.com/unist-builder/download/unist-builder-2.0.3.tgz?cache=0&sync_timestamp=1618816093327&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-builder%2Fdownload%2Funist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436" integrity sha1-d2SHEbXYavCULzNDl6M8XpFRZDY= unist-util-generated@^1.0.0: version "1.1.6" - resolved "https://registry.npm.taobao.org/unist-util-generated/download/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" + resolved "https://registry.nlark.com/unist-util-generated/download/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" integrity sha1-WrUfaJ4pkqRyvrGzXyzn/y8yTUs= unist-util-is@^4.0.0: @@ -7375,40 +7375,40 @@ unist-util-is@^4.0.0: unist-util-position@^3.0.0: version "3.1.0" - resolved "https://registry.nlark.com/unist-util-position/download/unist-util-position-3.1.0.tgz?cache=0&sync_timestamp=1620915237724&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-position%2Fdownload%2Funist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" + resolved "https://registry.nlark.com/unist-util-position/download/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" integrity sha1-HELuYwH41S9H0U9iu9t5ZXH6LUc= unist-util-remove-position@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/unist-util-remove-position/download/unist-util-remove-position-2.0.1.tgz?cache=0&sync_timestamp=1627848251490&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-remove-position%2Fdownload%2Funist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" + resolved "https://registry.nlark.com/unist-util-remove-position/download/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" integrity sha1-XRnKef26cSMBmZsrc1U8qPOzUsw= dependencies: unist-util-visit "^2.0.0" unist-util-remove@2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unist-util-remove/download/unist-util-remove-2.0.0.tgz?cache=0&sync_timestamp=1627635399225&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-remove%2Fdownload%2Funist-util-remove-2.0.0.tgz#32c2ad5578802f2ca62ab808173d505b2c898488" + resolved "https://registry.nlark.com/unist-util-remove/download/unist-util-remove-2.0.0.tgz#32c2ad5578802f2ca62ab808173d505b2c898488" integrity sha1-MsKtVXiALyymKrgIFz1QWyyJhIg= dependencies: unist-util-is "^4.0.0" unist-util-remove@^2.0.0: version "2.1.0" - resolved "https://registry.nlark.com/unist-util-remove/download/unist-util-remove-2.1.0.tgz?cache=0&sync_timestamp=1627635399225&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-remove%2Fdownload%2Funist-util-remove-2.1.0.tgz#b0b4738aa7ee445c402fda9328d604a02d010588" + resolved "https://registry.nlark.com/unist-util-remove/download/unist-util-remove-2.1.0.tgz#b0b4738aa7ee445c402fda9328d604a02d010588" integrity sha1-sLRziqfuRFxAL9qTKNYEoC0BBYg= dependencies: unist-util-is "^4.0.0" unist-util-stringify-position@^2.0.0: version "2.0.3" - resolved "https://registry.npm.taobao.org/unist-util-stringify-position/download/unist-util-stringify-position-2.0.3.tgz?cache=0&sync_timestamp=1618328228185&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funist-util-stringify-position%2Fdownload%2Funist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" + resolved "https://registry.nlark.com/unist-util-stringify-position/download/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" integrity sha1-zOO/oc34W6c3XR1bF73Eytqb2do= dependencies: "@types/unist" "^2.0.2" unist-util-visit-parents@^3.0.0: version "3.1.1" - resolved "https://registry.npmmirror.com/unist-util-visit-parents/download/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6" + resolved "https://registry.nlark.com/unist-util-visit-parents/download/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6" integrity sha1-ZabOaY94prD1aqDojxOAGIbNrvY= dependencies: "@types/unist" "^2.0.0" @@ -7416,7 +7416,7 @@ unist-util-visit-parents@^3.0.0: unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist-util-visit@^2.0.2, unist-util-visit@^2.0.3: version "2.0.3" - resolved "https://registry.npmmirror.com/unist-util-visit/download/unist-util-visit-2.0.3.tgz?cache=0&sync_timestamp=1632405961713&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funist-util-visit%2Fdownload%2Funist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" + resolved "https://registry.npmmirror.com/unist-util-visit/download/unist-util-visit-2.0.3.tgz?cache=0&sync_timestamp=1632405194557&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funist-util-visit%2Fdownload%2Funist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" integrity sha1-w3A4kxRt9HIDu4qXla9H17lxIIw= dependencies: "@types/unist" "^2.0.0" @@ -7425,7 +7425,7 @@ unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist- universalify@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + resolved "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz?cache=0&sync_timestamp=1603180004159&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc= unpipe@1.0.0, unpipe@~1.0.0: @@ -7460,7 +7460,7 @@ update-notifier@^5.1.0: uri-js@^4.2.2: version "4.4.1" - resolved "https://registry.npm.taobao.org/uri-js/download/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + resolved "https://registry.npm.taobao.org/uri-js/download/uri-js-4.4.1.tgz?cache=0&sync_timestamp=1610237641463&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Furi-js%2Fdownload%2Furi-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" integrity sha1-mxpSWVIlhZ5V9mnZKPiMbFfyp34= dependencies: punycode "^2.1.0" @@ -7476,14 +7476,14 @@ url-loader@^4.1.1: url-parse-lax@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/url-parse-lax/download/url-parse-lax-3.0.0.tgz?cache=0&sync_timestamp=1628547550655&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl-parse-lax%2Fdownload%2Furl-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + resolved "https://registry.nlark.com/url-parse-lax/download/url-parse-lax-3.0.0.tgz?cache=0&sync_timestamp=1628548236896&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl-parse-lax%2Fdownload%2Furl-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= dependencies: prepend-http "^2.0.0" url@^0.11.0: version "0.11.0" - resolved "https://registry.npm.taobao.org/url/download/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" + resolved "https://registry.nlark.com/url/download/url-0.11.0.tgz?cache=0&sync_timestamp=1618846952693&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl%2Fdownload%2Furl-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= dependencies: punycode "1.3.2" @@ -7496,7 +7496,7 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: util.promisify@~1.0.0: version "1.0.1" - resolved "https://registry.npm.taobao.org/util.promisify/download/util.promisify-1.0.1.tgz?cache=0&sync_timestamp=1615984387069&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Futil.promisify%2Fdownload%2Futil.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" + resolved "https://registry.nlark.com/util.promisify/download/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" integrity sha1-a693dLgO6w91INi4HQeYKlmruu4= dependencies: define-properties "^1.1.3" @@ -7506,7 +7506,7 @@ util.promisify@~1.0.0: utila@~0.4: version "0.4.0" - resolved "https://registry.npm.taobao.org/utila/download/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" + resolved "https://registry.nlark.com/utila/download/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw= utility-types@^3.10.0: @@ -7541,7 +7541,7 @@ vfile-location@^3.0.0, vfile-location@^3.2.0: vfile-message@^2.0.0: version "2.0.4" - resolved "https://registry.nlark.com/vfile-message/download/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" + resolved "https://registry.nlark.com/vfile-message/download/vfile-message-2.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvfile-message%2Fdownload%2Fvfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" integrity sha1-W0O4gXHUCerlhHfRPyPdQdUsNxo= dependencies: "@types/unist" "^2.0.0" @@ -7568,17 +7568,17 @@ wait-on@^6.0.0: minimist "^1.2.5" rxjs "^7.1.0" -watchpack@^2.3.0: - version "2.3.0" - resolved "https://registry.npmmirror.com/watchpack/download/watchpack-2.3.0.tgz#a41bca3da6afaff31e92a433f4c856a0c25ea0c4" - integrity sha512-MnN0Q1OsvB/GGHETrFeZPQaOelWh/7O+EiFlj8sM9GPjtQkis7k01aAxrg/18kTfoIVcLL+haEVFlXDaSRwKRw== +watchpack@^2.3.1: + version "2.3.1" + resolved "https://registry.npmmirror.com/watchpack/download/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25" + integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA== dependencies: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" wbuf@^1.1.0, wbuf@^1.7.3: version "1.7.3" - resolved "https://registry.npm.taobao.org/wbuf/download/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" + resolved "https://registry.nlark.com/wbuf/download/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" integrity sha1-wdjRSTFtPqhShIiVy2oL/oh7h98= dependencies: minimalistic-assert "^1.0.0" @@ -7590,7 +7590,7 @@ web-namespaces@^1.0.0, web-namespaces@^1.1.2: webpack-bundle-analyzer@^4.4.2: version "4.5.0" - resolved "https://registry.npmmirror.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-4.5.0.tgz?cache=0&sync_timestamp=1634019956604&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-bundle-analyzer%2Fdownload%2Fwebpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" + resolved "https://registry.npmmirror.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" integrity sha1-Gw7qKUfnNSh1Sm+a8+kbK24PedU= dependencies: acorn "^8.0.4" @@ -7605,7 +7605,7 @@ webpack-bundle-analyzer@^4.4.2: webpack-dev-middleware@^5.2.1: version "5.2.2" - resolved "https://registry.npmmirror.com/webpack-dev-middleware/download/webpack-dev-middleware-5.2.2.tgz?cache=0&sync_timestamp=1637165508298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-dev-middleware%2Fdownload%2Fwebpack-dev-middleware-5.2.2.tgz#eb5193faa5479ca1086b9f7bed68b89c731bff62" + resolved "https://registry.npmmirror.com/webpack-dev-middleware/download/webpack-dev-middleware-5.2.2.tgz?cache=0&sync_timestamp=1637165517894&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-dev-middleware%2Fdownload%2Fwebpack-dev-middleware-5.2.2.tgz#eb5193faa5479ca1086b9f7bed68b89c731bff62" integrity sha512-DjZyYrsHhkikAFNvSNKrpnziXukU1EChFAh9j4LAm6ndPLPW8cN0KhM7T+RAiOqsQ6ABfQ8hoKIs9IWMTjov+w== dependencies: colorette "^2.0.10" @@ -7655,7 +7655,7 @@ webpack-merge@^5.8.0: webpack-sources@^1.1.0, webpack-sources@^1.4.3: version "1.4.3" - resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1636982675275&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" + resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1636982701357&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha1-7t2OwLko+/HL/plOItLYkPMwqTM= dependencies: source-list-map "^2.0.0" @@ -7663,13 +7663,13 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.3: webpack-sources@^3.2.2: version "3.2.2" - resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-3.2.2.tgz?cache=0&sync_timestamp=1636982675275&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260" + resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-3.2.2.tgz?cache=0&sync_timestamp=1636982701357&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260" integrity sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw== webpack@^5.61.0: - version "5.64.4" - resolved "https://registry.npmmirror.com/webpack/download/webpack-5.64.4.tgz#e1454b6a13009f57cc2c78e08416cd674622937b" - integrity sha512-LWhqfKjCLoYJLKJY8wk2C3h77i8VyHowG3qYNZiIqD6D0ZS40439S/KVuc/PY48jp2yQmy0mhMknq8cys4jFMw== + version "5.65.0" + resolved "https://registry.npmmirror.com/webpack/download/webpack-5.65.0.tgz#ed2891d9145ba1f0d318e4ea4f89c3fa18e6f9be" + integrity sha512-Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.50" @@ -7693,12 +7693,12 @@ webpack@^5.61.0: schema-utils "^3.1.0" tapable "^2.1.1" terser-webpack-plugin "^5.1.3" - watchpack "^2.3.0" + watchpack "^2.3.1" webpack-sources "^3.2.2" webpackbar@^5.0.0-3: version "5.0.2" - resolved "https://registry.npmmirror.com/webpackbar/download/webpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" + resolved "https://registry.npmmirror.com/webpackbar/download/webpackbar-5.0.2.tgz?cache=0&sync_timestamp=1636124846959&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpackbar%2Fdownload%2Fwebpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" integrity sha1-091GYhHHOFJ0HfyEK3VW3LwrBXA= dependencies: chalk "^4.1.0" @@ -7708,7 +7708,7 @@ webpackbar@^5.0.0-3: websocket-driver@>=0.5.1, websocket-driver@^0.7.4: version "0.7.4" - resolved "https://registry.npm.taobao.org/websocket-driver/download/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" + resolved "https://registry.nlark.com/websocket-driver/download/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" integrity sha1-ia1Slbv2S0gKvLox5JU6ynBvV2A= dependencies: http-parser-js ">=0.5.1" @@ -7717,12 +7717,12 @@ websocket-driver@>=0.5.1, websocket-driver@^0.7.4: websocket-extensions@>=0.1.1: version "0.1.4" - resolved "https://registry.npm.taobao.org/websocket-extensions/download/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + resolved "https://registry.nlark.com/websocket-extensions/download/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha1-f4RzvIOd/YdgituV1+sHUhFXikI= which-boxed-primitive@^1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/which-boxed-primitive/download/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + resolved "https://registry.nlark.com/which-boxed-primitive/download/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" integrity sha1-E3V7yJsgmwSf5dhkMOIc9AqJqOY= dependencies: is-bigint "^1.0.1" @@ -7733,21 +7733,21 @@ which-boxed-primitive@^1.0.2: which@^1.3.1: version "1.3.1" - resolved "https://registry.npm.taobao.org/which/download/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + resolved "https://registry.nlark.com/which/download/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo= dependencies: isexe "^2.0.0" which@^2.0.1: version "2.0.2" - resolved "https://registry.npm.taobao.org/which/download/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + resolved "https://registry.nlark.com/which/download/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha1-fGqN0KY2oDJ+ELWckobu6T8/UbE= dependencies: isexe "^2.0.0" widest-line@^3.1.0: version "3.1.0" - resolved "https://registry.npmmirror.com/widest-line/download/widest-line-3.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwidest-line%2Fdownload%2Fwidest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" + resolved "https://registry.npmmirror.com/widest-line/download/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" integrity sha1-gpIzO79my0X/DeFgOxNreuFJbso= dependencies: string-width "^4.0.0" @@ -7815,10 +7815,10 @@ yallist@^4.0.0: yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: version "1.10.2" - resolved "https://registry.npmmirror.com/yaml/download/yaml-1.10.2.tgz?cache=0&sync_timestamp=1636797530964&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyaml%2Fdownload%2Fyaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + resolved "https://registry.npmmirror.com/yaml/download/yaml-1.10.2.tgz?cache=0&sync_timestamp=1636797186957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyaml%2Fdownload%2Fyaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha1-IwHF/78StGfejaIzOkWeKeeSDks= zwitch@^1.0.0: version "1.0.5" - resolved "https://registry.npm.taobao.org/zwitch/download/zwitch-1.0.5.tgz?cache=0&sync_timestamp=1617357655901&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fzwitch%2Fdownload%2Fzwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" + resolved "https://registry.npm.taobao.org/zwitch/download/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" integrity sha1-0R1zgf/tFrdC9q97PyI9XNn+mSA= From b64b02bb4508aae4f14f99cd3fe5e27a5a6732d4 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 7 Dec 2021 02:16:18 +0800 Subject: [PATCH 071/174] :pencil2: add missing annotationo --- nonebot/adapters/_adapter.py | 2 +- nonebot/adapters/_bot.py | 37 +----------------------------------- 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/nonebot/adapters/_adapter.py b/nonebot/adapters/_adapter.py index 92038d78..f22e872c 100644 --- a/nonebot/adapters/_adapter.py +++ b/nonebot/adapters/_adapter.py @@ -14,7 +14,7 @@ from nonebot.drivers import ( class Adapter(abc.ABC): def __init__(self, driver: Driver, **kwargs: Any): - self.driver = driver + self.driver: Driver = driver self.bots: Dict[str, Bot] = {} @classmethod diff --git a/nonebot/adapters/_bot.py b/nonebot/adapters/_bot.py index 5aba33ef..ab6ec419 100644 --- a/nonebot/adapters/_bot.py +++ b/nonebot/adapters/_bot.py @@ -44,7 +44,7 @@ class Bot(abc.ABC): * ``self_id: str``: 机器人 ID * ``request: HTTPConnection``: request 连接对象 """ - self.adapter = adapter + self.adapter: "Adapter" = adapter self.self_id: str = self_id """机器人 ID""" @@ -59,41 +59,6 @@ class Bot(abc.ABC): def config(self) -> Config: return self.adapter.config - @classmethod - @abc.abstractmethod - async def check_permission( - cls, driver: Driver, request: HTTPConnection - ) -> Tuple[Optional[str], Optional[HTTPResponse]]: - """ - :说明: - - 检查连接请求是否合法的函数，如果合法则返回当前连接 ``唯一标识符``，通常为机器人 ID；如果不合法则抛出 ``RequestDenied`` 异常。 - - :参数: - - * ``driver: Driver``: Driver 对象 - * ``request: HTTPConnection``: request 请求详情 - - :返回: - - - ``Optional[str]``: 连接唯一标识符，``None`` 代表连接不合法 - - ``Optional[HTTPResponse]``: HTTP 上报响应 - """ - raise NotImplementedError - - @abc.abstractmethod - async def handle_message(self, message: bytes): - """ - :说明: - - 处理上报消息的函数，转换为 ``Event`` 事件后调用 ``nonebot.message.handle_event`` 进一步处理事件。 - - :参数: - - * ``message: bytes``: 收到的上报消息 - """ - raise NotImplementedError - async def call_api(self, api: str, **data: Any) -> Any: """ :说明: From 61e17d0de7efc3f908f00276f0da1db9c328e39d Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 8 Dec 2021 16:46:10 +0800 Subject: [PATCH 072/174] :label: fix missing type --- nonebot/exception.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nonebot/exception.py b/nonebot/exception.py index f1e95fd6..44ac6a7e 100644 --- a/nonebot/exception.py +++ b/nonebot/exception.py @@ -127,8 +127,8 @@ class SkippedException(MatcherException): """ def __init__(self, param: ModelField, value: Any): - self.param = param - self.value = value + self.param: ModelField = param + self.value: Any = value def __repr__(self): return f"" From 4de01d7d4f240823c0ad3db9dfa1674851ea689c Mon Sep 17 00:00:00 2001 From: hemengyang Date: Wed, 8 Dec 2021 19:48:09 +0800 Subject: [PATCH 073/174] =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=96=B0=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=E5=95=86=E5=BA=97=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- website/static/adapters.json | 32 +- website/static/bots.json | 48 ++- website/static/plugins.json | 556 ++++++++++++++++++++++------------- 3 files changed, 411 insertions(+), 225 deletions(-) diff --git a/website/static/adapters.json b/website/static/adapters.json index 3d6d0e41..7a76e548 100644 --- a/website/static/adapters.json +++ b/website/static/adapters.json @@ -1,34 +1,42 @@ [ { - "id": "nonebot.adapters.cqhttp", - "link": "nonebot-adapter-cqhttp", + "module_name": "nonebot.adapters.cqhttp", + "project_link": "nonebot-adapter-cqhttp", "name": "cqhttp", "desc": "OneBot(CQHTTP) 协议", "author": "yanyongyu", - "repo": "nonebot/nonebot2/tree/master/packages/nonebot-adapter-cqhttp" + "homepage": "https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-adapter-cqhttp", + "tags": [], + "is_official": false }, { - "id": "nonebot.adapters.ding", - "link": "nonebot-adapter-ding", + "module_name": "nonebot.adapters.ding", + "project_link": "nonebot-adapter-ding", "name": "ding", "desc": "钉钉协议", "author": "Artin", - "repo": "nonebot/nonebot2/tree/master/packages/nonebot-adapter-ding" + "homepage": "https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-adapter-ding", + "tags": [], + "is_official": false }, { - "id": "nonebot.adapters.mirai", - "link": "nonebot-adapter-mirai", + "module_name": "nonebot.adapters.mirai", + "project_link": "nonebot-adapter-mirai", "name": "mirai", "desc": "Mirai-Api-HTTP 协议", "author": "Mix", - "repo": "nonebot/nonebot2/tree/master/packages/nonebot-adapter-mirai" + "homepage": "https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-adapter-mirai", + "tags": [], + "is_official": false }, { - "id": "nonebot.adapters.feishu", - "link": "nonebot-adapter-feishu", + "module_name": "nonebot.adapters.feishu", + "project_link": "nonebot-adapter-feishu", "name": "feishu", "desc": "飞书协议", "author": "StarHeartHunt", - "repo": "nonebot/nonebot2/tree/master/packages/nonebot-adapter-feishu" + "homepage": "https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-adapter-feishu", + "tags": [], + "is_official": false } ] diff --git a/website/static/bots.json b/website/static/bots.json index 78a3b612..5eeca3ae 100644 --- a/website/static/bots.json +++ b/website/static/bots.json @@ -3,72 +3,96 @@ "name": "HarukaBot", "desc": "将B站UP主的动态和直播信息推送至QQ", "author": "SK-415", - "repo": "SK-415/HarukaBot" + "homepage": "https://github.com/SK-415/HarukaBot", + "tags": [], + "is_official": false }, { "name": "Omega Miya", "desc": "B站推送Pixiv搜图识番求签抽卡表情包还有其他杂七杂八的功能", "author": "Ailitonia", - "repo": "Ailitonia/omega-miya" + "homepage": "https://github.com/Ailitonia/omega-miya", + "tags": [], + "is_official": false }, { "name": "Github Bot", "desc": "在QQ获取/处理Github repo/pr/issue", "author": "yanyongyu", - "repo": "cscs181/QQ-GitHub-Bot" + "homepage": "https://github.com/cscs181/QQ-GitHub-Bot", + "tags": [], + "is_official": false }, { "name": "YanXiBot", "desc": "动漫资源查找与娱乐机器人", "author": "Melodyknit", - "repo": "https://github.com/Melodyknit/YanXiBot" + "homepage": "https://github.com/Melodyknit/YanXiBot", + "tags": [], + "is_official": false }, { "name": "绪山真寻bot", "desc": "含有不少的娱乐功能同时稍稍有一些实用的功能 :P", "author": "HibiKier", - "repo": "https://github.com/HibiKier/zhenxun_bot" + "homepage": "https://github.com/HibiKier/zhenxun_bot", + "tags": [], + "is_official": false }, { "name": "ATRI", "desc": "高性能文爱萝卜子，糅杂了各类有趣小功能", "author": "Kyomotoi", - "repo": "https://github.com/Kyomotoi/ATRI" + "homepage": "https://github.com/Kyomotoi/ATRI", + "tags": [], + "is_official": false }, { "name": "dumbot傻瓜机器人", "desc": "猜一猜游戏、新闻一览、英文每日一词一短语等等，含一键启动及docker容器部署就绪", "author": "ffreemt", - "repo": "https://github.com/ffreemt/koyeb-nb2" + "homepage": "https://github.com/ffreemt/koyeb-nb2", + "tags": [], + "is_official": false }, { "name": "DicePP", "desc": "TRPG骰娘, 带先攻, 查询等功能, 主要面向DND5E. 面对骰主推出的船新版本, 内置Windows/Linux详细部署指南以及方便的自定义骰娘方法, 从回复文本到查询资料库都可轻松配置~", "author": "pear-studio", - "repo": "https://github.com/pear-studio/nonebot-dicepp" + "homepage": "https://github.com/pear-studio/nonebot-dicepp", + "tags": [], + "is_official": false }, { "name": "SetuBot", "desc": "每个群配置文件独立,可以控制频率,socks http代理,R18开关,支持多tag,自建API lolicon Pixiv热度榜", "author": "yuban10703", - "repo": "https://github.com/yuban10703/setu-nonebot2" + "homepage": "https://github.com/yuban10703/setu-nonebot2", + "tags": [], + "is_official": false }, { "name": "Takker", "desc": "综合了各种娱乐功能的Bot", "author": "FYWinds", - "repo": "https://github.com/FYWinds/takker" + "homepage": "https://github.com/FYWinds/takker", + "tags": [], + "is_official": false }, { "name": "剑网三bot", "desc": "网络游戏《剑网三》的群聊机器人，数据使用：www.jx3api.com", "author": "JustUndertaker", - "repo": "https://github.com/JustUndertaker/jx3_bot" + "homepage": "https://github.com/JustUndertaker/jx3_bot", + "tags": [], + "is_official": false }, { "name": "PixivBot", "desc": "顾名思义是Pixiv的bot（随机推荐插画、随机指定关键词插画、随机书签、查看排行榜、查看指定id插画）", "author": "ssttkkl", - "repo": "https://github.com/ssttkkl/PixivBot" + "homepage": "https://github.com/ssttkkl/PixivBot", + "tags": [], + "is_official": false } ] diff --git a/website/static/plugins.json b/website/static/plugins.json index 7f76e695..9e039904 100644 --- a/website/static/plugins.json +++ b/website/static/plugins.json @@ -1,538 +1,692 @@ [ { - "id": "nonebot_plugin_status", - "link": "nonebot-plugin-status", + "module_name": "nonebot_plugin_status", + "project_link": "nonebot-plugin-status", "name": "服务器状态查看", "desc": "通过戳一戳获取服务器状态", "author": "yanyongyu", - "repo": "cscs181/QQ-GitHub-Bot/tree/master/src/plugins/nonebot_plugin_status" + "homepage": "https://github.com/cscs181/QQ-GitHub-Bot/tree/master/src/plugins/nonebot_plugin_status", + "tags": [], + "is_official": false }, { - "id": "haruka_bot", - "link": "haruka-bot", + "module_name": "haruka_bot", + "project_link": "haruka-bot", "name": "HarukaBot", "desc": "将B站UP主的动态和直播信息推送至QQ", "author": "SK-415", - "repo": "SK-415/HarukaBot" + "homepage": "https://github.com/SK-415/HarukaBot", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_rauthman", - "link": "nonebot-plugin-rauthman", + "module_name": "nonebot_plugin_rauthman", + "project_link": "nonebot-plugin-rauthman", "name": "RAM 授权管理", "desc": "基于规则的授权管理", "author": "Lancercmd", - "repo": "Lancercmd/nonebot_plugin_rauthman" + "homepage": "https://github.com/Lancercmd/nonebot_plugin_rauthman", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_docs", - "link": "nonebot-plugin-docs", + "module_name": "nonebot_plugin_docs", + "project_link": "nonebot-plugin-docs", "author": "nonebot", "desc": "在本地浏览NoneBot文档", "name": "NoneBot离线文档", - "repo": "nonebot/nonebot2/tree/master/packages/nonebot-plugin-docs" + "homepage": "https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-plugin-docs", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_sentry", - "link": "nonebot-plugin-sentry", + "module_name": "nonebot_plugin_sentry", + "project_link": "nonebot-plugin-sentry", "author": "yanyongyu", "desc": "使用Sentry监控机器人日志并处理报错", "name": "Sentry日志监控", - "repo": "cscs181/QQ-GitHub-Bot/tree/master/src/plugins/nonebot_plugin_sentry" + "homepage": "https://github.com/cscs181/QQ-GitHub-Bot/tree/master/src/plugins/nonebot_plugin_sentry", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_test", - "link": "nonebot-plugin-test", + "module_name": "nonebot_plugin_test", + "project_link": "nonebot-plugin-test", "author": "yanyongyu", "desc": "在浏览器中测试你的 NoneBot 机器人", "name": "前端测试机器人插件", - "repo": "nonebot/plugin-test" + "homepage": "https://github.com/nonebot/plugin-test", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_apscheduler", - "link": "nonebot-plugin-apscheduler", + "module_name": "nonebot_plugin_apscheduler", + "project_link": "nonebot-plugin-apscheduler", "author": "yanyongyu", "desc": "APScheduler 定时任务插件", "name": "定时任务", - "repo": "nonebot/plugin-apscheduler" + "homepage": "https://github.com/nonebot/plugin-apscheduler", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_picsearcher", - "link": "nonebot-plugin-picsearcher", + "module_name": "nonebot_plugin_picsearcher", + "project_link": "nonebot-plugin-picsearcher", "author": "synodriver", "desc": "从基本上所有你想的出名字的搜图平台找图片", "name": "图片搜索", - "repo": "synodriver/nonebot_plugin_picsearcher" + "homepage": "https://github.com/synodriver/nonebot_plugin_picsearcher", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_navicat", - "link": "nonebot-plugin-navicat", + "module_name": "nonebot_plugin_navicat", + "project_link": "nonebot-plugin-navicat", "author": "synodriver", "desc": "连接至各种数据库,为其他插件导出连接对象", "name": "通用数据库连接", - "repo": "synodriver/nonebot_plugin_navicat" + "homepage": "https://github.com/synodriver/nonebot_plugin_navicat", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_translator", - "link": "nonebot-plugin-translator", + "module_name": "nonebot_plugin_translator", + "project_link": "nonebot-plugin-translator", "author": "Lancercmd", "desc": "基于腾讯机器翻译 TMT", "name": "多语种翻译插件", - "repo": "Lancercmd/nonebot_plugin_translator" + "homepage": "https://github.com/Lancercmd/nonebot_plugin_translator", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_web", - "link": "nonebot-plugin-web", + "module_name": "nonebot_plugin_web", + "project_link": "nonebot-plugin-web", "author": "abrahum", "desc": "Web Monitor 时刻视奸你的bot", "name": "Web监视器", - "repo": "abrahum/nonebot_plugin_web" + "homepage": "https://github.com/abrahum/nonebot_plugin_web", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_wordbank", - "link": "nonebot-plugin-wordbank", + "module_name": "nonebot_plugin_wordbank", + "project_link": "nonebot-plugin-wordbank", "author": "Joenothing-lst", "desc": "无数据库的轻量问答插件，支持模糊问答", "name": "nonebot-plugin-wordbank", - "repo": "Joenothing-lst/word-bank" + "homepage": "https://github.com/Joenothing-lst/word-bank", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_cooldown", - "link": "nonebot-plugin-cooldown", + "module_name": "nonebot_plugin_cooldown", + "project_link": "nonebot-plugin-cooldown", "author": "jks15satoshi", "desc": "为用户调用功能添加冷却时间（调用频率限制）功能", "name": "冷却事件", - "repo": "jks15satoshi/nonebot-plugin-cooldown" + "homepage": "https://github.com/jks15satoshi/nonebot-plugin-cooldown", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_mqtt", - "link": "nonebot-plugin-mqtt", + "module_name": "nonebot_plugin_mqtt", + "project_link": "nonebot-plugin-mqtt", "author": "synodriver", "desc": "接入mqtt网络,订阅和发布消息", "name": "mqtt接入", - "repo": "synodriver/nonebot_plugin_mqtt" + "homepage": "https://github.com/synodriver/nonebot_plugin_mqtt", + "tags": [], + "is_official": false }, { - "id": "nonebot-plugin-ipypreter", - "link": "nonebot-plugin-ipypreter", + "module_name": "nonebot-plugin-ipypreter", + "project_link": "nonebot-plugin-ipypreter", "author": "iyume", "desc": "消息交互式 python 解释器", "name": "消息交互式 python 解释器", - "repo": "iyume/nonebot-plugin-ipypreter" + "homepage": "https://github.com/iyume/nonebot-plugin-ipypreter", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_songpicker2", - "link": "nonebot-plugin-songpicker2", + "module_name": "nonebot_plugin_songpicker2", + "project_link": "nonebot-plugin-songpicker2", "author": "maxesisn", "desc": "点播歌曲，支持候选菜单、热评显示，数据源为网易云", "name": "songpicker2", - "repo": "maxesisn/nonebot_plugin_songpicker2" + "homepage": "https://github.com/maxesisn/nonebot_plugin_songpicker2", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_styledstr", - "link": "nonebot-plugin-styledstr", + "module_name": "nonebot_plugin_styledstr", + "project_link": "nonebot-plugin-styledstr", "author": "jks15satoshi", "desc": "通过字符串标签管理字符串资源", "name": "风格化字符串管理", - "repo": "jks15satoshi/nonebot_plugin_styledstr" + "homepage": "https://github.com/jks15satoshi/nonebot_plugin_styledstr", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_arcaea", - "link": "nonebot-plugin-arcaea", + "module_name": "nonebot_plugin_arcaea", + "project_link": "nonebot-plugin-arcaea", "author": "iyume", "desc": "Arcaea 查分器，可以实现 best30 | recent | songinfo 之类的查询功能并支持 DIY", "name": "Arcaea 查分器", - "repo": "iyume/nonebot-plugin-arcaea" + "homepage": "https://github.com/iyume/nonebot-plugin-arcaea", + "tags": [], + "is_official": false }, { - "id": "nonebot_bison", - "link": "nonebot-bison", + "module_name": "nonebot_bison", + "project_link": "nonebot-bison", "author": "felinae98", "desc": "订阅来自微博，B站，网易云，RSS以及各种网站的动态，转发到QQ群中", "name": "Bison", - "repo": "felinae98/nonebot-bison" + "homepage": "https://github.com/felinae98/nonebot-bison", + "tags": [], + "is_official": false }, { - "id": "nonebot-plugin-ncm", - "link": "nonebot-plugin-ncm", + "module_name": "nonebot-plugin-ncm", + "project_link": "nonebot-plugin-ncm", "author": "kitUIN", "desc": "网易云无损音乐下载", "name": "网易云无损音乐下载", - "repo": "kitUIN/nonebot_tools/tree/master/nonebot_tools/nonebot-plugin-ncm" + "homepage": "https://github.com/kitUIN/nonebot_tools/tree/master/nonebot_tools/nonebot-plugin-ncm", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_cocdicer", - "link": "nonebot-plugin-cocdicer", + "module_name": "nonebot_plugin_cocdicer", + "project_link": "nonebot-plugin-cocdicer", "author": "abrahum", "desc": "COC跑团骰子娘", "name": "nonebot-plugin-cocdicer", - "repo": "abrahum/nonebot_plugin_cocdicer" + "homepage": "https://github.com/abrahum/nonebot_plugin_cocdicer", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_trpglogger", - "link": "nonebot-plugin-trpglogger", + "module_name": "nonebot_plugin_trpglogger", + "project_link": "nonebot-plugin-trpglogger", "author": "Jigsaw111", "desc": "记录跑团记录并上传", "name": "跑团记录记录器", - "repo": "thereisnodice/TRPGLogger" + "homepage": "https://github.com/thereisnodice/TRPGLogger", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_r6s", - "link": "nonebot-plugin-r6s", + "module_name": "nonebot_plugin_r6s", + "project_link": "nonebot-plugin-r6s", "author": "abrahum", "desc": "查询彩虹六号玩家信息", "name": "nonebot-plugin-r6s", - "repo": "abrahum/nonebot_plugin_r6s" + "homepage": "https://github.com/abrahum/nonebot_plugin_r6s", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_guess", - "link": "nonebot-plugin-guess", + "module_name": "nonebot_plugin_guess", + "project_link": "nonebot-plugin-guess", "author": "ffreemt", "desc": "多次互动猜名字游戏，自带猜城市名，可定制", "name": "猜猜看", - "repo": "ffreemt/nonebot-plugin-guess-game" + "homepage": "https://github.com/ffreemt/nonebot-plugin-guess-game", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_abbrreply", - "link": "nonebot_plugin_abbrreply", + "module_name": "nonebot_plugin_abbrreply", + "project_link": "nonebot_plugin_abbrreply", "author": "anlen123", "desc": "输入拼音首字母，猜测文字", "name": "缩写查询器", - "repo": "anlen123/nonebot_plugin_abbrreply" + "homepage": "https://github.com/anlen123/nonebot_plugin_abbrreply", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_biliav", - "link": "nonebot_plugin_biliav", + "module_name": "nonebot_plugin_biliav", + "project_link": "nonebot_plugin_biliav", "author": "knva", "desc": "将用户发的av号或者bv号转成小程序返回", "name": "biliav小程序转换器", - "repo": "knva/nonebot_plugin_biliav" + "homepage": "https://github.com/knva/nonebot_plugin_biliav", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_manager", - "link": "nonebot-plugin-manager", + "module_name": "nonebot_plugin_manager", + "project_link": "nonebot-plugin-manager", "name": "插件管理器", "desc": "基于 import hook 的插件管理", "author": "Jigsaw111", - "repo": "Jigsaw111/nonebot_plugin_manager" + "homepage": "https://github.com/Jigsaw111/nonebot_plugin_manager", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_analysis_bilibili", - "link": "nonebot-plugin-analysis-bilibili", + "module_name": "nonebot_plugin_analysis_bilibili", + "project_link": "nonebot-plugin-analysis-bilibili", "name": "bilibili视频、番剧解析", "desc": "自动解析bilibili视频、番剧解析", "author": "mengshouer", - "repo": "mengshouer/nonebot_plugin_analysis_bilibili" + "homepage": "https://github.com/mengshouer/nonebot_plugin_analysis_bilibili", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_localstore", - "link": "nonebot-plugin-localstore", + "module_name": "nonebot_plugin_localstore", + "project_link": "nonebot-plugin-localstore", "name": "本地数据存储", "desc": "存储插件数据至本地文件", "author": "yanyongyu", - "repo": "nonebot/plugin-localstore" + "homepage": "https://github.com/nonebot/plugin-localstore", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_puppet", - "link": "nonebot-plugin-puppet", + "module_name": "nonebot_plugin_puppet", + "project_link": "nonebot-plugin-puppet", "name": "nonebot_plugin_puppet", "desc": "多对多的会话转接", "author": "Jigsaw111", - "repo": "Jigsaw111/nonebot_plugin_puppet" + "homepage": "https://github.com/Jigsaw111/nonebot_plugin_puppet", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_mcstatus", - "link": "nonebot-plugin-mcstatus", + "module_name": "nonebot_plugin_mcstatus", + "project_link": "nonebot-plugin-mcstatus", "name": "Minecraft 服务器状态查询", "desc": "顾名思义", "author": "Jigsaw111", - "repo": "Jigsaw111/nonebot-plugin-mcstatus" + "homepage": "https://github.com/Jigsaw111/nonebot-plugin-mcstatus", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_help", - "link": "nonebot-plugin-help", + "module_name": "nonebot_plugin_help", + "project_link": "nonebot-plugin-help", "name": "Nonebot2插件轻量帮助列表", "desc": "读取并提供已加载Nonebot2插件开发者提供的帮助信息（用途）", "author": "XZhouQD", - "repo": "https://github.com/XZhouQD/nonebot-plugin-help" + "homepage": "https://github.com/XZhouQD/nonebot-plugin-help", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_gamedraw", - "link": "nonebot-plugin-gamedraw", + "module_name": "nonebot_plugin_gamedraw", + "project_link": "nonebot-plugin-gamedraw", "name": "nonebot_plugin_gamedraw", "desc": "基于爬取wiki实现自动更新的抽卡，目前支持赛马娘，原神，明日方舟，坎公骑冠剑，公主连结(国/台)，碧蓝航线，FGO，阴阳师", "author": "HibiKier", - "repo": "https://github.com/HibiKier/nonebot_plugin_gamedraw" + "homepage": "https://github.com/HibiKier/nonebot_plugin_gamedraw", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_alias", - "link": "nonebot-plugin-alias", + "module_name": "nonebot_plugin_alias", + "project_link": "nonebot-plugin-alias", "name": "nonebot-plugin-alias", "desc": "为 nonebot2 的指令创建别名", "author": "MeetWq", - "repo": "https://github.com/MeetWq/nonebot-plugin-alias" + "homepage": "https://github.com/MeetWq/nonebot-plugin-alias", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_withdraw", - "link": "nonebot-plugin-withdraw", + "module_name": "nonebot_plugin_withdraw", + "project_link": "nonebot-plugin-withdraw", "name": "Nonebot2 消息撤回插件", "desc": "用于让机器人撤回自己发出的消息", "author": "MeetWq", - "repo": "https://github.com/MeetWq/nonebot-plugin-withdraw" + "homepage": "https://github.com/MeetWq/nonebot-plugin-withdraw", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_pixivrank_search", - "link": "nonebot-plugin-pixivrank-search", + "module_name": "nonebot_plugin_pixivrank_search", + "project_link": "nonebot-plugin-pixivrank-search", "name": "nonebot_plugin_pixivrank_search", "desc": "基于RSSHUB阅读器的P站排行和P站搜图", "author": "HibiKier", - "repo": "https://github.com/HibiKier/nonebot_plugin_pixivrank_search" + "homepage": "https://github.com/HibiKier/nonebot_plugin_pixivrank_search", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_russian", - "link": "nonebot-plugin-russian", + "module_name": "nonebot_plugin_russian", + "project_link": "nonebot-plugin-russian", "name": "nonebot_plugin_russian", "desc": "群内小游戏，使用金币赌注的俄罗斯轮盘", "author": "HibiKier", - "repo": "https://github.com/HibiKier/nonebot_plugin_russian" + "homepage": "https://github.com/HibiKier/nonebot_plugin_russian", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_statistical", - "link": "nonebot-plugin-statistical", + "module_name": "nonebot_plugin_statistical", + "project_link": "nonebot-plugin-statistical", "name": "nonebot_plugin_statistical", "desc": "一个简单的功能调用统计以及可视化插件", "author": "HibiKier", - "repo": "https://github.com/HibiKier/nonebot_plugin_statistical" + "homepage": "https://github.com/HibiKier/nonebot_plugin_statistical", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_setu", - "link": "nonebot_plugin_setu", + "module_name": "nonebot_plugin_setu", + "project_link": "nonebot_plugin_setu", "name": "nonebot_plugin_setu", "desc": "基于loliconImage Api的涩图插件，内置涩图CD", "author": "ayanamiblhx", - "repo": "https://github.com/ayanamiblhx/nonebot_plugin_setu" + "homepage": "https://github.com/ayanamiblhx/nonebot_plugin_setu", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_fr24", - "link": "nonebot-plugin-fr24", + "module_name": "nonebot_plugin_fr24", + "project_link": "nonebot-plugin-fr24", "name": "FlightRadar24查询模块", "desc": "通过FlightRadar24查询航班信息", "author": "IronWolf-K", - "repo": "https://github.com/IronWolf-K/nonebot_plugin_fr24" + "homepage": "https://github.com/IronWolf-K/nonebot_plugin_fr24", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_heweather", - "link": "nonebot-plugin-heweather", + "module_name": "nonebot_plugin_heweather", + "project_link": "nonebot-plugin-heweather", "name": "和风天气", "desc": "获取和风天气信息并转换为图片", "author": "kexue-z", - "repo": "https://github.com/kexue-z/nonebot-plugin-heweather" + "homepage": "https://github.com/kexue-z/nonebot-plugin-heweather", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_autohelp", - "link": "nonebot-plugin-autohelp", + "module_name": "nonebot_plugin_autohelp", + "project_link": "nonebot-plugin-autohelp", "name": "nonebot-plugin-autohelp", "desc": "响应help/菜单/帮助(群消息或私信)并提供已载入插件的帮助信息（如命令名，aliases，模块文档）", "author": "ffreemt", - "repo": "https://github.com/ffreemt/nonebot-plugin-autohelp" + "homepage": "https://github.com/ffreemt/nonebot-plugin-autohelp", + "tags": [], + "is_official": false }, { - "id": "gugua_bot", - "link": "gugua_bot", + "module_name": "gugua_bot", + "project_link": "gugua_bot", "name": "孤寡机器人", "desc": "让你的孤寡朋友露出阳光的笑容", "author": "Sclock", - "repo": "https://github.com/Sclock/gugua" + "homepage": "https://github.com/Sclock/gugua", + "tags": [], + "is_official": false }, { - "id": "bugu_bot", - "link": "bugu_bot", + "module_name": "bugu_bot", + "project_link": "bugu_bot", "name": "布谷机器人", "desc": "增进你和你单身朋友的友谊", "author": "Sclock", - "repo": "https://github.com/Sclock/bugu_bot" + "homepage": "https://github.com/Sclock/bugu_bot", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_flexperm", - "link": "nonebot-plugin-flexperm", + "module_name": "nonebot_plugin_flexperm", + "project_link": "nonebot-plugin-flexperm", "name": "nonebot-plugin-flexperm", "desc": "精细化的 NoneBot 权限管理插件", "author": "rmuchan", - "repo": "https://github.com/rmuchan/nonebot-plugin-flexperm" + "homepage": "https://github.com/rmuchan/nonebot-plugin-flexperm", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_epicfree", - "link": "nonebot_plugin_epicfree", + "module_name": "nonebot_plugin_epicfree", + "project_link": "nonebot_plugin_epicfree", "name": "Epic 限免游戏资讯", "desc": "EpicGameStore 喜加一资讯插件，发送「喜加一」逝世看吧！", "author": "monsterxcn", - "repo": "https://github.com/monsterxcn/nonebot_plugin_epicfree" + "homepage": "https://github.com/monsterxcn/nonebot_plugin_epicfree", + "tags": [], + "is_official": false }, { - "id": "ELF_RSS2", - "link": "ELF-RSS", + "module_name": "ELF_RSS2", + "project_link": "ELF-RSS", "name": "ELF_RSS", "desc": "QQ机器人 RSS订阅 插件，订阅源建议选择 RSSHub", "author": "Quan666", - "repo": "https://github.com/Quan666/ELF_RSS" + "homepage": "https://github.com/Quan666/ELF_RSS", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_atri", - "link": "nonebot-plugin-atri", + "module_name": "nonebot_plugin_atri", + "project_link": "nonebot-plugin-atri", "name": "ATRI语音包", "desc": "一个ATRI语音包，基于文本相似度匹配回复", "author": "FYWinds", - "repo": "https://github.com/FYWinds/nonebot-plugin-atri" + "homepage": "https://github.com/FYWinds/nonebot-plugin-atri", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_hanayori", - "link": "nonebot-plugin-hanayori", + "module_name": "nonebot_plugin_hanayori", + "project_link": "nonebot-plugin-hanayori", "name": "HanayoriBot", "desc": "B站动态推送与开播提醒插件", "author": "kanomahoro", - "repo": "https://github.com/kanomahoro/nonebot-hanayori" + "homepage": "https://github.com/kanomahoro/nonebot-hanayori", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_filehost", - "link": "nonebot-plugin-filehost", + "module_name": "nonebot_plugin_filehost", + "project_link": "nonebot-plugin-filehost", "name": "HTTP静态文件托管", "desc": "一款 HTTP 静态文件托管插件, 为跨机文件传输提供了优雅的解决方案", "author": "mnixry", - "repo": "https://github.com/mnixry/nonebot-plugin-filehost" + "homepage": "https://github.com/mnixry/nonebot-plugin-filehost", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_simplemusic", - "link": "nonebot-plugin-simplemusic", + "module_name": "nonebot_plugin_simplemusic", + "project_link": "nonebot-plugin-simplemusic", "name": "SimpleMusic", "desc": "最简Q群点歌插件，支持网易云、QQ音乐", "author": "kanomahoro", - "repo": "https://github.com/kanomahoro/nonebot-simplemusic" + "homepage": "https://github.com/kanomahoro/nonebot-simplemusic", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_phlogo", - "link": "nonebot-plugin-phlogo", + "module_name": "nonebot_plugin_phlogo", + "project_link": "nonebot-plugin-phlogo", "name": "pornhub风格图标生成", "desc": "生成pornhub风格logo", "author": "kexue-z", - "repo": "https://github.com/kexue-z/nonebot-plugin-phlogo" + "homepage": "https://github.com/kexue-z/nonebot-plugin-phlogo", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_twitter", - "link": "nonebot-plugin-twitter", + "module_name": "nonebot_plugin_twitter", + "project_link": "nonebot-plugin-twitter", "name": "Twitter推送", "desc": "Twitter推送插件，自带推文翻译功能", "author": "kanomahoro", - "repo": "https://github.com/kanomahoro/nonebot-twitter" + "homepage": "https://github.com/kanomahoro/nonebot-twitter", + "tags": [], + "is_official": false }, { - "id": "nb2chan", - "link": "nb2chan", + "module_name": "nb2chan", + "project_link": "nb2chan", "name": "nb2chan", "desc": "Nonebot2酱推送", "author": "yucongo", - "repo": "https://github.com/ffreemt/nb2chan" + "homepage": "https://github.com/ffreemt/nb2chan", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_setu_now", - "link": "nonebot-plugin-setu-now", + "module_name": "nonebot_plugin_setu_now", + "project_link": "nonebot-plugin-setu-now", "name": "nonebot-plugin-setu-now", "desc": "另一个色图插件，即时下载并保存，可选WebDAV。可选特殊色图", "author": "kexue-z", - "repo": "https://github.com/kexue-z/nonebot-plugin-setu-now" + "homepage": "https://github.com/kexue-z/nonebot-plugin-setu-now", + "tags": [], + "is_official": false }, { - "id": "leetcode", - "link": "nonebot-plugin-leetcode", + "module_name": "leetcode", + "project_link": "nonebot-plugin-leetcode", "name": "leetcode提醒机器人", "desc": " 安装该插件后能往指定qq和指定qq群定时发送leetcode每日一题", "author": "zxz0415", - "repo": "https://github.com/zxz0415/leetcode" + "homepage": "https://github.com/zxz0415/leetcode", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_imgsearch", - "link": "nonebot-plugin-imgsearch", + "module_name": "nonebot_plugin_imgsearch", + "project_link": "nonebot-plugin-imgsearch", "name": "另一个图片搜索", "desc": "在Ascii2D以及SauceNAO的所有数据库中搜索这张图片", "author": "bakashigure", - "repo": "https://github.com/bakashigure/nonebot_plugin_imgsearch" + "homepage": "https://github.com/bakashigure/nonebot_plugin_imgsearch", + "tags": [], + "is_official": false }, { - "id": "nonebot-plugin-itnews", - "link": "nonebot-plugin-itnew", + "module_name": "nonebot-plugin-itnews", + "project_link": "nonebot-plugin-itnew", "name": "IT咨讯", "desc": "获取IT咨讯并生成图片发送", "author": "yzyyz1387", - "repo": "https://github.com/yzyyz1387/nonebot_plugin_itnews" + "homepage": "https://github.com/yzyyz1387/nonebot_plugin_itnews", + "tags": [], + "is_official": false }, { - "id": "lolheroes", - "link": "lolHeroes", + "module_name": "lolheroes", + "project_link": "lolHeroes", "name": "lolheroes", "desc": "获取lol英雄背景的故事", "author": "cjladmin", - "repo": "https://github.com/cjladmin/lolheroes" + "homepage": "https://github.com/cjladmin/lolheroes", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_youthstudy", - "link": "nonebot-plugin-youthstudy", + "module_name": "nonebot_plugin_youthstudy", + "project_link": "nonebot-plugin-youthstudy", "name": "nonebot_plugin_youthstudy", "desc": "基于nonebot的青年大学习插件，用来获取最新一期的青年大学习答案", "author": "ayanamiblhx", - "repo": "https://github.com/ayanamiblhx/nonebot_plugin_youthstudy" + "homepage": "https://github.com/ayanamiblhx/nonebot_plugin_youthstudy", + "tags": [], + "is_official": false }, { - "id": "gocqapi", - "link": "gocqapi", + "module_name": "gocqapi", + "project_link": "gocqapi", "name": "gocqapi", "desc": "对 go-cqhttp 的 API 调用添加了类型注解与滥用OOP的返回值Model支持，远离魔法方法的Dict[Any, Any]", "author": "FYWinds", - "repo": "https://github.com/FYWinds/gocqapi" + "homepage": "https://github.com/FYWinds/gocqapi", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_workscore", - "link": "nonebot-plugin-workscore", + "module_name": "nonebot_plugin_workscore", + "project_link": "nonebot-plugin-workscore", "name": "工作性价比计算器", "desc": "一个计算工作性价比的插件", "author": "yzyyz1387", - "repo": "https://github.com/yzyyz1387/nonebot_plugin_workscore" + "homepage": "https://github.com/yzyyz1387/nonebot_plugin_workscore", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_nokia", - "link": "nonebot-plugin-nokia", + "module_name": "nonebot_plugin_nokia", + "project_link": "nonebot-plugin-nokia", "name": "诺基亚手机图生成", "desc": "生成一张诺基亚（无内鬼）图片", "author": "kexue-z", - "repo": "https://github.com/kexue-z/nonebot-plugin-nokia" + "homepage": "https://github.com/kexue-z/nonebot-plugin-nokia", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_asoulcnki", - "link": "nonebot-plugin-asoulcnki", + "module_name": "nonebot_plugin_asoulcnki", + "project_link": "nonebot-plugin-asoulcnki", "name": "nonebot-plugin-asoulcnki", "desc": "枝网查重插件，查询发病小作文复制比", "author": "MeetWq", - "repo": "https://github.com/MeetWq/nonebot-plugin-asoulcnki" + "homepage": "https://github.com/MeetWq/nonebot-plugin-asoulcnki", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_petpet", - "link": "nonebot-plugin-petpet", + "module_name": "nonebot_plugin_petpet", + "project_link": "nonebot-plugin-petpet", "name": "nonebot-plugin-petpet", "desc": "制作头像相关的沙雕表情包", "author": "MeetWq", - "repo": "https://github.com/MeetWq/nonebot-plugin-petpet" + "homepage": "https://github.com/MeetWq/nonebot-plugin-petpet", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_shindan", - "link": "nonebot-plugin-shindan", + "module_name": "nonebot_plugin_shindan", + "project_link": "nonebot-plugin-shindan", "name": "ShindanMaker", "desc": "使用 ShindanMaker 网站的趣味占卜", "author": "MeetWq", - "repo": "https://github.com/MeetWq/nonebot-plugin-shindan" + "homepage": "https://github.com/MeetWq/nonebot-plugin-shindan", + "tags": [], + "is_official": false }, { - "id": "nonebot_plugin_vf", - "link": "nonebot-plugin-vf", + "module_name": "nonebot_plugin_vf", + "project_link": "nonebot-plugin-vf", "name": "虚拟朋友", "desc": "基于小冰框架的人工智能聊天机器人", "author": "snowyfirefly", - "repo": "https://github.com/snowyfirefly/VirtualFriends" + "homepage": "https://github.com/snowyfirefly/VirtualFriends", + "tags": [], + "is_official": false + }, + { + "module_name": "nonebot-plugin-code", + "project_link": "nonebot-plugin-code", + "name": "在线运行代码", + "desc": "在线运行代码插件，支持输入", + "author": "yzyyz1387", + "homepage": "https://github.com/yzyyz1387/nonebot_plugin_code", + "tags": [], + "is_official": false + }, + { + "module_name": "nonebot_plugin_heisi", + "project_link": "nonebot-plugin-heisi", + "name": "随机黑丝", + "desc": "发送一张黑丝涩图，内置CD", + "author": "yzyyz1387", + "homepage": "https://github.com/yzyyz1387/nonebot_plugin_heisi", + "tags": [], + "is_official": false } ] From a0d13822c01adf24573a354afb36bc494758ac49 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 10 Dec 2021 15:46:06 +0800 Subject: [PATCH 074/174] :recycle: change matcher run function --- nonebot/matcher.py | 71 ++++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 47ebebd1..f7f6cf51 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -63,6 +63,7 @@ matchers: Dict[int, List[Type["Matcher"]]] = defaultdict(list) current_bot: ContextVar[Bot] = ContextVar("current_bot") current_event: ContextVar[Event] = ContextVar("current_event") current_state: ContextVar[T_State] = ContextVar("current_state") +current_handler: ContextVar[Handler] = ContextVar("current_handler") class MatcherMeta(type): @@ -636,8 +637,19 @@ class Matcher(metaclass=MatcherMeta): """ self.block = True - # 运行handlers - async def run( + async def update_type(self, bot: Bot, event: Event) -> str: + updater = self.__class__._default_type_updater + if not updater: + return "message" + return await updater(bot, event, self.state, self.type) + + async def update_permission(self, bot: Bot, event: Event) -> Permission: + updater = self.__class__._default_permission_updater + if not updater: + return USER(event.get_session_id(), perm=self.permission) + return await updater(bot, event, self.state, self.permission) + + async def simple_run( self, bot: Bot, event: Event, @@ -659,6 +671,7 @@ class Matcher(metaclass=MatcherMeta): while self.handlers: handler = self.handlers.pop(0) + current_handler.set(handler) logger.debug(f"Running handler {handler}") try: await handler( @@ -674,20 +687,32 @@ class Matcher(metaclass=MatcherMeta): f"Handler {handler} param {e.param.name} value {e.value} " f"mismatch type {e.param._type_display()}, skipped" ) + except StopPropagation: + self.block = True + finally: + logger.info(f"Matcher {self} running complete") + current_bot.reset(b_t) + current_event.reset(e_t) + current_state.reset(s_t) + + # 运行handlers + async def run( + self, + bot: Bot, + event: Event, + state: T_State, + stack: Optional[AsyncExitStack] = None, + dependency_cache: Optional[T_DependencyCache] = None, + ): + try: + await self.simple_run(bot, event, state, stack, dependency_cache) except RejectedException: - self.handlers.insert(0, handler) # type: ignore - updater = self.__class__._default_type_updater - if updater: - type_ = await updater(bot, event, self.state, self.type) # type: ignore - else: - type_ = "message" + handler = current_handler.get() + self.handlers.insert(0, handler) - updater = self.__class__._default_permission_updater - if updater: - permission = await updater(bot, event, self.state, self.permission) - else: - permission = USER(event.get_session_id(), perm=self.permission) + type_ = await self.update_type(bot, event) + permission = await self.update_permission(bot, event) Matcher.new( type_, @@ -706,17 +731,8 @@ class Matcher(metaclass=MatcherMeta): default_permission_updater=self.__class__._default_permission_updater, ) except PausedException: - updater = self.__class__._default_type_updater - if updater: - type_ = await updater(bot, event, self.state, self.type) # type: ignore - else: - type_ = "message" - - updater = self.__class__._default_permission_updater - if updater: - permission = await updater(bot, event, self.state, self.permission) - else: - permission = USER(event.get_session_id(), perm=self.permission) + type_ = await self.update_type(bot, event) + permission = await self.update_permission(bot, event) Matcher.new( type_, @@ -736,10 +752,3 @@ class Matcher(metaclass=MatcherMeta): ) except FinishedException: pass - except StopPropagation: - self.block = True - finally: - logger.info(f"Matcher {self} running complete") - current_bot.reset(b_t) - current_event.reset(e_t) - current_state.reset(s_t) From 5aedc52537119e1a28f5e4a87857c6b546e57bd1 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 10 Dec 2021 17:01:56 +0800 Subject: [PATCH 075/174] :white_check_mark: add pytest --- .github/workflows/codecov.yml | 32 +++++++ nonebot/config.py | 4 +- poetry.lock | 169 +++++++++++++++++++++++++++++++++- pyproject.toml | 4 + tests/test_init.py | 19 ++++ 5 files changed, 224 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/codecov.yml create mode 100644 tests/test_init.py diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml new file mode 100644 index 00000000..9c094273 --- /dev/null +++ b/.github/workflows/codecov.yml @@ -0,0 +1,32 @@ +name: Code Coverage + +on: + push: + pull_request: + +jobs: + test: + runs-on: ubuntu-latest + name: Run Pytest and Upload Coverage + steps: + - uses: actions/checkout@v2 + + - name: Set up Python environment + uses: actions/setup-python@v2 + with: + python-version: "3.9" + architecture: "x64" + + - uses: Gr1N/setup-poetry@v4 + + - name: Install dependencies + run: | + poetry install + cd tests/ + poetry run pytest --cov-report xml + + - name: Upload coverage report + uses: codecov/codecov-action@v2 + with: + files: ./tests/coverage.xml + flags: unittests diff --git a/nonebot/config.py b/nonebot/config.py index 4bbbf1f9..71fb532b 100644 --- a/nonebot/config.py +++ b/nonebot/config.py @@ -79,7 +79,9 @@ class CustomEnvSettings(EnvSettingsSource): try: env_val = settings.__config__.json_loads(env_val) except ValueError as e: - raise SettingsError(f'error parsing JSON for "{env_name}"') from e + raise SettingsError( + f'error parsing JSON for "{env_name}"' # type: ignore + ) from e d[field.alias] = env_val if env_file_vars: diff --git a/poetry.lock b/poetry.lock index f26c1e66..4497054e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -112,12 +112,20 @@ category = "main" optional = true python-versions = ">=3.5" +[[package]] +name = "atomicwrites" +version = "1.4.0" +description = "Atomic file writes." +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + [[package]] name = "attrs" version = "21.2.0" description = "Classes Without Boilerplate" category = "main" -optional = true +optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [package.extras] @@ -238,6 +246,20 @@ category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +[[package]] +name = "coverage" +version = "6.2" +description = "Code coverage measurement for Python" +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +tomli = {version = "*", optional = true, markers = "extra == \"toml\""} + +[package.extras] +toml = ["tomli"] + [[package]] name = "docutils" version = "0.17.1" @@ -419,6 +441,14 @@ docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] perf = ["ipython"] testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"] +[[package]] +name = "iniconfig" +version = "1.1.1" +description = "iniconfig: brain-dead simple config-ini parsing" +category = "dev" +optional = false +python-versions = "*" + [[package]] name = "isort" version = "5.10.1" @@ -525,6 +555,21 @@ python-versions = ">=3.6" docs = ["Sphinx (>=4)", "furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)"] test = ["appdirs (==1.4.4)", "pytest (>=6)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)"] +[[package]] +name = "pluggy" +version = "1.0.0" +description = "plugin and hook calling mechanisms for python" +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} + +[package.extras] +dev = ["pre-commit", "tox"] +testing = ["pytest", "pytest-benchmark"] + [[package]] name = "priority" version = "2.0.0" @@ -533,6 +578,14 @@ category = "main" optional = true python-versions = ">=3.6.1" +[[package]] +name = "py" +version = "1.11.0" +description = "library with cross-python path, ini-parsing, io, code, log facilities" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + [[package]] name = "pycares" version = "4.1.2" @@ -609,6 +662,43 @@ python-versions = ">=3.6" [package.extras] diagrams = ["jinja2", "railroad-diagrams"] +[[package]] +name = "pytest" +version = "6.2.5" +description = "pytest: simple powerful testing with Python" +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""} +attrs = ">=19.2.0" +colorama = {version = "*", markers = "sys_platform == \"win32\""} +importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} +iniconfig = "*" +packaging = "*" +pluggy = ">=0.12,<2.0" +py = ">=1.8.2" +toml = "*" + +[package.extras] +testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"] + +[[package]] +name = "pytest-cov" +version = "3.0.0" +description = "Pytest plugin for measuring coverage." +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +coverage = {version = ">=5.2.1", extras = ["toml"]} +pytest = ">=4.6" + +[package.extras] +testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"] + [[package]] name = "python-dotenv" version = "0.19.2" @@ -850,7 +940,7 @@ name = "toml" version = "0.10.2" description = "Python Library for Tom's Obvious, Minimal Language" category = "main" -optional = true +optional = false python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] @@ -1044,7 +1134,7 @@ quart = ["Quart"] [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "d7cede1e6f5d427a8122a895459faf0181ccee6e670fc275e8890219fc11d545" +content-hash = "c33107aee8de168aab0deceabc9d684f57b5280575da839692f48960998c5a69" [metadata.files] aiodns = [ @@ -1153,6 +1243,10 @@ asynctest = [ {file = "asynctest-0.13.0-py3-none-any.whl", hash = "sha256:5da6118a7e6d6b54d83a8f7197769d046922a44d2a99c21382f0a6e4fadae676"}, {file = "asynctest-0.13.0.tar.gz", hash = "sha256:c27862842d15d83e6a34eb0b2866c323880eb3a75e4485b079ea11748fd77fac"}, ] +atomicwrites = [ + {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"}, + {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"}, +] attrs = [ {file = "attrs-21.2.0-py2.py3-none-any.whl", hash = "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1"}, {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"}, @@ -1316,6 +1410,55 @@ colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] +coverage = [ + {file = "coverage-6.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6dbc1536e105adda7a6312c778f15aaabe583b0e9a0b0a324990334fd458c94b"}, + {file = "coverage-6.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:174cf9b4bef0db2e8244f82059a5a72bd47e1d40e71c68ab055425172b16b7d0"}, + {file = "coverage-6.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:92b8c845527eae547a2a6617d336adc56394050c3ed8a6918683646328fbb6da"}, + {file = "coverage-6.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c7912d1526299cb04c88288e148c6c87c0df600eca76efd99d84396cfe00ef1d"}, + {file = "coverage-6.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d5d2033d5db1d58ae2d62f095e1aefb6988af65b4b12cb8987af409587cc0739"}, + {file = "coverage-6.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3feac4084291642165c3a0d9eaebedf19ffa505016c4d3db15bfe235718d4971"}, + {file = "coverage-6.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:276651978c94a8c5672ea60a2656e95a3cce2a3f31e9fb2d5ebd4c215d095840"}, + {file = "coverage-6.2-cp310-cp310-win32.whl", hash = "sha256:f506af4f27def639ba45789fa6fde45f9a217da0be05f8910458e4557eed020c"}, + {file = "coverage-6.2-cp310-cp310-win_amd64.whl", hash = "sha256:3f7c17209eef285c86f819ff04a6d4cbee9b33ef05cbcaae4c0b4e8e06b3ec8f"}, + {file = "coverage-6.2-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:13362889b2d46e8d9f97c421539c97c963e34031ab0cb89e8ca83a10cc71ac76"}, + {file = "coverage-6.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:22e60a3ca5acba37d1d4a2ee66e051f5b0e1b9ac950b5b0cf4aa5366eda41d47"}, + {file = "coverage-6.2-cp311-cp311-win_amd64.whl", hash = "sha256:b637c57fdb8be84e91fac60d9325a66a5981f8086c954ea2772efe28425eaf64"}, + {file = "coverage-6.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f467bbb837691ab5a8ca359199d3429a11a01e6dfb3d9dcc676dc035ca93c0a9"}, + {file = "coverage-6.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2641f803ee9f95b1f387f3e8f3bf28d83d9b69a39e9911e5bfee832bea75240d"}, + {file = "coverage-6.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1219d760ccfafc03c0822ae2e06e3b1248a8e6d1a70928966bafc6838d3c9e48"}, + {file = "coverage-6.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9a2b5b52be0a8626fcbffd7e689781bf8c2ac01613e77feda93d96184949a98e"}, + {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:8e2c35a4c1f269704e90888e56f794e2d9c0262fb0c1b1c8c4ee44d9b9e77b5d"}, + {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:5d6b09c972ce9200264c35a1d53d43ca55ef61836d9ec60f0d44273a31aa9f17"}, + {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:e3db840a4dee542e37e09f30859f1612da90e1c5239a6a2498c473183a50e781"}, + {file = "coverage-6.2-cp36-cp36m-win32.whl", hash = "sha256:4e547122ca2d244f7c090fe3f4b5a5861255ff66b7ab6d98f44a0222aaf8671a"}, + {file = "coverage-6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:01774a2c2c729619760320270e42cd9e797427ecfddd32c2a7b639cdc481f3c0"}, + {file = "coverage-6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fb8b8ee99b3fffe4fd86f4c81b35a6bf7e4462cba019997af2fe679365db0c49"}, + {file = "coverage-6.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:619346d57c7126ae49ac95b11b0dc8e36c1dd49d148477461bb66c8cf13bb521"}, + {file = "coverage-6.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0a7726f74ff63f41e95ed3a89fef002916c828bb5fcae83b505b49d81a066884"}, + {file = "coverage-6.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cfd9386c1d6f13b37e05a91a8583e802f8059bebfccde61a418c5808dea6bbfa"}, + {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:17e6c11038d4ed6e8af1407d9e89a2904d573be29d51515f14262d7f10ef0a64"}, + {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c254b03032d5a06de049ce8bca8338a5185f07fb76600afff3c161e053d88617"}, + {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:dca38a21e4423f3edb821292e97cec7ad38086f84313462098568baedf4331f8"}, + {file = "coverage-6.2-cp37-cp37m-win32.whl", hash = "sha256:600617008aa82032ddeace2535626d1bc212dfff32b43989539deda63b3f36e4"}, + {file = "coverage-6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:bf154ba7ee2fd613eb541c2bc03d3d9ac667080a737449d1a3fb342740eb1a74"}, + {file = "coverage-6.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f9afb5b746781fc2abce26193d1c817b7eb0e11459510fba65d2bd77fe161d9e"}, + {file = "coverage-6.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:edcada2e24ed68f019175c2b2af2a8b481d3d084798b8c20d15d34f5c733fa58"}, + {file = "coverage-6.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a9c8c4283e17690ff1a7427123ffb428ad6a52ed720d550e299e8291e33184dc"}, + {file = "coverage-6.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f614fc9956d76d8a88a88bb41ddc12709caa755666f580af3a688899721efecd"}, + {file = "coverage-6.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9365ed5cce5d0cf2c10afc6add145c5037d3148585b8ae0e77cc1efdd6aa2953"}, + {file = "coverage-6.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8bdfe9ff3a4ea37d17f172ac0dff1e1c383aec17a636b9b35906babc9f0f5475"}, + {file = "coverage-6.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:63c424e6f5b4ab1cf1e23a43b12f542b0ec2e54f99ec9f11b75382152981df57"}, + {file = "coverage-6.2-cp38-cp38-win32.whl", hash = "sha256:49dbff64961bc9bdd2289a2bda6a3a5a331964ba5497f694e2cbd540d656dc1c"}, + {file = "coverage-6.2-cp38-cp38-win_amd64.whl", hash = "sha256:9a29311bd6429be317c1f3fe4bc06c4c5ee45e2fa61b2a19d4d1d6111cb94af2"}, + {file = "coverage-6.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:03b20e52b7d31be571c9c06b74746746d4eb82fc260e594dc662ed48145e9efd"}, + {file = "coverage-6.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:215f8afcc02a24c2d9a10d3790b21054b58d71f4b3c6f055d4bb1b15cecce685"}, + {file = "coverage-6.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a4bdeb0a52d1d04123b41d90a4390b096f3ef38eee35e11f0b22c2d031222c6c"}, + {file = "coverage-6.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c332d8f8d448ded473b97fefe4a0983265af21917d8b0cdcb8bb06b2afe632c3"}, + {file = "coverage-6.2-cp39-cp39-win32.whl", hash = "sha256:6e1394d24d5938e561fbeaa0cd3d356207579c28bd1792f25a068743f2d5b282"}, + {file = "coverage-6.2-cp39-cp39-win_amd64.whl", hash = "sha256:86f2e78b1eff847609b1ca8050c9e1fa3bd44ce755b2ec30e70f2d3ba3844644"}, + {file = "coverage-6.2-pp36.pp37.pp38-none-any.whl", hash = "sha256:5829192582c0ec8ca4a2532407bc14c2f338d9878a10442f5d03804a95fac9de"}, + {file = "coverage-6.2.tar.gz", hash = "sha256:e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8"}, +] docutils = [ {file = "docutils-0.17.1-py2.py3-none-any.whl", hash = "sha256:cf316c8370a737a022b72b56874f6602acf974a37a9fba42ec2876387549fc61"}, {file = "docutils-0.17.1.tar.gz", hash = "sha256:686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125"}, @@ -1459,6 +1602,10 @@ importlib-metadata = [ {file = "importlib_metadata-4.8.2-py3-none-any.whl", hash = "sha256:53ccfd5c134223e497627b9815d5030edf77d2ed573922f7a0b8f8bb81a1c100"}, {file = "importlib_metadata-4.8.2.tar.gz", hash = "sha256:75bdec14c397f528724c1bfd9709d660b33a4d2e77387a3358f20b848bb5e5fb"}, ] +iniconfig = [ + {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, + {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"}, +] isort = [ {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"}, {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"}, @@ -1636,10 +1783,18 @@ platformdirs = [ {file = "platformdirs-2.4.0-py3-none-any.whl", hash = "sha256:8868bbe3c3c80d42f20156f22e7131d2fb321f5bc86a2a345375c6481a67021d"}, {file = "platformdirs-2.4.0.tar.gz", hash = "sha256:367a5e80b3d04d2428ffa76d33f124cf11e8fff2acdaa9b43d545f5c7d661ef2"}, ] +pluggy = [ + {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, + {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, +] priority = [ {file = "priority-2.0.0-py3-none-any.whl", hash = "sha256:6f8eefce5f3ad59baf2c080a664037bb4725cd0a790d53d59ab4059288faf6aa"}, {file = "priority-2.0.0.tar.gz", hash = "sha256:c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0"}, ] +py = [ + {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"}, + {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"}, +] pycares = [ {file = "pycares-4.1.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:71b99b9e041ae3356b859822c511f286f84c8889ec9ed1fbf6ac30fb4da13e4c"}, {file = "pycares-4.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c000942f5fc64e6e046aa61aa53b629b576ba11607d108909727c3c8f211a157"}, @@ -1716,6 +1871,14 @@ pyparsing = [ {file = "pyparsing-3.0.6-py3-none-any.whl", hash = "sha256:04ff808a5b90911829c55c4e26f75fa5ca8a2f5f36aa3a51f68e27033341d3e4"}, {file = "pyparsing-3.0.6.tar.gz", hash = "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"}, ] +pytest = [ + {file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"}, + {file = "pytest-6.2.5.tar.gz", hash = "sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"}, +] +pytest-cov = [ + {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"}, + {file = "pytest_cov-3.0.0-py3-none-any.whl", hash = "sha256:578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6"}, +] python-dotenv = [ {file = "python-dotenv-0.19.2.tar.gz", hash = "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"}, {file = "python_dotenv-0.19.2-py2.py3-none-any.whl", hash = "sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3"}, diff --git a/pyproject.toml b/pyproject.toml index bd75b6c9..5ef5a065 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,6 +39,7 @@ aiohttp = { version = "^3.7.4", extras = ["speedups"], optional = true } sphinx = "^4.1.1" isort = "^5.10.1" black = "^21.11b1" +pytest-cov = "^3.0.0" sphinx-markdown-builder = { git = "https://github.com/nonebot/sphinx-markdown-builder.git" } [tool.poetry.extras] @@ -51,6 +52,9 @@ all = ["quart", "aiohttp"] # url = "https://mirrors.aliyun.com/pypi/simple/" # default = true +[tool.pytest.ini_options] +addopts = "--cov=nonebot --cov-report=term-missing" + [tool.black] line-length = 88 target-version = ["py37", "py38", "py39", "py310"] diff --git a/tests/test_init.py b/tests/test_init.py new file mode 100644 index 00000000..b5f6ac96 --- /dev/null +++ b/tests/test_init.py @@ -0,0 +1,19 @@ +import os + +import pytest + +os.environ["CONFIG_FROM_ENV"] = "env" + + +@pytest.mark.asyncio +@pytest.mark.parametrize("nonebug_init", [{"config_from_init": "init"}], indirect=True) +async def test_init(nonebug_init): + from nonebot import get_driver + + env = get_driver().env + assert env == "test" + + config = get_driver().config + assert config.config_from_env == "env" + assert config.config_from_init == "init" + assert config.common_config == "common" From f160310aeaba9e39f5b4ac343185a4911d3cf916 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 10 Dec 2021 17:09:12 +0800 Subject: [PATCH 076/174] :heavy_plus_sign: add nonebug as dev dependency --- .github/workflows/codecov.yml | 2 +- poetry.lock | 57 ++++++++++++++++++++++++++++++++++- pyproject.toml | 1 + 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 9c094273..e6002bfa 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: | - poetry install + poetry install -E all cd tests/ poetry run pytest --cov-report xml diff --git a/poetry.lock b/poetry.lock index 4497054e..b7ccbb28 100644 --- a/poetry.lock +++ b/poetry.lock @@ -524,6 +524,27 @@ category = "dev" optional = false python-versions = "*" +[[package]] +name = "nonebug" +version = "0.2.0" +description = "nonebot2 test framework" +category = "dev" +optional = false +python-versions = "^3.7.3" +develop = false + +[package.dependencies] +nonebot2 = "^2.0.0-alpha.14" +pytest = "^6.2.5" +pytest-asyncio = "^0.16.0" +pytest-order = "^1.0.0" + +[package.source] +type = "git" +url = "https://github.com/nonebot/nonebug.git" +reference = "master" +resolved_reference = "e276dfcfadd242f14158f125fa1ed5915973a30a" + [[package]] name = "packaging" version = "21.3" @@ -684,6 +705,20 @@ toml = "*" [package.extras] testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"] +[[package]] +name = "pytest-asyncio" +version = "0.16.0" +description = "Pytest support for asyncio." +category = "dev" +optional = false +python-versions = ">= 3.6" + +[package.dependencies] +pytest = ">=5.4.0" + +[package.extras] +testing = ["coverage", "hypothesis (>=5.7.1)"] + [[package]] name = "pytest-cov" version = "3.0.0" @@ -699,6 +734,17 @@ pytest = ">=4.6" [package.extras] testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"] +[[package]] +name = "pytest-order" +version = "1.0.0" +description = "pytest plugin to run your tests in a specific order" +category = "dev" +optional = false +python-versions = "*" + +[package.dependencies] +pytest = ">=5.0" + [[package]] name = "python-dotenv" version = "0.19.2" @@ -1134,7 +1180,7 @@ quart = ["Quart"] [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "c33107aee8de168aab0deceabc9d684f57b5280575da839692f48960998c5a69" +content-hash = "32ef230c4c02d1eb68754ad0bb938d1d960d7c6362ea2250cc23bbed910fbe34" [metadata.files] aiodns = [ @@ -1771,6 +1817,7 @@ mypy-extensions = [ {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, ] +nonebug = [] packaging = [ {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"}, {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"}, @@ -1875,10 +1922,18 @@ pytest = [ {file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"}, {file = "pytest-6.2.5.tar.gz", hash = "sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"}, ] +pytest-asyncio = [ + {file = "pytest-asyncio-0.16.0.tar.gz", hash = "sha256:7496c5977ce88c34379df64a66459fe395cd05543f0a2f837016e7144391fcfb"}, + {file = "pytest_asyncio-0.16.0-py3-none-any.whl", hash = "sha256:5f2a21273c47b331ae6aa5b36087047b4899e40f03f18397c0e65fa5cca54e9b"}, +] pytest-cov = [ {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"}, {file = "pytest_cov-3.0.0-py3-none-any.whl", hash = "sha256:578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6"}, ] +pytest-order = [ + {file = "pytest-order-1.0.0.tar.gz", hash = "sha256:5997a262b31234eebb461f9a9ef24687bf732029b499845a4398b69edb5ac321"}, + {file = "pytest_order-1.0.0-py3-none-any.whl", hash = "sha256:a4cdf12f4c83c76bdfd6e6088e2e157df7fdf91a9c3e3ca7d8809e8dabce0f4b"}, +] python-dotenv = [ {file = "python-dotenv-0.19.2.tar.gz", hash = "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"}, {file = "python_dotenv-0.19.2-py2.py3-none-any.whl", hash = "sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3"}, diff --git a/pyproject.toml b/pyproject.toml index 5ef5a065..4312f2a8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -40,6 +40,7 @@ sphinx = "^4.1.1" isort = "^5.10.1" black = "^21.11b1" pytest-cov = "^3.0.0" +nonebug = { git = "https://github.com/nonebot/nonebug.git" } sphinx-markdown-builder = { git = "https://github.com/nonebot/sphinx-markdown-builder.git" } [tool.poetry.extras] From 5efdc71d9f2678f44e5db5febfb59929ca6bcc52 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 10 Dec 2021 17:13:07 +0800 Subject: [PATCH 077/174] :wrench: add config file --- tests/.env | 2 ++ tests/.env.test | 1 + 2 files changed, 3 insertions(+) create mode 100644 tests/.env create mode 100644 tests/.env.test diff --git a/tests/.env b/tests/.env new file mode 100644 index 00000000..46048df6 --- /dev/null +++ b/tests/.env @@ -0,0 +1,2 @@ +ENVIRONMENT=test +COMMON_CONFIG=common diff --git a/tests/.env.test b/tests/.env.test new file mode 100644 index 00000000..d3820de0 --- /dev/null +++ b/tests/.env.test @@ -0,0 +1 @@ +CONFIG_FROM_ENV= From 344c3576b151617aa310e0ed455870d63e2881a1 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 10 Dec 2021 18:14:48 +0800 Subject: [PATCH 078/174] :memo: update readme --- README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3c3c7c19..36678d52 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ - +

- nonebot + nonebot

@@ -58,7 +58,6 @@ _✨ 跨平台 Python 异步机器人框架 ✨_ · 文档打不开？

- ## 简介 @@ -133,14 +132,20 @@ NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义 - 其他插件请查看 [商店](https://v2.nonebot.dev/store.html) +## 许可证 + +`NoneBot` 采用 `MIT` 协议开源，协议文件参考 [LICENSE](./LICENSE)。 + ## 贡献 如果你在使用过程中发现任何问题，可以 [提交 issue](https://github.com/nonebot/nonebot2/issues/new) 或自行 fork 修改后提交 pull request。 如果你要提交 pull request，请确保你的代码风格和项目已有的代码保持一致，遵循 [PEP 8](https://www.python.org/dev/peps/pep-0008/) [PEP 484](https://www.python.org/dev/peps/pep-0484/)，变量命名清晰，有适当的注释。 -## 许可证 +**Pull Request 请以 `dev` 分支作为目标分支** -`NoneBot` 采用 `MIT` 协议开源，协议文件参考 [LICENSE](./LICENSE)。 +感谢以下开发者对 NoneBot2 的贡献： -特别的，由于 `mirai` 使用 `AGPLv3` 协议并要求使用 `mirai` 的软件同样以 `AGPLv3` 协议开源，本项目 `mirai` 适配器部分（即 [`packages/nonebot-adapter-mirai`](./packages/nonebot-adapter-mirai/) 目录）以 `AGPLv3` 协议开源，协议文件参考 [LICENSE](./packages/nonebot-adapter-mirai/LICENSE)。 + + + From 6b5a5e53eb2b67307ab012940c2e9b18d0dc7591 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sat, 11 Dec 2021 17:35:12 +0800 Subject: [PATCH 079/174] :fire: remove state factory --- nonebot/matcher.py | 15 --------------- nonebot/plugin/on.py | 32 -------------------------------- nonebot/plugin/on.pyi | 26 -------------------------- website/src/pages/changelog.md | 1 + 4 files changed, 1 insertion(+), 73 deletions(-) diff --git a/nonebot/matcher.py b/nonebot/matcher.py index f7f6cf51..4701ff55 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -162,11 +162,6 @@ class Matcher(metaclass=MatcherMeta): :类型: ``T_State`` :说明: 事件响应器默认状态 """ - _default_state_factory: Optional[T_StateFactory] = None - """ - :类型: ``Optional[T_State]`` - :说明: 事件响应器默认工厂函数 - """ _default_parser: Optional[T_ArgsParser] = None """ @@ -223,7 +218,6 @@ class Matcher(metaclass=MatcherMeta): module: Optional[ModuleType] = None, expire_time: Optional[datetime] = None, default_state: Optional[T_State] = None, - default_state_factory: Optional[T_StateFactory] = None, default_parser: Optional[T_ArgsParser] = None, default_type_updater: Optional[T_TypeUpdater] = None, default_permission_updater: Optional[T_PermissionUpdater] = None, @@ -245,7 +239,6 @@ class Matcher(metaclass=MatcherMeta): * ``plugin: Optional[Plugin]``: 事件响应器所在插件 * ``module: Optional[ModuleType]``: 事件响应器所在模块 * ``default_state: Optional[T_State]``: 默认状态 ``state`` - * ``default_state_factory: Optional[T_StateFactory]``: 默认状态 ``state`` 的工厂函数 * ``expire_time: Optional[datetime]``: 事件响应器最终有效时间点，过时即被删除 :返回: @@ -277,9 +270,6 @@ class Matcher(metaclass=MatcherMeta): "priority": priority, "block": block, "_default_state": default_state or {}, - "_default_state_factory": staticmethod(default_state_factory) - if default_state_factory - else None, "_default_parser": default_parser, "_default_type_updater": default_type_updater, "_default_permission_updater": default_permission_updater, @@ -662,11 +652,6 @@ class Matcher(metaclass=MatcherMeta): s_t = current_state.set(self.state) try: # Refresh preprocess state - self.state = ( - await self._default_state_factory(bot, event) - if self._default_state_factory - else self.state - ) self.state.update(state) while self.handlers: diff --git a/nonebot/plugin/on.py b/nonebot/plugin/on.py index ca7bafef..2c7446e6 100644 --- a/nonebot/plugin/on.py +++ b/nonebot/plugin/on.py @@ -50,7 +50,6 @@ def on( priority: int = 1, block: bool = False, state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None, _depth: int = 0, ) -> Type[Matcher]: """ @@ -68,7 +67,6 @@ def on( * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -85,7 +83,6 @@ def on( plugin=_current_plugin.get(), module=_get_matcher_module(_depth + 1), default_state=state, - default_state_factory=state_factory, ) _store_matcher(matcher) return matcher @@ -99,7 +96,6 @@ def on_metaevent( priority: int = 1, block: bool = False, state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None, _depth: int = 0, ) -> Type[Matcher]: """ @@ -115,7 +111,6 @@ def on_metaevent( * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -132,7 +127,6 @@ def on_metaevent( plugin=_current_plugin.get(), module=_get_matcher_module(_depth + 1), default_state=state, - default_state_factory=state_factory, ) _store_matcher(matcher) return matcher @@ -147,7 +141,6 @@ def on_message( priority: int = 1, block: bool = True, state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None, _depth: int = 0, ) -> Type[Matcher]: """ @@ -164,7 +157,6 @@ def on_message( * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -181,7 +173,6 @@ def on_message( plugin=_current_plugin.get(), module=_get_matcher_module(_depth + 1), default_state=state, - default_state_factory=state_factory, ) _store_matcher(matcher) return matcher @@ -195,7 +186,6 @@ def on_notice( priority: int = 1, block: bool = False, state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None, _depth: int = 0, ) -> Type[Matcher]: """ @@ -211,7 +201,6 @@ def on_notice( * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -228,7 +217,6 @@ def on_notice( plugin=_current_plugin.get(), module=_get_matcher_module(_depth + 1), default_state=state, - default_state_factory=state_factory, ) _store_matcher(matcher) return matcher @@ -242,7 +230,6 @@ def on_request( priority: int = 1, block: bool = False, state: Optional[T_State] = None, - state_factory: Optional[T_StateFactory] = None, _depth: int = 0, ) -> Type[Matcher]: """ @@ -258,7 +245,6 @@ def on_request( * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -275,7 +261,6 @@ def on_request( plugin=_current_plugin.get(), module=_get_matcher_module(_depth + 1), default_state=state, - default_state_factory=state_factory, ) _store_matcher(matcher) return matcher @@ -304,7 +289,6 @@ def on_startswith( * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -336,7 +320,6 @@ def on_endswith( * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -366,7 +349,6 @@ def on_keyword( * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -400,7 +382,6 @@ def on_command( * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -459,7 +440,6 @@ def on_shell_command( * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -512,7 +492,6 @@ def on_regex( * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -627,7 +606,6 @@ class MatcherGroup: * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -653,7 +631,6 @@ class MatcherGroup: * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -682,7 +659,6 @@ class MatcherGroup: * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -709,7 +685,6 @@ class MatcherGroup: * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -736,7 +711,6 @@ class MatcherGroup: * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -768,7 +742,6 @@ class MatcherGroup: * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -798,7 +771,6 @@ class MatcherGroup: * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -827,7 +799,6 @@ class MatcherGroup: * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -864,7 +835,6 @@ class MatcherGroup: * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -905,7 +875,6 @@ class MatcherGroup: * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: @@ -941,7 +910,6 @@ class MatcherGroup: * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 * ``state: Optional[T_State]``: 默认 state - * ``state_factory: Optional[T_StateFactory]``: 默认 state 的工厂函数 :返回: diff --git a/nonebot/plugin/on.pyi b/nonebot/plugin/on.pyi index affd285b..bf1222ef 100644 --- a/nonebot/plugin/on.pyi +++ b/nonebot/plugin/on.pyi @@ -17,7 +17,6 @@ def on( priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_metaevent( rule: Optional[Union[Rule, T_RuleChecker]] = ..., @@ -27,7 +26,6 @@ def on_metaevent( priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_message( rule: Optional[Union[Rule, T_RuleChecker]] = ..., @@ -38,7 +36,6 @@ def on_message( priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_notice( rule: Optional[Union[Rule, T_RuleChecker]] = ..., @@ -48,7 +45,6 @@ def on_notice( priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_request( rule: Optional[Union[Rule, T_RuleChecker]] = ..., @@ -58,7 +54,6 @@ def on_request( priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_startswith( msg: Union[str, Tuple[str, ...]], @@ -71,7 +66,6 @@ def on_startswith( priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_endswith( msg: Union[str, Tuple[str, ...]], @@ -84,7 +78,6 @@ def on_endswith( priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_keyword( keywords: Set[str], @@ -96,7 +89,6 @@ def on_keyword( priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_command( cmd: Union[str, Tuple[str, ...]], @@ -109,7 +101,6 @@ def on_command( priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_shell_command( cmd: Union[str, Tuple[str, ...]], @@ -123,7 +114,6 @@ def on_shell_command( priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_regex( pattern: str, @@ -136,7 +126,6 @@ def on_regex( priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... class CommandGroup: @@ -151,7 +140,6 @@ class CommandGroup: priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ): ... def command( self, @@ -165,7 +153,6 @@ class CommandGroup: priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def shell_command( self, @@ -180,7 +167,6 @@ class CommandGroup: priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... class MatcherGroup: @@ -195,7 +181,6 @@ class MatcherGroup: priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ): ... def on( self, @@ -208,7 +193,6 @@ class MatcherGroup: priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_metaevent( self, @@ -219,7 +203,6 @@ class MatcherGroup: priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_message( self, @@ -231,7 +214,6 @@ class MatcherGroup: priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_notice( self, @@ -242,7 +224,6 @@ class MatcherGroup: priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_request( self, @@ -253,7 +234,6 @@ class MatcherGroup: priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_startswith( self, @@ -267,7 +247,6 @@ class MatcherGroup: priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_endswith( self, @@ -281,7 +260,6 @@ class MatcherGroup: priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_keyword( self, @@ -294,7 +272,6 @@ class MatcherGroup: priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_command( self, @@ -308,7 +285,6 @@ class MatcherGroup: priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_shell_command( self, @@ -323,7 +299,6 @@ class MatcherGroup: priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... def on_regex( self, @@ -337,5 +312,4 @@ class MatcherGroup: priority: int = ..., block: bool = ..., state: Optional[T_State] = ..., - state_factory: Optional[T_StateFactory] = ..., ) -> Type[Matcher]: ... diff --git a/website/src/pages/changelog.md b/website/src/pages/changelog.md index dc07a86a..3a068096 100644 --- a/website/src/pages/changelog.md +++ b/website/src/pages/changelog.md @@ -9,6 +9,7 @@ - 统一 `Processor`, `Rule`, `Permission`, `Processor` 使用 `Handler` - 修改内置 `Rule`, `Permission` 如 `startswith`, `command` 等使用 class 实现 - 更换文档框架 (docusaurus) 以及主题 (docusaurus-theme-nonepress) +- 移除 Matcher `state_factory` 支持 ## v2.0.0a16 From 66ba25494a0ef4501c890f2747d3dbd5bbbd1023 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 12 Dec 2021 18:19:08 +0800 Subject: [PATCH 080/174] :recycle: rewrite dependency injection system --- nonebot/consts.py | 4 + nonebot/dependencies/__init__.py | 337 +++++++++++++------------------ nonebot/dependencies/models.py | 52 ----- nonebot/dependencies/utils.py | 6 +- nonebot/handler.py | 125 ------------ nonebot/matcher.py | 190 +++++++++-------- nonebot/message.py | 55 +++-- nonebot/params.py | 215 +++++++++++++++++--- nonebot/permission.py | 35 ++-- nonebot/plugin/on.py | 103 +++++----- nonebot/plugin/on.pyi | 101 ++++----- nonebot/rule.py | 39 ++-- nonebot/typing.py | 69 ++++--- nonebot/utils.py | 76 ++----- tests/plugins/depends.py | 23 +++ tests/test_init.py | 17 ++ tests/utils.py | 14 ++ 17 files changed, 728 insertions(+), 733 deletions(-) create mode 100644 nonebot/consts.py delete mode 100644 nonebot/dependencies/models.py delete mode 100644 nonebot/handler.py create mode 100644 tests/plugins/depends.py create mode 100644 tests/utils.py diff --git a/nonebot/consts.py b/nonebot/consts.py new file mode 100644 index 00000000..a8867395 --- /dev/null +++ b/nonebot/consts.py @@ -0,0 +1,4 @@ +RECEIVE_KEY = "_receive_{id}" +ARG_KEY = "_arg_{key}" +ARG_STR_KEY = "{key}" +REJECT_TARGET = "_current_target" diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index 776a25e5..da5f9273 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -5,227 +5,170 @@ 该模块实现了依赖注入的定义与处理。 """ +import abc import inspect -from itertools import chain -from typing import Any, Dict, List, Type, Tuple, Callable, Optional, cast -from contextlib import AsyncExitStack, contextmanager, asynccontextmanager +from typing import Any, Dict, List, Type, Generic, TypeVar, Callable, Optional from pydantic import BaseConfig from pydantic.schema import get_annotation_from_field_info -from pydantic.fields import Required, Undefined, ModelField +from pydantic.fields import Required, FieldInfo, Undefined, ModelField from nonebot.log import logger -from .models import Param as Param from .utils import get_typed_signature -from .models import Dependent as Dependent from nonebot.exception import SkippedException -from .models import DependsWrapper as DependsWrapper -from nonebot.typing import T_Handler, T_DependencyCache -from nonebot.utils import ( - CacheLock, - run_sync, - is_gen_callable, - run_sync_ctx_manager, - is_async_gen_callable, - is_coroutine_callable, -) +from nonebot.utils import run_sync, is_coroutine_callable -cache_lock = CacheLock() +T = TypeVar("T", bound="Dependent") +R = TypeVar("R") + + +class Param(abc.ABC, FieldInfo): + @classmethod + def _check_param( + cls, dependent: "Dependent", name: str, param: inspect.Parameter + ) -> Optional["Param"]: + return None + + @classmethod + def _check_parameterless( + cls, dependent: "Dependent", value: Any + ) -> Optional["Param"]: + return None + + @abc.abstractmethod + async def _solve(self, **kwargs: Any) -> Any: + raise NotImplementedError class CustomConfig(BaseConfig): arbitrary_types_allowed = True -def get_param_sub_dependent( - *, param: inspect.Parameter, allow_types: Optional[List[Type[Param]]] = None -) -> Dependent: - depends: DependsWrapper = param.default - if depends.dependency: - dependency = depends.dependency - else: - dependency = param.annotation - return get_sub_dependant( - depends=depends, dependency=dependency, name=param.name, allow_types=allow_types - ) +class Dependent(Generic[R]): + def __init__( + self, + *, + call: Callable[..., Any], + params: Optional[List[ModelField]] = None, + parameterless: Optional[List[Param]] = None, + allow_types: Optional[List[Type[Param]]] = None, + ) -> None: + self.call = call + self.params = params or [] + self.parameterless = parameterless or [] + self.allow_types = allow_types or [] + async def __call__(self, **kwargs: Any) -> R: + values = await self.solve(**kwargs) -def get_parameterless_sub_dependant( - *, depends: DependsWrapper, allow_types: Optional[List[Type[Param]]] = None -) -> Dependent: - assert callable( - depends.dependency - ), "A parameter-less dependency must have a callable dependency" - return get_sub_dependant( - depends=depends, dependency=depends.dependency, allow_types=allow_types - ) - - -def get_sub_dependant( - *, - depends: DependsWrapper, - dependency: T_Handler, - name: Optional[str] = None, - allow_types: Optional[List[Type[Param]]] = None, -) -> Dependent: - sub_dependant = get_dependent( - call=dependency, name=name, use_cache=depends.use_cache, allow_types=allow_types - ) - return sub_dependant - - -def get_dependent( - *, - call: T_Handler, - name: Optional[str] = None, - use_cache: bool = True, - allow_types: Optional[List[Type[Param]]] = None, -) -> Dependent: - signature = get_typed_signature(call) - params = signature.parameters - dependent = Dependent( - call=call, name=name, allow_types=allow_types, use_cache=use_cache - ) - for param_name, param in params.items(): - if isinstance(param.default, DependsWrapper): - sub_dependent = get_param_sub_dependent( - param=param, allow_types=allow_types - ) - dependent.dependencies.append(sub_dependent) - continue - - default_value = Required - if param.default != param.empty: - default_value = param.default - - if isinstance(default_value, Param): - field_info = default_value - default_value = field_info.default + if is_coroutine_callable(self.call): + return await self.call(**values) else: - for allow_type in dependent.allow_types: - if allow_type._check(param_name, param): - field_info = allow_type(default_value) - break + return await run_sync(self.call)(**values) + + def parse_param(self, name: str, param: inspect.Parameter) -> Param: + for allow_type in self.allow_types: + field_info = allow_type._check_param(self, name, param) + if field_info: + return field_info + else: + raise ValueError( + f"Unknown parameter {name} for function {self.call} with type {param.annotation}" + ) + + def parse_parameterless(self, value: Any) -> Param: + for allow_type in self.allow_types: + field_info = allow_type._check_parameterless(self, value) + if field_info: + return field_info + else: + raise ValueError( + f"Unknown parameterless {value} for function {self.call} with type {type(value)}" + ) + + def prepend_parameterless(self, value: Any) -> None: + self.parameterless.insert(0, self.parse_parameterless(value)) + + def append_parameterless(self, value: Any) -> None: + self.parameterless.append(self.parse_parameterless(value)) + + @classmethod + def parse( + cls: Type[T], + *, + call: Callable[..., Any], + parameterless: Optional[List[Any]] = None, + allow_types: Optional[List[Type[Param]]] = None, + ) -> T: + signature = get_typed_signature(call) + params = signature.parameters + dependent = cls( + call=call, + allow_types=allow_types, + ) + + parameterless_params = [ + dependent.parse_parameterless(param) for param in (parameterless or []) + ] + dependent.parameterless.extend(parameterless_params) + + for param_name, param in params.items(): + default_value = Required + if param.default != param.empty: + default_value = param.default + + if isinstance(default_value, Param): + field_info = default_value + default_value = field_info.default else: - raise ValueError( - f"Unknown parameter {param_name} for function {call} with type {param.annotation}" + field_info = dependent.parse_param(param_name, param) + default_value = field_info.default + + annotation: Any = Any + required = default_value == Required + if param.annotation != param.empty: + annotation = param.annotation + annotation = get_annotation_from_field_info( + annotation, field_info, param_name + ) + dependent.params.append( + ModelField( + name=param_name, + type_=annotation, + class_validators=None, + model_config=CustomConfig, + default=None if required else default_value, + required=required, + field_info=field_info, ) - - annotation: Any = Any - required = default_value == Required - if param.annotation != param.empty: - annotation = param.annotation - annotation = get_annotation_from_field_info(annotation, field_info, param_name) - dependent.params.append( - ModelField( - name=param_name, - type_=annotation, - class_validators=None, - model_config=CustomConfig, - default=None if required else default_value, - required=required, - field_info=field_info, ) - ) - return dependent + return dependent + async def solve( + self, + **params: Any, + ) -> Dict[str, Any]: + values: Dict[str, Any] = {} -async def solve_dependencies( - *, - _dependent: Dependent, - _stack: Optional[AsyncExitStack] = None, - _sub_dependents: Optional[List[Dependent]] = None, - _dependency_cache: Optional[T_DependencyCache] = None, - **params: Any, -) -> Tuple[Dict[str, Any], T_DependencyCache]: - values: Dict[str, Any] = {} - dependency_cache = {} if _dependency_cache is None else _dependency_cache - - # usual dependency - for field in _dependent.params: - field_info = field.field_info - assert isinstance(field_info, Param), "Params must be subclasses of Param" - value = field_info._solve(**params) - if value == Undefined: - value = field.get_default() - _, errs_ = field.validate(value, values, loc=(str(field_info), field.alias)) - if errs_: - logger.debug( - f"{field_info} " - f"type {type(value)} not match depends {_dependent.call} " - f"annotation {field._type_display()}, ignored" - ) - raise SkippedException(field, value) - else: - values[field.name] = value - - # solve sub dependencies - sub_dependent: Dependent - for sub_dependent in chain(_sub_dependents or tuple(), _dependent.dependencies): - sub_dependent.call = cast(Callable[..., Any], sub_dependent.call) - sub_dependent.cache_key = cast(Callable[..., Any], sub_dependent.cache_key) - call = sub_dependent.call - - # solve sub dependency with current cache - solved_result = await solve_dependencies( - _dependent=sub_dependent, _dependency_cache=dependency_cache, **params - ) - sub_values, sub_dependency_cache = solved_result - # update cache? - # dependency_cache.update(sub_dependency_cache) - - # run dependency function - async with cache_lock: - if sub_dependent.use_cache and sub_dependent.cache_key in dependency_cache: - solved = dependency_cache[sub_dependent.cache_key] - elif is_gen_callable(call) or is_async_gen_callable(call): - assert isinstance( - _stack, AsyncExitStack - ), "Generator dependency should be called in context" - if is_gen_callable(call): - cm = run_sync_ctx_manager(contextmanager(call)(**sub_values)) - else: - cm = asynccontextmanager(call)(**sub_values) - solved = await _stack.enter_async_context(cm) - elif is_coroutine_callable(call): - solved = await call(**sub_values) + for field in self.params: + field_info = field.field_info + assert isinstance(field_info, Param), "Params must be subclasses of Param" + value = await field_info._solve(**params) + if value == Undefined: + value = field.get_default() + _, errs_ = field.validate(value, values, loc=(str(field_info), field.alias)) + if errs_: + logger.debug( + f"{field_info} " + f"type {type(value)} not match depends {self.call} " + f"annotation {field._type_display()}, ignored" + ) + raise SkippedException(field, value) else: - solved = await run_sync(call)(**sub_values) + values[field.name] = value - # parameter dependency - if sub_dependent.name is not None: - values[sub_dependent.name] = solved - # save current dependency to cache - if sub_dependent.cache_key not in dependency_cache: - dependency_cache[sub_dependent.cache_key] = solved + for param in self.parameterless: + await param._solve(**params) - return values, dependency_cache - - -def Depends(dependency: Optional[T_Handler] = None, *, use_cache: bool = True) -> Any: - """ - :说明: - - 参数依赖注入装饰器 - - :参数: - - * ``dependency: Optional[Callable[..., Any]] = None``: 依赖函数。默认为参数的类型注释。 - * ``use_cache: bool = True``: 是否使用缓存。默认为 ``True``。 - - .. code-block:: python - - def depend_func() -> Any: - return ... - - def depend_gen_func(): - try: - yield ... - finally: - ... - - async def handler(param_name: Any = Depends(depend_func), gen: Any = Depends(depend_gen_func)): - ... - """ - return DependsWrapper(dependency=dependency, use_cache=use_cache) + return values diff --git a/nonebot/dependencies/models.py b/nonebot/dependencies/models.py deleted file mode 100644 index 3875a6d7..00000000 --- a/nonebot/dependencies/models.py +++ /dev/null @@ -1,52 +0,0 @@ -import abc -import inspect -from typing import Any, List, Type, Optional - -from pydantic.fields import FieldInfo, ModelField - -from nonebot.utils import get_name -from nonebot.typing import T_Handler - - -class Param(abc.ABC, FieldInfo): - @classmethod - @abc.abstractmethod - def _check(cls, name: str, param: inspect.Parameter) -> bool: - raise NotImplementedError - - @abc.abstractmethod - def _solve(self, **kwargs: Any) -> Any: - raise NotImplementedError - - -class DependsWrapper: - def __init__( - self, dependency: Optional[T_Handler] = None, *, use_cache: bool = True - ) -> None: - self.dependency = dependency - self.use_cache = use_cache - - def __repr__(self) -> str: - dep = get_name(self.dependency) - cache = "" if self.use_cache else ", use_cache=False" - return f"{self.__class__.__name__}({dep}{cache})" - - -class Dependent: - def __init__( - self, - *, - call: Optional[T_Handler] = None, - name: Optional[str] = None, - params: Optional[List[ModelField]] = None, - allow_types: Optional[List[Type[Param]]] = None, - dependencies: Optional[List["Dependent"]] = None, - use_cache: bool = True, - ) -> None: - self.call = call - self.name = name - self.params = params or [] - self.allow_types = allow_types or [] - self.dependencies = dependencies or [] - self.use_cache = use_cache - self.cache_key = self.call diff --git a/nonebot/dependencies/utils.py b/nonebot/dependencies/utils.py index d82976c5..56a815ff 100644 --- a/nonebot/dependencies/utils.py +++ b/nonebot/dependencies/utils.py @@ -1,13 +1,11 @@ import inspect -from typing import Any, Dict +from typing import Any, Dict, Callable from loguru import logger from pydantic.typing import ForwardRef, evaluate_forwardref -from nonebot.typing import T_Handler - -def get_typed_signature(call: T_Handler) -> inspect.Signature: +def get_typed_signature(call: Callable[..., Any]) -> inspect.Signature: signature = inspect.signature(call) globalns = getattr(call, "__globals__", {}) typed_params = [ diff --git a/nonebot/handler.py b/nonebot/handler.py deleted file mode 100644 index b381a228..00000000 --- a/nonebot/handler.py +++ /dev/null @@ -1,125 +0,0 @@ -""" -事件处理函数 -============ - -该模块实现事件处理函数的封装，以实现动态参数等功能。 -""" - -from contextlib import AsyncExitStack -from typing import Any, Dict, List, Type, Callable, Optional - -from nonebot.utils import get_name, run_sync, is_coroutine_callable -from nonebot.dependencies import ( - Param, - Dependent, - DependsWrapper, - get_dependent, - solve_dependencies, - get_parameterless_sub_dependant, -) - - -class Handler: - """事件处理器类。支持依赖注入。""" - - def __init__( - self, - call: Callable[..., Any], - *, - name: Optional[str] = None, - dependencies: Optional[List[DependsWrapper]] = None, - allow_types: Optional[List[Type[Param]]] = None, - ): - """ - :说明: - - 装饰一个函数为事件处理器。 - - :参数: - - * ``call: Callable[..., Any]``: 事件处理函数。 - * ``name: Optional[str]``: 事件处理器名称。默认为函数名。 - * ``dependencies: Optional[List[DependsWrapper]]``: 额外的非参数依赖注入。 - * ``allow_types: Optional[List[Type[Param]]]``: 允许的参数类型。 - """ - self.call = call - """ - :类型: ``Callable[..., Any]`` - :说明: 事件处理函数 - """ - self.name = get_name(call) if name is None else name - """ - :类型: ``str`` - :说明: 事件处理函数名 - """ - self.allow_types = allow_types or [] - """ - :类型: ``List[Type[Param]]`` - :说明: 事件处理器允许的参数类型 - """ - - self.dependencies = dependencies or [] - """ - :类型: ``List[DependsWrapper]`` - :说明: 事件处理器的额外依赖 - """ - self.sub_dependents: Dict[Callable[..., Any], Dependent] = {} - if dependencies: - for depends in dependencies: - self.cache_dependent(depends) - self.dependent = get_dependent(call=call, allow_types=self.allow_types) - - def __repr__(self) -> str: - return f"" - - def __str__(self) -> str: - return repr(self) - - async def __call__( - self, - *, - _stack: Optional[AsyncExitStack] = None, - _dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, - **params, - ) -> Any: - values, _ = await solve_dependencies( - _dependent=self.dependent, - _stack=_stack, - _sub_dependents=[ - self.sub_dependents[dependency.dependency] # type: ignore - for dependency in self.dependencies - ], - _dependency_cache=_dependency_cache, - **params, - ) - - if is_coroutine_callable(self.call): - return await self.call(**values) - else: - return await run_sync(self.call)(**values) - - def cache_dependent(self, dependency: DependsWrapper): - if not dependency.dependency: - raise ValueError(f"{dependency} has no dependency") - if dependency.dependency in self.sub_dependents: - raise ValueError(f"{dependency} is already in dependencies") - sub_dependant = get_parameterless_sub_dependant( - depends=dependency, allow_types=self.allow_types - ) - self.sub_dependents[dependency.dependency] = sub_dependant - - def prepend_dependency(self, dependency: DependsWrapper): - self.cache_dependent(dependency) - self.dependencies.insert(0, dependency) - - def append_dependency(self, dependency: DependsWrapper): - self.cache_dependent(dependency) - self.dependencies.append(dependency) - - def remove_dependency(self, dependency: DependsWrapper): - if not dependency.dependency: - raise ValueError(f"{dependency} has no dependency") - if dependency.dependency in self.sub_dependents: - del self.sub_dependents[dependency.dependency] - if dependency in self.dependencies: - self.dependencies.remove(dependency) diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 4701ff55..5d079718 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -17,6 +17,7 @@ from typing import ( List, Type, Union, + TypeVar, Callable, NoReturn, Optional, @@ -25,9 +26,10 @@ from typing import ( from nonebot import params from nonebot.rule import Rule from nonebot.log import logger -from nonebot.handler import Handler -from nonebot.dependencies import DependsWrapper +from nonebot.utils import CacheDict +from nonebot.dependencies import Dependent from nonebot.permission import USER, Permission +from nonebot.consts import ARG_KEY, ARG_STR_KEY, RECEIVE_KEY, REJECT_TARGET from nonebot.adapters import ( Bot, Event, @@ -35,6 +37,14 @@ from nonebot.adapters import ( MessageSegment, MessageTemplate, ) +from nonebot.typing import ( + Any, + T_State, + T_Handler, + T_ArgsParser, + T_TypeUpdater, + T_PermissionUpdater, +) from nonebot.exception import ( PausedException, StopPropagation, @@ -42,19 +52,12 @@ from nonebot.exception import ( FinishedException, RejectedException, ) -from nonebot.typing import ( - T_State, - T_Handler, - T_ArgsParser, - T_TypeUpdater, - T_StateFactory, - T_DependencyCache, - T_PermissionUpdater, -) if TYPE_CHECKING: from nonebot.plugin import Plugin +T = TypeVar("T") + matchers: Dict[int, List[Type["Matcher"]]] = defaultdict(list) """ :类型: ``Dict[int, List[Type[Matcher]]]`` @@ -63,7 +66,7 @@ matchers: Dict[int, List[Type["Matcher"]]] = defaultdict(list) current_bot: ContextVar[Bot] = ContextVar("current_bot") current_event: ContextVar[Event] = ContextVar("current_event") current_state: ContextVar[T_State] = ContextVar("current_state") -current_handler: ContextVar[Handler] = ContextVar("current_handler") +current_handler: ContextVar[Dependent] = ContextVar("current_handler") class MatcherMeta(type): @@ -131,7 +134,7 @@ class Matcher(metaclass=MatcherMeta): :类型: ``Permission`` :说明: 事件响应器触发权限 """ - handlers: List[Handler] = [] + handlers: List[Dependent[Any]] = [] """ :类型: ``List[Handler]`` :说明: 事件响应器拥有的事件处理函数列表 @@ -163,23 +166,24 @@ class Matcher(metaclass=MatcherMeta): :说明: 事件响应器默认状态 """ - _default_parser: Optional[T_ArgsParser] = None + _default_parser: Optional[Dependent[None]] = None """ - :类型: ``Optional[T_ArgsParser]`` + :类型: ``Optional[Dependent]`` :说明: 事件响应器默认参数解析函数 """ - _default_type_updater: Optional[T_TypeUpdater] = None + _default_type_updater: Optional[Dependent[str]] = None """ - :类型: ``Optional[T_TypeUpdater]`` + :类型: ``Optional[Dependent]`` :说明: 事件响应器类型更新函数 """ - _default_permission_updater: Optional[T_PermissionUpdater] = None + _default_permission_updater: Optional[Dependent[Permission]] = None """ - :类型: ``Optional[T_PermissionUpdater]`` + :类型: ``Optional[Dependent]`` :说明: 事件响应器权限更新函数 """ HANDLER_PARAM_TYPES = [ + params.DependParam, params.BotParam, params.EventParam, params.StateParam, @@ -207,9 +211,7 @@ class Matcher(metaclass=MatcherMeta): type_: str = "", rule: Optional[Rule] = None, permission: Optional[Permission] = None, - handlers: Optional[ - Union[List[T_Handler], List[Handler], List[Union[T_Handler, Handler]]] - ] = None, + handlers: Optional[List[Union[T_Handler, Dependent[Any]]]] = None, temp: bool = False, priority: int = 1, block: bool = False, @@ -259,8 +261,10 @@ class Matcher(metaclass=MatcherMeta): "permission": permission or Permission(), "handlers": [ handler - if isinstance(handler, Handler) - else Handler(handler, allow_types=cls.HANDLER_PARAM_TYPES) + if isinstance(handler, Dependent) + else Dependent[Any].parse( + call=handler, allow_types=cls.HANDLER_PARAM_TYPES + ) for handler in handlers ] if handlers @@ -286,7 +290,7 @@ class Matcher(metaclass=MatcherMeta): bot: Bot, event: Event, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, + dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, ) -> bool: """ :说明: @@ -314,7 +318,7 @@ class Matcher(metaclass=MatcherMeta): event: Event, state: T_State, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, + dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, ) -> bool: """ :说明: @@ -347,7 +351,9 @@ class Matcher(metaclass=MatcherMeta): * ``func: T_ArgsParser``: 参数解析函数 """ - cls._default_parser = func + cls._default_parser = Dependent[None].parse( + call=func, allow_types=cls.HANDLER_PARAM_TYPES + ) return func @classmethod @@ -361,7 +367,9 @@ class Matcher(metaclass=MatcherMeta): * ``func: T_TypeUpdater``: 响应事件类型更新函数 """ - cls._default_type_updater = func + cls._default_type_updater = Dependent[str].parse( + call=func, allow_types=cls.HANDLER_PARAM_TYPES + ) return func @classmethod @@ -375,22 +383,26 @@ class Matcher(metaclass=MatcherMeta): * ``func: T_PermissionUpdater``: 会话权限更新函数 """ - cls._default_permission_updater = func + cls._default_permission_updater = Dependent[Permission].parse( + call=func, allow_types=cls.HANDLER_PARAM_TYPES + ) return func @classmethod def append_handler( - cls, handler: T_Handler, dependencies: Optional[List[DependsWrapper]] = None - ) -> Handler: - handler_ = Handler( - handler, dependencies=dependencies, allow_types=cls.HANDLER_PARAM_TYPES + cls, handler: T_Handler, parameterless: Optional[List[Any]] = None + ) -> Dependent[Any]: + handler_ = Dependent[Any].parse( + call=handler, + parameterless=parameterless, + allow_types=cls.HANDLER_PARAM_TYPES, ) cls.handlers.append(handler_) return handler_ @classmethod def handle( - cls, dependencies: Optional[List[DependsWrapper]] = None + cls, parameterless: Optional[List[Any]] = None ) -> Callable[[T_Handler], T_Handler]: """ :说明: @@ -399,18 +411,18 @@ class Matcher(metaclass=MatcherMeta): :参数: - * ``dependencies: Optional[List[DependsWrapper]]``: 非参数类型依赖列表 + * ``parameterless: Optional[List[Any]]``: 非参数类型依赖列表 """ def _decorator(func: T_Handler) -> T_Handler: - cls.append_handler(func, dependencies=dependencies) + cls.append_handler(func, parameterless=parameterless) return func return _decorator @classmethod def receive( - cls, dependencies: Optional[List[DependsWrapper]] = None + cls, id: str = "", parameterless: Optional[List[Any]] = None ) -> Callable[[T_Handler], T_Handler]: """ :说明: @@ -419,28 +431,30 @@ class Matcher(metaclass=MatcherMeta): :参数: - * ``dependencies: Optional[List[DependsWrapper]]``: 非参数类型依赖列表 + * ``parameterless: Optional[List[Any]]``: 非参数类型依赖列表 """ - async def _receive(state: T_State) -> Union[None, NoReturn]: - if state.get(_receive): + async def _receive(event: Event, matcher: "Matcher") -> Union[None, NoReturn]: + if matcher.get_receive(id): return - state[_receive] = True - del state["_current_key"] + if matcher.get_target() == RECEIVE_KEY.format(id=id): + matcher.set_receive(id, event) + return + matcher.set_target(RECEIVE_KEY.format(id=id)) raise RejectedException - _dependencies = [DependsWrapper(_receive), *(dependencies or [])] + parameterless = [params.Depends(_receive), *(parameterless or [])] def _decorator(func: T_Handler) -> T_Handler: if cls.handlers and cls.handlers[-1].call is func: func_handler = cls.handlers[-1] - for depend in reversed(_dependencies): - func_handler.prepend_dependency(depend) + for depend in reversed(parameterless): + func_handler.prepend_parameterless(depend) else: cls.append_handler( func, - dependencies=_dependencies if cls.handlers else dependencies, + parameterless=parameterless if cls.handlers else parameterless, ) return func @@ -453,7 +467,7 @@ class Matcher(metaclass=MatcherMeta): key: str, prompt: Optional[Union[str, Message, MessageSegment, MessageTemplate]] = None, args_parser: Optional[T_ArgsParser] = None, - dependencies: Optional[List[DependsWrapper]] = None, + parameterless: Optional[List[Any]] = None, ) -> Callable[[T_Handler], T_Handler]: """ :说明: @@ -465,51 +479,31 @@ class Matcher(metaclass=MatcherMeta): * ``key: str``: 参数名 * ``prompt: Optional[Union[str, Message, MessageSegment, MessageFormatter]]``: 在参数不存在时向用户发送的消息 * ``args_parser: Optional[T_ArgsParser]``: 可选参数解析函数，空则使用默认解析函数 - * ``dependencies: Optional[List[DependsWrapper]]``: 非参数类型依赖列表 + * ``parameterless: Optional[List[Any]]``: 非参数类型依赖列表 """ - async def _key_getter(bot: Bot, event: Event, state: T_State): - if state.get(f"_{key}_prompted"): + async def _key_getter(event: Event, matcher: "Matcher"): + if matcher.get_arg(key): return - - state["_current_key"] = key - state[f"_{key}_prompted"] = True - if key not in state: - if prompt is not None: - if isinstance(prompt, MessageTemplate): - _prompt = prompt.format(**state) - else: - _prompt = prompt - await bot.send(event=event, message=_prompt) - raise RejectedException - else: - state[f"_{key}_parsed"] = True - - async def _key_parser(bot: Bot, event: Event, state: T_State): - if key in state and state.get(f"_{key}_parsed"): + if matcher.get_target() == ARG_KEY.format(key=key): + matcher.set_arg(key, event) return + matcher.set_target(ARG_KEY.format(key=key)) + raise RejectedException - parser = args_parser or cls._default_parser - if parser: - await parser(bot, event, state) - else: - state[key] = str(event.get_message()) - state[f"_{key}_parsed"] = True - - _dependencies = [ - DependsWrapper(_key_getter), - DependsWrapper(_key_parser), - *(dependencies or []), + _parameterless = [ + params.Depends(_key_getter), + *(parameterless or []), ] def _decorator(func: T_Handler) -> T_Handler: if cls.handlers and cls.handlers[-1].call is func: func_handler = cls.handlers[-1] - for depend in reversed(_dependencies): - func_handler.prepend_dependency(depend) + for depend in reversed(_parameterless): + func_handler.prepend_parameterless(depend) else: - cls.append_handler(func, dependencies=_dependencies) + cls.append_handler(func, parameterless=_parameterless) return func @@ -609,8 +603,6 @@ class Matcher(metaclass=MatcherMeta): bot = current_bot.get() event = current_event.get() state = current_state.get() - if "_current_key" in state and f"_{state['_current_key']}_parsed" in state: - del state[f"_{state['_current_key']}_parsed"] if isinstance(prompt, MessageTemplate): _prompt = prompt.format(**state) else: @@ -619,6 +611,28 @@ class Matcher(metaclass=MatcherMeta): await bot.send(event=event, message=_prompt, **kwargs) raise RejectedException + def get_receive(self, id: str, default: T = None) -> Union[Event, T]: + return self.state.get(RECEIVE_KEY.format(id=id), default) + + def set_receive(self, id: str, event: Event) -> None: + self.state[RECEIVE_KEY.format(id=id)] = event + + def get_arg(self, key: str, default: T = None) -> Union[Event, T]: + return self.state.get(ARG_KEY.format(key=key), default) + + def get_arg_str(self, key: str, default: T = None) -> Union[str, T]: + return self.state.get(ARG_STR_KEY.format(key=key), default) + + def set_arg(self, key: str, event: Event) -> None: + self.state[ARG_KEY.format(key=key)] = event + self.state[ARG_STR_KEY.format(key=key)] = str(event.get_message()) + + def set_target(self, target: str) -> None: + self.state[REJECT_TARGET] = target + + def get_target(self, default: T = None) -> Union[str, T]: + return self.state.get(REJECT_TARGET, default) + def stop_propagation(self): """ :说明: @@ -631,13 +645,13 @@ class Matcher(metaclass=MatcherMeta): updater = self.__class__._default_type_updater if not updater: return "message" - return await updater(bot, event, self.state, self.type) + return await updater(bot=bot, event=event, state=self.state, matcher=self) async def update_permission(self, bot: Bot, event: Event) -> Permission: updater = self.__class__._default_permission_updater if not updater: return USER(event.get_session_id(), perm=self.permission) - return await updater(bot, event, self.state, self.permission) + return await updater(bot=bot, event=event, state=self.state, matcher=self) async def simple_run( self, @@ -645,7 +659,7 @@ class Matcher(metaclass=MatcherMeta): event: Event, state: T_State, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[T_DependencyCache] = None, + dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, ): b_t = current_bot.set(bot) e_t = current_event.set(event) @@ -664,8 +678,8 @@ class Matcher(metaclass=MatcherMeta): bot=bot, event=event, state=self.state, - _stack=stack, - _dependency_cache=dependency_cache, + stack=stack, + dependency_cache=dependency_cache, ) except SkippedException as e: logger.debug( @@ -687,7 +701,7 @@ class Matcher(metaclass=MatcherMeta): event: Event, state: T_State, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[T_DependencyCache] = None, + dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, ): try: await self.simple_run(bot, event, state, stack, dependency_cache) diff --git a/nonebot/message.py b/nonebot/message.py index 02863aa5..9b45c62a 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -22,9 +22,9 @@ from typing import ( from nonebot import params from nonebot.log import logger from nonebot.rule import TrieRule -from nonebot.handler import Handler -from nonebot.utils import escape_tag +from nonebot.dependencies import Dependent from nonebot.matcher import Matcher, matchers +from nonebot.utils import CacheDict, escape_tag from nonebot.exception import ( NoLogException, StopPropagation, @@ -33,7 +33,7 @@ from nonebot.exception import ( ) from nonebot.typing import ( T_State, - T_DependencyCache, + T_Handler, T_RunPreProcessor, T_RunPostProcessor, T_EventPreProcessor, @@ -43,18 +43,20 @@ from nonebot.typing import ( if TYPE_CHECKING: from nonebot.adapters import Bot, Event -_event_preprocessors: Set[Handler] = set() -_event_postprocessors: Set[Handler] = set() -_run_preprocessors: Set[Handler] = set() -_run_postprocessors: Set[Handler] = set() +_event_preprocessors: Set[Dependent[None]] = set() +_event_postprocessors: Set[Dependent[None]] = set() +_run_preprocessors: Set[Dependent[None]] = set() +_run_postprocessors: Set[Dependent[None]] = set() EVENT_PCS_PARAMS = [ + params.DependParam, params.BotParam, params.EventParam, params.StateParam, params.DefaultParam, ] RUN_PREPCS_PARAMS = [ + params.DependParam, params.MatcherParam, params.BotParam, params.EventParam, @@ -62,6 +64,7 @@ RUN_PREPCS_PARAMS = [ params.DefaultParam, ] RUN_POSTPCS_PARAMS = [ + params.DependParam, params.MatcherParam, params.ExceptionParam, params.BotParam, @@ -77,7 +80,9 @@ def event_preprocessor(func: T_EventPreProcessor) -> T_EventPreProcessor: 事件预处理。装饰一个函数，使它在每次接收到事件并分发给各响应器之前执行。 """ - _event_preprocessors.add(Handler(func, allow_types=EVENT_PCS_PARAMS)) + _event_preprocessors.add( + Dependent[None].parse(call=func, allow_types=EVENT_PCS_PARAMS) + ) return func @@ -87,7 +92,9 @@ def event_postprocessor(func: T_EventPostProcessor) -> T_EventPostProcessor: 事件后处理。装饰一个函数，使它在每次接收到事件并分发给各响应器之后执行。 """ - _event_postprocessors.add(Handler(func, allow_types=EVENT_PCS_PARAMS)) + _event_postprocessors.add( + Dependent[None].parse(call=func, allow_types=EVENT_PCS_PARAMS) + ) return func @@ -97,7 +104,9 @@ def run_preprocessor(func: T_RunPreProcessor) -> T_RunPreProcessor: 运行预处理。装饰一个函数，使它在每次事件响应器运行前执行。 """ - _run_preprocessors.add(Handler(func, allow_types=RUN_PREPCS_PARAMS)) + _run_preprocessors.add( + Dependent[None].parse(call=func, allow_types=RUN_PREPCS_PARAMS) + ) return func @@ -107,7 +116,9 @@ def run_postprocessor(func: T_RunPostProcessor) -> T_RunPostProcessor: 运行后处理。装饰一个函数，使它在每次事件响应器运行后执行。 """ - _run_postprocessors.add(Handler(func, allow_types=RUN_POSTPCS_PARAMS)) + _run_postprocessors.add( + Dependent[None].parse(call=func, allow_types=RUN_POSTPCS_PARAMS) + ) return func @@ -125,7 +136,7 @@ async def _check_matcher( event: "Event", state: T_State, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[T_DependencyCache] = None, + dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, ) -> None: if Matcher.expire_time and datetime.now() > Matcher.expire_time: try: @@ -160,7 +171,7 @@ async def _run_matcher( event: "Event", state: T_State, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[T_DependencyCache] = None, + dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, ) -> None: logger.info(f"Event will be handled by {Matcher}") @@ -174,8 +185,8 @@ async def _run_matcher( bot=bot, event=event, state=state, - _stack=stack, - _dependency_cache=dependency_cache, + stack=stack, + dependency_cache=dependency_cache, ) ), _run_preprocessors, @@ -216,8 +227,8 @@ async def _run_matcher( bot=bot, event=event, state=state, - _stack=stack, - _dependency_cache=dependency_cache, + stack=stack, + dependency_cache=dependency_cache, ) ), _run_postprocessors, @@ -264,7 +275,7 @@ async def handle_event(bot: "Bot", event: "Event") -> None: logger.opt(colors=True).success(log_msg) state: Dict[Any, Any] = {} - dependency_cache: T_DependencyCache = {} + dependency_cache: CacheDict[T_Handler, Any] = CacheDict() async with AsyncExitStack() as stack: coros = list( @@ -274,8 +285,8 @@ async def handle_event(bot: "Bot", event: "Event") -> None: bot=bot, event=event, state=state, - _stack=stack, - _dependency_cache=dependency_cache, + stack=stack, + dependency_cache=dependency_cache, ) ), _event_preprocessors, @@ -336,8 +347,8 @@ async def handle_event(bot: "Bot", event: "Event") -> None: bot=bot, event=event, state=state, - _stack=stack, - _dependency_cache=dependency_cache, + stack=stack, + dependency_cache=dependency_cache, ) ), _event_postprocessors, diff --git a/nonebot/params.py b/nonebot/params.py index 79747ca4..b92e9a15 100644 --- a/nonebot/params.py +++ b/nonebot/params.py @@ -1,20 +1,160 @@ import inspect -from typing import Any, Dict, Optional +from typing import Any, List, Type, Callable, Optional, cast +from contextlib import AsyncExitStack, contextmanager, asynccontextmanager -from pydantic.fields import Undefined +from pydantic.fields import Required, Undefined -from nonebot.typing import T_State -from nonebot.dependencies import Param from nonebot.adapters import Bot, Event -from nonebot.utils import generic_check_issubclass +from nonebot.typing import T_State, T_Handler +from nonebot.dependencies import Param, Dependent +from nonebot.utils import ( + CacheDict, + get_name, + run_sync, + is_gen_callable, + run_sync_ctx_manager, + is_async_gen_callable, + is_coroutine_callable, + generic_check_issubclass, +) + + +class DependsInner: + def __init__( + self, + dependency: Optional[T_Handler] = None, + *, + use_cache: bool = True, + ) -> None: + self.dependency = dependency + self.use_cache = use_cache + + def __repr__(self) -> str: + dep = get_name(self.dependency) + cache = "" if self.use_cache else ", use_cache=False" + return f"{self.__class__.__name__}({dep}{cache})" + + +def Depends( + dependency: Optional[T_Handler] = None, + *, + use_cache: bool = True, +) -> Any: + """ + :说明: + + 参数依赖注入装饰器 + + :参数: + + * ``dependency: Optional[Callable[..., Any]] = None``: 依赖函数。默认为参数的类型注释。 + * ``use_cache: bool = True``: 是否使用缓存。默认为 ``True``。 + * ``allow_types: Optional[List[Type[Param]]] = None``: 允许的参数类型。默认为 ``None``。 + + .. code-block:: python + + def depend_func() -> Any: + return ... + + def depend_gen_func(): + try: + yield ... + finally: + ... + + async def handler(param_name: Any = Depends(depend_func), gen: Any = Depends(depend_gen_func)): + ... + """ + return DependsInner(dependency, use_cache=use_cache) + + +class DependParam(Param): + @classmethod + def _check_param( + cls, + dependent: Dependent, + name: str, + param: inspect.Parameter, + ) -> Optional["DependParam"]: + if isinstance(param.default, DependsInner): + dependency: T_Handler + if param.default.dependency is None: + assert param.annotation is not param.empty, "Dependency cannot be empty" + dependency = param.annotation + else: + dependency = param.default.dependency + dependent = Dependent[Any].parse( + call=dependency, + allow_types=dependent.allow_types, + ) + return cls(Required, use_cache=param.default.use_cache, dependent=dependent) + + @classmethod + def _check_parameterless( + cls, dependent: "Dependent", value: Any + ) -> Optional["Param"]: + if isinstance(value, DependsInner): + assert value.dependency, "Dependency cannot be empty" + dependent = Dependent[Any].parse( + call=value.dependency, allow_types=dependent.allow_types + ) + return cls(Required, use_cache=value.use_cache, dependent=dependent) + + async def _solve( + self, + stack: Optional[AsyncExitStack] = None, + dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, + **kwargs: Any, + ) -> Any: + use_cache: bool = self.extra["use_cache"] + dependency_cache = CacheDict() if dependency_cache is None else dependency_cache + + sub_dependent: Dependent = self.extra["dependent"] + sub_dependent.call = cast(Callable[..., Any], sub_dependent.call) + call = sub_dependent.call + + # solve sub dependency with current cache + sub_values = await sub_dependent.solve( + stack=stack, + dependency_cache=dependency_cache, + **kwargs, + ) + + # run dependency function + async with dependency_cache: + if use_cache and call in dependency_cache: + solved = dependency_cache[call] + elif is_gen_callable(call) or is_async_gen_callable(call): + assert isinstance( + stack, AsyncExitStack + ), "Generator dependency should be called in context" + if is_gen_callable(call): + cm = run_sync_ctx_manager(contextmanager(call)(**sub_values)) + else: + cm = asynccontextmanager(call)(**sub_values) + solved = await stack.enter_async_context(cm) + elif is_coroutine_callable(call): + return await call(**sub_values) + else: + return await run_sync(call)(**sub_values) + + # save current dependency to cache + if call not in dependency_cache: + dependency_cache[call] = solved + + return solved class BotParam(Param): @classmethod - def _check(cls, name: str, param: inspect.Parameter) -> bool: - return generic_check_issubclass(param.annotation, Bot) or ( - param.annotation == param.empty and name == "bot" - ) + def _check_param( + cls, dependent: Dependent, name: str, param: inspect.Parameter + ) -> Optional["BotParam"]: + if param.default == param.empty and ( + generic_check_issubclass(param.annotation, Bot) + or (param.annotation == param.empty and name == "bot") + ): + return cls(Required) def _solve(self, bot: Bot, **kwargs: Any) -> Any: return bot @@ -22,22 +162,34 @@ class BotParam(Param): class EventParam(Param): @classmethod - def _check(cls, name: str, param: inspect.Parameter) -> bool: - return generic_check_issubclass(param.annotation, Event) or ( - param.annotation == param.empty and name == "event" - ) + def _check_param( + cls, dependent: Dependent, name: str, param: inspect.Parameter + ) -> Optional["EventParam"]: + if param.default == param.empty and ( + generic_check_issubclass(param.annotation, Event) + or (param.annotation == param.empty and name == "event") + ): + return cls(Required) def _solve(self, event: Event, **kwargs: Any) -> Any: return event -# FIXME: may detect error param +class StateInner: + ... + + +def State() -> Any: + return StateInner() + + class StateParam(Param): @classmethod - def _check(cls, name: str, param: inspect.Parameter) -> bool: - return generic_check_issubclass(param.annotation, Dict) or ( - param.annotation == param.empty and name == "state" - ) + def _check_param( + cls, dependent: Dependent, name: str, param: inspect.Parameter + ) -> Optional["StateParam"]: + if isinstance(param.default, StateInner): + return cls(Required) def _solve(self, state: T_State, **kwargs: Any) -> Any: return state @@ -45,21 +197,27 @@ class StateParam(Param): class MatcherParam(Param): @classmethod - def _check(cls, name: str, param: inspect.Parameter) -> bool: - return generic_check_issubclass(param.annotation, Matcher) or ( + def _check_param( + cls, dependent: Dependent, name: str, param: inspect.Parameter + ) -> Optional["MatcherParam"]: + if generic_check_issubclass(param.annotation, Matcher) or ( param.annotation == param.empty and name == "matcher" - ) + ): + return cls(Required) - def _solve(self, matcher: Optional["Matcher"] = None, **kwargs: Any) -> Any: + def _solve(self, matcher: "Matcher", **kwargs: Any) -> Any: return matcher class ExceptionParam(Param): @classmethod - def _check(cls, name: str, param: inspect.Parameter) -> bool: - return generic_check_issubclass(param.annotation, Exception) or ( + def _check_param( + cls, dependent: Dependent, name: str, param: inspect.Parameter + ) -> Optional["ExceptionParam"]: + if generic_check_issubclass(param.annotation, Exception) or ( param.annotation == param.empty and name == "exception" - ) + ): + return cls(Required) def _solve(self, exception: Optional[Exception] = None, **kwargs: Any) -> Any: return exception @@ -67,8 +225,11 @@ class ExceptionParam(Param): class DefaultParam(Param): @classmethod - def _check(cls, name: str, param: inspect.Parameter) -> bool: - return param.default != param.empty + def _check_param( + cls, dependent: Dependent, name: str, param: inspect.Parameter + ) -> Optional["DefaultParam"]: + if param.default != param.empty: + return cls(param.default) def _solve(self, **kwargs: Any) -> Any: return Undefined diff --git a/nonebot/permission.py b/nonebot/permission.py index 3f33dd5d..9ca25f64 100644 --- a/nonebot/permission.py +++ b/nonebot/permission.py @@ -13,6 +13,7 @@ import asyncio from contextlib import AsyncExitStack from typing import ( Any, + Set, Dict, Tuple, Union, @@ -23,10 +24,11 @@ from typing import ( ) from nonebot import params -from nonebot.handler import Handler +from nonebot.utils import CacheDict from nonebot.adapters import Bot, Event +from nonebot.dependencies import Dependent from nonebot.exception import SkippedException -from nonebot.typing import T_PermissionChecker +from nonebot.typing import T_Handler, T_PermissionChecker async def _run_coro_with_catch(coro: Coroutine[Any, Any, Any]): @@ -54,19 +56,26 @@ class Permission: __slots__ = ("checkers",) - HANDLER_PARAM_TYPES = [params.BotParam, params.EventParam, params.DefaultParam] + HANDLER_PARAM_TYPES = [ + params.DependParam, + params.BotParam, + params.EventParam, + params.DefaultParam, + ] - def __init__(self, *checkers: Union[T_PermissionChecker, Handler]) -> None: + def __init__(self, *checkers: Union[T_PermissionChecker, Dependent[bool]]) -> None: """ :参数: - * ``*checkers: Union[T_PermissionChecker, Handler]``: PermissionChecker + * ``*checkers: Union[T_PermissionChecker, Dependent[bool]``: PermissionChecker """ - self.checkers = set( + self.checkers: Set[Dependent[bool]] = set( checker - if isinstance(checker, Handler) - else Handler(checker, allow_types=self.HANDLER_PARAM_TYPES) + if isinstance(checker, Dependent) + else Dependent[bool].parse( + call=checker, allow_types=self.HANDLER_PARAM_TYPES + ) for checker in checkers ) """ @@ -76,7 +85,7 @@ class Permission: :类型: - * ``Set[Handler]`` + * ``Set[Dependent[bool]]`` """ async def __call__( @@ -84,7 +93,7 @@ class Permission: bot: Bot, event: Event, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, + dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, ) -> bool: """ :说明: @@ -96,7 +105,7 @@ class Permission: * ``bot: Bot``: Bot 对象 * ``event: Event``: Event 对象 * ``stack: Optional[AsyncExitStack]``: 异步上下文栈 - * ``dependency_cache: Optional[Dict[Callable[..., Any], Any]]``: 依赖缓存 + * ``dependency_cache: Optional[CacheDict[T_Handler, Any]]``: 依赖缓存 :返回: @@ -110,8 +119,8 @@ class Permission: checker( bot=bot, event=event, - _stack=stack, - _dependency_cache=dependency_cache, + stack=stack, + dependency_cache=dependency_cache, ) ) for checker in self.checkers diff --git a/nonebot/plugin/on.py b/nonebot/plugin/on.py index 2c7446e6..f0a5523c 100644 --- a/nonebot/plugin/on.py +++ b/nonebot/plugin/on.py @@ -5,11 +5,16 @@ from types import ModuleType from typing import Any, Set, Dict, List, Type, Tuple, Union, Optional from nonebot.adapters import Event -from nonebot.handler import Handler from nonebot.matcher import Matcher from .manager import _current_plugin from nonebot.permission import Permission -from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_StateFactory +from nonebot.dependencies import Dependent +from nonebot.typing import ( + T_State, + T_Handler, + T_RuleChecker, + T_PermissionChecker, +) from nonebot.rule import ( PREFIX_KEY, RAW_CMD_KEY, @@ -43,9 +48,9 @@ def _get_matcher_module(depth: int = 1) -> Optional[ModuleType]: def on( type: str = "", rule: Optional[Union[Rule, T_RuleChecker]] = None, - permission: Optional[Permission] = None, + permission: Optional[Union[Permission, T_PermissionChecker]] = None, *, - handlers: Optional[List[Union[T_Handler, Handler]]] = None, + handlers: Optional[List[Union[T_Handler, Dependent]]] = None, temp: bool = False, priority: int = 1, block: bool = False, @@ -61,8 +66,8 @@ def on( * ``type: str``: 事件响应器类型 * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``permission: Optional[Union[Permission, T_PermissionChecker]] =]]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -75,7 +80,7 @@ def on( matcher = Matcher.new( type, Rule() & rule, - permission or Permission(), + Permission() | permission, temp=temp, priority=priority, block=block, @@ -91,7 +96,7 @@ def on( def on_metaevent( rule: Optional[Union[Rule, T_RuleChecker]] = None, *, - handlers: Optional[List[Union[T_Handler, Handler]]] = None, + handlers: Optional[List[Union[T_Handler, Dependent]]] = None, temp: bool = False, priority: int = 1, block: bool = False, @@ -106,7 +111,7 @@ def on_metaevent( :参数: * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -134,9 +139,9 @@ def on_metaevent( def on_message( rule: Optional[Union[Rule, T_RuleChecker]] = None, - permission: Optional[Permission] = None, + permission: Optional[Union[Permission, T_PermissionChecker]] = None, *, - handlers: Optional[List[Union[T_Handler, Handler]]] = None, + handlers: Optional[List[Union[T_Handler, Dependent]]] = None, temp: bool = False, priority: int = 1, block: bool = True, @@ -151,8 +156,8 @@ def on_message( :参数: * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``permission: Optional[Union[Permission, T_PermissionChecker]] =]]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -165,7 +170,7 @@ def on_message( matcher = Matcher.new( "message", Rule() & rule, - permission or Permission(), + Permission() | permission, temp=temp, priority=priority, block=block, @@ -181,7 +186,7 @@ def on_message( def on_notice( rule: Optional[Union[Rule, T_RuleChecker]] = None, *, - handlers: Optional[List[Union[T_Handler, Handler]]] = None, + handlers: Optional[List[Union[T_Handler, Dependent]]] = None, temp: bool = False, priority: int = 1, block: bool = False, @@ -196,7 +201,7 @@ def on_notice( :参数: * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -225,7 +230,7 @@ def on_notice( def on_request( rule: Optional[Union[Rule, T_RuleChecker]] = None, *, - handlers: Optional[List[Union[T_Handler, Handler]]] = None, + handlers: Optional[List[Union[T_Handler, Dependent]]] = None, temp: bool = False, priority: int = 1, block: bool = False, @@ -240,7 +245,7 @@ def on_request( :参数: * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -283,8 +288,8 @@ def on_startswith( * ``msg: Union[str, Tuple[str, ...]]``: 指定消息开头内容 * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 * ``ignorecase: bool``: 是否忽略大小写 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``permission: Optional[Union[Permission, T_PermissionChecker]] =]]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -314,8 +319,8 @@ def on_endswith( * ``msg: Union[str, Tuple[str, ...]]``: 指定消息结尾内容 * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 * ``ignorecase: bool``: 是否忽略大小写 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``permission: Optional[Union[Permission, T_PermissionChecker]] =]]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -343,8 +348,8 @@ def on_keyword( * ``keywords: Set[str]``: 关键词列表 * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``permission: Optional[Union[Permission, T_PermissionChecker]] =]]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -376,8 +381,8 @@ def on_command( * ``cmd: Union[str, Tuple[str, ...]]``: 指定命令内容 * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 * ``aliases: Optional[Set[Union[str, Tuple[str, ...]]]]``: 命令别名 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``permission: Optional[Union[Permission, T_PermissionChecker]] =]]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -434,8 +439,8 @@ def on_shell_command( * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 * ``aliases: Optional[Set[Union[str, Tuple[str, ...]]]]``: 命令别名 * ``parser: Optional[ArgumentParser]``: ``nonebot.rule.ArgumentParser`` 对象 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``permission: Optional[Union[Permission, T_PermissionChecker]] =]]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -486,8 +491,8 @@ def on_regex( * ``pattern: str``: 正则表达式 * ``flags: Union[int, re.RegexFlag]``: 正则匹配标志 * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``permission: Optional[Union[Permission, T_PermissionChecker]] =]]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -600,8 +605,8 @@ class MatcherGroup: * ``type: str``: 事件响应器类型 * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``permission: Optional[Union[Permission, T_PermissionChecker]] =]]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -626,7 +631,7 @@ class MatcherGroup: :参数: * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -653,8 +658,8 @@ class MatcherGroup: :参数: * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``permission: Optional[Union[Permission, T_PermissionChecker]] =]]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -680,7 +685,7 @@ class MatcherGroup: :参数: * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -706,7 +711,7 @@ class MatcherGroup: :参数: * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -736,8 +741,8 @@ class MatcherGroup: * ``msg: Union[str, Tuple[str, ...]]``: 指定消息开头内容 * ``ignorecase: bool``: 是否忽略大小写 * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``permission: Optional[Union[Permission, T_PermissionChecker]] =]]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -765,8 +770,8 @@ class MatcherGroup: * ``msg: Union[str, Tuple[str, ...]]``: 指定消息结尾内容 * ``ignorecase: bool``: 是否忽略大小写 * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``permission: Optional[Union[Permission, T_PermissionChecker]] =]]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -793,8 +798,8 @@ class MatcherGroup: * ``keywords: Set[str]``: 关键词列表 * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``permission: Optional[Union[Permission, T_PermissionChecker]] =]]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -829,8 +834,8 @@ class MatcherGroup: * ``cmd: Union[str, Tuple[str, ...]]``: 指定命令内容 * ``aliases: Optional[Set[Union[str, Tuple[str, ...]]]]``: 命令别名 * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``permission: Optional[Union[Permission, T_PermissionChecker]] =]]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -869,8 +874,8 @@ class MatcherGroup: * ``aliases: Optional[Set[Union[str, Tuple[str, ...]]]]``: 命令别名 * ``parser: Optional[ArgumentParser]``: ``nonebot.rule.ArgumentParser`` 对象 * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``permission: Optional[Union[Permission, T_PermissionChecker]] =]]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 @@ -904,8 +909,8 @@ class MatcherGroup: * ``pattern: str``: 正则表达式 * ``flags: Union[int, re.RegexFlag]``: 正则匹配标志 * ``rule: Optional[Union[Rule, T_RuleChecker]]``: 事件响应规则 - * ``permission: Optional[Permission]``: 事件响应权限 - * ``handlers: Optional[List[Union[T_Handler, Handler]]]``: 事件处理函数列表 + * ``permission: Optional[Union[Permission, T_PermissionChecker]] =]]``: 事件响应权限 + * ``handlers: Optional[List[Union[T_Handler, Dependent]]]``: 事件处理函数列表 * ``temp: bool``: 是否为临时事件响应器（仅执行一次） * ``priority: int``: 事件响应器优先级 * ``block: bool``: 是否阻止事件向更低优先级传递 diff --git a/nonebot/plugin/on.pyi b/nonebot/plugin/on.pyi index bf1222ef..8cf990fd 100644 --- a/nonebot/plugin/on.pyi +++ b/nonebot/plugin/on.pyi @@ -1,18 +1,23 @@ import re from typing import Set, List, Type, Tuple, Union, Optional -from nonebot.handler import Handler from nonebot.matcher import Matcher from nonebot.permission import Permission +from nonebot.dependencies import Dependent from nonebot.rule import Rule, ArgumentParser -from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_StateFactory +from nonebot.typing import ( + T_State, + T_Handler, + T_RuleChecker, + T_PermissionChecker, +) def on( type: str = "", rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., *, - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -21,7 +26,7 @@ def on( def on_metaevent( rule: Optional[Union[Rule, T_RuleChecker]] = ..., *, - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -29,9 +34,9 @@ def on_metaevent( ) -> Type[Matcher]: ... def on_message( rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., *, - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -40,7 +45,7 @@ def on_message( def on_notice( rule: Optional[Union[Rule, T_RuleChecker]] = ..., *, - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -49,7 +54,7 @@ def on_notice( def on_request( rule: Optional[Union[Rule, T_RuleChecker]] = ..., *, - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -60,8 +65,8 @@ def on_startswith( rule: Optional[Optional[Union[Rule, T_RuleChecker]]] = ..., ignorecase: bool = ..., *, - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -72,8 +77,8 @@ def on_endswith( rule: Optional[Optional[Union[Rule, T_RuleChecker]]] = ..., ignorecase: bool = ..., *, - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -83,8 +88,8 @@ def on_keyword( keywords: Set[str], rule: Optional[Union[Rule, T_RuleChecker]] = ..., *, - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -95,8 +100,8 @@ def on_command( rule: Optional[Union[Rule, T_RuleChecker]] = ..., aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = ..., *, - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -108,8 +113,8 @@ def on_shell_command( aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = ..., parser: Optional[ArgumentParser] = ..., *, - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -120,8 +125,8 @@ def on_regex( flags: Union[int, re.RegexFlag] = ..., rule: Optional[Union[Rule, T_RuleChecker]] = ..., *, - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -134,8 +139,8 @@ class CommandGroup: cmd: Union[str, Tuple[str, ...]], *, rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -147,8 +152,8 @@ class CommandGroup: *, aliases: Optional[Set[Union[str, Tuple[str, ...]]]], rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -161,8 +166,8 @@ class CommandGroup: rule: Optional[Union[Rule, T_RuleChecker]] = ..., aliases: Optional[Set[Union[str, Tuple[str, ...]]]], parser: Optional[ArgumentParser] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -175,8 +180,8 @@ class MatcherGroup: *, type: str = ..., rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -187,8 +192,8 @@ class MatcherGroup: *, type: str = ..., rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -198,7 +203,7 @@ class MatcherGroup: self, *, rule: Optional[Union[Rule, T_RuleChecker]] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -208,8 +213,8 @@ class MatcherGroup: self, *, rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -219,7 +224,7 @@ class MatcherGroup: self, *, rule: Optional[Union[Rule, T_RuleChecker]] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -229,7 +234,7 @@ class MatcherGroup: self, *, rule: Optional[Union[Rule, T_RuleChecker]] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -241,8 +246,8 @@ class MatcherGroup: *, ignorecase: bool = ..., rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -254,8 +259,8 @@ class MatcherGroup: *, ignorecase: bool = ..., rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -266,8 +271,8 @@ class MatcherGroup: keywords: Set[str], *, rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -279,8 +284,8 @@ class MatcherGroup: aliases: Optional[Set[Union[str, Tuple[str, ...]]]] = ..., *, rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -293,8 +298,8 @@ class MatcherGroup: parser: Optional[ArgumentParser] = ..., *, rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., @@ -306,8 +311,8 @@ class MatcherGroup: flags: Union[int, re.RegexFlag] = ..., *, rule: Optional[Union[Rule, T_RuleChecker]] = ..., - permission: Optional[Permission] = ..., - handlers: Optional[List[Union[T_Handler, Handler]]] = ..., + permission: Optional[Union[Permission, T_PermissionChecker]] = ..., + handlers: Optional[List[Union[T_Handler, Dependent]]] = ..., temp: bool = ..., priority: int = ..., block: bool = ..., diff --git a/nonebot/rule.py b/nonebot/rule.py index 2408e4eb..a58d3125 100644 --- a/nonebot/rule.py +++ b/nonebot/rule.py @@ -17,27 +17,17 @@ from argparse import Namespace from contextlib import AsyncExitStack from typing_extensions import TypedDict from argparse import ArgumentParser as ArgParser -from typing import ( - Any, - Dict, - List, - Type, - Tuple, - Union, - Callable, - NoReturn, - Optional, - Sequence, -) +from typing import Any, Set, List, Tuple, Union, NoReturn, Optional, Sequence from pygtrie import CharTrie from nonebot.log import logger -from nonebot.handler import Handler +from nonebot.utils import CacheDict from nonebot import params, get_driver -from nonebot.typing import T_State, T_RuleChecker +from nonebot.dependencies import Dependent from nonebot.adapters import Bot, Event, MessageSegment from nonebot.exception import ParserExit, SkippedException +from nonebot.typing import T_State, T_Handler, T_RuleChecker PREFIX_KEY = "_prefix" SUFFIX_KEY = "_suffix" @@ -74,23 +64,24 @@ class Rule: __slots__ = ("checkers",) HANDLER_PARAM_TYPES = [ + params.DependParam, params.BotParam, params.EventParam, params.StateParam, params.DefaultParam, ] - def __init__(self, *checkers: Union[T_RuleChecker, Handler]) -> None: + def __init__(self, *checkers: Union[T_RuleChecker, Dependent[bool]]) -> None: """ :参数: - * ``*checkers: Union[T_RuleChecker, Handler]``: RuleChecker + * ``*checkers: Union[T_RuleChecker, Dependent[bool]]``: RuleChecker """ - self.checkers = set( + self.checkers: Set[Dependent[bool]] = set( checker - if isinstance(checker, Handler) - else Handler(checker, allow_types=self.HANDLER_PARAM_TYPES) + if isinstance(checker, Dependent) + else Dependent[bool](call=checker, allow_types=self.HANDLER_PARAM_TYPES) for checker in checkers ) """ @@ -100,7 +91,7 @@ class Rule: :类型: - * ``Set[Handler]`` + * ``Set[Dependent[bool]]`` """ async def __call__( @@ -109,7 +100,7 @@ class Rule: event: Event, state: T_State, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[Dict[Callable[..., Any], Any]] = None, + dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, ) -> bool: """ :说明: @@ -122,7 +113,7 @@ class Rule: * ``event: Event``: Event 对象 * ``state: T_State``: 当前 State * ``stack: Optional[AsyncExitStack]``: 异步上下文栈 - * ``dependency_cache: Optional[Dict[Callable[..., Any], Any]]``: 依赖缓存 + * ``dependency_cache: Optional[CacheDict[T_Handler, Any]]``: 依赖缓存 :返回: @@ -137,8 +128,8 @@ class Rule: bot=bot, event=event, state=state, - _stack=stack, - _dependency_cache=dependency_cache, + stack=stack, + dependency_cache=dependency_cache, ) for checker in self.checkers ) diff --git a/nonebot/typing.py b/nonebot/typing.py index 04632c72..bf9d1042 100644 --- a/nonebot/typing.py +++ b/nonebot/typing.py @@ -28,9 +28,11 @@ from typing import ( NoReturn, Optional, Awaitable, + ForwardRef, ) if TYPE_CHECKING: + from nonebot.utils import CacheDict from nonebot.adapters import Bot, Event from nonebot.permission import Permission @@ -53,14 +55,6 @@ T_State = Dict[Any, Any] 事件处理状态 State 类型 """ -T_StateFactory = Callable[["Bot", "Event"], Awaitable[T_State]] -""" -:类型: ``Callable[[Bot, Event], Awaitable[T_State]]`` - -:说明: - - 事件处理状态 State 类工厂函数 -""" T_BotConnectionHook = Callable[["Bot"], Awaitable[None]] """ @@ -103,9 +97,11 @@ T_EventPreProcessor = Callable[..., Union[None, Awaitable[None]]] :依赖参数: + * ``DependParam``: 子依赖参数 * ``BotParam``: Bot 对象 * ``EventParam``: Event 对象 * ``StateParam``: State 对象 + * ``DefaultParam``: 带有默认值的参数 :说明: @@ -117,9 +113,11 @@ T_EventPostProcessor = Callable[..., Union[None, Awaitable[None]]] :依赖参数: + * ``DependParam``: 子依赖参数 * ``BotParam``: Bot 对象 * ``EventParam``: Event 对象 * ``StateParam``: State 对象 + * ``DefaultParam``: 带有默认值的参数 :说明: @@ -131,10 +129,12 @@ T_RunPreProcessor = Callable[..., Union[None, Awaitable[None]]] :依赖参数: + * ``DependParam``: 子依赖参数 * ``BotParam``: Bot 对象 * ``EventParam``: Event 对象 * ``StateParam``: State 对象 * ``MatcherParam``: Matcher 对象 + * ``DefaultParam``: 带有默认值的参数 :说明: @@ -146,11 +146,13 @@ T_RunPostProcessor = Callable[..., Union[None, Awaitable[None]]] :依赖参数: + * ``DependParam``: 子依赖参数 * ``BotParam``: Bot 对象 * ``EventParam``: Event 对象 * ``StateParam``: State 对象 * ``MatcherParam``: Matcher 对象 * ``ExceptionParam``: 异常对象（可能为 None） + * ``DefaultParam``: 带有默认值的参数 :说明: @@ -163,9 +165,11 @@ T_RuleChecker = Callable[..., Union[bool, Awaitable[bool]]] :依赖参数: + * ``DependParam``: 子依赖参数 * ``BotParam``: Bot 对象 * ``EventParam``: Event 对象 * ``StateParam``: State 对象 + * ``DefaultParam``: 带有默认值的参数 :说明: @@ -177,8 +181,10 @@ T_PermissionChecker = Callable[..., Union[bool, Awaitable[bool]]] :依赖参数: + * ``DependParam``: 子依赖参数 * ``BotParam``: Bot 对象 * ``EventParam``: Event 对象 + * ``DefaultParam``: 带有默认值的参数 :说明: @@ -193,37 +199,52 @@ T_Handler = Callable[..., Any] Handler 处理函数。 """ -T_DependencyCache = Dict[T_Handler, Any] +T_ArgsParser = Callable[..., Union[None, Awaitable[None]]] """ -:类型: ``Dict[T_Handler, Any]`` +:类型: ``Callable[..., Union[None, Awaitable[None]]]`` -:说明: +:依赖参数: - 依赖缓存, 用于存储依赖函数的返回值 -""" -T_ArgsParser = Callable[ - ["Bot", "Event", T_State], Union[Awaitable[None], Awaitable[NoReturn]] -] -""" -:类型: ``Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]`` + * ``DependParam``: 子依赖参数 + * ``BotParam``: Bot 对象 + * ``EventParam``: Event 对象 + * ``StateParam``: State 对象 + * ``MatcherParam``: Matcher 对象 + * ``DefaultParam``: 带有默认值的参数 :说明: ArgsParser 即消息参数解析函数，在 Matcher.got 获取参数时被运行。 """ -T_TypeUpdater = Callable[["Bot", "Event", T_State, str], Awaitable[str]] +T_TypeUpdater = Callable[..., Union[str, Awaitable[str]]] """ -:类型: ``Callable[[Bot, Event, T_State, str], Awaitable[str]]`` +:类型: ``Callable[..., Union[None, Awaitable[None]]]`` + +:依赖参数: + + * ``DependParam``: 子依赖参数 + * ``BotParam``: Bot 对象 + * ``EventParam``: Event 对象 + * ``StateParam``: State 对象 + * ``MatcherParam``: Matcher 对象 + * ``DefaultParam``: 带有默认值的参数 :说明: TypeUpdater 在 Matcher.pause, Matcher.reject 时被运行，用于更新响应的事件类型。默认会更新为 ``message``。 """ -T_PermissionUpdater = Callable[ - ["Bot", "Event", T_State, "Permission"], Awaitable["Permission"] -] +T_PermissionUpdater = Callable[..., Union["Permission", Awaitable["Permission"]]] """ -:类型: ``Callable[[Bot, Event, T_State, Permission], Awaitable[Permission]]`` +:类型: ``Callable[..., Union[Permission, Awaitable[Permission]]]`` + +:依赖参数: + + * ``DependParam``: 子依赖参数 + * ``BotParam``: Bot 对象 + * ``EventParam``: Event 对象 + * ``StateParam``: State 对象 + * ``MatcherParam``: Matcher 对象 + * ``DefaultParam``: 带有默认值的参数 :说明: diff --git a/nonebot/utils.py b/nonebot/utils.py index 1c1f2e67..075ba667 100644 --- a/nonebot/utils.py +++ b/nonebot/utils.py @@ -2,17 +2,17 @@ import re import json import asyncio import inspect -import collections import dataclasses from functools import wraps, partial from contextlib import asynccontextmanager from typing_extensions import ParamSpec, get_args, get_origin from typing import ( Any, + Dict, Type, - Deque, Tuple, Union, + Generic, TypeVar, Callable, Optional, @@ -27,6 +27,8 @@ from nonebot.typing import overrides P = ParamSpec("P") R = TypeVar("R") T = TypeVar("T") +K = TypeVar("K") +V = TypeVar("V") def escape_tag(s: str) -> str: @@ -133,77 +135,31 @@ def get_name(obj: Any) -> str: return obj.__class__.__name__ -class CacheLock: - def __init__(self): - self._waiters: Optional[Deque[asyncio.Future]] = None - self._locked = False +class CacheDict(Dict[K, V], Generic[K, V]): + def __init__(self, *args, **kwargs): + super(CacheDict, self).__init__(*args, **kwargs) + self._lock = asyncio.Lock() + + @property + def locked(self): + return self._lock.locked() def __repr__(self): - extra = "locked" if self._locked else "unlocked" - if self._waiters: - extra = f"{extra}, waiters: {len(self._waiters)}" + extra = "locked" if self.locked else "unlocked" return f"<{self.__class__.__name__} [{extra}]>" - async def __aenter__(self): + async def __aenter__(self) -> None: await self.acquire() return None async def __aexit__(self, exc_type, exc, tb): self.release() - def locked(self): - return self._locked - async def acquire(self): - if not self._locked and ( - self._waiters is None or all(w.cancelled() for w in self._waiters) - ): - self._locked = True - return True - - if self._waiters is None: - self._waiters = collections.deque() - - loop = asyncio.get_running_loop() - future = loop.create_future() - self._waiters.append(future) - - # Finally block should be called before the CancelledError - # handling as we don't want CancelledError to call - # _wake_up_first() and attempt to wake up itself. - try: - try: - await future - finally: - self._waiters.remove(future) - except asyncio.CancelledError: - if not self._locked: - self._wake_up_first() - raise - - self._locked = True - return True + return await self._lock.acquire() def release(self): - if self._locked: - self._locked = False - self._wake_up_first() - else: - raise RuntimeError("Lock is not acquired.") - - def _wake_up_first(self): - if not self._waiters: - return - try: - future = next(iter(self._waiters)) - except StopIteration: - return - - # .done() necessarily means that a waiter will wake up later on and - # either take the lock, or, if it was cancelled and lock wasn't - # taken already, will hit this again and wake up a new waiter. - if not future.done(): - future.set_result(True) + self._lock.release() class DataclassEncoder(json.JSONEncoder): diff --git a/tests/plugins/depends.py b/tests/plugins/depends.py new file mode 100644 index 00000000..36f3c3fc --- /dev/null +++ b/tests/plugins/depends.py @@ -0,0 +1,23 @@ +from nonebot import on_message +from nonebot.adapters import Event +from nonebot.params import Depends + +test = on_message() +test2 = on_message() + +runned = False + + +def dependency(event: Event): + # test cache + global runned + assert not runned + runned = True + return event + + +@test.handle() +@test2.handle() +async def handle(x: Event = Depends(dependency)): + # test dependency + return x diff --git a/tests/test_init.py b/tests/test_init.py index b5f6ac96..61dbdae7 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -1,6 +1,12 @@ import os +import sys +from typing import TYPE_CHECKING, Set import pytest +from utils import load_plugin + +if TYPE_CHECKING: + from nonebot.plugin import Plugin os.environ["CONFIG_FROM_ENV"] = "env" @@ -17,3 +23,14 @@ async def test_init(nonebug_init): assert config.config_from_env == "env" assert config.config_from_init == "init" assert config.common_config == "common" + + +@pytest.mark.asyncio +async def test_load_plugin(load_plugin: Set["Plugin"]): + import nonebot + + assert nonebot.get_loaded_plugins() == load_plugin + plugin = nonebot.get_plugin("depends") + assert plugin + assert plugin.module_name == "plugins.depends" + assert "plugins.depends" in sys.modules diff --git a/tests/utils.py b/tests/utils.py new file mode 100644 index 00000000..0223b365 --- /dev/null +++ b/tests/utils.py @@ -0,0 +1,14 @@ +from pathlib import Path +from typing import TYPE_CHECKING, Set + +import pytest + +if TYPE_CHECKING: + from nonebot.plugin import Plugin + + +@pytest.fixture +def load_plugin(nonebug_init: None) -> Set["Plugin"]: + import nonebot + + return nonebot.load_plugins(str(Path(__file__).parent / "plugins")) From 60461c767ec2e64daf55970e87d24bc3af2e7f0f Mon Sep 17 00:00:00 2001 From: StarHeart Date: Sun, 12 Dec 2021 18:34:52 +0800 Subject: [PATCH 081/174] :memo: style tweaks --- README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 36678d52..cb926003 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义 目前 NoneBot2 内置的驱动框架： - [FastAPI](https://fastapi.tiangolo.com/) -- [Quart](https://pgjones.gitlab.io/quart/) (异步 flask ) +- [Quart](https://pgjones.gitlab.io/quart/) (异步 Flask) 目前 NoneBot2 官方维护的协议适配： @@ -128,7 +128,7 @@ NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义 或者尝试以下镜像： - [文档镜像(中国境内)](https://nb2.baka.icu) - - [文档镜像(vercel)](https://nonebot2-vercel-mirror.vercel.app) + - [文档镜像(Vercel)](https://nonebot2-vercel-mirror.vercel.app) - 其他插件请查看 [商店](https://v2.nonebot.dev/store.html) @@ -138,11 +138,9 @@ NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义 ## 贡献 -如果你在使用过程中发现任何问题，可以 [提交 issue](https://github.com/nonebot/nonebot2/issues/new) 或自行 fork 修改后提交 pull request。 +如果你在使用过程中发现任何问题，可以 [提交 Issue](https://github.com/nonebot/nonebot2/issues/new) 或自行 Fork 修改后提交 Pull Request。 -如果你要提交 pull request，请确保你的代码风格和项目已有的代码保持一致，遵循 [PEP 8](https://www.python.org/dev/peps/pep-0008/) [PEP 484](https://www.python.org/dev/peps/pep-0484/)，变量命名清晰，有适当的注释。 - -**Pull Request 请以 `dev` 分支作为目标分支** +如果你要提交 Pull Request，请确保你的代码风格和项目已有的代码保持一致，遵循 [PEP 8](https://www.python.org/dev/peps/pep-0008/) 与 [PEP 484](https://www.python.org/dev/peps/pep-0484/)，变量命名清晰，有适当的注释，**并且请以 `dev` 分支作为 Pull Request 目标分支**。 感谢以下开发者对 NoneBot2 的贡献： From 3b8ba6ee3a52e627efbedd1a44e3b11ea9691009 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 12 Dec 2021 18:44:12 +0800 Subject: [PATCH 082/174] :memo: update doc --- docs_build/config.rst | 4 +++- docs_build/dependencies.rst | 6 ++++-- docs_build/exception.rst | 4 +++- docs_build/handler.rst | 10 ---------- docs_build/log.rst | 4 +++- docs_build/matcher.rst | 4 +++- docs_build/message.rst | 4 +++- docs_build/permission.rst | 4 +++- docs_build/plugin.rst | 4 +++- docs_build/rule.rst | 4 +++- docs_build/typing.rst | 4 +++- docs_build/utils.rst | 4 +++- website/docs/api/adapters/_category_.json | 3 +++ website/docs/api/drivers/_category_.json | 3 +++ 14 files changed, 40 insertions(+), 22 deletions(-) delete mode 100644 docs_build/handler.rst create mode 100644 website/docs/api/adapters/_category_.json create mode 100644 website/docs/api/drivers/_category_.json diff --git a/docs_build/config.rst b/docs_build/config.rst index be976ded..157e248a 100644 --- a/docs_build/config.rst +++ b/docs_build/config.rst @@ -1,4 +1,6 @@ - +\-\-\- +sidebar_position: 2 +\-\-\- NoneBot.config 模块 =================== diff --git a/docs_build/dependencies.rst b/docs_build/dependencies.rst index 23252c0d..00256bc5 100644 --- a/docs_build/dependencies.rst +++ b/docs_build/dependencies.rst @@ -1,6 +1,8 @@ +\-\-\- +sidebar_position: 8 +\-\-\- - -NoneBot.handler 模块 +NoneBot.dependencies 模块 ==================== .. automodule:: nonebot.dependencies diff --git a/docs_build/exception.rst b/docs_build/exception.rst index c112b951..619c5632 100644 --- a/docs_build/exception.rst +++ b/docs_build/exception.rst @@ -1,4 +1,6 @@ - +\-\-\- +sidebar_position: 12 +\-\-\- NoneBot.exception 模块 ====================== diff --git a/docs_build/handler.rst b/docs_build/handler.rst deleted file mode 100644 index 79152d5b..00000000 --- a/docs_build/handler.rst +++ /dev/null @@ -1,10 +0,0 @@ - - -NoneBot.handler 模块 -==================== - -.. automodule:: nonebot.handler - :members: - :private-members: - :special-members: __init__ - :show-inheritance: diff --git a/docs_build/log.rst b/docs_build/log.rst index 80a16ead..208befdf 100644 --- a/docs_build/log.rst +++ b/docs_build/log.rst @@ -1,4 +1,6 @@ - +\-\-\- +sidebar_position: 9 +\-\-\- NoneBot.log 模块 ================= diff --git a/docs_build/matcher.rst b/docs_build/matcher.rst index 0551e757..1acbcc76 100644 --- a/docs_build/matcher.rst +++ b/docs_build/matcher.rst @@ -1,4 +1,6 @@ - +\-\-\- +sidebar_position: 5 +\-\-\- NoneBot.matcher 模块 ==================== diff --git a/docs_build/message.rst b/docs_build/message.rst index 086023b3..44583499 100644 --- a/docs_build/message.rst +++ b/docs_build/message.rst @@ -1,4 +1,6 @@ - +\-\-\- +sidebar_position: 4 +\-\-\- NoneBot.message 模块 ====================== diff --git a/docs_build/permission.rst b/docs_build/permission.rst index 77fca180..216bd2c7 100644 --- a/docs_build/permission.rst +++ b/docs_build/permission.rst @@ -1,4 +1,6 @@ - +\-\-\- +sidebar_position: 7 +\-\-\- NoneBot.permission 模块 ======================= diff --git a/docs_build/plugin.rst b/docs_build/plugin.rst index 550b6795..23f888ed 100644 --- a/docs_build/plugin.rst +++ b/docs_build/plugin.rst @@ -1,4 +1,6 @@ - +\-\-\- +sidebar_position: 3 +\-\-\- NoneBot.plugin 模块 ==================== diff --git a/docs_build/rule.rst b/docs_build/rule.rst index 9d6c72e2..f51d539d 100644 --- a/docs_build/rule.rst +++ b/docs_build/rule.rst @@ -1,4 +1,6 @@ - +\-\-\- +sidebar_position: 6 +\-\-\- NoneBot.rule 模块 ==================== diff --git a/docs_build/typing.rst b/docs_build/typing.rst index 315963bc..fb398047 100644 --- a/docs_build/typing.rst +++ b/docs_build/typing.rst @@ -1,4 +1,6 @@ - +\-\-\- +sidebar_position: 11 +\-\-\- NoneBot.typing 模块 =================== diff --git a/docs_build/utils.rst b/docs_build/utils.rst index 0e7f1ab9..e3fae252 100644 --- a/docs_build/utils.rst +++ b/docs_build/utils.rst @@ -1,4 +1,6 @@ - +\-\-\- +sidebar_position: 10 +\-\-\- NoneBot.utils 模块 ================== diff --git a/website/docs/api/adapters/_category_.json b/website/docs/api/adapters/_category_.json new file mode 100644 index 00000000..3714fde8 --- /dev/null +++ b/website/docs/api/adapters/_category_.json @@ -0,0 +1,3 @@ +{ + "position": 14 +} diff --git a/website/docs/api/drivers/_category_.json b/website/docs/api/drivers/_category_.json new file mode 100644 index 00000000..6bd1772a --- /dev/null +++ b/website/docs/api/drivers/_category_.json @@ -0,0 +1,3 @@ +{ + "position": 13 +} From e942f4076c045ccb84d29b246bcc7074cb9c50f3 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 13 Dec 2021 00:37:07 +0800 Subject: [PATCH 083/174] :bug: fix builtin bug --- nonebot/params.py | 12 ++++++------ nonebot/plugin/on.py | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/nonebot/params.py b/nonebot/params.py index b92e9a15..4023f03d 100644 --- a/nonebot/params.py +++ b/nonebot/params.py @@ -156,7 +156,7 @@ class BotParam(Param): ): return cls(Required) - def _solve(self, bot: Bot, **kwargs: Any) -> Any: + async def _solve(self, bot: Bot, **kwargs: Any) -> Any: return bot @@ -171,7 +171,7 @@ class EventParam(Param): ): return cls(Required) - def _solve(self, event: Event, **kwargs: Any) -> Any: + async def _solve(self, event: Event, **kwargs: Any) -> Any: return event @@ -191,7 +191,7 @@ class StateParam(Param): if isinstance(param.default, StateInner): return cls(Required) - def _solve(self, state: T_State, **kwargs: Any) -> Any: + async def _solve(self, state: T_State, **kwargs: Any) -> Any: return state @@ -205,7 +205,7 @@ class MatcherParam(Param): ): return cls(Required) - def _solve(self, matcher: "Matcher", **kwargs: Any) -> Any: + async def _solve(self, matcher: "Matcher", **kwargs: Any) -> Any: return matcher @@ -219,7 +219,7 @@ class ExceptionParam(Param): ): return cls(Required) - def _solve(self, exception: Optional[Exception] = None, **kwargs: Any) -> Any: + async def _solve(self, exception: Optional[Exception] = None, **kwargs: Any) -> Any: return exception @@ -231,7 +231,7 @@ class DefaultParam(Param): if param.default != param.empty: return cls(param.default) - def _solve(self, **kwargs: Any) -> Any: + async def _solve(self, **kwargs: Any) -> Any: return Undefined diff --git a/nonebot/plugin/on.py b/nonebot/plugin/on.py index f0a5523c..5f65a21b 100644 --- a/nonebot/plugin/on.py +++ b/nonebot/plugin/on.py @@ -4,6 +4,7 @@ import inspect from types import ModuleType from typing import Any, Set, Dict, List, Type, Tuple, Union, Optional +from nonebot.params import State from nonebot.adapters import Event from nonebot.matcher import Matcher from .manager import _current_plugin @@ -393,7 +394,7 @@ def on_command( - ``Type[Matcher]`` """ - async def _strip_cmd(event: Event, state: T_State): + async def _strip_cmd(event: Event, state: T_State = State()): message = event.get_message() if len(message) < 1: return @@ -451,7 +452,7 @@ def on_shell_command( - ``Type[Matcher]`` """ - async def _strip_cmd(event: Event, state: T_State): + async def _strip_cmd(event: Event, state: T_State = State()): message = event.get_message() segment = message.pop(0) new_message = message.__class__( From 329a1fd226862ca11125a66a104d6313345e6843 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 14 Dec 2021 01:08:48 +0800 Subject: [PATCH 084/174] :sparkles: add di functions --- nonebot/consts.py | 25 ++++++++++ nonebot/dependencies/utils.py | 1 + nonebot/params.py | 91 +++++++++++++++++++++++++++++++++-- nonebot/plugin/on.py | 34 +------------ nonebot/rule.py | 68 ++++++++++++-------------- nonebot/utils.py | 2 +- 6 files changed, 147 insertions(+), 74 deletions(-) diff --git a/nonebot/consts.py b/nonebot/consts.py index a8867395..ae70ea7f 100644 --- a/nonebot/consts.py +++ b/nonebot/consts.py @@ -1,4 +1,29 @@ +# used by Params +WRAPPER_ASSIGNMENTS = ( + "__module__", + "__name__", + "__qualname__", + "__doc__", + "__annotations__", + "__globals__", +) + +# used by Matcher RECEIVE_KEY = "_receive_{id}" ARG_KEY = "_arg_{key}" ARG_STR_KEY = "{key}" REJECT_TARGET = "_current_target" + +# used by Rule +PREFIX_KEY = "_prefix" + +CMD_KEY = "command" +RAW_CMD_KEY = "raw_command" +CMD_ARG_KEY = "command_arg" + +SHELL_ARGS = "_args" +SHELL_ARGV = "_argv" + +REGEX_MATCHED = "_matched" +REGEX_GROUP = "_matched_groups" +REGEX_DICT = "_matched_dict" diff --git a/nonebot/dependencies/utils.py b/nonebot/dependencies/utils.py index 56a815ff..4f587803 100644 --- a/nonebot/dependencies/utils.py +++ b/nonebot/dependencies/utils.py @@ -8,6 +8,7 @@ from pydantic.typing import ForwardRef, evaluate_forwardref def get_typed_signature(call: Callable[..., Any]) -> inspect.Signature: signature = inspect.signature(call) globalns = getattr(call, "__globals__", {}) + print(signature.parameters) typed_params = [ inspect.Parameter( name=param.name, diff --git a/nonebot/params.py b/nonebot/params.py index 4023f03d..d21c633e 100644 --- a/nonebot/params.py +++ b/nonebot/params.py @@ -1,12 +1,25 @@ import inspect -from typing import Any, List, Type, Callable, Optional, cast +from functools import wraps, partial +from typing import Any, Tuple, Union, TypeVar, Callable, Optional, cast from contextlib import AsyncExitStack, contextmanager, asynccontextmanager from pydantic.fields import Required, Undefined -from nonebot.adapters import Bot, Event from nonebot.typing import T_State, T_Handler +from nonebot.adapters import Bot, Event, Message from nonebot.dependencies import Param, Dependent +from nonebot.consts import ( + CMD_KEY, + PREFIX_KEY, + REGEX_DICT, + SHELL_ARGS, + SHELL_ARGV, + CMD_ARG_KEY, + RAW_CMD_KEY, + REGEX_GROUP, + REGEX_MATCHED, + WRAPPER_ASSIGNMENTS, +) from nonebot.utils import ( CacheDict, get_name, @@ -18,6 +31,8 @@ from nonebot.utils import ( generic_check_issubclass, ) +T = TypeVar("T") + class DependsInner: def __init__( @@ -175,12 +190,44 @@ class EventParam(Param): return event +async def _event_type(event: Event) -> str: + return event.get_type() + + +def EventType() -> str: + return Depends(_event_type) + + +async def _event_message(event: Event) -> Message: + return event.get_message() + + +def EventMessage() -> Message: + return Depends(_event_message) + + +async def _event_plain_text(event: Event) -> str: + return event.get_plaintext() + + +def EventPlainText() -> str: + return Depends(_event_plain_text) + + +async def _event_to_me(event: Event) -> bool: + return event.is_tome() + + +def EventToMe() -> bool: + return Depends(_event_to_me) + + class StateInner: ... -def State() -> Any: - return StateInner() +def State() -> T_State: + return StateInner() # type: ignore class StateParam(Param): @@ -195,6 +242,30 @@ class StateParam(Param): return state +def _command(state=State()) -> Message: + return state[PREFIX_KEY][CMD_KEY] + + +def Command() -> Tuple[str, ...]: + return Depends(_command) + + +def _raw_command(state=State()) -> Message: + return state[PREFIX_KEY][RAW_CMD_KEY] + + +def RawCommand() -> str: + return Depends(_raw_command) + + +def _command_arg(state=State()) -> Message: + return state[PREFIX_KEY][CMD_ARG_KEY] + + +def CommandArg() -> Message: + return Depends(_command_arg) + + class MatcherParam(Param): @classmethod def _check_param( @@ -209,6 +280,18 @@ class MatcherParam(Param): return matcher +def _received(matcher: "Matcher", id: str = "", default: T = None) -> Union[Event, T]: + return matcher.get_receive(id, default) + + +def Received(id: str = "", default: Any = None) -> Any: + return Depends( + wraps(_received, assigned=WRAPPER_ASSIGNMENTS)( + partial(_received, id=id, default=default) + ) + ) + + class ExceptionParam(Param): @classmethod def _check_param( diff --git a/nonebot/plugin/on.py b/nonebot/plugin/on.py index 5f65a21b..d302cfdf 100644 --- a/nonebot/plugin/on.py +++ b/nonebot/plugin/on.py @@ -394,27 +394,8 @@ def on_command( - ``Type[Matcher]`` """ - async def _strip_cmd(event: Event, state: T_State = State()): - message = event.get_message() - if len(message) < 1: - return - segment = message.pop(0) - segment_text = str(segment).lstrip() - if not segment_text.startswith(state[PREFIX_KEY][RAW_CMD_KEY]): - return - new_message = message.__class__( - segment_text[len(state[PREFIX_KEY][RAW_CMD_KEY]) :].lstrip() - ) - for new_segment in reversed(new_message): - message.insert(0, new_segment) - - handlers = kwargs.pop("handlers", []) - handlers.insert(0, _strip_cmd) - commands = set([cmd]) | (aliases or set()) - return on_message( - command(*commands) & rule, handlers=handlers, **kwargs, _depth=_depth + 1 - ) + return on_message(command(*commands) & rule, **kwargs, _depth=_depth + 1) def on_shell_command( @@ -452,22 +433,9 @@ def on_shell_command( - ``Type[Matcher]`` """ - async def _strip_cmd(event: Event, state: T_State = State()): - message = event.get_message() - segment = message.pop(0) - new_message = message.__class__( - str(segment)[len(state[PREFIX_KEY][RAW_CMD_KEY]) :].strip() - ) - for new_segment in reversed(new_message): - message.insert(0, new_segment) - - handlers = kwargs.pop("handlers", []) - handlers.insert(0, _strip_cmd) - commands = set([cmd]) | (aliases or set()) return on_message( shell_command(*commands, parser=parser) & rule, - handlers=handlers, **kwargs, _depth=_depth + 1, ) diff --git a/nonebot/rule.py b/nonebot/rule.py index a58d3125..627f18c6 100644 --- a/nonebot/rule.py +++ b/nonebot/rule.py @@ -25,24 +25,29 @@ from nonebot.log import logger from nonebot.utils import CacheDict from nonebot import params, get_driver from nonebot.dependencies import Dependent -from nonebot.adapters import Bot, Event, MessageSegment from nonebot.exception import ParserExit, SkippedException from nonebot.typing import T_State, T_Handler, T_RuleChecker - -PREFIX_KEY = "_prefix" -SUFFIX_KEY = "_suffix" -CMD_KEY = "command" -RAW_CMD_KEY = "raw_command" -CMD_RESULT = TypedDict( - "CMD_RESULT", {"command": Optional[Tuple[str, ...]], "raw_command": Optional[str]} +from nonebot.adapters import Bot, Event, Message, MessageSegment +from nonebot.consts import ( + CMD_KEY, + PREFIX_KEY, + REGEX_DICT, + SHELL_ARGS, + SHELL_ARGV, + CMD_ARG_KEY, + RAW_CMD_KEY, + REGEX_GROUP, + REGEX_MATCHED, ) -SHELL_ARGS = "_args" -SHELL_ARGV = "_argv" - -REGEX_MATCHED = "_matched" -REGEX_GROUP = "_matched_groups" -REGEX_DICT = "_matched_dict" +CMD_RESULT = TypedDict( + "CMD_RESULT", + { + "command": Optional[Tuple[str, ...]], + "raw_command": Optional[str], + "command_arg": Optional[Message[MessageSegment]], + }, +) class Rule: @@ -152,7 +157,6 @@ class Rule: class TrieRule: prefix: CharTrie = CharTrie() - suffix: CharTrie = CharTrie() @classmethod def add_prefix(cls, prefix: str, value: Any): @@ -162,36 +166,28 @@ class TrieRule: cls.prefix[prefix] = value @classmethod - def add_suffix(cls, suffix: str, value: Any): - if suffix[::-1] in cls.suffix: - logger.warning(f'Duplicated suffix rule "{suffix}"') - return - cls.suffix[suffix[::-1]] = value - - @classmethod - def get_value( - cls, bot: Bot, event: Event, state: T_State - ) -> Tuple[CMD_RESULT, CMD_RESULT]: - prefix = CMD_RESULT(command=None, raw_command=None) - suffix = CMD_RESULT(command=None, raw_command=None) + def get_value(cls, bot: Bot, event: Event, state: T_State) -> CMD_RESULT: + prefix = CMD_RESULT(command=None, raw_command=None, command_arg=None) state[PREFIX_KEY] = prefix - state[SUFFIX_KEY] = suffix if event.get_type() != "message": - return prefix, suffix + return prefix message = event.get_message() message_seg: MessageSegment = message[0] if message_seg.is_text(): - pf = cls.prefix.longest_prefix(str(message_seg).lstrip()) + segment_text = str(message_seg).lstrip() + pf = cls.prefix.longest_prefix(segment_text) prefix[RAW_CMD_KEY] = pf.key prefix[CMD_KEY] = pf.value - message_seg_r: MessageSegment = message[-1] - if message_seg_r.is_text(): - sf = cls.suffix.longest_prefix(str(message_seg_r).rstrip()[::-1]) - suffix[RAW_CMD_KEY] = sf.key - suffix[CMD_KEY] = sf.value + if pf.key: + msg = message.copy() + msg.pop(0) + new_message = msg.__class__(segment_text[len(pf.key) :].lstrip()) + for new_segment in reversed(new_message): + msg.insert(0, new_segment) + prefix[CMD_ARG_KEY] = msg - return prefix, suffix + return prefix class Startswith: diff --git a/nonebot/utils.py b/nonebot/utils.py index 075ba667..57756f58 100644 --- a/nonebot/utils.py +++ b/nonebot/utils.py @@ -64,7 +64,7 @@ def generic_check_issubclass( return True elif origin: return issubclass(origin, class_or_tuple) - raise + return False def is_coroutine_callable(call: Callable[..., Any]) -> bool: From de7c51a518a21132304c16de038273c9b7698ef8 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 14 Dec 2021 22:40:47 +0800 Subject: [PATCH 085/174] :alembic: add regex and shell command di function --- nonebot/consts.py | 11 +----- nonebot/dependencies/utils.py | 1 - nonebot/matcher.py | 20 ++++++++--- nonebot/params.py | 66 +++++++++++++++++++++++++++-------- 4 files changed, 68 insertions(+), 30 deletions(-) diff --git a/nonebot/consts.py b/nonebot/consts.py index ae70ea7f..47ee68ab 100644 --- a/nonebot/consts.py +++ b/nonebot/consts.py @@ -1,15 +1,6 @@ -# used by Params -WRAPPER_ASSIGNMENTS = ( - "__module__", - "__name__", - "__qualname__", - "__doc__", - "__annotations__", - "__globals__", -) - # used by Matcher RECEIVE_KEY = "_receive_{id}" +LAST_RECEIVE_KEY = "_last_receive" ARG_KEY = "_arg_{key}" ARG_STR_KEY = "{key}" REJECT_TARGET = "_current_target" diff --git a/nonebot/dependencies/utils.py b/nonebot/dependencies/utils.py index 4f587803..56a815ff 100644 --- a/nonebot/dependencies/utils.py +++ b/nonebot/dependencies/utils.py @@ -8,7 +8,6 @@ from pydantic.typing import ForwardRef, evaluate_forwardref def get_typed_signature(call: Callable[..., Any]) -> inspect.Signature: signature = inspect.signature(call) globalns = getattr(call, "__globals__", {}) - print(signature.parameters) typed_params = [ inspect.Parameter( name=param.name, diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 5d079718..5f06f309 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -29,7 +29,6 @@ from nonebot.log import logger from nonebot.utils import CacheDict from nonebot.dependencies import Dependent from nonebot.permission import USER, Permission -from nonebot.consts import ARG_KEY, ARG_STR_KEY, RECEIVE_KEY, REJECT_TARGET from nonebot.adapters import ( Bot, Event, @@ -37,6 +36,13 @@ from nonebot.adapters import ( MessageSegment, MessageTemplate, ) +from nonebot.consts import ( + ARG_KEY, + ARG_STR_KEY, + RECEIVE_KEY, + REJECT_TARGET, + LAST_RECEIVE_KEY, +) from nonebot.typing import ( Any, T_State, @@ -422,7 +428,7 @@ class Matcher(metaclass=MatcherMeta): @classmethod def receive( - cls, id: str = "", parameterless: Optional[List[Any]] = None + cls, id: Optional[str] = None, parameterless: Optional[List[Any]] = None ) -> Callable[[T_Handler], T_Handler]: """ :说明: @@ -611,11 +617,15 @@ class Matcher(metaclass=MatcherMeta): await bot.send(event=event, message=_prompt, **kwargs) raise RejectedException - def get_receive(self, id: str, default: T = None) -> Union[Event, T]: + def get_receive(self, id: Optional[str], default: T = None) -> Union[Event, T]: + if id is None: + return self.state.get(LAST_RECEIVE_KEY, default) return self.state.get(RECEIVE_KEY.format(id=id), default) - def set_receive(self, id: str, event: Event) -> None: - self.state[RECEIVE_KEY.format(id=id)] = event + def set_receive(self, id: Optional[str], event: Event) -> None: + if id is not None: + self.state[RECEIVE_KEY.format(id=id)] = event + self.state[LAST_RECEIVE_KEY] = event def get_arg(self, key: str, default: T = None) -> Union[Event, T]: return self.state.get(ARG_KEY.format(key=key), default) diff --git a/nonebot/params.py b/nonebot/params.py index d21c633e..50358736 100644 --- a/nonebot/params.py +++ b/nonebot/params.py @@ -1,6 +1,5 @@ import inspect -from functools import wraps, partial -from typing import Any, Tuple, Union, TypeVar, Callable, Optional, cast +from typing import Any, Dict, List, Tuple, Callable, Optional, cast from contextlib import AsyncExitStack, contextmanager, asynccontextmanager from pydantic.fields import Required, Undefined @@ -18,7 +17,6 @@ from nonebot.consts import ( RAW_CMD_KEY, REGEX_GROUP, REGEX_MATCHED, - WRAPPER_ASSIGNMENTS, ) from nonebot.utils import ( CacheDict, @@ -31,8 +29,6 @@ from nonebot.utils import ( generic_check_issubclass, ) -T = TypeVar("T") - class DependsInner: def __init__( @@ -53,7 +49,7 @@ class DependsInner: def Depends( dependency: Optional[T_Handler] = None, *, - use_cache: bool = True, + use_cache: bool = False, ) -> Any: """ :说明: @@ -266,6 +262,46 @@ def CommandArg() -> Message: return Depends(_command_arg) +def _shell_command_args(state=State()) -> Any: + return state[SHELL_ARGS] + + +def ShellCommandArgs(): + return Depends(_shell_command_args) + + +def _shell_command_argv(state=State()) -> List[str]: + return state[SHELL_ARGV] + + +def ShellCommandArgv() -> Any: + return Depends(_shell_command_argv) + + +def _regex_matched(state=State()) -> str: + return state[REGEX_MATCHED] + + +def RegexMatched() -> str: + return Depends(_regex_matched) + + +def _regex_group(state=State()): + return state[REGEX_GROUP] + + +def RegexGroup() -> Tuple[Any, ...]: + return Depends(_regex_group) + + +def _regex_dict(state=State()): + return state[REGEX_DICT] + + +def RegexDict() -> Dict[str, Any]: + return Depends(_regex_dict) + + class MatcherParam(Param): @classmethod def _check_param( @@ -280,16 +316,18 @@ class MatcherParam(Param): return matcher -def _received(matcher: "Matcher", id: str = "", default: T = None) -> Union[Event, T]: - return matcher.get_receive(id, default) +def Received(id: str, default: Any = None) -> Any: + def _received(matcher: "Matcher"): + return matcher.get_receive(id, default) + + return Depends(_received) -def Received(id: str = "", default: Any = None) -> Any: - return Depends( - wraps(_received, assigned=WRAPPER_ASSIGNMENTS)( - partial(_received, id=id, default=default) - ) - ) +def LastReceived(default: Any = None) -> Any: + def _last_received(matcher: "Matcher") -> Any: + return matcher.get_receive(None, default) + + return Depends(_last_received) class ExceptionParam(Param): From acbb886942b926136828d7b5073dafa010fc29c8 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 16 Dec 2021 16:20:33 +0800 Subject: [PATCH 086/174] :arrow_up: update dependency --- poetry.lock | 22 +++++++++++----------- tests/plugins/depends.py | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/poetry.lock b/poetry.lock index b7ccbb28..bfcc66d2 100644 --- a/poetry.lock +++ b/poetry.lock @@ -270,7 +270,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "fastapi" -version = "0.70.0" +version = "0.70.1" description = "FastAPI framework, high performance, easy to learn, fast to code, ready for production" category = "main" optional = false @@ -381,7 +381,7 @@ http2 = ["h2 (>=3,<5)"] [[package]] name = "hypercorn" -version = "0.12.0" +version = "0.13.0" description = "A ASGI Server based on Hyper libraries and inspired by Gunicorn" category = "main" optional = true @@ -534,7 +534,7 @@ python-versions = "^3.7.3" develop = false [package.dependencies] -nonebot2 = "^2.0.0-alpha.14" +nonebot2 = "^2.0.0-beta.1" pytest = "^6.2.5" pytest-asyncio = "^0.16.0" pytest-order = "^1.0.0" @@ -543,7 +543,7 @@ pytest-order = "^1.0.0" type = "git" url = "https://github.com/nonebot/nonebug.git" reference = "master" -resolved_reference = "e276dfcfadd242f14158f125fa1ed5915973a30a" +resolved_reference = "4584d5a4bc95cd1bafcec08599ab7d72815e268e" [[package]] name = "packaging" @@ -991,7 +991,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" [[package]] name = "tomli" -version = "1.2.2" +version = "1.2.3" description = "A lil' TOML parser" category = "dev" optional = false @@ -1510,8 +1510,8 @@ docutils = [ {file = "docutils-0.17.1.tar.gz", hash = "sha256:686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125"}, ] fastapi = [ - {file = "fastapi-0.70.0-py3-none-any.whl", hash = "sha256:a36d5f2fad931aa3575c07a3472c784e81f3e664e3bb5c8b9c88d0ec1104f59c"}, - {file = "fastapi-0.70.0.tar.gz", hash = "sha256:66da43cfe5185ea1df99552acffd201f1832c6b364e0f4136c0a99f933466ced"}, + {file = "fastapi-0.70.1-py3-none-any.whl", hash = "sha256:5367226c7bcd7bfb2e17edaf225fd9a983095b1372281e9a3eb661336fb93748"}, + {file = "fastapi-0.70.1.tar.gz", hash = "sha256:21d03979b5336375c66fa5d1f3126c6beca650d5d2166fbb78345a30d33c8d06"}, ] frozenlist = [ {file = "frozenlist-1.2.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:977a1438d0e0d96573fd679d291a1542097ea9f4918a8b6494b06610dfeefbf9"}, @@ -1629,8 +1629,8 @@ httpx = [ {file = "httpx-0.21.1.tar.gz", hash = "sha256:02af20df486b78892a614a7ccd4e4e86a5409ec4981ab0e422c579a887acad83"}, ] hypercorn = [ - {file = "Hypercorn-0.12.0-py3-none-any.whl", hash = "sha256:485a03dc171549dd802c5a2d4cce2d46daf077fbc06c7db90e0862ebc1bd07c9"}, - {file = "Hypercorn-0.12.0.tar.gz", hash = "sha256:0504720bfc3fad83b4520b37fa5032b75ee3f2e71d26d6f7fea41fa2995b0138"}, + {file = "Hypercorn-0.13.0-py3-none-any.whl", hash = "sha256:eafbed8b1cb9827552c0066386d3e693c16d3977dd60896bfa07dca4c9d92a20"}, + {file = "Hypercorn-0.13.0.tar.gz", hash = "sha256:229d1e8684919c455281526d7c19e3568d51e4e5657a0051a4625d00902a1122"}, ] hyperframe = [ {file = "hyperframe-6.0.1-py3-none-any.whl", hash = "sha256:0ec6bafd80d8ad2195c4f03aacba3a8265e57bc4cff261e802bf39970ed02a15"}, @@ -2035,8 +2035,8 @@ toml = [ {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, ] tomli = [ - {file = "tomli-1.2.2-py3-none-any.whl", hash = "sha256:f04066f68f5554911363063a30b108d2b5a5b1a010aa8b6132af78489fe3aade"}, - {file = "tomli-1.2.2.tar.gz", hash = "sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee"}, + {file = "tomli-1.2.3-py3-none-any.whl", hash = "sha256:e3069e4be3ead9668e21cb9b074cd948f7b3113fd9c8bba083f48247aab8b11c"}, + {file = "tomli-1.2.3.tar.gz", hash = "sha256:05b6166bff487dc068d322585c7ea4ef78deed501cc124060e0f238e89a9231f"}, ] tomlkit = [ {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"}, diff --git a/tests/plugins/depends.py b/tests/plugins/depends.py index 36f3c3fc..e9690785 100644 --- a/tests/plugins/depends.py +++ b/tests/plugins/depends.py @@ -18,6 +18,6 @@ def dependency(event: Event): @test.handle() @test2.handle() -async def handle(x: Event = Depends(dependency)): +async def handle(x: Event = Depends(dependency, use_cache=True)): # test dependency return x From fe69735ca00b791c731ee583dcf19957ca6c98bf Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 16 Dec 2021 17:28:57 +0800 Subject: [PATCH 087/174] :white_check_mark: add test cases --- nonebot/__init__.py | 8 +++--- nonebot/config.py | 7 ++--- nonebot/log.py | 2 +- tests/.coveragerc | 6 +++++ tests/.env.test | 1 + tests/plugins/export.py | 6 +++++ tests/plugins/require.py | 8 ++++++ tests/pyproject.toml | 2 ++ tests/test_init.py | 57 +++++++++++++++++++++++++++++++++++++--- 9 files changed, 85 insertions(+), 12 deletions(-) create mode 100644 tests/.coveragerc create mode 100644 tests/plugins/export.py create mode 100644 tests/plugins/require.py create mode 100644 tests/pyproject.toml diff --git a/nonebot/__init__.py b/nonebot/__init__.py index 9d90ac19..92d63d75 100644 --- a/nonebot/__init__.py +++ b/nonebot/__init__.py @@ -43,7 +43,7 @@ try: _dist: pkg_resources.Distribution = pkg_resources.get_distribution("nonebot2") __version__ = _dist.version VERSION = _dist.parsed_version -except pkg_resources.DistributionNotFound: +except pkg_resources.DistributionNotFound: # pragma: no cover __version__ = None VERSION = None @@ -252,7 +252,7 @@ def init(*, _env_file: Optional[str] = None, **kwargs): _driver = DriverClass(env, config) -def run(host: Optional[str] = None, port: Optional[int] = None, *args, **kwargs): +def run(*args: Any, **kwargs: Any) -> None: """ :说明: @@ -260,8 +260,6 @@ def run(host: Optional[str] = None, port: Optional[int] = None, *args, **kwargs) :参数: - * ``host: Optional[str]``: 主机名／IP，若不传入则使用配置文件中指定的值 - * ``port: Optional[int]``: 端口，若不传入则使用配置文件中指定的值 * ``*args``: 传入 Driver.run 的位置参数 * ``**kwargs``: 传入 Driver.run 的命名参数 @@ -277,7 +275,7 @@ def run(host: Optional[str] = None, port: Optional[int] = None, *args, **kwargs) """ logger.success("Running NoneBot...") - get_driver().run(host, port, *args, **kwargs) + get_driver().run(*args, **kwargs) import nonebot.params as params diff --git a/nonebot/config.py b/nonebot/config.py index 71fb532b..99507fa7 100644 --- a/nonebot/config.py +++ b/nonebot/config.py @@ -38,7 +38,7 @@ class CustomEnvSettings(EnvSettingsSource): d: Dict[str, Optional[str]] = {} if settings.__config__.case_sensitive: - env_vars: Mapping[str, Optional[str]] = os.environ + env_vars: Mapping[str, Optional[str]] = os.environ # pragma: no cover else: env_vars = {k.lower(): v for k, v in os.environ.items()} @@ -78,7 +78,7 @@ class CustomEnvSettings(EnvSettingsSource): if field.is_complex(): try: env_val = settings.__config__.json_loads(env_val) - except ValueError as e: + except ValueError as e: # pragma: no cover raise SettingsError( f'error parsing JSON for "{env_name}"' # type: ignore ) from e @@ -100,7 +100,8 @@ class CustomEnvSettings(EnvSettingsSource): class BaseConfig(BaseSettings): - def __getattr__(self, name: str) -> Any: + # dummy getattr for pylance checking, actually not used + def __getattr__(self, name: str) -> Any: # pragma: no cover return self.__dict__.get(name) class Config: diff --git a/nonebot/log.py b/nonebot/log.py index 8541f6b8..b39a0497 100644 --- a/nonebot/log.py +++ b/nonebot/log.py @@ -63,7 +63,7 @@ class Filter: return record["level"].no >= levelno -class LoguruHandler(logging.Handler): +class LoguruHandler(logging.Handler): # pragma: no cover def emit(self, record): try: level = logger.level(record.levelname).name diff --git a/tests/.coveragerc b/tests/.coveragerc new file mode 100644 index 00000000..97998b7f --- /dev/null +++ b/tests/.coveragerc @@ -0,0 +1,6 @@ +[report] +exclude_lines = + pragma: no cover + if TYPE_CHECKING: + @(abc\.)?abstractmethod + raise NotImplementedError diff --git a/tests/.env.test b/tests/.env.test index d3820de0..11b8445f 100644 --- a/tests/.env.test +++ b/tests/.env.test @@ -1 +1,2 @@ +NICKNAME=["test"] CONFIG_FROM_ENV= diff --git a/tests/plugins/export.py b/tests/plugins/export.py new file mode 100644 index 00000000..f7570e92 --- /dev/null +++ b/tests/plugins/export.py @@ -0,0 +1,6 @@ +from nonebot import export + + +@export() +def test(): + ... diff --git a/tests/plugins/require.py b/tests/plugins/require.py new file mode 100644 index 00000000..2b22504f --- /dev/null +++ b/tests/plugins/require.py @@ -0,0 +1,8 @@ +from nonebot import require + +from plugins.export import test +from .export import test as test_related + +test_require = require("export").test + +assert test is test_related and test is test_require, "Export Require Error" diff --git a/tests/pyproject.toml b/tests/pyproject.toml new file mode 100644 index 00000000..8f7f477a --- /dev/null +++ b/tests/pyproject.toml @@ -0,0 +1,2 @@ +[tool.isort] +known_local_folder = ["plugins"] diff --git a/tests/test_init.py b/tests/test_init.py index 61dbdae7..8038be9d 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -1,30 +1,81 @@ import os import sys +from re import A from typing import TYPE_CHECKING, Set import pytest + from utils import load_plugin if TYPE_CHECKING: from nonebot.plugin import Plugin -os.environ["CONFIG_FROM_ENV"] = "env" +os.environ["CONFIG_FROM_ENV"] = '{"test": "test"}' @pytest.mark.asyncio -@pytest.mark.parametrize("nonebug_init", [{"config_from_init": "init"}], indirect=True) +@pytest.mark.parametrize( + "nonebug_init", + [{"config_from_init": "init", "driver": "nonebot.drivers.fastapi:FullDriver"}], + indirect=True, +) async def test_init(nonebug_init): from nonebot import get_driver + from nonebot.drivers.fastapi import FullDriver env = get_driver().env assert env == "test" + assert isinstance(get_driver(), FullDriver) + config = get_driver().config - assert config.config_from_env == "env" + assert config.config_from_env == {"test": "test"} assert config.config_from_init == "init" assert config.common_config == "common" +@pytest.mark.asyncio +async def test_get(monkeypatch: pytest.MonkeyPatch, nonebug_clear): + import nonebot + from nonebot.drivers import ForwardDriver, ReverseDriver + from nonebot import get_app, get_bot, get_asgi, get_bots, get_driver + + try: + get_driver() + assert False, "Driver can only be got after initialization" + except ValueError: + assert True + + nonebot.init(driver="nonebot.drivers.fastapi") + + driver = get_driver() + assert isinstance(driver, ReverseDriver) + assert get_asgi() == driver.asgi + assert get_app() == driver.server_app + + runned = False + + def mock_run(*args, **kwargs): + nonlocal runned + runned = True + assert args == ("arg",) and kwargs == {"kwarg": "kwarg"} + + monkeypatch.setattr(driver, "run", mock_run) + nonebot.run("arg", kwarg="kwarg") + assert runned + + try: + get_bot() + assert False + except ValueError: + assert True + + monkeypatch.setattr(driver, "_clients", {"test": "test"}) + assert get_bot() == "test" + assert get_bot("test") == "test" + assert get_bots() == {"test": "test"} + + @pytest.mark.asyncio async def test_load_plugin(load_plugin: Set["Plugin"]): import nonebot From 3d762fcbab8ece9c2960392d5ce1e6f22ef67fc7 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 16 Dec 2021 23:22:25 +0800 Subject: [PATCH 088/174] :zap: improve dependency cache --- nonebot/matcher.py | 26 +++++++-------- nonebot/message.py | 9 +++--- nonebot/params.py | 70 +++++++++++++++++++++------------------- nonebot/permission.py | 5 ++- nonebot/rule.py | 5 ++- nonebot/typing.py | 9 ++++-- nonebot/utils.py | 27 ---------------- poetry.lock | 2 +- tests/.coveragerc | 2 ++ tests/.isort.cfg | 8 +++++ tests/plugins/depends.py | 19 +++++------ tests/pyproject.toml | 2 -- tests/test_init.py | 1 - tests/test_param.py | 29 +++++++++++++++++ tests/utils.py | 48 ++++++++++++++++++++++++++- 15 files changed, 162 insertions(+), 100 deletions(-) create mode 100644 tests/.isort.cfg delete mode 100644 tests/pyproject.toml create mode 100644 tests/test_param.py diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 5f06f309..382825bd 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -26,7 +26,6 @@ from typing import ( from nonebot import params from nonebot.rule import Rule from nonebot.log import logger -from nonebot.utils import CacheDict from nonebot.dependencies import Dependent from nonebot.permission import USER, Permission from nonebot.adapters import ( @@ -43,14 +42,6 @@ from nonebot.consts import ( REJECT_TARGET, LAST_RECEIVE_KEY, ) -from nonebot.typing import ( - Any, - T_State, - T_Handler, - T_ArgsParser, - T_TypeUpdater, - T_PermissionUpdater, -) from nonebot.exception import ( PausedException, StopPropagation, @@ -58,6 +49,15 @@ from nonebot.exception import ( FinishedException, RejectedException, ) +from nonebot.typing import ( + Any, + T_State, + T_Handler, + T_ArgsParser, + T_TypeUpdater, + T_DependencyCache, + T_PermissionUpdater, +) if TYPE_CHECKING: from nonebot.plugin import Plugin @@ -296,7 +296,7 @@ class Matcher(metaclass=MatcherMeta): bot: Bot, event: Event, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, + dependency_cache: Optional[T_DependencyCache] = None, ) -> bool: """ :说明: @@ -324,7 +324,7 @@ class Matcher(metaclass=MatcherMeta): event: Event, state: T_State, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, + dependency_cache: Optional[T_DependencyCache] = None, ) -> bool: """ :说明: @@ -669,7 +669,7 @@ class Matcher(metaclass=MatcherMeta): event: Event, state: T_State, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, + dependency_cache: Optional[T_DependencyCache] = None, ): b_t = current_bot.set(bot) e_t = current_event.set(event) @@ -711,7 +711,7 @@ class Matcher(metaclass=MatcherMeta): event: Event, state: T_State, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, + dependency_cache: Optional[T_DependencyCache] = None, ): try: await self.simple_run(bot, event, state, stack, dependency_cache) diff --git a/nonebot/message.py b/nonebot/message.py index 9b45c62a..a58c0222 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -22,9 +22,9 @@ from typing import ( from nonebot import params from nonebot.log import logger from nonebot.rule import TrieRule +from nonebot.utils import escape_tag from nonebot.dependencies import Dependent from nonebot.matcher import Matcher, matchers -from nonebot.utils import CacheDict, escape_tag from nonebot.exception import ( NoLogException, StopPropagation, @@ -34,6 +34,7 @@ from nonebot.exception import ( from nonebot.typing import ( T_State, T_Handler, + T_DependencyCache, T_RunPreProcessor, T_RunPostProcessor, T_EventPreProcessor, @@ -136,7 +137,7 @@ async def _check_matcher( event: "Event", state: T_State, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, + dependency_cache: Optional[T_DependencyCache] = None, ) -> None: if Matcher.expire_time and datetime.now() > Matcher.expire_time: try: @@ -171,7 +172,7 @@ async def _run_matcher( event: "Event", state: T_State, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, + dependency_cache: Optional[T_DependencyCache] = None, ) -> None: logger.info(f"Event will be handled by {Matcher}") @@ -275,7 +276,7 @@ async def handle_event(bot: "Bot", event: "Event") -> None: logger.opt(colors=True).success(log_msg) state: Dict[Any, Any] = {} - dependency_cache: CacheDict[T_Handler, Any] = CacheDict() + dependency_cache: T_DependencyCache = {} async with AsyncExitStack() as stack: coros = list( diff --git a/nonebot/params.py b/nonebot/params.py index 50358736..822fd2a8 100644 --- a/nonebot/params.py +++ b/nonebot/params.py @@ -1,12 +1,13 @@ +import asyncio import inspect from typing import Any, Dict, List, Tuple, Callable, Optional, cast from contextlib import AsyncExitStack, contextmanager, asynccontextmanager from pydantic.fields import Required, Undefined -from nonebot.typing import T_State, T_Handler from nonebot.adapters import Bot, Event, Message from nonebot.dependencies import Param, Dependent +from nonebot.typing import T_State, T_Handler, T_DependencyCache from nonebot.consts import ( CMD_KEY, PREFIX_KEY, @@ -19,7 +20,6 @@ from nonebot.consts import ( REGEX_MATCHED, ) from nonebot.utils import ( - CacheDict, get_name, run_sync, is_gen_callable, @@ -49,7 +49,7 @@ class DependsInner: def Depends( dependency: Optional[T_Handler] = None, *, - use_cache: bool = False, + use_cache: bool = True, ) -> Any: """ :说明: @@ -114,11 +114,11 @@ class DependParam(Param): async def _solve( self, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, + dependency_cache: Optional[T_DependencyCache] = None, **kwargs: Any, ) -> Any: use_cache: bool = self.extra["use_cache"] - dependency_cache = CacheDict() if dependency_cache is None else dependency_cache + dependency_cache = {} if dependency_cache is None else dependency_cache sub_dependent: Dependent = self.extra["dependent"] sub_dependent.call = cast(Callable[..., Any], sub_dependent.call) @@ -132,26 +132,28 @@ class DependParam(Param): ) # run dependency function - async with dependency_cache: - if use_cache and call in dependency_cache: - solved = dependency_cache[call] - elif is_gen_callable(call) or is_async_gen_callable(call): - assert isinstance( - stack, AsyncExitStack - ), "Generator dependency should be called in context" - if is_gen_callable(call): - cm = run_sync_ctx_manager(contextmanager(call)(**sub_values)) - else: - cm = asynccontextmanager(call)(**sub_values) - solved = await stack.enter_async_context(cm) - elif is_coroutine_callable(call): - return await call(**sub_values) + task: asyncio.Task[Any] + if use_cache and call in dependency_cache: + solved = await dependency_cache[call] + elif is_gen_callable(call) or is_async_gen_callable(call): + assert isinstance( + stack, AsyncExitStack + ), "Generator dependency should be called in context" + if is_gen_callable(call): + cm = run_sync_ctx_manager(contextmanager(call)(**sub_values)) else: - return await run_sync(call)(**sub_values) - - # save current dependency to cache - if call not in dependency_cache: - dependency_cache[call] = solved + cm = asynccontextmanager(call)(**sub_values) + task = asyncio.create_task(stack.enter_async_context(cm)) + dependency_cache[call] = task + solved = await task + elif is_coroutine_callable(call): + task = asyncio.create_task(call(**sub_values)) + dependency_cache[call] = task + solved = await task + else: + task = asyncio.create_task(run_sync(call)(**sub_values)) + dependency_cache[call] = task + solved = await task return solved @@ -243,7 +245,7 @@ def _command(state=State()) -> Message: def Command() -> Tuple[str, ...]: - return Depends(_command) + return Depends(_command, use_cache=False) def _raw_command(state=State()) -> Message: @@ -251,7 +253,7 @@ def _raw_command(state=State()) -> Message: def RawCommand() -> str: - return Depends(_raw_command) + return Depends(_raw_command, use_cache=False) def _command_arg(state=State()) -> Message: @@ -259,7 +261,7 @@ def _command_arg(state=State()) -> Message: def CommandArg() -> Message: - return Depends(_command_arg) + return Depends(_command_arg, use_cache=False) def _shell_command_args(state=State()) -> Any: @@ -267,7 +269,7 @@ def _shell_command_args(state=State()) -> Any: def ShellCommandArgs(): - return Depends(_shell_command_args) + return Depends(_shell_command_args, use_cache=False) def _shell_command_argv(state=State()) -> List[str]: @@ -275,7 +277,7 @@ def _shell_command_argv(state=State()) -> List[str]: def ShellCommandArgv() -> Any: - return Depends(_shell_command_argv) + return Depends(_shell_command_argv, use_cache=False) def _regex_matched(state=State()) -> str: @@ -283,7 +285,7 @@ def _regex_matched(state=State()) -> str: def RegexMatched() -> str: - return Depends(_regex_matched) + return Depends(_regex_matched, use_cache=False) def _regex_group(state=State()): @@ -291,7 +293,7 @@ def _regex_group(state=State()): def RegexGroup() -> Tuple[Any, ...]: - return Depends(_regex_group) + return Depends(_regex_group, use_cache=False) def _regex_dict(state=State()): @@ -299,7 +301,7 @@ def _regex_dict(state=State()): def RegexDict() -> Dict[str, Any]: - return Depends(_regex_dict) + return Depends(_regex_dict, use_cache=False) class MatcherParam(Param): @@ -320,14 +322,14 @@ def Received(id: str, default: Any = None) -> Any: def _received(matcher: "Matcher"): return matcher.get_receive(id, default) - return Depends(_received) + return Depends(_received, use_cache=False) def LastReceived(default: Any = None) -> Any: def _last_received(matcher: "Matcher") -> Any: return matcher.get_receive(None, default) - return Depends(_last_received) + return Depends(_last_received, use_cache=False) class ExceptionParam(Param): diff --git a/nonebot/permission.py b/nonebot/permission.py index 9ca25f64..a2ce1778 100644 --- a/nonebot/permission.py +++ b/nonebot/permission.py @@ -24,11 +24,10 @@ from typing import ( ) from nonebot import params -from nonebot.utils import CacheDict from nonebot.adapters import Bot, Event from nonebot.dependencies import Dependent from nonebot.exception import SkippedException -from nonebot.typing import T_Handler, T_PermissionChecker +from nonebot.typing import T_Handler, T_DependencyCache, T_PermissionChecker async def _run_coro_with_catch(coro: Coroutine[Any, Any, Any]): @@ -93,7 +92,7 @@ class Permission: bot: Bot, event: Event, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, + dependency_cache: Optional[T_DependencyCache] = None, ) -> bool: """ :说明: diff --git a/nonebot/rule.py b/nonebot/rule.py index 627f18c6..48c60963 100644 --- a/nonebot/rule.py +++ b/nonebot/rule.py @@ -22,12 +22,11 @@ from typing import Any, Set, List, Tuple, Union, NoReturn, Optional, Sequence from pygtrie import CharTrie from nonebot.log import logger -from nonebot.utils import CacheDict from nonebot import params, get_driver from nonebot.dependencies import Dependent from nonebot.exception import ParserExit, SkippedException -from nonebot.typing import T_State, T_Handler, T_RuleChecker from nonebot.adapters import Bot, Event, Message, MessageSegment +from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_DependencyCache from nonebot.consts import ( CMD_KEY, PREFIX_KEY, @@ -105,7 +104,7 @@ class Rule: event: Event, state: T_State, stack: Optional[AsyncExitStack] = None, - dependency_cache: Optional[CacheDict[T_Handler, Any]] = None, + dependency_cache: Optional[T_DependencyCache] = None, ) -> bool: """ :说明: diff --git a/nonebot/typing.py b/nonebot/typing.py index bf9d1042..e5a275f8 100644 --- a/nonebot/typing.py +++ b/nonebot/typing.py @@ -17,7 +17,7 @@ .. _typing: https://docs.python.org/3/library/typing.html """ - +from asyncio import Task from typing import ( TYPE_CHECKING, Any, @@ -32,7 +32,6 @@ from typing import ( ) if TYPE_CHECKING: - from nonebot.utils import CacheDict from nonebot.adapters import Bot, Event from nonebot.permission import Permission @@ -250,3 +249,9 @@ T_PermissionUpdater = Callable[..., Union["Permission", Awaitable["Permission"]] PermissionUpdater 在 Matcher.pause, Matcher.reject 时被运行，用于更新会话对象权限。默认会更新为当前事件的触发对象。 """ +T_DependencyCache = Dict[Callable[..., Any], Task[Any]] +""" +:类型: ``Dict[Callable[..., Any], Task[Any]]`` +:说明: + 依赖缓存, 用于存储依赖函数的返回值 +""" diff --git a/nonebot/utils.py b/nonebot/utils.py index 57756f58..bd4a92a0 100644 --- a/nonebot/utils.py +++ b/nonebot/utils.py @@ -135,33 +135,6 @@ def get_name(obj: Any) -> str: return obj.__class__.__name__ -class CacheDict(Dict[K, V], Generic[K, V]): - def __init__(self, *args, **kwargs): - super(CacheDict, self).__init__(*args, **kwargs) - self._lock = asyncio.Lock() - - @property - def locked(self): - return self._lock.locked() - - def __repr__(self): - extra = "locked" if self.locked else "unlocked" - return f"<{self.__class__.__name__} [{extra}]>" - - async def __aenter__(self) -> None: - await self.acquire() - return None - - async def __aexit__(self, exc_type, exc, tb): - self.release() - - async def acquire(self): - return await self._lock.acquire() - - def release(self): - self._lock.release() - - class DataclassEncoder(json.JSONEncoder): """ :说明: diff --git a/poetry.lock b/poetry.lock index bfcc66d2..fcb6dc22 100644 --- a/poetry.lock +++ b/poetry.lock @@ -543,7 +543,7 @@ pytest-order = "^1.0.0" type = "git" url = "https://github.com/nonebot/nonebug.git" reference = "master" -resolved_reference = "4584d5a4bc95cd1bafcec08599ab7d72815e268e" +resolved_reference = "9c4f21373701ac25bc152cbad5f5527edc5e4c19" [[package]] name = "packaging" diff --git a/tests/.coveragerc b/tests/.coveragerc index 97998b7f..4bf3ebe2 100644 --- a/tests/.coveragerc +++ b/tests/.coveragerc @@ -1,6 +1,8 @@ [report] exclude_lines = + def __repr__ pragma: no cover if TYPE_CHECKING: @(abc\.)?abstractmethod raise NotImplementedError + if __name__ == .__main__.: diff --git a/tests/.isort.cfg b/tests/.isort.cfg new file mode 100644 index 00000000..68396bdd --- /dev/null +++ b/tests/.isort.cfg @@ -0,0 +1,8 @@ +[settings] +profile=black +line_length=80 +length_sort=true +skip_gitignore=true +force_sort_within_sections=true +known_local_folder=plugins +extra_standard_library=typing_extensions diff --git a/tests/plugins/depends.py b/tests/plugins/depends.py index e9690785..51226d20 100644 --- a/tests/plugins/depends.py +++ b/tests/plugins/depends.py @@ -2,22 +2,23 @@ from nonebot import on_message from nonebot.adapters import Event from nonebot.params import Depends -test = on_message() -test2 = on_message() +test_depends = on_message() -runned = False +runned = [] def dependency(event: Event): # test cache - global runned - assert not runned - runned = True + runned.append(event) return event -@test.handle() -@test2.handle() -async def handle(x: Event = Depends(dependency, use_cache=True)): +@test_depends.handle() +async def depends(x: Event = Depends(dependency)): # test dependency return x + + +@test_depends.handle() +async def depends_cache(y: Event = Depends(dependency, use_cache=True)): + return y diff --git a/tests/pyproject.toml b/tests/pyproject.toml deleted file mode 100644 index 8f7f477a..00000000 --- a/tests/pyproject.toml +++ /dev/null @@ -1,2 +0,0 @@ -[tool.isort] -known_local_folder = ["plugins"] diff --git a/tests/test_init.py b/tests/test_init.py index 8038be9d..ef76676c 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -1,6 +1,5 @@ import os import sys -from re import A from typing import TYPE_CHECKING, Set import pytest diff --git a/tests/test_param.py b/tests/test_param.py new file mode 100644 index 00000000..35a67daa --- /dev/null +++ b/tests/test_param.py @@ -0,0 +1,29 @@ +import pytest +from nonebug import App + +from utils import load_plugin, make_fake_event + + +@pytest.mark.asyncio +async def test_depends(app: App, load_plugin): + from nonebot.params import EventParam, DependParam + + from plugins.depends import runned, depends, test_depends + + async with app.test_dependent( + depends, allow_types=[EventParam, DependParam] + ) as ctx: + event = make_fake_event()() + ctx.pass_params(event=event) + ctx.should_return(event) + + assert len(runned) == 1 and runned[0] == event + + runned.clear() + + async with app.test_matcher(test_depends) as ctx: + bot = ctx.create_bot() + event_next = make_fake_event()() + ctx.receive_event(bot, event_next) + + assert len(runned) == 1 and runned[0] == event_next diff --git a/tests/utils.py b/tests/utils.py index 0223b365..2e90ca7e 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,10 +1,56 @@ from pathlib import Path -from typing import TYPE_CHECKING, Set +from typing import TYPE_CHECKING, Set, Type, Optional import pytest +from pydantic import create_model if TYPE_CHECKING: from nonebot.plugin import Plugin + from nonebot.adapters import Event, Message + + +def make_fake_event( + _type: str = "message", + _name: str = "test", + _description: str = "test", + _user_id: str = "test", + _session_id: str = "test", + _message: Optional["Message"] = None, + _to_me: bool = True, + **fields, +) -> Type["Event"]: + from nonebot.adapters import Event + + _Fake = create_model("_Fake", __base__=Event, **fields) + + class FakeEvent(_Fake): + def get_type(self) -> str: + return _type + + def get_event_name(self) -> str: + return _name + + def get_event_description(self) -> str: + return _description + + def get_user_id(self) -> str: + return _user_id + + def get_session_id(self) -> str: + return _session_id + + def get_message(self) -> "Message": + if _message is not None: + return _message + raise NotImplementedError + + def is_tome(self) -> bool: + return _to_me + + class Config: + extra = "forbid" + + return FakeEvent @pytest.fixture From c0f321116ab8d16d2229ab62a09da2bc32d19060 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 16 Dec 2021 23:42:03 +0800 Subject: [PATCH 089/174] :arrow_up: update nonebug --- poetry.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/poetry.lock b/poetry.lock index fcb6dc22..12ca0bc1 100644 --- a/poetry.lock +++ b/poetry.lock @@ -426,7 +426,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "importlib-metadata" -version = "4.8.2" +version = "4.8.3" description = "Read metadata from Python packages" category = "main" optional = false @@ -543,7 +543,7 @@ pytest-order = "^1.0.0" type = "git" url = "https://github.com/nonebot/nonebug.git" reference = "master" -resolved_reference = "9c4f21373701ac25bc152cbad5f5527edc5e4c19" +resolved_reference = "6b965e522fce31c0d2c59de11c152a35fe079577" [[package]] name = "packaging" @@ -1645,8 +1645,8 @@ imagesize = [ {file = "imagesize-1.3.0.tar.gz", hash = "sha256:cd1750d452385ca327479d45b64d9c7729ecf0b3969a58148298c77092261f9d"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.8.2-py3-none-any.whl", hash = "sha256:53ccfd5c134223e497627b9815d5030edf77d2ed573922f7a0b8f8bb81a1c100"}, - {file = "importlib_metadata-4.8.2.tar.gz", hash = "sha256:75bdec14c397f528724c1bfd9709d660b33a4d2e77387a3358f20b848bb5e5fb"}, + {file = "importlib_metadata-4.8.3-py3-none-any.whl", hash = "sha256:65a9576a5b2d58ca44d133c42a241905cc45e34d2c06fd5ba2bafa221e5d7b5e"}, + {file = "importlib_metadata-4.8.3.tar.gz", hash = "sha256:766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668"}, ] iniconfig = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, From ec9e159ef6e5066e714cab0a8d452835e3ff3dc0 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 17 Dec 2021 23:20:19 +0800 Subject: [PATCH 090/174] :recycle: rewrite driver request and response class --- nonebot/drivers/__init__.py | 166 ++------------------- nonebot/drivers/_model.py | 282 ++++++++++++++++++++++++++++++++++++ poetry.lock | 6 +- pyproject.toml | 1 + 4 files changed, 296 insertions(+), 159 deletions(-) create mode 100644 nonebot/drivers/_model.py diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py index 1785e1b6..75398eb9 100644 --- a/nonebot/drivers/__init__.py +++ b/nonebot/drivers/__init__.py @@ -7,22 +7,13 @@ import abc import asyncio -from dataclasses import field, dataclass -from typing import ( - TYPE_CHECKING, - Any, - Set, - Dict, - Type, - Union, - Callable, - Optional, - Awaitable, -) +from dataclasses import dataclass +from typing import TYPE_CHECKING, Any, Set, Dict, Type, Callable, Awaitable from nonebot.log import logger from nonebot.utils import escape_tag from nonebot.config import Env, Config +from ._model import URL, Request, Response, WebSocket from nonebot.typing import T_BotConnectionHook, T_BotDisconnectionHook if TYPE_CHECKING: @@ -213,11 +204,11 @@ class ForwardDriver(Driver): """ @abc.abstractmethod - async def request(self, setup: "HTTPRequest") -> Any: + async def request(self, setup: "Request") -> Any: raise NotImplementedError @abc.abstractmethod - async def websocket(self, setup: "HTTPConnection") -> Any: + async def websocket(self, setup: "Request") -> Any: raise NotImplementedError @@ -247,153 +238,16 @@ class ReverseDriver(Driver): raise NotImplementedError -# TODO: repack dataclass -@dataclass -class HTTPConnection(abc.ABC): - http_version: str - """One of ``"1.0"``, ``"1.1"`` or ``"2"``.""" - scheme: str - """URL scheme portion (likely ``"http"`` or ``"https"``).""" - path: str - """ - HTTP request target excluding any query string, - with percent-encoded sequences and UTF-8 byte sequences - decoded into characters. - """ - query_string: bytes = b"" - """ URL portion after the ``?``, percent-encoded.""" - headers: Dict[str, str] = field(default_factory=dict) - """A dict of name-value pairs, - where name is the header name, and value is the header value. - - Order of header values must be preserved from the original HTTP request; - order of header names is not important. - - Header names must be lowercased. - """ - - @property - @abc.abstractmethod - def type(self) -> str: - """Connection type.""" - raise NotImplementedError - - -@dataclass -class HTTPRequest(HTTPConnection): - """HTTP 请求封装。参考 `asgi http scope`_。 - - .. _asgi http scope: - https://asgi.readthedocs.io/en/latest/specs/www.html#http-connection-scope - """ - - method: str = "GET" - """The HTTP method name, uppercased.""" - body: bytes = b"" - """Body of the request. - - Optional; if missing defaults to ``b""``. - """ - - @property - def type(self) -> str: - """Always ``http``""" - return "http" - - -@dataclass -class HTTPResponse: - """HTTP 响应封装。参考 `asgi http scope`_。 - - .. _asgi http scope: - https://asgi.readthedocs.io/en/latest/specs/www.html#http-connection-scope - """ - - status: int - """HTTP status code.""" - body: Optional[bytes] = None - """HTTP body content. - - Optional; if missing defaults to ``None``. - """ - headers: Dict[str, str] = field(default_factory=dict) - """A dict of name-value pairs, - where name is the header name, and value is the header value. - - Order must be preserved in the HTTP response. - - Header names must be lowercased. - - Optional; if missing defaults to an empty dict. - """ - - @property - def type(self) -> str: - """Always ``http``""" - return "http" - - -@dataclass -class WebSocket(HTTPConnection, abc.ABC): - """WebSocket 连接封装。参考 `asgi websocket scope`_。 - - .. _asgi websocket scope: - https://asgi.readthedocs.io/en/latest/specs/www.html#websocket-connection-scope - """ - - @property - def type(self) -> str: - """Always ``websocket``""" - return "websocket" - - @property - @abc.abstractmethod - def closed(self) -> bool: - """ - :类型: ``bool`` - :说明: 连接是否已经关闭 - """ - raise NotImplementedError - - @abc.abstractmethod - async def accept(self): - """接受 WebSocket 连接请求""" - raise NotImplementedError - - @abc.abstractmethod - async def close(self, code: int): - """关闭 WebSocket 连接请求""" - raise NotImplementedError - - @abc.abstractmethod - async def receive(self) -> str: - """接收一条 WebSocket text 信息""" - raise NotImplementedError - - @abc.abstractmethod - async def receive_bytes(self) -> bytes: - """接收一条 WebSocket binary 信息""" - raise NotImplementedError - - @abc.abstractmethod - async def send(self, data: str): - """发送一条 WebSocket text 信息""" - raise NotImplementedError - - @abc.abstractmethod - async def send_bytes(self, data: bytes): - """发送一条 WebSocket binary 信息""" - raise NotImplementedError - - @dataclass class HTTPServerSetup: - path: str + path: URL # path should not be absolute, check it by URL.is_absolute() == False method: str - handle_func: Callable[[HTTPRequest], Awaitable[HTTPResponse]] + name: str + handle_func: Callable[[Request], Awaitable[Response]] @dataclass class WebSocketServerSetup: - path: str + path: URL # path should not be absolute, check it by URL.is_absolute() == False + name: str handle_func: Callable[[WebSocket], Awaitable[Any]] diff --git a/nonebot/drivers/_model.py b/nonebot/drivers/_model.py new file mode 100644 index 00000000..ede3276a --- /dev/null +++ b/nonebot/drivers/_model.py @@ -0,0 +1,282 @@ +import abc +from enum import Enum +from http.cookiejar import Cookie, CookieJar +from typing import ( + Dict, + List, + Tuple, + Union, + Mapping, + Iterator, + Optional, + Sequence, + MutableMapping, +) + +from yarl import URL as URL +from multidict import CIMultiDict + +RawURL = Tuple[bytes, bytes, Optional[int], bytes] + +SimpleQuery = Union[str, int, float] +QueryVariable = Union[SimpleQuery, Sequence[SimpleQuery]] +QueryTypes = Union[ + None, str, Mapping[str, QueryVariable], Sequence[Tuple[str, QueryVariable]] +] + +HeaderTypes = Union[ + None, + CIMultiDict[str], + Dict[str, str], + Sequence[Tuple[str, str]], +] + +ContentTypes = Union[str, bytes] +CookieTypes = Union[None, "Cookies", CookieJar, Dict[str, str], List[Tuple[str, str]]] + + +class HTTPVersion(Enum): + H10 = "1.0" + H11 = "1.1" + H2 = "2" + + +class Request: + def __init__( + self, + method: Union[str, bytes], + url: Union["URL", str, RawURL], + *, + params: QueryTypes = None, + headers: HeaderTypes = None, + cookies: CookieTypes = None, + content: ContentTypes = None, + version: Union[str, HTTPVersion] = HTTPVersion.H11, + timeout: Optional[float] = None, + ): + # method + self.method = ( + method.decode("ascii").upper() + if isinstance(method, bytes) + else method.upper() + ) + # http version + self.version = HTTPVersion(version) + # timeout + self.timeout = timeout + + # url + if isinstance(url, tuple): + scheme, host, port, path = url + url = URL.build( + scheme=scheme.decode("ascii"), + host=host.decode("ascii"), + port=port, + path=path.decode("ascii"), + ) + else: + url = URL(url) + + if params is not None: + url = url.update_query(params) + self.url = url + + # headers + if headers is not None: + self.headers = CIMultiDict(headers) + else: + self.headers = CIMultiDict() + + # cookies + self.cookies = Cookies(cookies) + + # body + self.content = content + + def __repr__(self) -> str: + class_name = self.__class__.__name__ + url = str(self.url) + return f"<{class_name}({self.method!r}, {url!r})>" + + +class Response: + def __init__( + self, + status_code: int, + *, + headers: HeaderTypes = None, + content: ContentTypes = None, + request: Optional[Request] = None, + ): + # status code + self.status_code = status_code + + # headers + if headers is not None: + self.headers = CIMultiDict(headers) + else: + self.headers = CIMultiDict() + + # body + self.content = content + + # request + self.request = request + + +class WebSocket(abc.ABC): + def __init__(self, *, request: Request): + # request + self.request = request + + @property + @abc.abstractmethod + def closed(self) -> bool: + """ + :类型: ``bool`` + :说明: 连接是否已经关闭 + """ + raise NotImplementedError + + @abc.abstractmethod + async def accept(self): + """接受 WebSocket 连接请求""" + raise NotImplementedError + + @abc.abstractmethod + async def close(self, code: int): + """关闭 WebSocket 连接请求""" + raise NotImplementedError + + @abc.abstractmethod + async def receive(self) -> str: + """接收一条 WebSocket text 信息""" + raise NotImplementedError + + @abc.abstractmethod + async def receive_bytes(self) -> bytes: + """接收一条 WebSocket binary 信息""" + raise NotImplementedError + + @abc.abstractmethod + async def send(self, data: str): + """发送一条 WebSocket text 信息""" + raise NotImplementedError + + @abc.abstractmethod + async def send_bytes(self, data: bytes): + """发送一条 WebSocket binary 信息""" + raise NotImplementedError + + +class Cookies(MutableMapping): + def __init__(self, cookies: CookieTypes = None) -> None: + self.jar = cookies if isinstance(cookies, CookieJar) else CookieJar() + if cookies is not None and not isinstance(cookies, CookieJar): + if isinstance(cookies, dict): + for key, value in cookies.items(): + self.set(key, value) + elif isinstance(cookies, list): + for key, value in cookies: + self.set(key, value) + elif isinstance(cookies, Cookies): + for cookie in cookies.jar: + self.jar.set_cookie(cookie) + else: + raise TypeError(f"Cookies must be dict or list, not {type(cookies)}") + + def set(self, name: str, value: str, domain: str = "", path: str = "/") -> None: + cookie = Cookie( + version=0, + name=name, + value=value, + port=None, + port_specified=False, + domain=domain, + domain_specified=bool(domain), + domain_initial_dot=domain.startswith("."), + path=path, + path_specified=bool(path), + secure=False, + expires=None, + discard=True, + comment=None, + comment_url=None, + rest={}, + rfc2109=False, + ) + self.jar.set_cookie(cookie) + + def get( + self, + name: str, + default: Optional[str] = None, + domain: str = None, + path: str = None, + ) -> Optional[str]: + value: Optional[str] = None + for cookie in self.jar: + if ( + cookie.name == name + and (domain is None or cookie.domain == domain) + and (path is None or cookie.path == path) + ): + if value is not None: + message = f"Multiple cookies exist with name={name}" + raise ValueError(message) + value = cookie.value + + return default if value is None else value + + def delete( + self, name: str, domain: Optional[str] = None, path: Optional[str] = None + ) -> None: + if domain is not None and path is not None: + return self.jar.clear(domain, path, name) + + remove = [ + cookie + for cookie in self.jar + if cookie.name == name + and (domain is None or cookie.domain == domain) + and (path is None or cookie.path == path) + ] + + for cookie in remove: + self.jar.clear(cookie.domain, cookie.path, cookie.name) + + def clear(self, domain: Optional[str] = None, path: Optional[str] = None) -> None: + self.jar.clear(domain, path) + + def update(self, cookies: CookieTypes = None) -> None: + cookies = Cookies(cookies) + for cookie in cookies.jar: + self.jar.set_cookie(cookie) + + def __setitem__(self, name: str, value: str) -> None: + return self.set(name, value) + + def __getitem__(self, name: str) -> str: + value = self.get(name) + if value is None: + raise KeyError(name) + return value + + def __delitem__(self, name: str) -> None: + return self.delete(name) + + def __len__(self) -> int: + return len(self.jar) + + def __iter__(self) -> Iterator[Cookie]: + return (cookie for cookie in self.jar) + + def __repr__(self) -> str: + cookies_repr = ", ".join( + [ + f"" + for cookie in self.jar + ] + ) + + return f"" diff --git a/poetry.lock b/poetry.lock index 12ca0bc1..fedf1714 100644 --- a/poetry.lock +++ b/poetry.lock @@ -513,7 +513,7 @@ name = "multidict" version = "5.2.0" description = "multidict implementation" category = "main" -optional = true +optional = false python-versions = ">=3.6" [[package]] @@ -1152,7 +1152,7 @@ name = "yarl" version = "1.7.2" description = "Yet another URL library" category = "main" -optional = true +optional = false python-versions = ">=3.6" [package.dependencies] @@ -1180,7 +1180,7 @@ quart = ["Quart"] [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "32ef230c4c02d1eb68754ad0bb938d1d960d7c6362ea2250cc23bbed910fbe34" +content-hash = "3cef667f39a760749d4c1d35883be4cec9c224e8079ee28752f6aa7f58688442" [metadata.files] aiodns = [ diff --git a/pyproject.toml b/pyproject.toml index 4312f2a8..5dfd8cbe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,6 +34,7 @@ httpx = { version = ">=0.20.0, <1.0.0", extras = ["http2"] } pydantic = { version = "~1.8.0", extras = ["dotenv"] } uvicorn = { version = "^0.15.0", extras = ["standard"] } aiohttp = { version = "^3.7.4", extras = ["speedups"], optional = true } +yarl = "^1.7.2" [tool.poetry.dev-dependencies] sphinx = "^4.1.1" From ca045b2f73b0f725a72ee1be4b3b85649e8e0274 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sat, 18 Dec 2021 23:19:37 +0800 Subject: [PATCH 091/174] :construction: rewrite fastapi driver implementation --- nonebot/drivers/__init__.py | 2 +- nonebot/drivers/_model.py | 4 +- nonebot/drivers/fastapi.py | 204 +++++++++++++++++++++--------------- 3 files changed, 123 insertions(+), 87 deletions(-) diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py index 75398eb9..7511c745 100644 --- a/nonebot/drivers/__init__.py +++ b/nonebot/drivers/__init__.py @@ -13,7 +13,7 @@ from typing import TYPE_CHECKING, Any, Set, Dict, Type, Callable, Awaitable from nonebot.log import logger from nonebot.utils import escape_tag from nonebot.config import Env, Config -from ._model import URL, Request, Response, WebSocket +from ._model import URL, Request, Response, WebSocket, HTTPVersion from nonebot.typing import T_BotConnectionHook, T_BotDisconnectionHook if TYPE_CHECKING: diff --git a/nonebot/drivers/_model.py b/nonebot/drivers/_model.py index ede3276a..05d59c77 100644 --- a/nonebot/drivers/_model.py +++ b/nonebot/drivers/_model.py @@ -82,6 +82,7 @@ class Request: self.url = url # headers + self.headers: CIMultiDict[str] if headers is not None: self.headers = CIMultiDict(headers) else: @@ -112,6 +113,7 @@ class Response: self.status_code = status_code # headers + self.headers: CIMultiDict[str] if headers is not None: self.headers = CIMultiDict(headers) else: @@ -144,7 +146,7 @@ class WebSocket(abc.ABC): raise NotImplementedError @abc.abstractmethod - async def close(self, code: int): + async def close(self, code: int = 1000): """关闭 WebSocket 连接请求""" raise NotImplementedError diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index 9fea8d95..8eea6ea2 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -10,7 +10,6 @@ FastAPI 驱动适配 https://fastapi.tiangolo.com/ """ -import asyncio import logging from functools import partial from dataclasses import dataclass @@ -20,23 +19,21 @@ import httpx import uvicorn from pydantic import BaseSettings from fastapi.responses import Response -from starlette.websockets import WebSocketState -from fastapi import Depends, FastAPI, Request, status -from starlette.websockets import WebSocket as FastAPIWebSocket +from fastapi import FastAPI, Request, status +from starlette.websockets import WebSocket, WebSocketState from websockets.legacy.client import Connect, WebSocketClientProtocol from nonebot.config import Env from nonebot.typing import overrides from nonebot.utils import escape_tag -from nonebot.drivers import WebSocket from nonebot.config import Config as NoneBotConfig +from nonebot.drivers import Request as GenericRequest from nonebot.drivers import WebSocket as BaseWebSocket +from nonebot.drivers import Response as GenericResponse from nonebot.drivers import ( - HTTPRequest, - HTTPResponse, + HTTPVersion, ForwardDriver, ReverseDriver, - HTTPConnection, HTTPServerSetup, WebSocketServerSetup, ) @@ -173,26 +170,23 @@ class Driver(ReverseDriver): @overrides(ReverseDriver) def setup_http_server(self, setup: HTTPServerSetup): - def _get_handle_func(): - return setup.handle_func + async def _handle(request: Request) -> Response: + return await self._handle_http(request, setup) self._server_app.add_api_route( - setup.path, - partial(self._handle_http, handle_func=Depends(_get_handle_func)), + setup.path.path, + _handle, methods=[setup.method], ) @overrides(ReverseDriver) def setup_websocket_server(self, setup: WebSocketServerSetup) -> None: - def _get_handle_func(): - return setup.handle_func + async def _handle(websocket: WebSocket): + await self._handle_ws(websocket, setup) self._server_app.add_api_websocket_route( - setup.path, - partial( - self._handle_ws, - handle_func=Depends(_get_handle_func), - ), + setup.path.path, + _handle, ) @overrides(ReverseDriver) @@ -251,36 +245,34 @@ class Driver(ReverseDriver): async def _handle_http( self, request: Request, - handle_func: Callable[[HTTPRequest], Awaitable[HTTPResponse]], + setup: HTTPServerSetup, ): - http_request = HTTPRequest( - request.scope["http_version"], - request.url.scheme, - request.url.path, - request.scope["query_string"], - dict(request.headers), + http_request = GenericRequest( request.method, - await request.body(), + str(request.url), + headers=request.headers.items(), + cookies=request.cookies, + content=await request.body(), + version=request.scope["http_version"], ) - response = await handle_func(http_request) - return Response(response.body, response.status, response.headers) + response = await setup.handle_func(http_request) + return Response(response.content, response.status_code, dict(response.headers)) - async def _handle_ws( - self, - websocket: FastAPIWebSocket, - handle_func: Callable[[WebSocket], Awaitable[Any]], - ): - ws = WebSocket( - websocket.scope.get("http_version", "1.1"), - websocket.url.scheme, - websocket.url.path, - websocket.scope["query_string"], - dict(websocket.headers), - websocket, + async def _handle_ws(self, websocket: WebSocket, setup: WebSocketServerSetup): + request = GenericRequest( + "GET", + str(websocket.url), + headers=websocket.headers.items(), + cookies=websocket.cookies, + version=websocket.scope["http_version"], + ) + ws = FastAPIWebSocket( + request=request, + websocket=websocket, ) - await handle_func(ws) + await setup.handle_func(ws) class FullDriver(ForwardDriver, Driver): @@ -295,54 +287,110 @@ class FullDriver(ForwardDriver, Driver): """ @property - @overrides(ForwardDriver) + @overrides(Driver) def type(self) -> str: """驱动名称: ``fastapi_full``""" return "fastapi_full" @overrides(ForwardDriver) - async def request(self, setup: "HTTPRequest") -> Any: + async def request(self, setup: "GenericRequest") -> Any: async with httpx.AsyncClient( - http2=setup.http_version == "2", follow_redirects=True + http2=setup.version == HTTPVersion.H2, follow_redirects=True ) as client: response = await client.request( setup.method, - setup.url, - content=setup.body, - headers=setup.headers, + str(setup.url), + content=setup.content, + headers=tuple(setup.headers.items()), timeout=30.0, ) - return HTTPResponse( - response.status_code, response.content, response.headers + return GenericResponse( + response.status_code, + headers=response.headers, + content=response.content, + request=setup, ) @overrides(ForwardDriver) - async def websocket(self, setup: "HTTPConnection") -> Any: - ws = await Connect(setup.url, extra_headers=setup.headers) - return WebSocket("1.1", url.scheme, url.path, url.query, setup.headers, ws) + async def websocket(self, setup: "GenericRequest") -> Any: + ws = await Connect(str(setup.url), extra_headers=setup.headers.items()) + return WebSocketsWS(request=setup, websocket=ws) -@dataclass -class WebSocket(BaseWebSocket): - websocket: Union[FastAPIWebSocket, WebSocketClientProtocol] = None # type: ignore +class WebSocketsWS(BaseWebSocket): + @overrides(BaseWebSocket) + def __init__(self, *, request: GenericRequest, websocket: WebSocketClientProtocol): + super().__init__(request=request) + self.websocket = websocket @property @overrides(BaseWebSocket) def closed(self) -> bool: - if isinstance(self.websocket, FastAPIWebSocket): - return ( - self.websocket.client_state == WebSocketState.DISCONNECTED - or self.websocket.application_state == WebSocketState.DISCONNECTED - ) - else: - return self.websocket.closed + # if isinstance(self.websocket, WebSocket): + # return ( + # self.websocket.client_state == WebSocketState.DISCONNECTED + # or self.websocket.application_state == WebSocketState.DISCONNECTED + # ) + return self.websocket.closed @overrides(BaseWebSocket) async def accept(self): - if isinstance(self.websocket, FastAPIWebSocket): - await self.websocket.accept() - else: - raise NotImplementedError + # if isinstance(self.websocket, WebSocket): + # await self.websocket.accept() + raise NotImplementedError + + @overrides(BaseWebSocket) + async def close(self, code: int = 1000): + await self.websocket.close(code) + + @overrides(BaseWebSocket) + async def receive(self) -> str: + # if isinstance(self.websocket, WebSocket): + # return await self.websocket.receive_text() + msg = await self.websocket.recv() + if isinstance(msg, bytes): + raise TypeError("WebSocket received unexpected frame type: bytes") + return msg + + @overrides(BaseWebSocket) + async def receive_bytes(self) -> bytes: + # if isinstance(self.websocket, WebSocket): + # return await self.websocket.receive_bytes() + msg = await self.websocket.recv() + if isinstance(msg, str): + raise TypeError("WebSocket received unexpected frame type: str") + return msg + + @overrides(BaseWebSocket) + async def send(self, data: str) -> None: + # if isinstance(self.websocket, WebSocket): + # await self.websocket.send({"type": "websocket.send", "text": data}) + await self.websocket.send(data) + + @overrides(BaseWebSocket) + async def send_bytes(self, data: bytes) -> None: + # if isinstance(self.websocket, WebSocket): + # await self.websocket.send({"type": "websocket.send", "bytes": data}) + await self.websocket.send(data) + + +class FastAPIWebSocket(BaseWebSocket): + @overrides(BaseWebSocket) + def __init__(self, *, request: GenericRequest, websocket: WebSocket): + super().__init__(request=request) + self.websocket = websocket + + @property + @overrides(BaseWebSocket) + def closed(self) -> bool: + return ( + self.websocket.client_state == WebSocketState.DISCONNECTED + or self.websocket.application_state == WebSocketState.DISCONNECTED + ) + + @overrides(BaseWebSocket) + async def accept(self): + await self.websocket.accept() @overrides(BaseWebSocket) async def close(self, code: int = status.WS_1000_NORMAL_CLOSURE): @@ -350,30 +398,16 @@ class WebSocket(BaseWebSocket): @overrides(BaseWebSocket) async def receive(self) -> str: - if isinstance(self.websocket, FastAPIWebSocket): - return await self.websocket.receive_text() - else: - msg = await self.websocket.recv() - return msg.decode("utf-8") if isinstance(msg, bytes) else msg + return await self.websocket.receive_text() @overrides(BaseWebSocket) async def receive_bytes(self) -> bytes: - if isinstance(self.websocket, FastAPIWebSocket): - return await self.websocket.receive_bytes() - else: - msg = await self.websocket.recv() - return msg.encode("utf-8") if isinstance(msg, str) else msg + return await self.websocket.receive_bytes() @overrides(BaseWebSocket) async def send(self, data: str) -> None: - if isinstance(self.websocket, FastAPIWebSocket): - await self.websocket.send({"type": "websocket.send", "text": data}) - else: - await self.websocket.send(data) + await self.websocket.send({"type": "websocket.send", "text": data}) @overrides(BaseWebSocket) async def send_bytes(self, data: bytes) -> None: - if isinstance(self.websocket, FastAPIWebSocket): - await self.websocket.send({"type": "websocket.send", "bytes": data}) - else: - await self.websocket.send(data) + await self.websocket.send({"type": "websocket.send", "bytes": data}) From c2c3d5ef4b6a7bbbdf0289cafd92366422ed9182 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 20 Dec 2021 00:28:02 +0800 Subject: [PATCH 092/174] :white_check_mark: add test cases --- nonebot/adapters/_adapter.py | 13 ++ nonebot/adapters/_bot.py | 1 - nonebot/dependencies/__init__.py | 6 +- nonebot/drivers/__init__.py | 10 +- nonebot/matcher.py | 12 +- nonebot/message.py | 6 +- nonebot/params.py | 43 +++++- tests/plugins/depends.py | 24 ---- tests/plugins/param/__init__.py | 7 + tests/plugins/param/param_bot.py | 5 + tests/plugins/param/param_depend.py | 30 ++++ tests/plugins/param/param_event.py | 22 +++ tests/plugins/param/param_matcher.py | 15 ++ tests/plugins/param/param_state.py | 55 ++++++++ tests/test_init.py | 11 +- tests/test_param.py | 197 +++++++++++++++++++++++++-- tests/utils.py | 30 ++++ 17 files changed, 432 insertions(+), 55 deletions(-) delete mode 100644 tests/plugins/depends.py create mode 100644 tests/plugins/param/__init__.py create mode 100644 tests/plugins/param/param_bot.py create mode 100644 tests/plugins/param/param_depend.py create mode 100644 tests/plugins/param/param_event.py create mode 100644 tests/plugins/param/param_matcher.py create mode 100644 tests/plugins/param/param_state.py diff --git a/nonebot/adapters/_adapter.py b/nonebot/adapters/_adapter.py index f22e872c..b373dced 100644 --- a/nonebot/adapters/_adapter.py +++ b/nonebot/adapters/_adapter.py @@ -5,6 +5,9 @@ from ._bot import Bot from nonebot.config import Config from nonebot.drivers import ( Driver, + Request, + Response, + WebSocket, ForwardDriver, ReverseDriver, HTTPServerSetup, @@ -44,6 +47,16 @@ class Adapter(abc.ABC): raise TypeError("Current driver does not support websocket server") self.driver.setup_websocket_server(setup) + async def request(self, setup: Request) -> Response: + if not isinstance(self.driver, ForwardDriver): + raise TypeError("Current driver does not support http client") + return await self.driver.request(setup) + + async def websocket(self, setup: Request) -> WebSocket: + if not isinstance(self.driver, ForwardDriver): + raise TypeError("Current driver does not support websocket client") + return await self.driver.websocket(setup) + @abc.abstractmethod async def _call_api(self, api: str, **data) -> Any: """ diff --git a/nonebot/adapters/_bot.py b/nonebot/adapters/_bot.py index ab6ec419..cfaae3a8 100644 --- a/nonebot/adapters/_bot.py +++ b/nonebot/adapters/_bot.py @@ -8,7 +8,6 @@ from nonebot.log import logger from nonebot.config import Config from nonebot.exception import MockApiException from nonebot.typing import T_CalledAPIHook, T_CallingAPIHook -from nonebot.drivers import Driver, HTTPResponse, HTTPConnection if TYPE_CHECKING: from ._event import Event diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index da5f9273..05786d4b 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -151,6 +151,9 @@ class Dependent(Generic[R]): ) -> Dict[str, Any]: values: Dict[str, Any] = {} + for param in self.parameterless: + await param._solve(**params) + for field in self.params: field_info = field.field_info assert isinstance(field_info, Param), "Params must be subclasses of Param" @@ -168,7 +171,4 @@ class Dependent(Generic[R]): else: values[field.name] = value - for param in self.parameterless: - await param._solve(**params) - return values diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py index 7511c745..daca96b4 100644 --- a/nonebot/drivers/__init__.py +++ b/nonebot/drivers/__init__.py @@ -10,10 +10,14 @@ import asyncio from dataclasses import dataclass from typing import TYPE_CHECKING, Any, Set, Dict, Type, Callable, Awaitable +from ._model import URL as URL from nonebot.log import logger from nonebot.utils import escape_tag +from ._model import Request as Request from nonebot.config import Env, Config -from ._model import URL, Request, Response, WebSocket, HTTPVersion +from ._model import Response as Response +from ._model import WebSocket as WebSocket +from ._model import HTTPVersion as HTTPVersion from nonebot.typing import T_BotConnectionHook, T_BotDisconnectionHook if TYPE_CHECKING: @@ -204,11 +208,11 @@ class ForwardDriver(Driver): """ @abc.abstractmethod - async def request(self, setup: "Request") -> Any: + async def request(self, setup: Request) -> Response: raise NotImplementedError @abc.abstractmethod - async def websocket(self, setup: "Request") -> Any: + async def websocket(self, setup: Request) -> WebSocket: raise NotImplementedError diff --git a/nonebot/matcher.py b/nonebot/matcher.py index 382825bd..acdec706 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -193,6 +193,7 @@ class Matcher(metaclass=MatcherMeta): params.BotParam, params.EventParam, params.StateParam, + params.ArgParam, params.MatcherParam, params.DefaultParam, ] @@ -443,10 +444,10 @@ class Matcher(metaclass=MatcherMeta): async def _receive(event: Event, matcher: "Matcher") -> Union[None, NoReturn]: if matcher.get_receive(id): return - if matcher.get_target() == RECEIVE_KEY.format(id=id): + if matcher.get_target() == RECEIVE_KEY.format(id=id or ""): matcher.set_receive(id, event) return - matcher.set_target(RECEIVE_KEY.format(id=id)) + matcher.set_target(RECEIVE_KEY.format(id=id or "")) raise RejectedException parameterless = [params.Depends(_receive), *(parameterless or [])] @@ -472,7 +473,6 @@ class Matcher(metaclass=MatcherMeta): cls, key: str, prompt: Optional[Union[str, Message, MessageSegment, MessageTemplate]] = None, - args_parser: Optional[T_ArgsParser] = None, parameterless: Optional[List[Any]] = None, ) -> Callable[[T_Handler], T_Handler]: """ @@ -495,6 +495,8 @@ class Matcher(metaclass=MatcherMeta): matcher.set_arg(key, event) return matcher.set_target(ARG_KEY.format(key=key)) + if prompt is not None: + await matcher.send(prompt) raise RejectedException _parameterless = [ @@ -517,7 +519,9 @@ class Matcher(metaclass=MatcherMeta): @classmethod async def send( - cls, message: Union[str, Message, MessageSegment, MessageTemplate], **kwargs + cls, + message: Union[str, Message, MessageSegment, MessageTemplate], + **kwargs: Any, ) -> Any: """ :说明: diff --git a/nonebot/message.py b/nonebot/message.py index a58c0222..72386b7f 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -58,19 +58,21 @@ EVENT_PCS_PARAMS = [ ] RUN_PREPCS_PARAMS = [ params.DependParam, - params.MatcherParam, params.BotParam, params.EventParam, params.StateParam, + params.ArgParam, + params.MatcherParam, params.DefaultParam, ] RUN_POSTPCS_PARAMS = [ params.DependParam, - params.MatcherParam, params.ExceptionParam, params.BotParam, params.EventParam, params.StateParam, + params.ArgParam, + params.MatcherParam, params.DefaultParam, ] diff --git a/nonebot/params.py b/nonebot/params.py index 822fd2a8..a4a6c5f5 100644 --- a/nonebot/params.py +++ b/nonebot/params.py @@ -1,5 +1,6 @@ import asyncio import inspect +from typing_extensions import Literal from typing import Any, Dict, List, Tuple, Callable, Optional, cast from contextlib import AsyncExitStack, contextmanager, asynccontextmanager @@ -200,7 +201,7 @@ async def _event_message(event: Event) -> Message: return event.get_message() -def EventMessage() -> Message: +def EventMessage() -> Any: return Depends(_event_message) @@ -260,7 +261,7 @@ def _command_arg(state=State()) -> Message: return state[PREFIX_KEY][CMD_ARG_KEY] -def CommandArg() -> Message: +def CommandArg() -> Any: return Depends(_command_arg, use_cache=False) @@ -332,6 +333,44 @@ def LastReceived(default: Any = None) -> Any: return Depends(_last_received, use_cache=False) +class ArgInner: + def __init__( + self, key: Optional[str], type: Literal["event", "message", "str"] + ) -> None: + self.key = key + self.type = type + + +def Arg(key: Optional[str] = None) -> Any: + return ArgInner(key, "message") + + +def ArgEvent(key: Optional[str] = None) -> Any: + return ArgInner(key, "event") + + +def ArgStr(key: Optional[str] = None) -> Any: + return ArgInner(key, "str") + + +class ArgParam(Param): + @classmethod + def _check_param( + cls, dependent: Dependent, name: str, param: inspect.Parameter + ) -> Optional["ArgParam"]: + if isinstance(param.default, ArgInner): + return cls(Required, key=param.default.key or name, type=param.default.type) + + async def _solve(self, matcher: "Matcher", **kwargs: Any) -> Any: + event = matcher.get_arg(self.extra["key"]) + if self.extra["type"] == "event": + return event + elif self.extra["type"] == "message": + return event.get_message() + else: + return matcher.get_arg_str(self.extra["key"]) + + class ExceptionParam(Param): @classmethod def _check_param( diff --git a/tests/plugins/depends.py b/tests/plugins/depends.py deleted file mode 100644 index 51226d20..00000000 --- a/tests/plugins/depends.py +++ /dev/null @@ -1,24 +0,0 @@ -from nonebot import on_message -from nonebot.adapters import Event -from nonebot.params import Depends - -test_depends = on_message() - -runned = [] - - -def dependency(event: Event): - # test cache - runned.append(event) - return event - - -@test_depends.handle() -async def depends(x: Event = Depends(dependency)): - # test dependency - return x - - -@test_depends.handle() -async def depends_cache(y: Event = Depends(dependency, use_cache=True)): - return y diff --git a/tests/plugins/param/__init__.py b/tests/plugins/param/__init__.py new file mode 100644 index 00000000..f084d7f1 --- /dev/null +++ b/tests/plugins/param/__init__.py @@ -0,0 +1,7 @@ +from pathlib import Path + +from nonebot import load_plugins + +_sub_plugins = set() + +_sub_plugins |= load_plugins(str(Path(__file__).parent)) diff --git a/tests/plugins/param/param_bot.py b/tests/plugins/param/param_bot.py new file mode 100644 index 00000000..a6befdda --- /dev/null +++ b/tests/plugins/param/param_bot.py @@ -0,0 +1,5 @@ +from nonebot.adapters import Bot + + +async def get_bot(b: Bot): + return b diff --git a/tests/plugins/param/param_depend.py b/tests/plugins/param/param_depend.py new file mode 100644 index 00000000..fc13c415 --- /dev/null +++ b/tests/plugins/param/param_depend.py @@ -0,0 +1,30 @@ +from nonebot import on_message +from nonebot.adapters import Event +from nonebot.params import Depends + +test_depends = on_message() + +runned = [] + + +def dependency(): + runned.append(1) + return 1 + + +def parameterless(): + assert len(runned) == 0 + runned.append(1) + + +# test parameterless +@test_depends.handle(parameterless=[Depends(parameterless)]) +async def depends(x: int = Depends(dependency)): + # test dependency + return x + + +@test_depends.handle() +async def depends_cache(y: int = Depends(dependency, use_cache=True)): + # test cache + return y diff --git a/tests/plugins/param/param_event.py b/tests/plugins/param/param_event.py new file mode 100644 index 00000000..3cc04570 --- /dev/null +++ b/tests/plugins/param/param_event.py @@ -0,0 +1,22 @@ +from nonebot.adapters import Event, Message +from nonebot.params import EventToMe, EventType, EventMessage, EventPlainText + + +async def event(e: Event) -> Event: + return e + + +async def event_type(t: str = EventType()) -> str: + return t + + +async def event_message(msg: Message = EventMessage()) -> Message: + return msg + + +async def event_plain_text(text: str = EventPlainText()) -> str: + return text + + +async def event_to_me(to_me: bool = EventToMe()) -> bool: + return to_me diff --git a/tests/plugins/param/param_matcher.py b/tests/plugins/param/param_matcher.py new file mode 100644 index 00000000..ad8d5bd8 --- /dev/null +++ b/tests/plugins/param/param_matcher.py @@ -0,0 +1,15 @@ +from nonebot.adapters import Event +from nonebot.matcher import Matcher +from nonebot.params import Received, LastReceived + + +async def matcher(m: Matcher) -> Matcher: + return m + + +async def receive(e: Event = Received("test")) -> Event: + return e + + +async def last_receive(e: Event = LastReceived()) -> Event: + return e diff --git a/tests/plugins/param/param_state.py b/tests/plugins/param/param_state.py new file mode 100644 index 00000000..beec94b8 --- /dev/null +++ b/tests/plugins/param/param_state.py @@ -0,0 +1,55 @@ +from typing import List, Tuple + +from nonebot.typing import T_State +from nonebot.adapters import Message +from nonebot.params import ( + State, + Command, + RegexDict, + CommandArg, + RawCommand, + RegexGroup, + RegexMatched, + ShellCommandArgs, + ShellCommandArgv, +) + + +async def state(x: T_State = State()) -> T_State: + return x + + +async def command(cmd: Tuple[str, ...] = Command()) -> Tuple[str, ...]: + return cmd + + +async def raw_command(raw_cmd: str = RawCommand()) -> str: + return raw_cmd + + +async def command_arg(cmd_arg: Message = CommandArg()) -> Message: + return cmd_arg + + +async def shell_command_args( + shell_command_args: dict = ShellCommandArgs(), +) -> dict: + return shell_command_args + + +async def shell_command_argv( + shell_command_argv: List[str] = ShellCommandArgv(), +) -> List[str]: + return shell_command_argv + + +async def regex_dict(regex_dict: dict = RegexDict()) -> dict: + return regex_dict + + +async def regex_group(regex_group: Tuple = RegexGroup()) -> Tuple: + return regex_group + + +async def regex_matched(regex_matched: str = RegexMatched()) -> str: + return regex_matched diff --git a/tests/test_init.py b/tests/test_init.py index ef76676c..3ab17710 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -79,8 +79,11 @@ async def test_get(monkeypatch: pytest.MonkeyPatch, nonebug_clear): async def test_load_plugin(load_plugin: Set["Plugin"]): import nonebot - assert nonebot.get_loaded_plugins() == load_plugin - plugin = nonebot.get_plugin("depends") + loaded_plugins = set( + plugin for plugin in nonebot.get_loaded_plugins() if not plugin.parent_plugin + ) + assert loaded_plugins == load_plugin + plugin = nonebot.get_plugin("param_depend") assert plugin - assert plugin.module_name == "plugins.depends" - assert "plugins.depends" in sys.modules + assert plugin.module_name == "plugins.param.param_depend" + assert "plugins.param.param_depend" in sys.modules diff --git a/tests/test_param.py b/tests/test_param.py index 35a67daa..45f8d128 100644 --- a/tests/test_param.py +++ b/tests/test_param.py @@ -1,23 +1,19 @@ import pytest from nonebug import App -from utils import load_plugin, make_fake_event +from utils import load_plugin, make_fake_event, make_fake_message @pytest.mark.asyncio -async def test_depends(app: App, load_plugin): - from nonebot.params import EventParam, DependParam +async def test_depend(app: App, load_plugin): + from nonebot.params import DependParam - from plugins.depends import runned, depends, test_depends + from plugins.param.param_depend import runned, depends, test_depends - async with app.test_dependent( - depends, allow_types=[EventParam, DependParam] - ) as ctx: - event = make_fake_event()() - ctx.pass_params(event=event) - ctx.should_return(event) + async with app.test_dependent(depends, allow_types=[DependParam]) as ctx: + ctx.should_return(1) - assert len(runned) == 1 and runned[0] == event + assert len(runned) == 1 and runned[0] == 1 runned.clear() @@ -26,4 +22,181 @@ async def test_depends(app: App, load_plugin): event_next = make_fake_event()() ctx.receive_event(bot, event_next) - assert len(runned) == 1 and runned[0] == event_next + assert len(runned) == 2 and runned[0] == runned[1] == 1 + + +@pytest.mark.asyncio +async def test_bot(app: App, load_plugin): + from nonebot.params import BotParam + + from plugins.param.param_bot import get_bot + + async with app.test_dependent(get_bot, allow_types=[BotParam]) as ctx: + bot = ctx.create_bot() + ctx.pass_params(bot=bot) + ctx.should_return(bot) + + +@pytest.mark.asyncio +async def test_event(app: App, load_plugin): + from nonebot.params import EventParam, DependParam + + from plugins.param.param_event import ( + event, + event_type, + event_to_me, + event_message, + event_plain_text, + ) + + fake_message = make_fake_message()("text") + fake_event = make_fake_event(_message=fake_message)() + + async with app.test_dependent(event, allow_types=[EventParam]) as ctx: + ctx.pass_params(event=fake_event) + ctx.should_return(fake_event) + + async with app.test_dependent( + event_type, allow_types=[EventParam, DependParam] + ) as ctx: + ctx.pass_params(event=fake_event) + ctx.should_return(fake_event.get_type()) + + async with app.test_dependent( + event_message, allow_types=[EventParam, DependParam] + ) as ctx: + ctx.pass_params(event=fake_event) + ctx.should_return(fake_event.get_message()) + + async with app.test_dependent( + event_plain_text, allow_types=[EventParam, DependParam] + ) as ctx: + ctx.pass_params(event=fake_event) + ctx.should_return(fake_event.get_plaintext()) + + async with app.test_dependent( + event_to_me, allow_types=[EventParam, DependParam] + ) as ctx: + ctx.pass_params(event=fake_event) + ctx.should_return(fake_event.is_tome()) + + +@pytest.mark.asyncio +async def test_state(app: App, load_plugin): + from nonebot.params import StateParam, DependParam + from nonebot.consts import ( + CMD_KEY, + PREFIX_KEY, + REGEX_DICT, + SHELL_ARGS, + SHELL_ARGV, + CMD_ARG_KEY, + RAW_CMD_KEY, + REGEX_GROUP, + REGEX_MATCHED, + ) + + from plugins.param.param_state import ( + state, + command, + regex_dict, + command_arg, + raw_command, + regex_group, + regex_matched, + shell_command_args, + shell_command_argv, + ) + + fake_message = make_fake_message()("text") + fake_state = { + PREFIX_KEY: {CMD_KEY: ("cmd",), RAW_CMD_KEY: "/cmd", CMD_ARG_KEY: fake_message}, + SHELL_ARGV: ["-h"], + SHELL_ARGS: {"help": True}, + REGEX_MATCHED: "[cq:test,arg=value]", + REGEX_GROUP: ("test", "arg=value"), + REGEX_DICT: {"type": "test", "arg": "value"}, + } + + async with app.test_dependent(state, allow_types=[StateParam]) as ctx: + ctx.pass_params(state=fake_state) + ctx.should_return(fake_state) + + async with app.test_dependent( + command, allow_types=[StateParam, DependParam] + ) as ctx: + ctx.pass_params(state=fake_state) + ctx.should_return(fake_state[PREFIX_KEY][CMD_KEY]) + + async with app.test_dependent( + raw_command, allow_types=[StateParam, DependParam] + ) as ctx: + ctx.pass_params(state=fake_state) + ctx.should_return(fake_state[PREFIX_KEY][RAW_CMD_KEY]) + + async with app.test_dependent( + command_arg, allow_types=[StateParam, DependParam] + ) as ctx: + ctx.pass_params(state=fake_state) + ctx.should_return(fake_state[PREFIX_KEY][CMD_ARG_KEY]) + + async with app.test_dependent( + shell_command_argv, allow_types=[StateParam, DependParam] + ) as ctx: + ctx.pass_params(state=fake_state) + ctx.should_return(fake_state[SHELL_ARGV]) + + async with app.test_dependent( + shell_command_args, allow_types=[StateParam, DependParam] + ) as ctx: + ctx.pass_params(state=fake_state) + ctx.should_return(fake_state[SHELL_ARGS]) + + async with app.test_dependent( + regex_matched, allow_types=[StateParam, DependParam] + ) as ctx: + ctx.pass_params(state=fake_state) + ctx.should_return(fake_state[REGEX_MATCHED]) + + async with app.test_dependent( + regex_group, allow_types=[StateParam, DependParam] + ) as ctx: + ctx.pass_params(state=fake_state) + ctx.should_return(fake_state[REGEX_GROUP]) + + async with app.test_dependent( + regex_dict, allow_types=[StateParam, DependParam] + ) as ctx: + ctx.pass_params(state=fake_state) + ctx.should_return(fake_state[REGEX_DICT]) + + +@pytest.mark.asyncio +async def test_matcher(app: App, load_plugin): + from nonebot.matcher import Matcher + from nonebot.params import DependParam, MatcherParam + + from plugins.param.param_matcher import matcher, receive, last_receive + + fake_matcher = Matcher() + + async with app.test_dependent(matcher, allow_types=[MatcherParam]) as ctx: + ctx.pass_params(matcher=fake_matcher) + ctx.should_return(fake_matcher) + + event = make_fake_event()() + fake_matcher.set_receive("test", event) + event_next = make_fake_event()() + fake_matcher.set_receive(None, event_next) + + async with app.test_dependent( + receive, allow_types=[MatcherParam, DependParam] + ) as ctx: + ctx.pass_params(matcher=fake_matcher) + ctx.should_return(event) + + async with app.test_dependent( + last_receive, allow_types=[MatcherParam, DependParam] + ) as ctx: + ctx.pass_params(matcher=fake_matcher) + ctx.should_return(event_next) diff --git a/tests/utils.py b/tests/utils.py index 2e90ca7e..d516665f 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -9,6 +9,36 @@ if TYPE_CHECKING: from nonebot.adapters import Event, Message +def make_fake_message() -> Type["Message"]: + from nonebot.adapters import Message, MessageSegment + + class FakeMessageSegment(MessageSegment): + @classmethod + def get_message_class(cls): + return FakeMessage + + def __str__(self) -> str: + return self.data["text"] + + @classmethod + def text(cls, text: str): + return cls("text", {"text": text}) + + def is_text(self) -> bool: + return True + + class FakeMessage(Message): + @classmethod + def get_segment_class(cls): + return FakeMessageSegment + + @staticmethod + def _construct(msg: str): + yield FakeMessageSegment.text(msg) + + return FakeMessage + + def make_fake_event( _type: str = "message", _name: str = "test", From 44e5182322d42cc54f7e7bffe279638007d4d544 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 20 Dec 2021 00:28:17 +0800 Subject: [PATCH 093/174] :bug: fix parent plugin detect error --- nonebot/plugin/manager.py | 6 ++++-- nonebot/plugin/plugin.py | 14 +++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/nonebot/plugin/manager.py b/nonebot/plugin/manager.py index a4b375ab..e029efde 100644 --- a/nonebot/plugin/manager.py +++ b/nonebot/plugin/manager.py @@ -150,9 +150,11 @@ class PluginLoader(SourceFileLoader): if self.loaded: return - plugin = _new_plugin(self.name, module) + plugin = _new_plugin(self.name, module, self.manager) parent_plugin = _current_plugin.get() - if parent_plugin: + if parent_plugin and _managers.index(parent_plugin.manager) < _managers.index( + self.manager + ): plugin.parent_plugin = parent_plugin parent_plugin.sub_plugins.add(plugin) diff --git a/nonebot/plugin/plugin.py b/nonebot/plugin/plugin.py index 49e95dc2..88ebd304 100644 --- a/nonebot/plugin/plugin.py +++ b/nonebot/plugin/plugin.py @@ -1,10 +1,13 @@ from types import ModuleType from dataclasses import field, dataclass -from typing import Set, Dict, Type, Optional +from typing import TYPE_CHECKING, Set, Dict, Type, Optional from .export import Export from nonebot.matcher import Matcher +if TYPE_CHECKING: + from .manager import PluginManager + plugins: Dict[str, "Plugin"] = {} """ :类型: ``Dict[str, Plugin]`` @@ -31,6 +34,11 @@ class Plugin(object): - **类型**: ``str`` - **说明**: 点分割模块路径 """ + manager: "PluginManager" + """ + - **类型**: ``PluginManager`` + - **说明**: 导入该插件的插件管理器 + """ export: Export = field(default_factory=Export) """ - **类型**: ``Export`` @@ -83,10 +91,10 @@ def get_loaded_plugins() -> Set[Plugin]: return set(plugins.values()) -def _new_plugin(fullname: str, module: ModuleType) -> Plugin: +def _new_plugin(fullname: str, module: ModuleType, manager: "PluginManager") -> Plugin: name = fullname.rsplit(".", 1)[-1] if "." in fullname else fullname if name in plugins: raise RuntimeError("Plugin already exists! Check your plugin name.") - plugin = Plugin(name, module, fullname) + plugin = Plugin(name, module, fullname, manager) plugins[name] = plugin return plugin From 008c6fd0364f8583acef0989700b736248efb08b Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 20 Dec 2021 10:08:28 +0800 Subject: [PATCH 094/174] :lock: fix netlify action #631 --- .github/workflows/website-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/website-deploy.yml b/.github/workflows/website-deploy.yml index 3da67e69..0d6271d4 100644 --- a/.github/workflows/website-deploy.yml +++ b/.github/workflows/website-deploy.yml @@ -70,7 +70,7 @@ jobs: echo "PRODUCTION=false" >> $GITHUB_ENV - name: Deploy to Netlify - uses: nwtgck/actions-netlify@v1.1 + uses: nwtgck/actions-netlify@v1 with: publish-dir: './website/build' production-deploy: ${{ env.PRODUCTION }} From 6968d34fc293ea1b9e32f2ac41a3a836d6671a91 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 20 Dec 2021 10:10:22 +0800 Subject: [PATCH 095/174] :construction_worker: update codecov --- .github/workflows/codecov.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index e6002bfa..953d2038 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -20,8 +20,10 @@ jobs: - uses: Gr1N/setup-poetry@v4 - name: Install dependencies + run: poetry install -E all + + - name: Run Pytest run: | - poetry install -E all cd tests/ poetry run pytest --cov-report xml From 0d24a7984063351a6ba79260f043b17d583fdc19 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 20 Dec 2021 14:31:48 +0800 Subject: [PATCH 096/174] :white_check_mark: add param tests --- tests/plugins/param/param_arg.py | 14 ++++++++ tests/plugins/param/param_default.py | 2 ++ tests/plugins/param/param_exception.py | 6 ++++ tests/test_param.py | 47 ++++++++++++++++++++++++++ 4 files changed, 69 insertions(+) create mode 100644 tests/plugins/param/param_arg.py create mode 100644 tests/plugins/param/param_default.py create mode 100644 tests/plugins/param/param_exception.py diff --git a/tests/plugins/param/param_arg.py b/tests/plugins/param/param_arg.py new file mode 100644 index 00000000..bd3e2bcf --- /dev/null +++ b/tests/plugins/param/param_arg.py @@ -0,0 +1,14 @@ +from nonebot.adapters import Event, Message +from nonebot.params import Arg, ArgStr, ArgEvent + + +async def arg(key: Message = Arg()) -> Message: + return key + + +async def arg_str(key: str = ArgStr()) -> str: + return key + + +async def arg_event(key: Event = ArgEvent()) -> Event: + return key diff --git a/tests/plugins/param/param_default.py b/tests/plugins/param/param_default.py new file mode 100644 index 00000000..33660f83 --- /dev/null +++ b/tests/plugins/param/param_default.py @@ -0,0 +1,2 @@ +async def default(value: int = 1) -> int: + return value diff --git a/tests/plugins/param/param_exception.py b/tests/plugins/param/param_exception.py new file mode 100644 index 00000000..516323a4 --- /dev/null +++ b/tests/plugins/param/param_exception.py @@ -0,0 +1,6 @@ +from typing import Union + + +async def exc(e: Exception, x: Union[ValueError, TypeError]) -> Exception: + assert e == x + return e diff --git a/tests/test_param.py b/tests/test_param.py index 45f8d128..55725385 100644 --- a/tests/test_param.py +++ b/tests/test_param.py @@ -200,3 +200,50 @@ async def test_matcher(app: App, load_plugin): ) as ctx: ctx.pass_params(matcher=fake_matcher) ctx.should_return(event_next) + + +@pytest.mark.asyncio +async def test_arg(app: App, load_plugin): + from nonebot.matcher import Matcher + from nonebot.params import ArgParam + + from plugins.param.param_arg import arg, arg_str, arg_event + + matcher = Matcher() + message = make_fake_message()("text") + event = make_fake_event(_message=message)() + matcher.set_arg("key", event) + + async with app.test_dependent(arg, allow_types=[ArgParam]) as ctx: + ctx.pass_params(matcher=matcher) + ctx.should_return(message) + + async with app.test_dependent(arg_str, allow_types=[ArgParam]) as ctx: + ctx.pass_params(matcher=matcher) + ctx.should_return(str(message)) + + async with app.test_dependent(arg_event, allow_types=[ArgParam]) as ctx: + ctx.pass_params(matcher=matcher) + ctx.should_return(event) + + +@pytest.mark.asyncio +async def test_exception(app: App, load_plugin): + from nonebot.params import ExceptionParam + + from plugins.param.param_exception import exc + + exception = ValueError("test") + async with app.test_dependent(exc, allow_types=[ExceptionParam]) as ctx: + ctx.pass_params(exception=exception) + ctx.should_return(exception) + + +@pytest.mark.asyncio +async def test_default(app: App, load_plugin): + from nonebot.params import DefaultParam + + from plugins.param.param_default import default + + async with app.test_dependent(default, allow_types=[DefaultParam]) as ctx: + ctx.should_return(1) From c49059f9d3918cdda7b89c7eef00450ec2e4f087 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 20 Dec 2021 14:50:11 +0800 Subject: [PATCH 097/174] :white_check_mark: add more depend test case --- tests/plugins/param/param_depend.py | 21 ++++++++++++++++++++- tests/test_param.py | 11 ++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/tests/plugins/param/param_depend.py b/tests/plugins/param/param_depend.py index fc13c415..5e4c438b 100644 --- a/tests/plugins/param/param_depend.py +++ b/tests/plugins/param/param_depend.py @@ -1,5 +1,6 @@ +from dataclasses import dataclass + from nonebot import on_message -from nonebot.adapters import Event from nonebot.params import Depends test_depends = on_message() @@ -17,6 +18,20 @@ def parameterless(): runned.append(1) +def gen_sync(): + yield 1 + + +async def gen_async(): + yield 2 + + +@dataclass +class ClassDependency: + x: int = Depends(gen_sync) + y: int = Depends(gen_async) + + # test parameterless @test_depends.handle(parameterless=[Depends(parameterless)]) async def depends(x: int = Depends(dependency)): @@ -28,3 +43,7 @@ async def depends(x: int = Depends(dependency)): async def depends_cache(y: int = Depends(dependency, use_cache=True)): # test cache return y + + +async def class_depend(c: ClassDependency = Depends()): + return c diff --git a/tests/test_param.py b/tests/test_param.py index 55725385..c338091e 100644 --- a/tests/test_param.py +++ b/tests/test_param.py @@ -8,7 +8,13 @@ from utils import load_plugin, make_fake_event, make_fake_message async def test_depend(app: App, load_plugin): from nonebot.params import DependParam - from plugins.param.param_depend import runned, depends, test_depends + from plugins.param.param_depend import ( + ClassDependency, + runned, + depends, + class_depend, + test_depends, + ) async with app.test_dependent(depends, allow_types=[DependParam]) as ctx: ctx.should_return(1) @@ -24,6 +30,9 @@ async def test_depend(app: App, load_plugin): assert len(runned) == 2 and runned[0] == runned[1] == 1 + async with app.test_dependent(class_depend, allow_types=[DependParam]) as ctx: + ctx.should_return(ClassDependency(x=1, y=2)) + @pytest.mark.asyncio async def test_bot(app: App, load_plugin): From ea8f7717b9c4d1f2586fdf7184ddddc0ee0127f0 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 20 Dec 2021 15:46:23 +0800 Subject: [PATCH 098/174] :recycle: rewrite quart driver --- nonebot/drivers/fastapi.py | 33 +++----- nonebot/drivers/quart.py | 159 +++++++++++++------------------------ nonebot/params.py | 1 - 3 files changed, 64 insertions(+), 129 deletions(-) diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index 8eea6ea2..8efdf36e 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -27,9 +27,9 @@ from nonebot.config import Env from nonebot.typing import overrides from nonebot.utils import escape_tag from nonebot.config import Config as NoneBotConfig -from nonebot.drivers import Request as GenericRequest +from nonebot.drivers import Request as BaseRequest +from nonebot.drivers import Response as BaseResponse from nonebot.drivers import WebSocket as BaseWebSocket -from nonebot.drivers import Response as GenericResponse from nonebot.drivers import ( HTTPVersion, ForwardDriver, @@ -247,7 +247,7 @@ class Driver(ReverseDriver): request: Request, setup: HTTPServerSetup, ): - http_request = GenericRequest( + http_request = BaseRequest( request.method, str(request.url), headers=request.headers.items(), @@ -260,7 +260,7 @@ class Driver(ReverseDriver): return Response(response.content, response.status_code, dict(response.headers)) async def _handle_ws(self, websocket: WebSocket, setup: WebSocketServerSetup): - request = GenericRequest( + request = BaseRequest( "GET", str(websocket.url), headers=websocket.headers.items(), @@ -293,7 +293,7 @@ class FullDriver(ForwardDriver, Driver): return "fastapi_full" @overrides(ForwardDriver) - async def request(self, setup: "GenericRequest") -> Any: + async def request(self, setup: "BaseRequest") -> Any: async with httpx.AsyncClient( http2=setup.version == HTTPVersion.H2, follow_redirects=True ) as client: @@ -304,7 +304,7 @@ class FullDriver(ForwardDriver, Driver): headers=tuple(setup.headers.items()), timeout=30.0, ) - return GenericResponse( + return BaseResponse( response.status_code, headers=response.headers, content=response.content, @@ -312,31 +312,24 @@ class FullDriver(ForwardDriver, Driver): ) @overrides(ForwardDriver) - async def websocket(self, setup: "GenericRequest") -> Any: + async def websocket(self, setup: "BaseRequest") -> Any: ws = await Connect(str(setup.url), extra_headers=setup.headers.items()) return WebSocketsWS(request=setup, websocket=ws) class WebSocketsWS(BaseWebSocket): @overrides(BaseWebSocket) - def __init__(self, *, request: GenericRequest, websocket: WebSocketClientProtocol): + def __init__(self, *, request: BaseRequest, websocket: WebSocketClientProtocol): super().__init__(request=request) self.websocket = websocket @property @overrides(BaseWebSocket) def closed(self) -> bool: - # if isinstance(self.websocket, WebSocket): - # return ( - # self.websocket.client_state == WebSocketState.DISCONNECTED - # or self.websocket.application_state == WebSocketState.DISCONNECTED - # ) return self.websocket.closed @overrides(BaseWebSocket) async def accept(self): - # if isinstance(self.websocket, WebSocket): - # await self.websocket.accept() raise NotImplementedError @overrides(BaseWebSocket) @@ -345,8 +338,6 @@ class WebSocketsWS(BaseWebSocket): @overrides(BaseWebSocket) async def receive(self) -> str: - # if isinstance(self.websocket, WebSocket): - # return await self.websocket.receive_text() msg = await self.websocket.recv() if isinstance(msg, bytes): raise TypeError("WebSocket received unexpected frame type: bytes") @@ -354,8 +345,6 @@ class WebSocketsWS(BaseWebSocket): @overrides(BaseWebSocket) async def receive_bytes(self) -> bytes: - # if isinstance(self.websocket, WebSocket): - # return await self.websocket.receive_bytes() msg = await self.websocket.recv() if isinstance(msg, str): raise TypeError("WebSocket received unexpected frame type: str") @@ -363,20 +352,16 @@ class WebSocketsWS(BaseWebSocket): @overrides(BaseWebSocket) async def send(self, data: str) -> None: - # if isinstance(self.websocket, WebSocket): - # await self.websocket.send({"type": "websocket.send", "text": data}) await self.websocket.send(data) @overrides(BaseWebSocket) async def send_bytes(self, data: bytes) -> None: - # if isinstance(self.websocket, WebSocket): - # await self.websocket.send({"type": "websocket.send", "bytes": data}) await self.websocket.send(data) class FastAPIWebSocket(BaseWebSocket): @overrides(BaseWebSocket) - def __init__(self, *, request: GenericRequest, websocket: WebSocket): + def __init__(self, *, request: BaseRequest, websocket: WebSocket): super().__init__(request=request) self.websocket = websocket diff --git a/nonebot/drivers/quart.py b/nonebot/drivers/quart.py index 79055eb9..7527957e 100644 --- a/nonebot/drivers/quart.py +++ b/nonebot/drivers/quart.py @@ -8,8 +8,7 @@ Quart 驱动适配 https://pgjones.gitlab.io/quart/index.html """ -import asyncio -from dataclasses import dataclass +from functools import partial from typing import List, TypeVar, Callable, Optional, Coroutine import uvicorn @@ -20,8 +19,9 @@ from nonebot.log import logger from nonebot.typing import overrides from nonebot.utils import escape_tag from nonebot.config import Config as NoneBotConfig -from nonebot.drivers import HTTPRequest, ReverseDriver +from nonebot.drivers import Request as BaseRequest from nonebot.drivers import WebSocket as BaseWebSocket +from nonebot.drivers import ReverseDriver, HTTPServerSetup, WebSocketServerSetup try: from quart import request as _request @@ -98,11 +98,6 @@ class Config(BaseSettings): class Driver(ReverseDriver): """ Quart 驱动框架 - - :上报地址: - - * ``/{adapter name}/http``: HTTP POST 上报 - * ``/{adapter name}/ws``: WebSocket 上报 """ def __init__(self, env: Env, config: NoneBotConfig): @@ -111,12 +106,6 @@ class Driver(ReverseDriver): self.quart_config = Config(**config.dict()) self._server_app = Quart(self.__class__.__qualname__) - self._server_app.add_url_rule( - "//http", methods=["POST"], view_func=self._handle_http - ) - self._server_app.add_websocket( - "//ws", view_func=self._handle_ws_reverse - ) @property @overrides(ReverseDriver) @@ -142,6 +131,21 @@ class Driver(ReverseDriver): """Quart 使用的 logger""" return self._server_app.logger + @overrides(ReverseDriver) + def setup_http_server(self, setup: HTTPServerSetup): + self._server_app.add_url_rule( + setup.path.path, + methods=[setup.method], + view_func=partial(self._handle_http, setup=setup), + ) + + @overrides(ReverseDriver) + def setup_websocket_server(self, setup: WebSocketServerSetup) -> None: + self._server_app.add_websocket( + setup.path.path, + view_func=partial(self._handle_ws, setup=setup), + ) + @overrides(ReverseDriver) def on_startup(self, func: _AsyncCallable) -> _AsyncCallable: """参考文档: `Startup and Shutdown`_ @@ -199,128 +203,75 @@ class Driver(ReverseDriver): **kwargs, ) - async def _handle_http(self, adapter: str): + async def _handle_http(self, setup: HTTPServerSetup) -> Response: request: Request = _request - data: bytes = await request.get_data() # type: ignore - if adapter not in self._adapters: - logger.warning( - f"Unknown adapter {adapter}. " "Please register the adapter before use." - ) - raise exceptions.NotFound() - - BotClass = self._adapters[adapter] - http_request = HTTPRequest( - request.http_version, - request.scheme, - request.path, - request.query_string, - dict(request.headers), + http_request = BaseRequest( request.method, - data, + request.url, + headers=request.headers.items(), + cookies=list(request.cookies.items()), + content=await request.get_data( + cache=False, as_text=False, parse_form_data=False + ), + version=request.http_version, ) - self_id, response = await BotClass.check_permission(self, http_request) + response = await setup.handle_func(http_request) - if not self_id: - raise exceptions.Unauthorized( - description=(response and response.body or b"").decode() - ) - if self_id in self._clients: - logger.warning( - "There's already a reverse websocket connection," - "so the event may be handled twice." - ) - bot = BotClass(self_id, http_request) - asyncio.create_task(bot.handle_message(data)) return Response( - response and response.body or "", response and response.status or 200 + response.content or "", + response.status_code or 200, + headers=dict(response.headers), ) - async def _handle_ws_reverse(self, adapter: str): + async def _handle_ws(self, setup: WebSocketServerSetup) -> None: websocket: QuartWebSocket = _websocket - ws = WebSocket( - websocket.http_version, - websocket.scheme, - websocket.path, - websocket.query_string, - dict(websocket.headers), - websocket, + + http_request = BaseRequest( + websocket.method, + websocket.url, + headers=websocket.headers.items(), + cookies=list(websocket.cookies.items()), + version=websocket.http_version, ) - if adapter not in self._adapters: - logger.warning( - f"Unknown adapter {adapter}. Please register the adapter before use." - ) - raise exceptions.NotFound() + ws = WebSocket(request=http_request, websocket=websocket) - BotClass = self._adapters[adapter] - self_id, response = await BotClass.check_permission(self, ws) - - if not self_id: - raise exceptions.Unauthorized( - description=(response and response.body or b"").decode() - ) - - if self_id in self._clients: - logger.opt(colors=True).warning( - "There's already a websocket connection, " - f"{escape_tag(adapter.upper())} Bot {escape_tag(self_id)} ignored." - ) - raise exceptions.Forbidden(description="Client already exists.") - - bot = BotClass(self_id, ws) - await ws.accept() - logger.opt(colors=True).info( - f"WebSocket Connection from {escape_tag(adapter.upper())} " - f"Bot {escape_tag(self_id)} Accepted!" - ) - self._bot_connect(bot) - - try: - while not ws.closed: - try: - data = await ws.receive() - except asyncio.CancelledError: - logger.warning("WebSocket disconnected by peer.") - break - except Exception as e: - logger.opt(exception=e).error( - "Error when receiving data from websocket." - ) - break - - asyncio.create_task(bot.handle_message(data.encode())) - finally: - self._bot_disconnect(bot) + await setup.handle_func(ws) -@dataclass class WebSocket(BaseWebSocket): - websocket: QuartWebSocket = None # type: ignore + def __init__(self, *, request: BaseRequest, websocket: QuartWebSocket): + super().__init__(request=request) + self.websocket = websocket @property @overrides(BaseWebSocket) def closed(self): - # FIXME - return False + raise NotImplementedError @overrides(BaseWebSocket) async def accept(self): await self.websocket.accept() @overrides(BaseWebSocket) - async def close(self): - # FIXME - pass + async def close(self, code: int = 1000): + await self.websocket.close(code) @overrides(BaseWebSocket) async def receive(self) -> str: - return await self.websocket.receive() # type: ignore + msg = await self.websocket.receive() + if isinstance(msg, bytes): + raise TypeError("WebSocket received unexpected frame type: bytes") + return msg @overrides(BaseWebSocket) async def receive_bytes(self) -> bytes: - return await self.websocket.receive() # type: ignore + msg = await self.websocket.receive() + if isinstance(msg, str): + raise TypeError("WebSocket received unexpected frame type: str") + return msg @overrides(BaseWebSocket) async def send(self, data: str): diff --git a/nonebot/params.py b/nonebot/params.py index a4a6c5f5..bab4ed7f 100644 --- a/nonebot/params.py +++ b/nonebot/params.py @@ -61,7 +61,6 @@ def Depends( * ``dependency: Optional[Callable[..., Any]] = None``: 依赖函数。默认为参数的类型注释。 * ``use_cache: bool = True``: 是否使用缓存。默认为 ``True``。 - * ``allow_types: Optional[List[Type[Param]]] = None``: 允许的参数类型。默认为 ``None``。 .. code-block:: python From 883ea18224024badeb45d77c20670e786ae957dc Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 20 Dec 2021 15:53:05 +0800 Subject: [PATCH 099/174] :zap: improve echo matcher --- nonebot/plugins/echo.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nonebot/plugins/echo.py b/nonebot/plugins/echo.py index a070fc11..082cf420 100644 --- a/nonebot/plugins/echo.py +++ b/nonebot/plugins/echo.py @@ -1,10 +1,11 @@ from nonebot.rule import to_me -from nonebot.adapters import Event +from nonebot.adapters import Message from nonebot.plugin import on_command +from nonebot.params import EventMessage echo = on_command("echo", to_me()) @echo.handle() -async def echo_escape(event: Event): - await echo.send(message=event.get_message()) +async def echo_escape(message: Message = EventMessage()): + await echo.send(message=message) From d549cdf26a19907004f8f01d5f4abb6a83054001 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 20 Dec 2021 16:06:18 +0800 Subject: [PATCH 100/174] :arrow_up: bump dependency version --- poetry.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/poetry.lock b/poetry.lock index fedf1714..5a8b1d57 100644 --- a/poetry.lock +++ b/poetry.lock @@ -381,7 +381,7 @@ http2 = ["h2 (>=3,<5)"] [[package]] name = "hypercorn" -version = "0.13.0" +version = "0.13.1" description = "A ASGI Server based on Hyper libraries and inspired by Gunicorn" category = "main" optional = true @@ -426,11 +426,11 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "importlib-metadata" -version = "4.8.3" +version = "4.10.0" description = "Read metadata from Python packages" category = "main" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" [package.dependencies] typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} @@ -439,7 +439,7 @@ zipp = ">=0.5" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] perf = ["ipython"] -testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pep517", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"] +testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "packaging", "pyfakefs", "flufl.flake8", "pytest-perf (>=0.9.2)", "pytest-black (>=0.3.7)", "pytest-mypy", "importlib-resources (>=1.3)"] [[package]] name = "iniconfig" @@ -543,7 +543,7 @@ pytest-order = "^1.0.0" type = "git" url = "https://github.com/nonebot/nonebug.git" reference = "master" -resolved_reference = "6b965e522fce31c0d2c59de11c152a35fe079577" +resolved_reference = "5cb87c36aac56da3c71dd8c5aaa9b16396afc528" [[package]] name = "packaging" @@ -844,7 +844,7 @@ python-versions = "*" [[package]] name = "sphinx" -version = "4.3.1" +version = "4.3.2" description = "Python documentation generator" category = "dev" optional = false @@ -870,7 +870,7 @@ sphinxcontrib-serializinghtml = ">=1.1.5" [package.extras] docs = ["sphinxcontrib-websupport"] -lint = ["flake8 (>=3.5.0)", "isort", "mypy (>=0.900)", "docutils-stubs", "types-typed-ast", "types-pkg-resources", "types-requests"] +lint = ["flake8 (>=3.5.0)", "isort", "mypy (>=0.920)", "docutils-stubs", "types-typed-ast", "types-pkg-resources", "types-requests"] test = ["pytest", "pytest-cov", "html5lib", "cython", "typed-ast"] [[package]] @@ -1629,8 +1629,8 @@ httpx = [ {file = "httpx-0.21.1.tar.gz", hash = "sha256:02af20df486b78892a614a7ccd4e4e86a5409ec4981ab0e422c579a887acad83"}, ] hypercorn = [ - {file = "Hypercorn-0.13.0-py3-none-any.whl", hash = "sha256:eafbed8b1cb9827552c0066386d3e693c16d3977dd60896bfa07dca4c9d92a20"}, - {file = "Hypercorn-0.13.0.tar.gz", hash = "sha256:229d1e8684919c455281526d7c19e3568d51e4e5657a0051a4625d00902a1122"}, + {file = "Hypercorn-0.13.1-py3-none-any.whl", hash = "sha256:fcbfd5b691176cfcbf558cfa536909b2ef249af5528c99fcf941405c1c9aba74"}, + {file = "Hypercorn-0.13.1.tar.gz", hash = "sha256:3f55c7d0a51a93601d24fb773b88b1cd05c8ccb33e19294d1215bc0e19a6939c"}, ] hyperframe = [ {file = "hyperframe-6.0.1-py3-none-any.whl", hash = "sha256:0ec6bafd80d8ad2195c4f03aacba3a8265e57bc4cff261e802bf39970ed02a15"}, @@ -1645,8 +1645,8 @@ imagesize = [ {file = "imagesize-1.3.0.tar.gz", hash = "sha256:cd1750d452385ca327479d45b64d9c7729ecf0b3969a58148298c77092261f9d"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.8.3-py3-none-any.whl", hash = "sha256:65a9576a5b2d58ca44d133c42a241905cc45e34d2c06fd5ba2bafa221e5d7b5e"}, - {file = "importlib_metadata-4.8.3.tar.gz", hash = "sha256:766abffff765960fcc18003801f7044eb6755ffae4521c8e8ce8e83b9c9b0668"}, + {file = "importlib_metadata-4.10.0-py3-none-any.whl", hash = "sha256:b7cf7d3fef75f1e4c80a96ca660efbd51473d7e8f39b5ab9210febc7809012a4"}, + {file = "importlib_metadata-4.10.0.tar.gz", hash = "sha256:92a8b58ce734b2a4494878e0ecf7d79ccd7a128b5fc6014c401e0b61f006f0f6"}, ] iniconfig = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, @@ -1998,8 +1998,8 @@ snowballstemmer = [ {file = "snowballstemmer-2.2.0.tar.gz", hash = "sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"}, ] sphinx = [ - {file = "Sphinx-4.3.1-py3-none-any.whl", hash = "sha256:048dac56039a5713f47a554589dc98a442b39226a2b9ed7f82797fcb2fe9253f"}, - {file = "Sphinx-4.3.1.tar.gz", hash = "sha256:32a5b3e9a1b176cc25ed048557d4d3d01af635e6b76c5bc7a43b0a34447fbd45"}, + {file = "Sphinx-4.3.2-py3-none-any.whl", hash = "sha256:6a11ea5dd0bdb197f9c2abc2e0ce73e01340464feaece525e64036546d24c851"}, + {file = "Sphinx-4.3.2.tar.gz", hash = "sha256:0a8836751a68306b3fe97ecbe44db786f8479c3bf4b80e3a7f5c838657b4698c"}, ] sphinx-markdown-builder = [] sphinxcontrib-applehelp = [ From e9b8515cf155df6cca98d3d60bcd55ba07ceb043 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 21 Dec 2021 00:39:12 +0800 Subject: [PATCH 101/174] :white_check_mark: add got receive tests --- nonebot/dependencies/__init__.py | 9 +++++ nonebot/matcher.py | 69 ++++++++++---------------------- nonebot/params.py | 6 +-- tests/.env.test | 1 + tests/plugins/matcher.py | 35 ++++++++++++++++ tests/test_matcher.py | 41 +++++++++++++++++++ tests/test_param.py | 2 +- 7 files changed, 111 insertions(+), 52 deletions(-) create mode 100644 tests/plugins/matcher.py create mode 100644 tests/test_matcher.py diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index 05786d4b..54853dee 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -58,6 +58,15 @@ class Dependent(Generic[R]): self.parameterless = parameterless or [] self.allow_types = allow_types or [] + def __repr__(self) -> str: + return ( + f"" + ) + + def __str__(self) -> str: + return self.__repr__() + async def __call__(self, **kwargs: Any) -> R: values = await self.solve(**kwargs) diff --git a/nonebot/matcher.py b/nonebot/matcher.py index acdec706..a90ac63b 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -172,11 +172,6 @@ class Matcher(metaclass=MatcherMeta): :说明: 事件响应器默认状态 """ - _default_parser: Optional[Dependent[None]] = None - """ - :类型: ``Optional[Dependent]`` - :说明: 事件响应器默认参数解析函数 - """ _default_type_updater: Optional[Dependent[str]] = None """ :类型: ``Optional[Dependent]`` @@ -441,28 +436,27 @@ class Matcher(metaclass=MatcherMeta): * ``parameterless: Optional[List[Any]]``: 非参数类型依赖列表 """ + _id = id or "" + async def _receive(event: Event, matcher: "Matcher") -> Union[None, NoReturn]: - if matcher.get_receive(id): + if matcher.get_receive(_id): return - if matcher.get_target() == RECEIVE_KEY.format(id=id or ""): - matcher.set_receive(id, event) + if matcher.get_target() == RECEIVE_KEY.format(id=_id): + matcher.set_receive(_id, event) return - matcher.set_target(RECEIVE_KEY.format(id=id or "")) + matcher.set_target(RECEIVE_KEY.format(id=_id)) raise RejectedException - parameterless = [params.Depends(_receive), *(parameterless or [])] + _parameterless = [params.Depends(_receive), *(parameterless or [])] def _decorator(func: T_Handler) -> T_Handler: if cls.handlers and cls.handlers[-1].call is func: func_handler = cls.handlers[-1] - for depend in reversed(parameterless): + for depend in reversed(_parameterless): func_handler.prepend_parameterless(depend) else: - cls.append_handler( - func, - parameterless=parameterless if cls.handlers else parameterless, - ) + cls.append_handler(func, parameterless=_parameterless) return func @@ -558,15 +552,8 @@ class Matcher(metaclass=MatcherMeta): * ``message: Union[str, Message, MessageSegment]``: 消息内容 * ``**kwargs``: 其他传递给 ``bot.send`` 的参数，请参考对应 adapter 的 bot 对象 api """ - bot = current_bot.get() - event = current_event.get() - state = current_state.get() - if isinstance(message, MessageTemplate): - _message = message.format(**state) - else: - _message = message - if _message is not None: - await bot.send(event=event, message=_message, **kwargs) + if message is not None: + await cls.send(message, **kwargs) raise FinishedException @classmethod @@ -585,15 +572,8 @@ class Matcher(metaclass=MatcherMeta): * ``prompt: Union[str, Message, MessageSegment]``: 消息内容 * ``**kwargs``: 其他传递给 ``bot.send`` 的参数，请参考对应 adapter 的 bot 对象 api """ - bot = current_bot.get() - event = current_event.get() - state = current_state.get() - if isinstance(prompt, MessageTemplate): - _prompt = prompt.format(**state) - else: - _prompt = prompt - if _prompt is not None: - await bot.send(event=event, message=_prompt, **kwargs) + if prompt is not None: + await cls.send(prompt, **kwargs) raise PausedException @classmethod @@ -610,27 +590,20 @@ class Matcher(metaclass=MatcherMeta): * ``prompt: Union[str, Message, MessageSegment]``: 消息内容 * ``**kwargs``: 其他传递给 ``bot.send`` 的参数，请参考对应 adapter 的 bot 对象 api """ - bot = current_bot.get() - event = current_event.get() - state = current_state.get() - if isinstance(prompt, MessageTemplate): - _prompt = prompt.format(**state) - else: - _prompt = prompt - if _prompt is not None: - await bot.send(event=event, message=_prompt, **kwargs) + if prompt is not None: + await cls.send(prompt, **kwargs) raise RejectedException - def get_receive(self, id: Optional[str], default: T = None) -> Union[Event, T]: - if id is None: - return self.state.get(LAST_RECEIVE_KEY, default) + def get_receive(self, id: str, default: T = None) -> Union[Event, T]: return self.state.get(RECEIVE_KEY.format(id=id), default) - def set_receive(self, id: Optional[str], event: Event) -> None: - if id is not None: - self.state[RECEIVE_KEY.format(id=id)] = event + def set_receive(self, id: str, event: Event) -> None: + self.state[RECEIVE_KEY.format(id=id)] = event self.state[LAST_RECEIVE_KEY] = event + def get_last_receive(self, default: T = None) -> Union[Event, T]: + return self.state.get(LAST_RECEIVE_KEY, default) + def get_arg(self, key: str, default: T = None) -> Union[Event, T]: return self.state.get(ARG_KEY.format(key=key), default) diff --git a/nonebot/params.py b/nonebot/params.py index bab4ed7f..c067fb13 100644 --- a/nonebot/params.py +++ b/nonebot/params.py @@ -318,16 +318,16 @@ class MatcherParam(Param): return matcher -def Received(id: str, default: Any = None) -> Any: +def Received(id: Optional[str] = None, default: Any = None) -> Any: def _received(matcher: "Matcher"): - return matcher.get_receive(id, default) + return matcher.get_receive(id or "", default) return Depends(_received, use_cache=False) def LastReceived(default: Any = None) -> Any: def _last_received(matcher: "Matcher") -> Any: - return matcher.get_receive(None, default) + return matcher.get_last_receive(default) return Depends(_last_received, use_cache=False) diff --git a/tests/.env.test b/tests/.env.test index 11b8445f..41ae0e10 100644 --- a/tests/.env.test +++ b/tests/.env.test @@ -1,2 +1,3 @@ +DEBUG=true NICKNAME=["test"] CONFIG_FROM_ENV= diff --git a/tests/plugins/matcher.py b/tests/plugins/matcher.py new file mode 100644 index 00000000..a15c423a --- /dev/null +++ b/tests/plugins/matcher.py @@ -0,0 +1,35 @@ +from nonebot import on_message +from nonebot.adapters import Event +from nonebot.params import ArgStr, Received, LastReceived + +test_handle = on_message() + + +@test_handle.handle() +async def handle(): + await test_handle.finish("send", at_sender=True) + + +test_got = on_message() + + +@test_got.got("key1", "prompt key1") +@test_got.got("key2", "prompt key2") +async def got(key1: str = ArgStr(), key2: str = ArgStr()): + assert key1 == "text" + assert key2 == "text" + await test_got.reject("reject", at_sender=True) + + +test_receive = on_message() + + +@test_receive.receive() +@test_receive.receive("receive") +async def receive( + x: Event = Received("receive"), y: Event = LastReceived(), z: Event = Received() +): + assert str(x.get_message()) == "text" + assert str(z.get_message()) == "text" + assert x is y + await test_receive.pause("pause", at_sender=True) diff --git a/tests/test_matcher.py b/tests/test_matcher.py new file mode 100644 index 00000000..df2488c0 --- /dev/null +++ b/tests/test_matcher.py @@ -0,0 +1,41 @@ +from typing import TYPE_CHECKING, Set + +import pytest +from nonebug import App + +from utils import load_plugin, make_fake_event, make_fake_message + + +@pytest.mark.asyncio +async def test_matcher(app: App, load_plugin): + from plugins.matcher import test_got, test_handle, test_receive + + message = make_fake_message()("text") + event = make_fake_event(_message=message)() + + assert len(test_handle.handlers) == 1 + async with app.test_matcher(test_handle) as ctx: + bot = ctx.create_bot() + ctx.receive_event(bot, event) + ctx.should_call_send(event, "send", "result", at_sender=True) + ctx.should_finished() + + assert len(test_got.handlers) == 1 + async with app.test_matcher(test_got) as ctx: + bot = ctx.create_bot() + ctx.receive_event(bot, event) + ctx.should_call_send(event, "prompt key1", "result1") + ctx.receive_event(bot, event) + ctx.should_call_send(event, "prompt key2", "result2") + ctx.receive_event(bot, event) + ctx.should_call_send(event, "reject", "result3", at_sender=True) + ctx.should_rejected() + + assert len(test_receive.handlers) == 1 + async with app.test_matcher(test_receive) as ctx: + bot = ctx.create_bot() + ctx.receive_event(bot, event) + ctx.receive_event(bot, event) + ctx.receive_event(bot, event) + ctx.should_call_send(event, "pause", "result", at_sender=True) + ctx.should_paused() diff --git a/tests/test_param.py b/tests/test_param.py index c338091e..606ea08a 100644 --- a/tests/test_param.py +++ b/tests/test_param.py @@ -196,7 +196,7 @@ async def test_matcher(app: App, load_plugin): event = make_fake_event()() fake_matcher.set_receive("test", event) event_next = make_fake_event()() - fake_matcher.set_receive(None, event_next) + fake_matcher.set_receive("", event_next) async with app.test_dependent( receive, allow_types=[MatcherParam, DependParam] From cf8670c167a145fd884163565fcf3172b60cb317 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 21 Dec 2021 10:57:47 +0800 Subject: [PATCH 102/174] :alembic: add more reject case --- nonebot/matcher.py | 78 ++++++++++++++++++++++++++++++++-------- poetry.lock | 10 +++--- tests/plugins/matcher.py | 25 +++++++++++-- tests/test_matcher.py | 23 +++++++++++- 4 files changed, 114 insertions(+), 22 deletions(-) diff --git a/nonebot/matcher.py b/nonebot/matcher.py index a90ac63b..f52f8190 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -71,7 +71,7 @@ matchers: Dict[int, List[Type["Matcher"]]] = defaultdict(list) """ current_bot: ContextVar[Bot] = ContextVar("current_bot") current_event: ContextVar[Event] = ContextVar("current_event") -current_state: ContextVar[T_State] = ContextVar("current_state") +current_matcher: ContextVar["Matcher"] = ContextVar("current_matcher") current_handler: ContextVar[Dependent] = ContextVar("current_handler") @@ -424,7 +424,7 @@ class Matcher(metaclass=MatcherMeta): @classmethod def receive( - cls, id: Optional[str] = None, parameterless: Optional[List[Any]] = None + cls, id: str = "", parameterless: Optional[List[Any]] = None ) -> Callable[[T_Handler], T_Handler]: """ :说明: @@ -433,18 +433,17 @@ class Matcher(metaclass=MatcherMeta): :参数: + * ``id: str``: 消息 ID * ``parameterless: Optional[List[Any]]``: 非参数类型依赖列表 """ - _id = id or "" - async def _receive(event: Event, matcher: "Matcher") -> Union[None, NoReturn]: - if matcher.get_receive(_id): + if matcher.get_target() == RECEIVE_KEY.format(id=id): + matcher.set_receive(id, event) return - if matcher.get_target() == RECEIVE_KEY.format(id=_id): - matcher.set_receive(_id, event) + if matcher.get_receive(id): return - matcher.set_target(RECEIVE_KEY.format(id=_id)) + matcher.set_target(RECEIVE_KEY.format(id=id)) raise RejectedException _parameterless = [params.Depends(_receive), *(parameterless or [])] @@ -483,11 +482,11 @@ class Matcher(metaclass=MatcherMeta): """ async def _key_getter(event: Event, matcher: "Matcher"): - if matcher.get_arg(key): - return if matcher.get_target() == ARG_KEY.format(key=key): matcher.set_arg(key, event) return + if matcher.get_arg(key): + return matcher.set_target(ARG_KEY.format(key=key)) if prompt is not None: await matcher.send(prompt) @@ -529,7 +528,7 @@ class Matcher(metaclass=MatcherMeta): """ bot = current_bot.get() event = current_event.get() - state = current_state.get() + state = current_matcher.get().state if isinstance(message, MessageTemplate): _message = message.format(**state) else: @@ -583,7 +582,8 @@ class Matcher(metaclass=MatcherMeta): """ :说明: - 发送一条消息给当前交互用户并暂停事件响应器，在接收用户新的一条消息后重新运行当前处理函数 + 最近使用 ``got`` / ``receive`` 接收的消息不符合预期，发送一条消息给当前交互用户并暂停事件响应器， + 在接收用户新的一条消息后继续当前处理函数 :参数: @@ -594,6 +594,56 @@ class Matcher(metaclass=MatcherMeta): await cls.send(prompt, **kwargs) raise RejectedException + @classmethod + async def reject_arg( + cls, + key: str, + prompt: Optional[Union[str, Message, MessageSegment]] = None, + **kwargs, + ) -> NoReturn: + """ + :说明: + + 最近使用 ``got`` 接收的消息不符合预期，发送一条消息给当前交互用户并暂停事件响应器， + 在接收用户新的一条消息后继续当前处理函数 + + :参数: + + * ``key: str``: 参数名 + * ``prompt: Union[str, Message, MessageSegment]``: 消息内容 + * ``**kwargs``: 其他传递给 ``bot.send`` 的参数，请参考对应 adapter 的 bot 对象 api + """ + matcher = current_matcher.get() + matcher.set_target(ARG_KEY.format(key=key)) + if prompt is not None: + await cls.send(prompt, **kwargs) + raise RejectedException + + @classmethod + async def reject_receive( + cls, + id: str = "", + prompt: Optional[Union[str, Message, MessageSegment]] = None, + **kwargs, + ) -> NoReturn: + """ + :说明: + + 最近使用 ``got`` 接收的消息不符合预期，发送一条消息给当前交互用户并暂停事件响应器， + 在接收用户新的一条消息后继续当前处理函数 + + :参数: + + * ``id: str``: 消息 id + * ``prompt: Union[str, Message, MessageSegment]``: 消息内容 + * ``**kwargs``: 其他传递给 ``bot.send`` 的参数，请参考对应 adapter 的 bot 对象 api + """ + matcher = current_matcher.get() + matcher.set_target(RECEIVE_KEY.format(id=id)) + if prompt is not None: + await cls.send(prompt, **kwargs) + raise RejectedException + def get_receive(self, id: str, default: T = None) -> Union[Event, T]: return self.state.get(RECEIVE_KEY.format(id=id), default) @@ -650,7 +700,7 @@ class Matcher(metaclass=MatcherMeta): ): b_t = current_bot.set(bot) e_t = current_event.set(event) - s_t = current_state.set(self.state) + m_t = current_matcher.set(self) try: # Refresh preprocess state self.state.update(state) @@ -679,7 +729,7 @@ class Matcher(metaclass=MatcherMeta): logger.info(f"Matcher {self} running complete") current_bot.reset(b_t) current_event.reset(e_t) - current_state.reset(s_t) + current_matcher.reset(m_t) # 运行handlers async def run( diff --git a/poetry.lock b/poetry.lock index 5a8b1d57..32507fb9 100644 --- a/poetry.lock +++ b/poetry.lock @@ -95,14 +95,14 @@ tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] [[package]] name = "async-timeout" -version = "4.0.1" +version = "4.0.2" description = "Timeout context manager for asyncio programs" category = "main" optional = true python-versions = ">=3.6" [package.dependencies] -typing-extensions = ">=3.6.5" +typing-extensions = {version = ">=3.6.5", markers = "python_version < \"3.8\""} [[package]] name = "asynctest" @@ -543,7 +543,7 @@ pytest-order = "^1.0.0" type = "git" url = "https://github.com/nonebot/nonebug.git" reference = "master" -resolved_reference = "5cb87c36aac56da3c71dd8c5aaa9b16396afc528" +resolved_reference = "0a1132e9dc1803517ded0d485bfbe8c47a1d8585" [[package]] name = "packaging" @@ -1282,8 +1282,8 @@ asgiref = [ {file = "asgiref-3.4.1.tar.gz", hash = "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9"}, ] async-timeout = [ - {file = "async-timeout-4.0.1.tar.gz", hash = "sha256:b930cb161a39042f9222f6efb7301399c87eeab394727ec5437924a36d6eef51"}, - {file = "async_timeout-4.0.1-py3-none-any.whl", hash = "sha256:a22c0b311af23337eb05fcf05a8b51c3ea53729d46fb5460af62bee033cec690"}, + {file = "async-timeout-4.0.2.tar.gz", hash = "sha256:2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15"}, + {file = "async_timeout-4.0.2-py3-none-any.whl", hash = "sha256:8ca1e4fcf50d07413d66d1a5e416e42cfdf5851c981d679a09851a6853383b3c"}, ] asynctest = [ {file = "asynctest-0.13.0-py3-none-any.whl", hash = "sha256:5da6118a7e6d6b54d83a8f7197769d046922a44d2a99c21382f0a6e4fadae676"}, diff --git a/tests/plugins/matcher.py b/tests/plugins/matcher.py index a15c423a..e9b13c1d 100644 --- a/tests/plugins/matcher.py +++ b/tests/plugins/matcher.py @@ -16,9 +16,11 @@ test_got = on_message() @test_got.got("key1", "prompt key1") @test_got.got("key2", "prompt key2") async def got(key1: str = ArgStr(), key2: str = ArgStr()): + if key2 == "text": + await test_got.reject("reject", at_sender=True) + assert key1 == "text" - assert key2 == "text" - await test_got.reject("reject", at_sender=True) + assert key2 == "text_next" test_receive = on_message() @@ -33,3 +35,22 @@ async def receive( assert str(z.get_message()) == "text" assert x is y await test_receive.pause("pause", at_sender=True) + + +test_combine = on_message() + + +@test_combine.got("a") +@test_combine.receive() +@test_combine.got("b") +async def combine(a: str = ArgStr(), b: str = ArgStr(), r: Event = Received()): + if a == "text": + await test_combine.reject_arg("a") + elif b == "text": + await test_combine.reject_arg("b") + elif str(r.get_message()) == "text": + await test_combine.reject_receive() + + assert a == "text_next" + assert b == "text_next" + assert str(r.get_message()) == "text_next" diff --git a/tests/test_matcher.py b/tests/test_matcher.py index df2488c0..7df74850 100644 --- a/tests/test_matcher.py +++ b/tests/test_matcher.py @@ -8,10 +8,17 @@ from utils import load_plugin, make_fake_event, make_fake_message @pytest.mark.asyncio async def test_matcher(app: App, load_plugin): - from plugins.matcher import test_got, test_handle, test_receive + from plugins.matcher import ( + test_got, + test_handle, + test_combine, + test_receive, + ) message = make_fake_message()("text") event = make_fake_event(_message=message)() + message_next = make_fake_message()("text_next") + event_next = make_fake_event(_message=message_next)() assert len(test_handle.handlers) == 1 async with app.test_matcher(test_handle) as ctx: @@ -30,6 +37,7 @@ async def test_matcher(app: App, load_plugin): ctx.receive_event(bot, event) ctx.should_call_send(event, "reject", "result3", at_sender=True) ctx.should_rejected() + ctx.receive_event(bot, event_next) assert len(test_receive.handlers) == 1 async with app.test_matcher(test_receive) as ctx: @@ -39,3 +47,16 @@ async def test_matcher(app: App, load_plugin): ctx.receive_event(bot, event) ctx.should_call_send(event, "pause", "result", at_sender=True) ctx.should_paused() + + assert len(test_receive.handlers) == 1 + async with app.test_matcher(test_combine) as ctx: + bot = ctx.create_bot() + ctx.receive_event(bot, event) + ctx.receive_event(bot, event) + ctx.receive_event(bot, event) + ctx.should_rejected() + ctx.receive_event(bot, event_next) + ctx.should_rejected() + ctx.receive_event(bot, event_next) + ctx.should_rejected() + ctx.receive_event(bot, event_next) From b900133ab44e86c5bf07b734bce16a69cc816a35 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 21 Dec 2021 11:18:34 +0800 Subject: [PATCH 103/174] :bug: fix duplicate plugin check --- nonebot/plugin/manager.py | 12 +++++++++++- tests/test_init.py | 12 +++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/nonebot/plugin/manager.py b/nonebot/plugin/manager.py index e029efde..23597eb1 100644 --- a/nonebot/plugin/manager.py +++ b/nonebot/plugin/manager.py @@ -53,6 +53,15 @@ class PluginManager: # get all previous ready to load plugins previous_plugins = self._previous_plugins() searched_plugins: Dict[str, Path] = {} + third_party_plugins: Set[str] = set() + + for plugin in self.plugins: + name = plugin.rsplit(".", 1)[-1] if "." in plugin else plugin + if name in third_party_plugins or name in previous_plugins: + raise RuntimeError( + f"Plugin already exists: {name}! Check your plugin name" + ) + third_party_plugins.add(plugin) for module_info in pkgutil.iter_modules(self.search_path): if module_info.name.startswith("_"): @@ -60,6 +69,7 @@ class PluginManager: if ( module_info.name in searched_plugins.keys() or module_info.name in previous_plugins + or module_info.name in third_party_plugins ): raise RuntimeError( f"Plugin already exists: {module_info.name}! Check your plugin name" @@ -74,7 +84,7 @@ class PluginManager: self.searched_plugins = searched_plugins - return self.plugins | set(self.searched_plugins.keys()) + return third_party_plugins | set(self.searched_plugins.keys()) def load_plugin(self, name) -> Optional[Plugin]: try: diff --git a/tests/test_init.py b/tests/test_init.py index 3ab17710..2018fb75 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -83,7 +83,13 @@ async def test_load_plugin(load_plugin: Set["Plugin"]): plugin for plugin in nonebot.get_loaded_plugins() if not plugin.parent_plugin ) assert loaded_plugins == load_plugin - plugin = nonebot.get_plugin("param_depend") + plugin = nonebot.get_plugin("export") assert plugin - assert plugin.module_name == "plugins.param.param_depend" - assert "plugins.param.param_depend" in sys.modules + assert plugin.module_name == "plugins.export" + assert "plugins.export" in sys.modules + + try: + nonebot.load_plugin("plugins.export") + assert False + except RuntimeError: + assert True From 9b2fa46921792c26b90b6ca6fd79d7efd8180c16 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 21 Dec 2021 18:22:14 +0800 Subject: [PATCH 104/174] :pencil2: add typing --- nonebot/adapters/_adapter.py | 6 +++--- nonebot/adapters/_bot.py | 2 +- nonebot/drivers/__init__.py | 2 ++ nonebot/drivers/_model.py | 30 +++++++++++++++--------------- nonebot/drivers/fastapi.py | 10 ++++++---- nonebot/drivers/quart.py | 7 ++++--- nonebot/typing.py | 5 +++-- nonebot/utils.py | 2 +- 8 files changed, 35 insertions(+), 29 deletions(-) diff --git a/nonebot/adapters/_adapter.py b/nonebot/adapters/_adapter.py index b373dced..992ee52a 100644 --- a/nonebot/adapters/_adapter.py +++ b/nonebot/adapters/_adapter.py @@ -29,11 +29,11 @@ class Adapter(abc.ABC): def config(self) -> Config: return self.driver.config - def bot_connect(self, bot: Bot): + def bot_connect(self, bot: Bot) -> None: self.driver._bot_connect(bot) self.bots[bot.self_id] = bot - def bot_disconnect(self, bot: Bot): + def bot_disconnect(self, bot: Bot) -> None: self.driver._bot_disconnect(bot) self.bots.pop(bot.self_id, None) @@ -58,7 +58,7 @@ class Adapter(abc.ABC): return await self.driver.websocket(setup) @abc.abstractmethod - async def _call_api(self, api: str, **data) -> Any: + async def _call_api(self, bot: Bot, api: str, **data) -> Any: """ :说明: diff --git a/nonebot/adapters/_bot.py b/nonebot/adapters/_bot.py index cfaae3a8..e72a0d26 100644 --- a/nonebot/adapters/_bot.py +++ b/nonebot/adapters/_bot.py @@ -100,7 +100,7 @@ class Bot(abc.ABC): if not skip_calling_api: try: - result = await self.adapter._call_api(api, **data) + result = await self.adapter._call_api(self, api, **data) except Exception as e: exception = e diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py index daca96b4..8bb3951a 100644 --- a/nonebot/drivers/__init__.py +++ b/nonebot/drivers/__init__.py @@ -168,6 +168,8 @@ class Driver(abc.ABC): def _bot_connect(self, bot: "Bot") -> None: """在 WebSocket 连接成功后，调用该函数来注册 bot 对象""" + if bot.self_id in self._clients: + raise RuntimeError(f"Duplicate bot connection with id {bot.self_id}") self._clients[bot.self_id] = bot async def _run_hook(bot: "Bot") -> None: diff --git a/nonebot/drivers/_model.py b/nonebot/drivers/_model.py index 05d59c77..d217ab33 100644 --- a/nonebot/drivers/_model.py +++ b/nonebot/drivers/_model.py @@ -31,7 +31,7 @@ HeaderTypes = Union[ Sequence[Tuple[str, str]], ] -ContentTypes = Union[str, bytes] +ContentTypes = Union[str, bytes, None] CookieTypes = Union[None, "Cookies", CookieJar, Dict[str, str], List[Tuple[str, str]]] @@ -55,15 +55,15 @@ class Request: timeout: Optional[float] = None, ): # method - self.method = ( + self.method: str = ( method.decode("ascii").upper() if isinstance(method, bytes) else method.upper() ) # http version - self.version = HTTPVersion(version) + self.version: HTTPVersion = HTTPVersion(version) # timeout - self.timeout = timeout + self.timeout: Optional[float] = timeout # url if isinstance(url, tuple): @@ -79,7 +79,7 @@ class Request: if params is not None: url = url.update_query(params) - self.url = url + self.url: URL = url # headers self.headers: CIMultiDict[str] @@ -92,7 +92,7 @@ class Request: self.cookies = Cookies(cookies) # body - self.content = content + self.content: ContentTypes = content def __repr__(self) -> str: class_name = self.__class__.__name__ @@ -110,7 +110,7 @@ class Response: request: Optional[Request] = None, ): # status code - self.status_code = status_code + self.status_code: int = status_code # headers self.headers: CIMultiDict[str] @@ -120,16 +120,16 @@ class Response: self.headers = CIMultiDict() # body - self.content = content + self.content: ContentTypes = content # request - self.request = request + self.request: Optional[Request] = request class WebSocket(abc.ABC): def __init__(self, *, request: Request): # request - self.request = request + self.request: Request = request @property @abc.abstractmethod @@ -141,12 +141,12 @@ class WebSocket(abc.ABC): raise NotImplementedError @abc.abstractmethod - async def accept(self): + async def accept(self) -> None: """接受 WebSocket 连接请求""" raise NotImplementedError @abc.abstractmethod - async def close(self, code: int = 1000): + async def close(self, code: int = 1000, reason: str = "") -> None: """关闭 WebSocket 连接请求""" raise NotImplementedError @@ -161,19 +161,19 @@ class WebSocket(abc.ABC): raise NotImplementedError @abc.abstractmethod - async def send(self, data: str): + async def send(self, data: str) -> None: """发送一条 WebSocket text 信息""" raise NotImplementedError @abc.abstractmethod - async def send_bytes(self, data: bytes): + async def send_bytes(self, data: bytes) -> None: """发送一条 WebSocket binary 信息""" raise NotImplementedError class Cookies(MutableMapping): def __init__(self, cookies: CookieTypes = None) -> None: - self.jar = cookies if isinstance(cookies, CookieJar) else CookieJar() + self.jar: CookieJar = cookies if isinstance(cookies, CookieJar) else CookieJar() if cookies is not None and not isinstance(cookies, CookieJar): if isinstance(cookies, dict): for key, value in cookies.items(): diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index 8efdf36e..9752eb26 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -333,8 +333,8 @@ class WebSocketsWS(BaseWebSocket): raise NotImplementedError @overrides(BaseWebSocket) - async def close(self, code: int = 1000): - await self.websocket.close(code) + async def close(self, code: int = 1000, reason: str = ""): + await self.websocket.close(code, reason) @overrides(BaseWebSocket) async def receive(self) -> str: @@ -374,11 +374,13 @@ class FastAPIWebSocket(BaseWebSocket): ) @overrides(BaseWebSocket) - async def accept(self): + async def accept(self) -> None: await self.websocket.accept() @overrides(BaseWebSocket) - async def close(self, code: int = status.WS_1000_NORMAL_CLOSURE): + async def close( + self, code: int = status.WS_1000_NORMAL_CLOSURE, reason: str = "" + ) -> None: await self.websocket.close(code) @overrides(BaseWebSocket) diff --git a/nonebot/drivers/quart.py b/nonebot/drivers/quart.py index 7527957e..9d32463f 100644 --- a/nonebot/drivers/quart.py +++ b/nonebot/drivers/quart.py @@ -249,15 +249,16 @@ class WebSocket(BaseWebSocket): @property @overrides(BaseWebSocket) def closed(self): - raise NotImplementedError + # FIXME + return True @overrides(BaseWebSocket) async def accept(self): await self.websocket.accept() @overrides(BaseWebSocket) - async def close(self, code: int = 1000): - await self.websocket.close(code) + async def close(self, code: int = 1000, reason: str = ""): + await self.websocket.close(code, reason) @overrides(BaseWebSocket) async def receive(self) -> str: diff --git a/nonebot/typing.py b/nonebot/typing.py index e5a275f8..3e28a3ea 100644 --- a/nonebot/typing.py +++ b/nonebot/typing.py @@ -17,7 +17,6 @@ .. _typing: https://docs.python.org/3/library/typing.html """ -from asyncio import Task from typing import ( TYPE_CHECKING, Any, @@ -32,6 +31,8 @@ from typing import ( ) if TYPE_CHECKING: + from asyncio import Task + from nonebot.adapters import Bot, Event from nonebot.permission import Permission @@ -249,7 +250,7 @@ T_PermissionUpdater = Callable[..., Union["Permission", Awaitable["Permission"]] PermissionUpdater 在 Matcher.pause, Matcher.reject 时被运行，用于更新会话对象权限。默认会更新为当前事件的触发对象。 """ -T_DependencyCache = Dict[Callable[..., Any], Task[Any]] +T_DependencyCache = Dict[Callable[..., Any], "Task[Any]"] """ :类型: ``Dict[Callable[..., Any], Task[Any]]`` :说明: diff --git a/nonebot/utils.py b/nonebot/utils.py index bd4a92a0..5bbcbee1 100644 --- a/nonebot/utils.py +++ b/nonebot/utils.py @@ -163,7 +163,7 @@ def logger_wrapper(logger_name: str): """ def log(level: str, message: str, exception: Optional[Exception] = None): - return logger.opt(colors=True, exception=exception).log( + logger.opt(colors=True, exception=exception).log( level, f"{escape_tag(logger_name)} | " + message ) From fecdb5367adfed47fc05754c7b50b0314f37d2f1 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 22 Dec 2021 16:53:55 +0800 Subject: [PATCH 105/174] :arrow_up: upgrade dependencies --- nonebot/drivers/__init__.py | 32 +- nonebot/drivers/_block_driver.py | 158 +++++++ nonebot/drivers/aiohttp.py | 459 +++----------------- nonebot/drivers/fastapi.py | 105 +---- nonebot/drivers/httpx.py | 45 ++ nonebot/drivers/quart.py | 12 +- nonebot/drivers/websockets.py | 78 ++++ packages/nonebot-plugin-docs/pyproject.toml | 5 +- poetry.lock | 18 +- pyproject.toml | 2 +- tests/test_driver.py | 11 + 11 files changed, 417 insertions(+), 508 deletions(-) create mode 100644 nonebot/drivers/_block_driver.py create mode 100644 nonebot/drivers/httpx.py create mode 100644 nonebot/drivers/websockets.py create mode 100644 tests/test_driver.py diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py index 8bb3951a..eeb44a09 100644 --- a/nonebot/drivers/__init__.py +++ b/nonebot/drivers/__init__.py @@ -80,7 +80,7 @@ class Driver(abc.ABC): """ return self._clients - def register_adapter(self, adapter: Type["Adapter"], **kwargs): + def register_adapter(self, adapter: Type["Adapter"], **kwargs) -> None: """ :说明: @@ -105,7 +105,7 @@ class Driver(abc.ABC): @property @abc.abstractmethod - def type(self): + def type(self) -> str: """驱动类型名称""" raise NotImplementedError @@ -204,10 +204,11 @@ class Driver(abc.ABC): asyncio.create_task(_run_hook(bot)) -class ForwardDriver(Driver): - """ - Forward Driver 基类。将客户端框架封装，以满足适配器使用。 - """ +class ForwardMixin(abc.ABC): + @property + @abc.abstractmethod + def type(self) -> str: + raise NotImplementedError @abc.abstractmethod async def request(self, setup: Request) -> Response: @@ -218,6 +219,12 @@ class ForwardDriver(Driver): raise NotImplementedError +class ForwardDriver(Driver, ForwardMixin): + """ + Forward Driver 基类。将客户端框架封装，以满足适配器使用。 + """ + + class ReverseDriver(Driver): """ Reverse Driver 基类。将后端框架封装，以满足适配器使用。 @@ -244,6 +251,19 @@ class ReverseDriver(Driver): raise NotImplementedError +def combine_driver(driver: Type[Driver], *mixins: Type[ForwardMixin]) -> Type[Driver]: + class CombinedDriver(driver, *mixins): # type: ignore + @property + def type(self) -> str: + return ( + driver.type.__get__(self) + + "+" + + "+".join(map(lambda x: x.type.__get__(self), mixins)) + ) + + return CombinedDriver + + @dataclass class HTTPServerSetup: path: URL # path should not be absolute, check it by URL.is_absolute() == False diff --git a/nonebot/drivers/_block_driver.py b/nonebot/drivers/_block_driver.py new file mode 100644 index 00000000..afd7f8b3 --- /dev/null +++ b/nonebot/drivers/_block_driver.py @@ -0,0 +1,158 @@ +import signal +import asyncio +import threading +from typing import Set, Callable, Awaitable + +from nonebot.log import logger +from nonebot.typing import overrides +from nonebot.config import Env, Config +from nonebot.drivers import ForwardDriver + +STARTUP_FUNC = Callable[[], Awaitable[None]] +SHUTDOWN_FUNC = Callable[[], Awaitable[None]] +HANDLED_SIGNALS = ( + signal.SIGINT, # Unix signal 2. Sent by Ctrl+C. + signal.SIGTERM, # Unix signal 15. Sent by `kill `. +) + + +class BlockDriver(ForwardDriver): + """ + AIOHTTP 驱动框架 + """ + + def __init__(self, env: Env, config: Config): + super().__init__(env, config) + self.startup_funcs: Set[STARTUP_FUNC] = set() + self.shutdown_funcs: Set[SHUTDOWN_FUNC] = set() + self.should_exit: asyncio.Event = asyncio.Event() + self.force_exit: bool = False + + @property + @overrides(ForwardDriver) + def type(self) -> str: + """驱动名称: ``block_driver``""" + return "block_driver" + + @property + @overrides(ForwardDriver) + def logger(self): + """block driver 使用的 logger""" + return logger + + @overrides(ForwardDriver) + def on_startup(self, func: STARTUP_FUNC) -> STARTUP_FUNC: + """ + :说明: + + 注册一个启动时执行的函数 + + :参数: + + * ``func: Callable[[], Awaitable[None]]`` + """ + self.startup_funcs.add(func) + return func + + @overrides(ForwardDriver) + def on_shutdown(self, func: SHUTDOWN_FUNC) -> SHUTDOWN_FUNC: + """ + :说明: + + 注册一个停止时执行的函数 + + :参数: + + * ``func: Callable[[], Awaitable[None]]`` + """ + self.shutdown_funcs.add(func) + return func + + @overrides(ForwardDriver) + def run(self, *args, **kwargs): + """启动 block driver""" + super().run(*args, **kwargs) + loop = asyncio.get_event_loop() + loop.run_until_complete(self.serve()) + + async def serve(self): + self.install_signal_handlers() + await self.startup() + if self.should_exit.is_set(): + return + await self.main_loop() + await self.shutdown() + + async def startup(self): + # run startup + cors = [startup() for startup in self.startup_funcs] + if cors: + try: + await asyncio.gather(*cors) + except Exception as e: + logger.opt(colors=True, exception=e).error( + "Error when running startup function. " + "Ignored!" + ) + + logger.info("Application startup completed.") + + async def main_loop(self): + await self.should_exit.wait() + + async def shutdown(self): + logger.info("Shutting down") + + logger.info("Waiting for application shutdown.") + # run shutdown + cors = [shutdown() for shutdown in self.shutdown_funcs] + if cors: + try: + await asyncio.gather(*cors) + except Exception as e: + logger.opt(colors=True, exception=e).error( + "Error when running shutdown function. " + "Ignored!" + ) + + for task in asyncio.all_tasks(): + if task is not asyncio.current_task() and not task.done(): + task.cancel() + await asyncio.sleep(0.1) + + tasks = [t for t in asyncio.all_tasks() if t is not asyncio.current_task()] + if tasks and not self.force_exit: + logger.info("Waiting for tasks to finish. (CTRL+C to force quit)") + while tasks and not self.force_exit: + await asyncio.sleep(0.1) + tasks = [t for t in asyncio.all_tasks() if t is not asyncio.current_task()] + + for task in tasks: + task.cancel() + + await asyncio.gather(*tasks, return_exceptions=True) + + logger.info("Application shutdown complete.") + loop = asyncio.get_event_loop() + loop.stop() + + def install_signal_handlers(self) -> None: + if threading.current_thread() is not threading.main_thread(): + # Signals can only be listened to from the main thread. + return + + loop = asyncio.get_event_loop() + + try: + for sig in HANDLED_SIGNALS: + loop.add_signal_handler(sig, self.handle_exit, sig, None) + except NotImplementedError: + # Windows + for sig in HANDLED_SIGNALS: + signal.signal(sig, self.handle_exit) + + def handle_exit(self, sig, frame): + if self.should_exit.is_set(): + self.force_exit = True + else: + self.should_exit.set() diff --git a/nonebot/drivers/aiohttp.py b/nonebot/drivers/aiohttp.py index fbbf673d..cb7f7bbe 100644 --- a/nonebot/drivers/aiohttp.py +++ b/nonebot/drivers/aiohttp.py @@ -5,428 +5,79 @@ AIOHTTP 驱动适配 本驱动仅支持客户端连接 """ -import signal -import asyncio -import threading -from dataclasses import dataclass -from typing import Set, List, Union, Callable, Optional, Awaitable, cast import aiohttp -from yarl import URL -from nonebot.log import logger -from nonebot.adapters import Bot from nonebot.typing import overrides -from nonebot.utils import escape_tag -from nonebot.config import Env, Config +from nonebot.drivers import Request, Response +from nonebot.drivers._block_driver import BlockDriver from nonebot.drivers import WebSocket as BaseWebSocket -from nonebot.drivers import ( - HTTPRequest, - ForwardDriver, - WebSocketSetup, - HTTPPollingSetup, -) - -STARTUP_FUNC = Callable[[], Awaitable[None]] -SHUTDOWN_FUNC = Callable[[], Awaitable[None]] -HTTPPOLLING_SETUP = Union[HTTPPollingSetup, Callable[[], Awaitable[HTTPPollingSetup]]] -WEBSOCKET_SETUP = Union[WebSocketSetup, Callable[[], Awaitable[WebSocketSetup]]] -HANDLED_SIGNALS = ( - signal.SIGINT, # Unix signal 2. Sent by Ctrl+C. - signal.SIGTERM, # Unix signal 15. Sent by `kill `. -) +from nonebot.drivers import HTTPVersion, ForwardMixin, combine_driver -class Driver(ForwardDriver): - """ - AIOHTTP 驱动框架 - """ - - def __init__(self, env: Env, config: Config): - super().__init__(env, config) - self.startup_funcs: Set[STARTUP_FUNC] = set() - self.shutdown_funcs: Set[SHUTDOWN_FUNC] = set() - self.http_pollings: List[HTTPPOLLING_SETUP] = [] - self.websockets: List[WEBSOCKET_SETUP] = [] - self.connections: List[asyncio.Task] = [] - self.should_exit: asyncio.Event = asyncio.Event() - self.force_exit: bool = False - +class AiohttpMixin(ForwardMixin): @property - @overrides(ForwardDriver) + @overrides(ForwardMixin) def type(self) -> str: - """驱动名称: ``aiohttp``""" return "aiohttp" - @property - @overrides(ForwardDriver) - def logger(self): - """aiohttp driver 使用的 logger""" - return logger - - @overrides(ForwardDriver) - def on_startup(self, func: STARTUP_FUNC) -> STARTUP_FUNC: - """ - :说明: - - 注册一个启动时执行的函数 - - :参数: - - * ``func: Callable[[], Awaitable[None]]`` - """ - self.startup_funcs.add(func) - return func - - @overrides(ForwardDriver) - def on_shutdown(self, func: SHUTDOWN_FUNC) -> SHUTDOWN_FUNC: - """ - :说明: - - 注册一个停止时执行的函数 - - :参数: - - * ``func: Callable[[], Awaitable[None]]`` - """ - self.shutdown_funcs.add(func) - return func - - @overrides(ForwardDriver) - def setup_http_polling(self, setup: HTTPPOLLING_SETUP) -> None: - """ - :说明: - - 注册一个 HTTP 轮询连接，如果传入一个函数，则该函数会在每次连接时被调用 - - :参数: - - * ``setup: Union[HTTPPollingSetup, Callable[[], Awaitable[HTTPPollingSetup]]]`` - """ - self.http_pollings.append(setup) - - @overrides(ForwardDriver) - def setup_websocket(self, setup: WEBSOCKET_SETUP) -> None: - """ - :说明: - - 注册一个 WebSocket 连接，如果传入一个函数，则该函数会在每次重连时被调用 - - :参数: - - * ``setup: Union[WebSocketSetup, Callable[[], Awaitable[WebSocketSetup]]]`` - """ - self.websockets.append(setup) - - @overrides(ForwardDriver) - def run(self, *args, **kwargs): - """启动 aiohttp driver""" - super().run(*args, **kwargs) - loop = asyncio.get_event_loop() - loop.run_until_complete(self.serve()) - - async def serve(self): - self.install_signal_handlers() - await self.startup() - if self.should_exit.is_set(): - return - await self.main_loop() - await self.shutdown() - - async def startup(self): - for setup in self.http_pollings: - self.connections.append(asyncio.create_task(self._http_loop(setup))) - for setup in self.websockets: - self.connections.append(asyncio.create_task(self._ws_loop(setup))) - - logger.info("Application startup completed.") - - # run startup - cors = [startup() for startup in self.startup_funcs] - if cors: - try: - await asyncio.gather(*cors) - except Exception as e: - logger.opt(colors=True, exception=e).error( - "Error when running startup function. " - "Ignored!" - ) - - async def main_loop(self): - await self.should_exit.wait() - - async def shutdown(self): - # run shutdown - cors = [shutdown() for shutdown in self.shutdown_funcs] - if cors: - try: - await asyncio.gather(*cors) - except Exception as e: - logger.opt(colors=True, exception=e).error( - "Error when running shutdown function. " - "Ignored!" - ) - - for task in self.connections: - if not task.done(): - task.cancel() - await asyncio.sleep(0.1) - - tasks = [t for t in asyncio.all_tasks() if t is not asyncio.current_task()] - if tasks and not self.force_exit: - logger.info("Waiting for tasks to finish. (CTRL+C to force quit)") - while tasks and not self.force_exit: - await asyncio.sleep(0.1) - tasks = [t for t in asyncio.all_tasks() if t is not asyncio.current_task()] - - for task in tasks: - task.cancel() - - await asyncio.gather(*tasks, return_exceptions=True) - - loop = asyncio.get_event_loop() - loop.stop() - - def install_signal_handlers(self) -> None: - if threading.current_thread() is not threading.main_thread(): - # Signals can only be listened to from the main thread. - return - - loop = asyncio.get_event_loop() - - try: - for sig in HANDLED_SIGNALS: - loop.add_signal_handler(sig, self.handle_exit, sig, None) - except NotImplementedError: - # Windows - for sig in HANDLED_SIGNALS: - signal.signal(sig, self.handle_exit) - - def handle_exit(self, sig, frame): - if self.should_exit.is_set(): - self.force_exit = True + @overrides(ForwardMixin) + async def request(self, setup: Request) -> Response: + if setup.version == HTTPVersion.H10: + version = aiohttp.HttpVersion10 + elif setup.version == HTTPVersion.H11: + version = aiohttp.HttpVersion11 else: - self.should_exit.set() + raise RuntimeError(f"Unsupported HTTP version: {setup.version}") - async def _http_loop(self, setup: HTTPPOLLING_SETUP): - async def _build_request(setup: HTTPPollingSetup) -> Optional[HTTPRequest]: - url = URL(setup.url) - if not url.is_absolute() or not url.host: - logger.opt(colors=True).error( - f"Error parsing url {escape_tag(str(url))}" - ) - return - host = f"{url.host}:{url.port}" if url.port else url.host - return HTTPRequest( - setup.http_version, - url.scheme, - url.path, - url.raw_query_string.encode("latin-1"), - {**setup.headers, "host": host}, + timeout = aiohttp.ClientTimeout(setup.timeout) + async with aiohttp.ClientSession(version=version) as session: + async with session.request( setup.method, - setup.body, - ) + setup.url, + data=setup.content, + headers=setup.headers, + timeout=timeout, + ) as response: + res = Response( + response.status, + headers=response.headers.copy(), + content=await response.read(), + request=setup, + ) + return res - bot: Optional[Bot] = None - request: Optional[HTTPRequest] = None - setup_: Optional[HTTPPollingSetup] = None + @overrides(ForwardMixin) + async def websocket(self, setup: Request) -> "WebSocket": + if setup.version == HTTPVersion.H10: + version = aiohttp.HttpVersion10 + elif setup.version == HTTPVersion.H11: + version = aiohttp.HttpVersion11 + else: + raise RuntimeError(f"Unsupported HTTP version: {setup.version}") - logger.opt(colors=True).info( - f"Start http polling for {escape_tag(setup.adapter.upper())} " - f"Bot {escape_tag(setup.self_id)}" + session = aiohttp.ClientSession(version=version) + ws = await session.ws_connect( + setup.url, + method=setup.method, + timeout=setup.timeout or 10, + headers=setup.headers, ) - - try: - async with aiohttp.ClientSession() as session: - while not self.should_exit.is_set(): - - try: - if callable(setup): - setup_ = await setup() - else: - setup_ = setup - except Exception as e: - logger.opt(colors=True, exception=e).error( - "Error while parsing setup " - f"{escape_tag(repr(setup))}." - ) - await asyncio.sleep(3) - continue - - setup_ = cast(HTTPPollingSetup, setup_) - - if not bot: - request = await _build_request(setup_) - if not request: - return - - BotClass = self._adapters[setup.adapter] - bot = BotClass(setup.self_id, request) - self._bot_connect(bot) - elif callable(setup): - request = await _build_request(setup_) - if not request: - await asyncio.sleep(setup_.poll_interval) - continue - bot.request = request - - request = cast(HTTPRequest, request) - - headers = request.headers - timeout = aiohttp.ClientTimeout(30) - version: aiohttp.HttpVersion - if request.http_version == "1.0": - version = aiohttp.HttpVersion10 - elif request.http_version == "1.1": - version = aiohttp.HttpVersion11 - else: - logger.opt(colors=True).error( - "Unsupported HTTP Version " - f"{escape_tag(request.http_version)}" - ) - return - - logger.debug( - f"Bot {setup_.self_id} from adapter {setup_.adapter} request {setup_.url}" - ) - - try: - async with session.request( - request.method, - setup_.url, - data=request.body, - headers=headers, - timeout=timeout, - version=version, - ) as response: - response.raise_for_status() - data = await response.read() - asyncio.create_task(bot.handle_message(data)) - except aiohttp.ClientResponseError as e: - logger.opt(colors=True, exception=e).error( - f"Error occurred while requesting {escape_tag(setup_.url)}. " - "Try to reconnect..." - ) - - await asyncio.sleep(setup_.poll_interval) - - except asyncio.CancelledError: - pass - except Exception as e: - logger.opt(colors=True, exception=e).error( - "Unexpected exception occurred " - "while http polling" - ) - finally: - if bot: - self._bot_disconnect(bot) - - async def _ws_loop(self, setup: WEBSOCKET_SETUP): - bot: Optional[Bot] = None - - try: - async with aiohttp.ClientSession() as session: - while True: - - try: - if callable(setup): - setup_ = await setup() - else: - setup_ = setup - except Exception as e: - logger.opt(colors=True, exception=e).error( - "Error while parsing setup " - f"{escape_tag(repr(setup))}." - ) - await asyncio.sleep(3) - continue - - url = URL(setup_.url) - if not url.is_absolute() or not url.host: - logger.opt(colors=True).error( - f"Error parsing url {escape_tag(str(url))}" - ) - await asyncio.sleep(setup_.reconnect_interval) - continue - - host = f"{url.host}:{url.port}" if url.port else url.host - headers = {**setup_.headers, "host": host} - - logger.debug( - f"Bot {setup_.self_id} from adapter {setup_.adapter} connecting to {url}" - ) - try: - async with session.ws_connect( - url, headers=headers, timeout=30.0 - ) as ws: - logger.opt(colors=True).info( - f"WebSocket Connection to {escape_tag(setup_.adapter.upper())} " - f"Bot {escape_tag(setup_.self_id)} succeeded!" - ) - request = WebSocket( - "1.1", - url.scheme, - url.path, - url.raw_query_string.encode("latin-1"), - headers, - ws, - ) - - BotClass = self._adapters[setup_.adapter] - bot = BotClass(setup_.self_id, request) - self._bot_connect(bot) - while not self.should_exit.is_set(): - msg = await ws.receive() - if msg.type == aiohttp.WSMsgType.text: - asyncio.create_task( - bot.handle_message(msg.data.encode()) - ) - elif msg.type == aiohttp.WSMsgType.binary: - asyncio.create_task(bot.handle_message(msg.data)) - elif msg.type == aiohttp.WSMsgType.error: - logger.opt(colors=True).error( - "Error while handling websocket frame. " - "Try to reconnect..." - ) - break - else: - logger.opt(colors=True).error( - "WebSocket connection closed by peer. " - "Try to reconnect..." - ) - break - except ( - aiohttp.ClientResponseError, - aiohttp.ClientConnectionError, - ) as e: - logger.opt(colors=True, exception=e).error( - f"Error while connecting to {escape_tag(str(url))}. " - "Try to reconnect..." - ) - finally: - if bot: - self._bot_disconnect(bot) - bot = None - - if not setup_.reconnect: - logger.info( - f"WebSocket reconnect disabled for bot {setup_.self_id}" - ) - break - await asyncio.sleep(setup_.reconnect_interval) - - except asyncio.CancelledError: - pass - except Exception as e: - logger.opt(colors=True, exception=e).error( - "Unexpected exception occurred " - "while websocket loop" - ) + websocket = WebSocket(request=setup, session=session, websocket=ws) + return websocket -@dataclass class WebSocket(BaseWebSocket): - websocket: aiohttp.ClientWebSocketResponse = None # type: ignore + def __init__( + self, + *, + request: Request, + session: aiohttp.ClientSession, + websocket: aiohttp.ClientWebSocketResponse, + ): + super().__init__(request=request) + self.session = session + self.websocket = websocket @property @overrides(BaseWebSocket) @@ -440,6 +91,7 @@ class WebSocket(BaseWebSocket): @overrides(BaseWebSocket) async def close(self, code: int = 1000): await self.websocket.close(code=code) + await self.session.close() @overrides(BaseWebSocket) async def receive(self) -> str: @@ -456,3 +108,6 @@ class WebSocket(BaseWebSocket): @overrides(BaseWebSocket) async def send_bytes(self, data: bytes) -> None: await self.websocket.send_bytes(data) + + +Driver = combine_driver(BlockDriver, AiohttpMixin) diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index 9752eb26..66dd0d0a 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -11,31 +11,28 @@ FastAPI 驱动适配 """ import logging -from functools import partial -from dataclasses import dataclass -from typing import Any, List, Union, Callable, Optional, Awaitable +from typing import List, Callable, Optional -import httpx import uvicorn from pydantic import BaseSettings from fastapi.responses import Response from fastapi import FastAPI, Request, status from starlette.websockets import WebSocket, WebSocketState -from websockets.legacy.client import Connect, WebSocketClientProtocol from nonebot.config import Env from nonebot.typing import overrides from nonebot.utils import escape_tag +from nonebot.drivers.httpx import HttpxMixin +from nonebot.drivers.aiohttp import AiohttpMixin from nonebot.config import Config as NoneBotConfig from nonebot.drivers import Request as BaseRequest -from nonebot.drivers import Response as BaseResponse from nonebot.drivers import WebSocket as BaseWebSocket +from nonebot.drivers.websockets import WebSocketsMixin from nonebot.drivers import ( - HTTPVersion, - ForwardDriver, ReverseDriver, HTTPServerSetup, WebSocketServerSetup, + combine_driver, ) @@ -246,7 +243,7 @@ class Driver(ReverseDriver): self, request: Request, setup: HTTPServerSetup, - ): + ) -> Response: http_request = BaseRequest( request.method, str(request.url), @@ -265,7 +262,7 @@ class Driver(ReverseDriver): str(websocket.url), headers=websocket.headers.items(), cookies=websocket.cookies, - version=websocket.scope["http_version"], + version=websocket.scope.get("http_version", "1.1"), ) ws = FastAPIWebSocket( request=request, @@ -275,90 +272,6 @@ class Driver(ReverseDriver): await setup.handle_func(ws) -class FullDriver(ForwardDriver, Driver): - """ - 完整的 FastAPI 驱动框架，包含正向 Client 支持和反向 Server 支持。 - - :使用方法: - - .. code-block:: dotenv - - DRIVER=nonebot.drivers.fastapi:FullDriver - """ - - @property - @overrides(Driver) - def type(self) -> str: - """驱动名称: ``fastapi_full``""" - return "fastapi_full" - - @overrides(ForwardDriver) - async def request(self, setup: "BaseRequest") -> Any: - async with httpx.AsyncClient( - http2=setup.version == HTTPVersion.H2, follow_redirects=True - ) as client: - response = await client.request( - setup.method, - str(setup.url), - content=setup.content, - headers=tuple(setup.headers.items()), - timeout=30.0, - ) - return BaseResponse( - response.status_code, - headers=response.headers, - content=response.content, - request=setup, - ) - - @overrides(ForwardDriver) - async def websocket(self, setup: "BaseRequest") -> Any: - ws = await Connect(str(setup.url), extra_headers=setup.headers.items()) - return WebSocketsWS(request=setup, websocket=ws) - - -class WebSocketsWS(BaseWebSocket): - @overrides(BaseWebSocket) - def __init__(self, *, request: BaseRequest, websocket: WebSocketClientProtocol): - super().__init__(request=request) - self.websocket = websocket - - @property - @overrides(BaseWebSocket) - def closed(self) -> bool: - return self.websocket.closed - - @overrides(BaseWebSocket) - async def accept(self): - raise NotImplementedError - - @overrides(BaseWebSocket) - async def close(self, code: int = 1000, reason: str = ""): - await self.websocket.close(code, reason) - - @overrides(BaseWebSocket) - async def receive(self) -> str: - msg = await self.websocket.recv() - if isinstance(msg, bytes): - raise TypeError("WebSocket received unexpected frame type: bytes") - return msg - - @overrides(BaseWebSocket) - async def receive_bytes(self) -> bytes: - msg = await self.websocket.recv() - if isinstance(msg, str): - raise TypeError("WebSocket received unexpected frame type: str") - return msg - - @overrides(BaseWebSocket) - async def send(self, data: str) -> None: - await self.websocket.send(data) - - @overrides(BaseWebSocket) - async def send_bytes(self, data: bytes) -> None: - await self.websocket.send(data) - - class FastAPIWebSocket(BaseWebSocket): @overrides(BaseWebSocket) def __init__(self, *, request: BaseRequest, websocket: WebSocket): @@ -398,3 +311,7 @@ class FastAPIWebSocket(BaseWebSocket): @overrides(BaseWebSocket) async def send_bytes(self, data: bytes) -> None: await self.websocket.send({"type": "websocket.send", "bytes": data}) + + +FullDriver = combine_driver(Driver, HttpxMixin, WebSocketsMixin) +AiohttpDriver = combine_driver(Driver, AiohttpMixin) diff --git a/nonebot/drivers/httpx.py b/nonebot/drivers/httpx.py new file mode 100644 index 00000000..1965c439 --- /dev/null +++ b/nonebot/drivers/httpx.py @@ -0,0 +1,45 @@ +import httpx + +from nonebot.typing import overrides +from nonebot.drivers._block_driver import BlockDriver +from nonebot.drivers import ( + Request, + Response, + WebSocket, + HTTPVersion, + ForwardMixin, + combine_driver, +) + + +class HttpxMixin(ForwardMixin): + @property + @overrides(ForwardMixin) + def type(self) -> str: + return "httpx" + + @overrides(ForwardMixin) + async def request(self, setup: Request) -> Response: + async with httpx.AsyncClient( + http2=setup.version == HTTPVersion.H2, follow_redirects=True + ) as client: + response = await client.request( + setup.method, + str(setup.url), + content=setup.content, + headers=tuple(setup.headers.items()), + timeout=setup.timeout, + ) + return Response( + response.status_code, + headers=response.headers, + content=response.content, + request=setup, + ) + + @overrides(ForwardMixin) + async def websocket(self, setup: Request) -> WebSocket: + return await super(HttpxMixin, self).websocket(setup) + + +Driver = combine_driver(BlockDriver, HttpxMixin) diff --git a/nonebot/drivers/quart.py b/nonebot/drivers/quart.py index 9d32463f..bec26c9f 100644 --- a/nonebot/drivers/quart.py +++ b/nonebot/drivers/quart.py @@ -18,10 +18,17 @@ from nonebot.config import Env from nonebot.log import logger from nonebot.typing import overrides from nonebot.utils import escape_tag +from nonebot.drivers.httpx import HttpxMixin from nonebot.config import Config as NoneBotConfig from nonebot.drivers import Request as BaseRequest from nonebot.drivers import WebSocket as BaseWebSocket -from nonebot.drivers import ReverseDriver, HTTPServerSetup, WebSocketServerSetup +from nonebot.drivers.websockets import WebSocketsMixin +from nonebot.drivers import ( + ReverseDriver, + HTTPServerSetup, + WebSocketServerSetup, + combine_driver, +) try: from quart import request as _request @@ -281,3 +288,6 @@ class WebSocket(BaseWebSocket): @overrides(BaseWebSocket) async def send_bytes(self, data: bytes): await self.websocket.send(data) + + +FullDriver = combine_driver(Driver, HttpxMixin, WebSocketsMixin) diff --git a/nonebot/drivers/websockets.py b/nonebot/drivers/websockets.py new file mode 100644 index 00000000..7dbd6399 --- /dev/null +++ b/nonebot/drivers/websockets.py @@ -0,0 +1,78 @@ +import logging + +from websockets.legacy.client import Connect, WebSocketClientProtocol + +from nonebot.typing import overrides +from nonebot.log import LoguruHandler +from nonebot.drivers import Request, Response +from nonebot.drivers._block_driver import BlockDriver +from nonebot.drivers import WebSocket as BaseWebSocket +from nonebot.drivers import ForwardMixin, combine_driver + +logger = logging.Logger("websockets.client", "INFO") +logger.addHandler(LoguruHandler()) + + +class WebSocketsMixin(ForwardMixin): + @property + @overrides(ForwardMixin) + def type(self) -> str: + return "websockets" + + @overrides(ForwardMixin) + async def request(self, setup: Request) -> Response: + return await super(WebSocketsMixin, self).request(setup) + + @overrides(ForwardMixin) + async def websocket(self, setup: Request) -> "WebSocket": + ws = await Connect( + str(setup.url), + extra_headers=setup.headers.items(), + open_timeout=setup.timeout, + ) + return WebSocket(request=setup, websocket=ws) + + +class WebSocket(BaseWebSocket): + @overrides(BaseWebSocket) + def __init__(self, *, request: Request, websocket: WebSocketClientProtocol): + super().__init__(request=request) + self.websocket = websocket + + @property + @overrides(BaseWebSocket) + def closed(self) -> bool: + return self.websocket.closed + + @overrides(BaseWebSocket) + async def accept(self): + raise NotImplementedError + + @overrides(BaseWebSocket) + async def close(self, code: int = 1000, reason: str = ""): + await self.websocket.close(code, reason) + + @overrides(BaseWebSocket) + async def receive(self) -> str: + msg = await self.websocket.recv() + if isinstance(msg, bytes): + raise TypeError("WebSocket received unexpected frame type: bytes") + return msg + + @overrides(BaseWebSocket) + async def receive_bytes(self) -> bytes: + msg = await self.websocket.recv() + if isinstance(msg, str): + raise TypeError("WebSocket received unexpected frame type: str") + return msg + + @overrides(BaseWebSocket) + async def send(self, data: str) -> None: + await self.websocket.send(data) + + @overrides(BaseWebSocket) + async def send_bytes(self, data: bytes) -> None: + await self.websocket.send(data) + + +Driver = combine_driver(BlockDriver, WebSocketsMixin) diff --git a/packages/nonebot-plugin-docs/pyproject.toml b/packages/nonebot-plugin-docs/pyproject.toml index 8ee81dc6..48349e9e 100644 --- a/packages/nonebot-plugin-docs/pyproject.toml +++ b/packages/nonebot-plugin-docs/pyproject.toml @@ -12,9 +12,8 @@ include = ["nonebot_plugin_docs/dist/**/*"] [tool.poetry.dependencies] -python = "^3.7" -aiofiles = "^0.7.0" -nonebot2 = "^2.0.0-alpha.1" +python = "^3.7.3" +nonebot2 = "^2.0.0-beta.1" [tool.poetry.dev-dependencies] diff --git a/poetry.lock b/poetry.lock index 32507fb9..588b3567 100644 --- a/poetry.lock +++ b/poetry.lock @@ -93,6 +93,18 @@ typing-extensions = {version = "*", markers = "python_version < \"3.8\""} [package.extras] tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] +[[package]] +name = "async-asgi-testclient" +version = "1.4.8" +description = "Async client for testing ASGI web applications" +category = "dev" +optional = false +python-versions = "*" + +[package.dependencies] +multidict = ">=4.0,<6.0" +requests = ">=2.21,<3.0" + [[package]] name = "async-timeout" version = "4.0.2" @@ -534,6 +546,7 @@ python-versions = "^3.7.3" develop = false [package.dependencies] +async-asgi-testclient = "^1.4.8" nonebot2 = "^2.0.0-beta.1" pytest = "^6.2.5" pytest-asyncio = "^0.16.0" @@ -543,7 +556,7 @@ pytest-order = "^1.0.0" type = "git" url = "https://github.com/nonebot/nonebug.git" reference = "master" -resolved_reference = "0a1132e9dc1803517ded0d485bfbe8c47a1d8585" +resolved_reference = "4af5bd99c3eb0f63f4619620461b16de6c96b227" [[package]] name = "packaging" @@ -1281,6 +1294,9 @@ asgiref = [ {file = "asgiref-3.4.1-py3-none-any.whl", hash = "sha256:ffc141aa908e6f175673e7b1b3b7af4fdb0ecb738fc5c8b88f69f055c2415214"}, {file = "asgiref-3.4.1.tar.gz", hash = "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9"}, ] +async-asgi-testclient = [ + {file = "async-asgi-testclient-1.4.8.tar.gz", hash = "sha256:52d666ea75971c8a825befd34a5684414578f3c5bfa5a90e7eb7de924f447aae"}, +] async-timeout = [ {file = "async-timeout-4.0.2.tar.gz", hash = "sha256:2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15"}, {file = "async_timeout-4.0.2-py3-none-any.whl", hash = "sha256:8ca1e4fcf50d07413d66d1a5e416e42cfdf5851c981d679a09851a6853383b3c"}, diff --git a/pyproject.toml b/pyproject.toml index 5dfd8cbe..db906c0a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,6 +23,7 @@ include = ["nonebot/py.typed"] [tool.poetry.dependencies] python = "^3.7.3" +yarl = "^1.7.2" loguru = "^0.5.1" pygtrie = "^2.4.1" tomlkit = "^0.7.0" @@ -34,7 +35,6 @@ httpx = { version = ">=0.20.0, <1.0.0", extras = ["http2"] } pydantic = { version = "~1.8.0", extras = ["dotenv"] } uvicorn = { version = "^0.15.0", extras = ["standard"] } aiohttp = { version = "^3.7.4", extras = ["speedups"], optional = true } -yarl = "^1.7.2" [tool.poetry.dev-dependencies] sphinx = "^4.1.1" diff --git a/tests/test_driver.py b/tests/test_driver.py new file mode 100644 index 00000000..5e5d8a28 --- /dev/null +++ b/tests/test_driver.py @@ -0,0 +1,11 @@ +import pytest + + +@pytest.mark.asyncio +@pytest.mark.parametrize( + "nonebug_init", + [{"driver": "nonebot.drivers.fastapi"}], + indirect=True, +) +async def test_driver(nonebug_init): + ... From b984f99643d628f8e4902240a2f3e2d3faec4fe3 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 22 Dec 2021 18:50:03 +0800 Subject: [PATCH 106/174] :bug: fix missing endpoint name for routing --- nonebot/drivers/fastapi.py | 4 ++- nonebot/drivers/quart.py | 13 +++++++--- poetry.lock | 13 +++++----- pyproject.toml | 2 +- tests/test_driver.py | 51 +++++++++++++++++++++++++++++++++++--- 5 files changed, 69 insertions(+), 14 deletions(-) diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index 66dd0d0a..98803aa6 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -173,17 +173,19 @@ class Driver(ReverseDriver): self._server_app.add_api_route( setup.path.path, _handle, + name=setup.name, methods=[setup.method], ) @overrides(ReverseDriver) def setup_websocket_server(self, setup: WebSocketServerSetup) -> None: - async def _handle(websocket: WebSocket): + async def _handle(websocket: WebSocket) -> None: await self._handle_ws(websocket, setup) self._server_app.add_api_websocket_route( setup.path.path, _handle, + name=setup.name, ) @overrides(ReverseDriver) diff --git a/nonebot/drivers/quart.py b/nonebot/drivers/quart.py index bec26c9f..a56d4767 100644 --- a/nonebot/drivers/quart.py +++ b/nonebot/drivers/quart.py @@ -8,7 +8,6 @@ Quart 驱动适配 https://pgjones.gitlab.io/quart/index.html """ -from functools import partial from typing import List, TypeVar, Callable, Optional, Coroutine import uvicorn @@ -140,17 +139,25 @@ class Driver(ReverseDriver): @overrides(ReverseDriver) def setup_http_server(self, setup: HTTPServerSetup): + async def _handle() -> Response: + return await self._handle_http(setup) + self._server_app.add_url_rule( setup.path.path, + endpoint=setup.name, methods=[setup.method], - view_func=partial(self._handle_http, setup=setup), + view_func=_handle, ) @overrides(ReverseDriver) def setup_websocket_server(self, setup: WebSocketServerSetup) -> None: + async def _handle() -> None: + return await self._handle_ws(setup) + self._server_app.add_websocket( setup.path.path, - view_func=partial(self._handle_ws, setup=setup), + endpoint=setup.name, + view_func=_handle, ) @overrides(ReverseDriver) diff --git a/poetry.lock b/poetry.lock index 588b3567..00787ac7 100644 --- a/poetry.lock +++ b/poetry.lock @@ -787,21 +787,22 @@ python-versions = ">=3.6" [[package]] name = "quart" -version = "0.15.1" +version = "0.16.2" description = "A Python ASGI web microframework with the same API as Flask" category = "main" optional = true -python-versions = ">=3.7.0" +python-versions = ">=3.7" [package.dependencies] aiofiles = "*" blinker = "*" click = "*" hypercorn = ">=0.11.2" +importlib_metadata = {version = "*", markers = "python_version < \"3.8\""} itsdangerous = "*" jinja2 = "*" toml = "*" -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} +typing_extensions = {version = "*", markers = "python_version < \"3.8\""} werkzeug = ">=2.0.0" [package.extras] @@ -1193,7 +1194,7 @@ quart = ["Quart"] [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "3cef667f39a760749d4c1d35883be4cec9c224e8079ee28752f6aa7f58688442" +content-hash = "e32c99ae82181567b69bc70580e3c0d816a522d0174fce2ce04c773219f1bb50" [metadata.files] aiodns = [ @@ -1994,8 +1995,8 @@ pyyaml = [ {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, ] quart = [ - {file = "Quart-0.15.1-py3-none-any.whl", hash = "sha256:f35134fb1d81af61624e6d89bca33cd611dcedce2dc4e291f527ab04395f4e1a"}, - {file = "Quart-0.15.1.tar.gz", hash = "sha256:f80c91d1e0588662483e22dd9c368a5778886b62e128c5399d2cc1b1898482cf"}, + {file = "Quart-0.16.2-py3-none-any.whl", hash = "sha256:c1bcc4989c7e0b6c3301df10b6285c09ee0a1d75fa4cebd936f0d17312294e36"}, + {file = "Quart-0.16.2.tar.gz", hash = "sha256:356f4fd795fbf5a7a97bdeb7ca908b5051d0e6e4c0499b2b7c30b743a6938a7e"}, ] requests = [ {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, diff --git a/pyproject.toml b/pyproject.toml index db906c0a..b6d94cb6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,7 @@ tomlkit = "^0.7.0" fastapi = "^0.70.0" websockets = ">=9.1" typing-extensions = ">=3.10.0,<5.0.0" -Quart = { version = "^0.15.0", optional = true } +Quart = { version = "^0.16.0", optional = true } httpx = { version = ">=0.20.0, <1.0.0", extras = ["http2"] } pydantic = { version = "~1.8.0", extras = ["dotenv"] } uvicorn = { version = "^0.15.0", extras = ["standard"] } diff --git a/tests/test_driver.py b/tests/test_driver.py index 5e5d8a28..a26fa3f2 100644 --- a/tests/test_driver.py +++ b/tests/test_driver.py @@ -1,11 +1,56 @@ +from typing import cast + import pytest +from nonebug import App @pytest.mark.asyncio @pytest.mark.parametrize( "nonebug_init", - [{"driver": "nonebot.drivers.fastapi"}], + [ + pytest.param({"driver": "nonebot.drivers.fastapi:Driver"}, id="fastapi"), + pytest.param({"driver": "nonebot.drivers.quart:Driver"}, id="quart"), + ], indirect=True, ) -async def test_driver(nonebug_init): - ... +async def test_reverse_driver(app: App): + import nonebot + from nonebot.drivers import ( + URL, + Request, + Response, + WebSocket, + ReverseDriver, + HTTPServerSetup, + WebSocketServerSetup, + ) + + driver = cast(ReverseDriver, nonebot.get_driver()) + + async def _handle_http(request: Request) -> Response: + assert request.content in (b"test", "test") + return Response(200, content="test") + + async def _handle_ws(ws: WebSocket) -> None: + await ws.accept() + data = await ws.receive() + assert data == "ping" + await ws.send("pong") + await ws.close() + + http_setup = HTTPServerSetup(URL("/http_test"), "POST", "http_test", _handle_http) + driver.setup_http_server(http_setup) + + ws_setup = WebSocketServerSetup(URL("/ws_test"), "ws_test", _handle_ws) + driver.setup_websocket_server(ws_setup) + + async with app.test_server() as ctx: + client = ctx.get_client() + response = await client.post("/http_test", data="test") + assert response.status_code == 200 + assert response.text == "test" + + # FIXME: https://github.com/vinissimus/async-asgi-testclient/issues/43 + # async with client.websocket_connect("/ws_test") as ws: + # await ws.send_text("ping") + # assert await ws.receive_text() == "pong" From cda49551a8fd77e2ac657a0972d660062cc77f88 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 23 Dec 2021 01:34:20 +0800 Subject: [PATCH 107/174] :arrow_up: upgrade asgi test client --- poetry.lock | 22 +++------------------- tests/test_driver.py | 7 +++---- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/poetry.lock b/poetry.lock index 00787ac7..b7b28986 100644 --- a/poetry.lock +++ b/poetry.lock @@ -95,7 +95,7 @@ tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] [[package]] name = "async-asgi-testclient" -version = "1.4.8" +version = "1.4.9" description = "Async client for testing ASGI web applications" category = "dev" optional = false @@ -550,13 +550,12 @@ async-asgi-testclient = "^1.4.8" nonebot2 = "^2.0.0-beta.1" pytest = "^6.2.5" pytest-asyncio = "^0.16.0" -pytest-order = "^1.0.0" [package.source] type = "git" url = "https://github.com/nonebot/nonebug.git" reference = "master" -resolved_reference = "4af5bd99c3eb0f63f4619620461b16de6c96b227" +resolved_reference = "6e2292f06b0b06dc2e1353ed1ef248a6c91fa2e4" [[package]] name = "packaging" @@ -747,17 +746,6 @@ pytest = ">=4.6" [package.extras] testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"] -[[package]] -name = "pytest-order" -version = "1.0.0" -description = "pytest plugin to run your tests in a specific order" -category = "dev" -optional = false -python-versions = "*" - -[package.dependencies] -pytest = ">=5.0" - [[package]] name = "python-dotenv" version = "0.19.2" @@ -1296,7 +1284,7 @@ asgiref = [ {file = "asgiref-3.4.1.tar.gz", hash = "sha256:4ef1ab46b484e3c706329cedeff284a5d40824200638503f5768edb6de7d58e9"}, ] async-asgi-testclient = [ - {file = "async-asgi-testclient-1.4.8.tar.gz", hash = "sha256:52d666ea75971c8a825befd34a5684414578f3c5bfa5a90e7eb7de924f447aae"}, + {file = "async-asgi-testclient-1.4.9.tar.gz", hash = "sha256:ae507f44a53699611cff81ad548090dad24055fba02cce398e1ca9b84d1e1288"}, ] async-timeout = [ {file = "async-timeout-4.0.2.tar.gz", hash = "sha256:2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15"}, @@ -1947,10 +1935,6 @@ pytest-cov = [ {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"}, {file = "pytest_cov-3.0.0-py3-none-any.whl", hash = "sha256:578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6"}, ] -pytest-order = [ - {file = "pytest-order-1.0.0.tar.gz", hash = "sha256:5997a262b31234eebb461f9a9ef24687bf732029b499845a4398b69edb5ac321"}, - {file = "pytest_order-1.0.0-py3-none-any.whl", hash = "sha256:a4cdf12f4c83c76bdfd6e6088e2e157df7fdf91a9c3e3ca7d8809e8dabce0f4b"}, -] python-dotenv = [ {file = "python-dotenv-0.19.2.tar.gz", hash = "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"}, {file = "python_dotenv-0.19.2-py2.py3-none-any.whl", hash = "sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3"}, diff --git a/tests/test_driver.py b/tests/test_driver.py index a26fa3f2..21949b2b 100644 --- a/tests/test_driver.py +++ b/tests/test_driver.py @@ -50,7 +50,6 @@ async def test_reverse_driver(app: App): assert response.status_code == 200 assert response.text == "test" - # FIXME: https://github.com/vinissimus/async-asgi-testclient/issues/43 - # async with client.websocket_connect("/ws_test") as ws: - # await ws.send_text("ping") - # assert await ws.receive_text() == "pong" + async with client.websocket_connect("/ws_test") as ws: + await ws.send_text("ping") + assert await ws.receive_text() == "pong" From 0839d6d062f82f5d00683f9e65918b115cc2d8e1 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 23 Dec 2021 14:29:21 +0800 Subject: [PATCH 108/174] :bug: fix import error for extra dependencies --- nonebot/drivers/__init__.py | 2 +- nonebot/drivers/aiohttp.py | 10 +++++++--- nonebot/drivers/fastapi.py | 9 +++++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py index eeb44a09..44868897 100644 --- a/nonebot/drivers/__init__.py +++ b/nonebot/drivers/__init__.py @@ -252,7 +252,7 @@ class ReverseDriver(Driver): def combine_driver(driver: Type[Driver], *mixins: Type[ForwardMixin]) -> Type[Driver]: - class CombinedDriver(driver, *mixins): # type: ignore + class CombinedDriver(driver, *mixins, ForwardDriver): # type: ignore @property def type(self) -> str: return ( diff --git a/nonebot/drivers/aiohttp.py b/nonebot/drivers/aiohttp.py index cb7f7bbe..031e3b57 100644 --- a/nonebot/drivers/aiohttp.py +++ b/nonebot/drivers/aiohttp.py @@ -5,15 +5,19 @@ AIOHTTP 驱动适配 本驱动仅支持客户端连接 """ - -import aiohttp - from nonebot.typing import overrides from nonebot.drivers import Request, Response from nonebot.drivers._block_driver import BlockDriver from nonebot.drivers import WebSocket as BaseWebSocket from nonebot.drivers import HTTPVersion, ForwardMixin, combine_driver +try: + import aiohttp +except ImportError: + raise ImportError( + "Please install aiohttp first to use this driver. `pip install nonebot2[aiohttp]`" + ) from None + class AiohttpMixin(ForwardMixin): @property diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index 98803aa6..0e36bdda 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -23,7 +23,6 @@ from nonebot.config import Env from nonebot.typing import overrides from nonebot.utils import escape_tag from nonebot.drivers.httpx import HttpxMixin -from nonebot.drivers.aiohttp import AiohttpMixin from nonebot.config import Config as NoneBotConfig from nonebot.drivers import Request as BaseRequest from nonebot.drivers import WebSocket as BaseWebSocket @@ -35,6 +34,11 @@ from nonebot.drivers import ( combine_driver, ) +try: + from nonebot.drivers.aiohttp import AiohttpMixin +except ImportError: + AiohttpMixin = None + class Config(BaseSettings): """ @@ -316,4 +320,5 @@ class FastAPIWebSocket(BaseWebSocket): FullDriver = combine_driver(Driver, HttpxMixin, WebSocketsMixin) -AiohttpDriver = combine_driver(Driver, AiohttpMixin) +if AiohttpMixin: + AiohttpDriver = combine_driver(Driver, AiohttpMixin) From b9f1890d80317a55bd5838877c2744e96905b50b Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 23 Dec 2021 16:01:09 +0800 Subject: [PATCH 109/174] :bug: fix command parse error --- nonebot/message.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nonebot/message.py b/nonebot/message.py index 72386b7f..d09a64e0 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -313,7 +313,7 @@ async def handle_event(bot: "Bot", event: "Event") -> None: return # Trie Match - _, _ = TrieRule.get_value(bot, event, state) + TrieRule.get_value(bot, event, state) break_flag = False for priority in sorted(matchers.keys()): From 8fb394e4c3e66d7720942ef4a997fa442d7120a7 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 23 Dec 2021 17:20:26 +0800 Subject: [PATCH 110/174] :alembic: new driver combine expr support --- nonebot/__init__.py | 38 ++++++++++++++++++++++++++------ nonebot/drivers/__init__.py | 8 ++++++- nonebot/drivers/_block_driver.py | 18 ++++++--------- nonebot/drivers/aiohttp.py | 4 ++-- nonebot/drivers/fastapi.py | 19 +--------------- nonebot/drivers/httpx.py | 13 ++++++----- nonebot/drivers/quart.py | 12 +--------- nonebot/drivers/websockets.py | 15 ++++++++----- nonebot/rule.py | 2 +- pyproject.toml | 8 ++++--- tests/test_init.py | 14 ++++++++---- 11 files changed, 83 insertions(+), 68 deletions(-) diff --git a/nonebot/__init__.py b/nonebot/__init__.py index 92d63d75..78f7fc39 100644 --- a/nonebot/__init__.py +++ b/nonebot/__init__.py @@ -37,7 +37,7 @@ from nonebot.adapters import Bot from nonebot.utils import escape_tag from nonebot.config import Env, Config from nonebot.log import logger, default_filter -from nonebot.drivers import Driver, ReverseDriver +from nonebot.drivers import Driver, ReverseDriver, combine_driver try: _dist: pkg_resources.Distribution = pkg_resources.get_distribution("nonebot2") @@ -195,6 +195,35 @@ def get_bots() -> Dict[str, Bot]: return driver.bots +def _resolve_dot_notation( + obj_str: str, default_attr: str, default_prefix: Optional[str] = None +) -> Any: + modulename, _, cls = obj_str.partition(":") + if default_prefix is not None and modulename.startswith("~"): + modulename = default_prefix + modulename[1:] + module = importlib.import_module(modulename) + if not cls: + return getattr(module, default_attr) + instance = module + for attr_str in cls.split("."): + instance = getattr(instance, attr_str) + return instance + + +def _resolve_combine_expr(obj_str: str) -> Type[Driver]: + drivers = obj_str.split("+") + DriverClass = _resolve_dot_notation( + drivers[0], "Driver", default_prefix="nonebot.drivers." + ) + if len(drivers) == 1: + return DriverClass + mixins = [ + _resolve_dot_notation(mixin, "Mixin", default_prefix="nonebot.drivers.") + for mixin in drivers[1:] + ] + return combine_driver(DriverClass, *mixins) + + def init(*, _env_file: Optional[str] = None, **kwargs): """ :说明: @@ -243,12 +272,7 @@ def init(*, _env_file: Optional[str] = None, **kwargs): f"Loaded Config: {escape_tag(str(config.dict()))}" ) - modulename, _, cls = config.driver.partition(":") - module = importlib.import_module(modulename) - instance = module - for attr_str in (cls or "Driver").split("."): - instance = getattr(instance, attr_str) - DriverClass: Type[Driver] = instance # type: ignore + DriverClass: Type[Driver] = _resolve_combine_expr(config.driver) _driver = DriverClass(env, config) diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py index 44868897..079534ce 100644 --- a/nonebot/drivers/__init__.py +++ b/nonebot/drivers/__init__.py @@ -252,7 +252,13 @@ class ReverseDriver(Driver): def combine_driver(driver: Type[Driver], *mixins: Type[ForwardMixin]) -> Type[Driver]: - class CombinedDriver(driver, *mixins, ForwardDriver): # type: ignore + # check first + assert issubclass(driver, Driver), "`driver` must be subclass of Driver" + assert all( + map(lambda m: issubclass(m, ForwardMixin), mixins) + ), "`mixins` must be subclass of ForwardMixin" + + class CombinedDriver(*mixins, driver, ForwardDriver): # type: ignore @property def type(self) -> str: return ( diff --git a/nonebot/drivers/_block_driver.py b/nonebot/drivers/_block_driver.py index afd7f8b3..0e8f34f8 100644 --- a/nonebot/drivers/_block_driver.py +++ b/nonebot/drivers/_block_driver.py @@ -4,9 +4,9 @@ import threading from typing import Set, Callable, Awaitable from nonebot.log import logger +from nonebot.drivers import Driver from nonebot.typing import overrides from nonebot.config import Env, Config -from nonebot.drivers import ForwardDriver STARTUP_FUNC = Callable[[], Awaitable[None]] SHUTDOWN_FUNC = Callable[[], Awaitable[None]] @@ -16,11 +16,7 @@ HANDLED_SIGNALS = ( ) -class BlockDriver(ForwardDriver): - """ - AIOHTTP 驱动框架 - """ - +class BlockDriver(Driver): def __init__(self, env: Env, config: Config): super().__init__(env, config) self.startup_funcs: Set[STARTUP_FUNC] = set() @@ -29,18 +25,18 @@ class BlockDriver(ForwardDriver): self.force_exit: bool = False @property - @overrides(ForwardDriver) + @overrides(Driver) def type(self) -> str: """驱动名称: ``block_driver``""" return "block_driver" @property - @overrides(ForwardDriver) + @overrides(Driver) def logger(self): """block driver 使用的 logger""" return logger - @overrides(ForwardDriver) + @overrides(Driver) def on_startup(self, func: STARTUP_FUNC) -> STARTUP_FUNC: """ :说明: @@ -54,7 +50,7 @@ class BlockDriver(ForwardDriver): self.startup_funcs.add(func) return func - @overrides(ForwardDriver) + @overrides(Driver) def on_shutdown(self, func: SHUTDOWN_FUNC) -> SHUTDOWN_FUNC: """ :说明: @@ -68,7 +64,7 @@ class BlockDriver(ForwardDriver): self.shutdown_funcs.add(func) return func - @overrides(ForwardDriver) + @overrides(Driver) def run(self, *args, **kwargs): """启动 block driver""" super().run(*args, **kwargs) diff --git a/nonebot/drivers/aiohttp.py b/nonebot/drivers/aiohttp.py index 031e3b57..f935342c 100644 --- a/nonebot/drivers/aiohttp.py +++ b/nonebot/drivers/aiohttp.py @@ -19,7 +19,7 @@ except ImportError: ) from None -class AiohttpMixin(ForwardMixin): +class Mixin(ForwardMixin): @property @overrides(ForwardMixin) def type(self) -> str: @@ -114,4 +114,4 @@ class WebSocket(BaseWebSocket): await self.websocket.send_bytes(data) -Driver = combine_driver(BlockDriver, AiohttpMixin) +Driver = combine_driver(BlockDriver, Mixin) diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index 0e36bdda..41bd6c71 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -22,22 +22,10 @@ from starlette.websockets import WebSocket, WebSocketState from nonebot.config import Env from nonebot.typing import overrides from nonebot.utils import escape_tag -from nonebot.drivers.httpx import HttpxMixin from nonebot.config import Config as NoneBotConfig from nonebot.drivers import Request as BaseRequest from nonebot.drivers import WebSocket as BaseWebSocket -from nonebot.drivers.websockets import WebSocketsMixin -from nonebot.drivers import ( - ReverseDriver, - HTTPServerSetup, - WebSocketServerSetup, - combine_driver, -) - -try: - from nonebot.drivers.aiohttp import AiohttpMixin -except ImportError: - AiohttpMixin = None +from nonebot.drivers import ReverseDriver, HTTPServerSetup, WebSocketServerSetup class Config(BaseSettings): @@ -317,8 +305,3 @@ class FastAPIWebSocket(BaseWebSocket): @overrides(BaseWebSocket) async def send_bytes(self, data: bytes) -> None: await self.websocket.send({"type": "websocket.send", "bytes": data}) - - -FullDriver = combine_driver(Driver, HttpxMixin, WebSocketsMixin) -if AiohttpMixin: - AiohttpDriver = combine_driver(Driver, AiohttpMixin) diff --git a/nonebot/drivers/httpx.py b/nonebot/drivers/httpx.py index 1965c439..09234710 100644 --- a/nonebot/drivers/httpx.py +++ b/nonebot/drivers/httpx.py @@ -1,5 +1,3 @@ -import httpx - from nonebot.typing import overrides from nonebot.drivers._block_driver import BlockDriver from nonebot.drivers import ( @@ -11,8 +9,13 @@ from nonebot.drivers import ( combine_driver, ) +try: + import httpx +except ImportError: + raise ImportError("Please install httpx by using `pip install nonebot2[httpx]`") -class HttpxMixin(ForwardMixin): + +class Mixin(ForwardMixin): @property @overrides(ForwardMixin) def type(self) -> str: @@ -39,7 +42,7 @@ class HttpxMixin(ForwardMixin): @overrides(ForwardMixin) async def websocket(self, setup: Request) -> WebSocket: - return await super(HttpxMixin, self).websocket(setup) + return await super(Mixin, self).websocket(setup) -Driver = combine_driver(BlockDriver, HttpxMixin) +Driver = combine_driver(BlockDriver, Mixin) diff --git a/nonebot/drivers/quart.py b/nonebot/drivers/quart.py index a56d4767..89822ee6 100644 --- a/nonebot/drivers/quart.py +++ b/nonebot/drivers/quart.py @@ -17,17 +17,10 @@ from nonebot.config import Env from nonebot.log import logger from nonebot.typing import overrides from nonebot.utils import escape_tag -from nonebot.drivers.httpx import HttpxMixin from nonebot.config import Config as NoneBotConfig from nonebot.drivers import Request as BaseRequest from nonebot.drivers import WebSocket as BaseWebSocket -from nonebot.drivers.websockets import WebSocketsMixin -from nonebot.drivers import ( - ReverseDriver, - HTTPServerSetup, - WebSocketServerSetup, - combine_driver, -) +from nonebot.drivers import ReverseDriver, HTTPServerSetup, WebSocketServerSetup try: from quart import request as _request @@ -295,6 +288,3 @@ class WebSocket(BaseWebSocket): @overrides(BaseWebSocket) async def send_bytes(self, data: bytes): await self.websocket.send(data) - - -FullDriver = combine_driver(Driver, HttpxMixin, WebSocketsMixin) diff --git a/nonebot/drivers/websockets.py b/nonebot/drivers/websockets.py index 7dbd6399..81903698 100644 --- a/nonebot/drivers/websockets.py +++ b/nonebot/drivers/websockets.py @@ -1,7 +1,5 @@ import logging -from websockets.legacy.client import Connect, WebSocketClientProtocol - from nonebot.typing import overrides from nonebot.log import LoguruHandler from nonebot.drivers import Request, Response @@ -9,11 +7,18 @@ from nonebot.drivers._block_driver import BlockDriver from nonebot.drivers import WebSocket as BaseWebSocket from nonebot.drivers import ForwardMixin, combine_driver +try: + from websockets.legacy.client import Connect, WebSocketClientProtocol +except ImportError: + raise ImportError( + "Please install websockets by using `pip install nonebot2[websockets]`" + ) + logger = logging.Logger("websockets.client", "INFO") logger.addHandler(LoguruHandler()) -class WebSocketsMixin(ForwardMixin): +class Mixin(ForwardMixin): @property @overrides(ForwardMixin) def type(self) -> str: @@ -21,7 +26,7 @@ class WebSocketsMixin(ForwardMixin): @overrides(ForwardMixin) async def request(self, setup: Request) -> Response: - return await super(WebSocketsMixin, self).request(setup) + return await super(Mixin, self).request(setup) @overrides(ForwardMixin) async def websocket(self, setup: Request) -> "WebSocket": @@ -75,4 +80,4 @@ class WebSocket(BaseWebSocket): await self.websocket.send(data) -Driver = combine_driver(BlockDriver, WebSocketsMixin) +Driver = combine_driver(BlockDriver, Mixin) diff --git a/nonebot/rule.py b/nonebot/rule.py index 48c60963..8224e31f 100644 --- a/nonebot/rule.py +++ b/nonebot/rule.py @@ -422,7 +422,7 @@ def shell_command( 命令内容与后续消息间无需空格！ \:\:\: """ - if not isinstance(parser, ArgumentParser): + if parser is not None and not isinstance(parser, ArgumentParser): raise TypeError("`parser` must be an instance of nonebot.rule.ArgumentParser") config = get_driver().config diff --git a/pyproject.toml b/pyproject.toml index b6d94cb6..c687ce18 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,13 +28,13 @@ loguru = "^0.5.1" pygtrie = "^2.4.1" tomlkit = "^0.7.0" fastapi = "^0.70.0" -websockets = ">=9.1" typing-extensions = ">=3.10.0,<5.0.0" Quart = { version = "^0.16.0", optional = true } -httpx = { version = ">=0.20.0, <1.0.0", extras = ["http2"] } +websockets = { version=">=9.1", optional = true } pydantic = { version = "~1.8.0", extras = ["dotenv"] } uvicorn = { version = "^0.15.0", extras = ["standard"] } aiohttp = { version = "^3.7.4", extras = ["speedups"], optional = true } +httpx = { version = ">=0.20.0, <1.0.0", extras = ["http2"], optional = true } [tool.poetry.dev-dependencies] sphinx = "^4.1.1" @@ -46,8 +46,10 @@ sphinx-markdown-builder = { git = "https://github.com/nonebot/sphinx-markdown-bu [tool.poetry.extras] quart = ["quart"] +httpx = ["httpx"] aiohttp = ["aiohttp"] -all = ["quart", "aiohttp"] +websockets = ["websockets"] +all = ["quart", "aiohttp", "httpx", "websockets"] # [[tool.poetry.source]] # name = "aliyun" diff --git a/tests/test_init.py b/tests/test_init.py index 2018fb75..44411fb4 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -15,18 +15,24 @@ os.environ["CONFIG_FROM_ENV"] = '{"test": "test"}' @pytest.mark.asyncio @pytest.mark.parametrize( "nonebug_init", - [{"config_from_init": "init", "driver": "nonebot.drivers.fastapi:FullDriver"}], + [ + { + "config_from_init": "init", + "driver": "nonebot.drivers.fastapi+nonebot.drivers.httpx+nonebot.drivers.websockets", + }, + { + "config_from_init": "init", + "driver": "~fastapi+~httpx+~websockets", + }, + ], indirect=True, ) async def test_init(nonebug_init): from nonebot import get_driver - from nonebot.drivers.fastapi import FullDriver env = get_driver().env assert env == "test" - assert isinstance(get_driver(), FullDriver) - config = get_driver().config assert config.config_from_env == {"test": "test"} assert config.config_from_init == "init" From e3aba260804e89be9c014de323267a64fbb5851a Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 23 Dec 2021 17:50:59 +0800 Subject: [PATCH 111/174] :recycle: rewrite builtin rule and permission --- nonebot/permission.py | 44 ++++++++---------- nonebot/rule.py | 106 ++++++++++++++++++++++++++---------------- 2 files changed, 86 insertions(+), 64 deletions(-) diff --git a/nonebot/permission.py b/nonebot/permission.py index a2ce1778..79aa87aa 100644 --- a/nonebot/permission.py +++ b/nonebot/permission.py @@ -11,23 +11,19 @@ r""" import asyncio from contextlib import AsyncExitStack -from typing import ( - Any, - Set, - Dict, - Tuple, - Union, - Callable, - NoReturn, - Optional, - Coroutine, -) +from typing import Any, Set, Tuple, Union, NoReturn, Optional, Coroutine -from nonebot import params from nonebot.adapters import Bot, Event from nonebot.dependencies import Dependent from nonebot.exception import SkippedException from nonebot.typing import T_Handler, T_DependencyCache, T_PermissionChecker +from nonebot.params import ( + BotParam, + EventType, + EventParam, + DependParam, + DefaultParam, +) async def _run_coro_with_catch(coro: Coroutine[Any, Any, Any]): @@ -56,10 +52,10 @@ class Permission: __slots__ = ("checkers",) HANDLER_PARAM_TYPES = [ - params.DependParam, - params.BotParam, - params.EventParam, - params.DefaultParam, + DependParam, + BotParam, + EventParam, + DefaultParam, ] def __init__(self, *checkers: Union[T_PermissionChecker, Dependent[bool]]) -> None: @@ -142,23 +138,23 @@ class Permission: class Message: - async def __call__(self, event: Event) -> bool: - return event.get_type() == "message" + async def __call__(self, type: str = EventType()) -> bool: + return type == "message" class Notice: - async def __call__(self, event: Event) -> bool: - return event.get_type() == "notice" + async def __call__(self, type: str = EventType()) -> bool: + return type == "notice" class Request: - async def __call__(self, event: Event) -> bool: - return event.get_type() == "request" + async def __call__(self, type: str = EventType()) -> bool: + return type == "request" class MetaEvent: - async def __call__(self, event: Event) -> bool: - return event.get_type() == "meta_event" + async def __call__(self, type: str = EventType()) -> bool: + return type == "meta_event" MESSAGE = Permission(Message()) diff --git a/nonebot/rule.py b/nonebot/rule.py index 8224e31f..33ab18d5 100644 --- a/nonebot/rule.py +++ b/nonebot/rule.py @@ -21,12 +21,12 @@ from typing import Any, Set, List, Tuple, Union, NoReturn, Optional, Sequence from pygtrie import CharTrie +from nonebot import get_driver from nonebot.log import logger -from nonebot import params, get_driver from nonebot.dependencies import Dependent from nonebot.exception import ParserExit, SkippedException from nonebot.adapters import Bot, Event, Message, MessageSegment -from nonebot.typing import T_State, T_Handler, T_RuleChecker, T_DependencyCache +from nonebot.typing import T_State, T_RuleChecker, T_DependencyCache from nonebot.consts import ( CMD_KEY, PREFIX_KEY, @@ -38,6 +38,19 @@ from nonebot.consts import ( REGEX_GROUP, REGEX_MATCHED, ) +from nonebot.params import ( + State, + Command, + BotParam, + EventToMe, + EventType, + EventParam, + StateParam, + DependParam, + DefaultParam, + EventMessage, + EventPlainText, +) CMD_RESULT = TypedDict( "CMD_RESULT", @@ -68,11 +81,11 @@ class Rule: __slots__ = ("checkers",) HANDLER_PARAM_TYPES = [ - params.DependParam, - params.BotParam, - params.EventParam, - params.StateParam, - params.DefaultParam, + DependParam, + BotParam, + EventParam, + StateParam, + DefaultParam, ] def __init__(self, *checkers: Union[T_RuleChecker, Dependent[bool]]) -> None: @@ -189,15 +202,16 @@ class TrieRule: return prefix -class Startswith: +class StartswithRule: def __init__(self, msg: Tuple[str, ...], ignorecase: bool = False): self.msg = msg self.ignorecase = ignorecase - async def __call__(self, event: Event) -> Any: - if event.get_type() != "message": + async def __call__( + self, type: str = EventType(), text: str = EventPlainText() + ) -> Any: + if type != "message": return False - text = event.get_plaintext() return bool( re.match( f"^(?:{'|'.join(re.escape(prefix) for prefix in self.msg)})", @@ -220,18 +234,19 @@ def startswith(msg: Union[str, Tuple[str, ...]], ignorecase: bool = False) -> Ru if isinstance(msg, str): msg = (msg,) - return Rule(Startswith(msg, ignorecase)) + return Rule(StartswithRule(msg, ignorecase)) -class Endswith: +class EndswithRule: def __init__(self, msg: Tuple[str, ...], ignorecase: bool = False): self.msg = msg self.ignorecase = ignorecase - async def __call__(self, event: Event) -> Any: - if event.get_type() != "message": + async def __call__( + self, type: str = EventType(), text: str = EventPlainText() + ) -> Any: + if type != "message": return False - text = event.get_plaintext() return bool( re.search( f"(?:{'|'.join(re.escape(prefix) for prefix in self.msg)})$", @@ -254,17 +269,18 @@ def endswith(msg: Union[str, Tuple[str, ...]], ignorecase: bool = False) -> Rule if isinstance(msg, str): msg = (msg,) - return Rule(Endswith(msg, ignorecase)) + return Rule(EndswithRule(msg, ignorecase)) -class Keywords: +class KeywordsRule: def __init__(self, *keywords: str): self.keywords = keywords - async def __call__(self, bot: Bot, event: Event, state: T_State) -> bool: - if event.get_type() != "message": + async def __call__( + self, type: str = EventType(), text: str = EventPlainText() + ) -> bool: + if type != "message": return False - text = event.get_plaintext() return bool(text and any(keyword in text for keyword in self.keywords)) @@ -279,15 +295,15 @@ def keyword(*keywords: str) -> Rule: * ``*keywords: str``: 关键词 """ - return Rule(Keywords(*keywords)) + return Rule(KeywordsRule(*keywords)) -class Command: +class CommandRule: def __init__(self, cmds: List[Tuple[str, ...]]): self.cmds = cmds - async def __call__(self, state: T_State) -> bool: - return state[PREFIX_KEY][CMD_KEY] in self.cmds + async def __call__(self, cmd: Tuple[str, ...] = Command()) -> bool: + return cmd in self.cmds def __repr__(self): return f"" @@ -334,7 +350,7 @@ def command(*cmds: Union[str, Tuple[str, ...]]) -> Rule: for start, sep in product(command_start, command_sep): TrieRule.add_prefix(f"{start}{sep.join(command)}", command) - return Rule(Command(commands)) + return Rule(CommandRule(commands)) class ArgumentParser(ArgParser): @@ -365,14 +381,19 @@ class ArgumentParser(ArgParser): return super().parse_args(args=args, namespace=namespace) # type: ignore -class ShellCommand: +class ShellCommandRule: def __init__(self, cmds: List[Tuple[str, ...]], parser: Optional[ArgumentParser]): self.cmds = cmds self.parser = parser - async def __call__(self, event: Event, state: T_State) -> bool: - if state[PREFIX_KEY][CMD_KEY] in self.cmds: - message = str(event.get_message()) + async def __call__( + self, + cmd: Tuple[str, ...] = Command(), + msg: Message = EventMessage(), + state: T_State = State(), + ) -> bool: + if cmd in self.cmds: + message = str(msg) strip_message = message[len(state[PREFIX_KEY][RAW_CMD_KEY]) :].lstrip() state[SHELL_ARGV] = shlex.split(strip_message) if self.parser: @@ -442,18 +463,23 @@ def shell_command( for start, sep in product(command_start, command_sep): TrieRule.add_prefix(f"{start}{sep.join(command)}", command) - return Rule(ShellCommand(commands, parser)) + return Rule(ShellCommandRule(commands, parser)) -class Regex: +class RegexRule: def __init__(self, regex: str, flags: int = 0): self.regex = regex self.flags = flags - async def __call__(self, event: Event, state: T_State) -> bool: - if event.get_type() != "message": + async def __call__( + self, + type: str = EventType(), + msg: Message = EventMessage(), + state: T_State = State(), + ) -> bool: + if type != "message": return False - matched = re.search(self.regex, str(event.get_message()), self.flags) + matched = re.search(self.regex, str(msg), self.flags) if matched: state[REGEX_MATCHED] = matched.group() state[REGEX_GROUP] = matched.groups() @@ -482,12 +508,12 @@ def regex(regex: str, flags: Union[int, re.RegexFlag] = 0) -> Rule: \:\:\: """ - return Rule(Regex(regex, flags)) + return Rule(RegexRule(regex, flags)) -class ToMe: - async def __call__(self, event: Event) -> bool: - return event.is_tome() +class ToMeRule: + async def __call__(self, to_me: bool = EventToMe()) -> bool: + return to_me def to_me() -> Rule: @@ -501,4 +527,4 @@ def to_me() -> Rule: * 无 """ - return Rule(ToMe()) + return Rule(ToMeRule()) From 76104d323748926a5f20c412cde31cf216f02aaa Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 23 Dec 2021 19:36:29 +0800 Subject: [PATCH 112/174] :bug: fix rule checker not parsed --- nonebot/rule.py | 4 +++- poetry.lock | 18 ++++++++++-------- tests/test_matcher.py | 2 -- tests/test_rule.py | 18 ++++++++++++++++++ 4 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 tests/test_rule.py diff --git a/nonebot/rule.py b/nonebot/rule.py index 33ab18d5..f127230c 100644 --- a/nonebot/rule.py +++ b/nonebot/rule.py @@ -98,7 +98,9 @@ class Rule: self.checkers: Set[Dependent[bool]] = set( checker if isinstance(checker, Dependent) - else Dependent[bool](call=checker, allow_types=self.HANDLER_PARAM_TYPES) + else Dependent[bool].parse( + call=checker, allow_types=self.HANDLER_PARAM_TYPES + ) for checker in checkers ) """ diff --git a/poetry.lock b/poetry.lock index b7b28986..7dc91309 100644 --- a/poetry.lock +++ b/poetry.lock @@ -319,7 +319,7 @@ name = "h2" version = "4.1.0" description = "HTTP/2 State-Machine based protocol implementation" category = "main" -optional = false +optional = true python-versions = ">=3.6.1" [package.dependencies] @@ -331,7 +331,7 @@ name = "hpack" version = "4.0.0" description = "Pure-Python HPACK header compression" category = "main" -optional = false +optional = true python-versions = ">=3.6.1" [[package]] @@ -347,7 +347,7 @@ name = "httpcore" version = "0.14.3" description = "A minimal low-level HTTP client." category = "main" -optional = false +optional = true python-versions = ">=3.6" [package.dependencies] @@ -375,7 +375,7 @@ name = "httpx" version = "0.21.1" description = "The next generation HTTP client." category = "main" -optional = false +optional = true python-versions = ">=3.6" [package.dependencies] @@ -417,7 +417,7 @@ name = "hyperframe" version = "6.0.1" description = "HTTP/2 framing layer for Python" category = "main" -optional = false +optional = true python-versions = ">=3.6.1" [[package]] @@ -819,7 +819,7 @@ name = "rfc3986" version = "1.5.0" description = "Validating URI References per RFC 3986" category = "main" -optional = false +optional = true python-versions = "*" [package.dependencies] @@ -1176,13 +1176,15 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes [extras] aiohttp = ["aiohttp"] -all = ["Quart", "aiohttp"] +all = ["Quart", "aiohttp", "httpx", "websockets"] +httpx = ["httpx"] quart = ["Quart"] +websockets = ["websockets"] [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "e32c99ae82181567b69bc70580e3c0d816a522d0174fce2ce04c773219f1bb50" +content-hash = "f917cb99a90280fb78a3d5e51410d89c364a05d917951a90c1c5af0bda1f08c3" [metadata.files] aiodns = [ diff --git a/tests/test_matcher.py b/tests/test_matcher.py index 7df74850..3340afb8 100644 --- a/tests/test_matcher.py +++ b/tests/test_matcher.py @@ -1,5 +1,3 @@ -from typing import TYPE_CHECKING, Set - import pytest from nonebug import App diff --git a/tests/test_rule.py b/tests/test_rule.py new file mode 100644 index 00000000..3ca23196 --- /dev/null +++ b/tests/test_rule.py @@ -0,0 +1,18 @@ +import pytest +from nonebug import App + + +@pytest.mark.asyncio +async def test_command(app: App): + from nonebot.consts import CMD_KEY, PREFIX_KEY + from nonebot.rule import Rule, CommandRule, command + + test_command = command("help") + dependent = list(test_command.checkers)[0] + checker = dependent.call + + assert isinstance(checker, CommandRule) + assert checker.cmds == [("help",)] + + state = {PREFIX_KEY: {CMD_KEY: ("help",)}} + assert await dependent(state=state) From 17f3c8fd09a4c7f629efb94c2b1738fd83dd39b1 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 23 Dec 2021 22:16:55 +0800 Subject: [PATCH 113/174] :bug: fix arg message store --- nonebot/consts.py | 3 +-- nonebot/matcher.py | 20 +++++--------------- nonebot/params.py | 24 +++++++++++++----------- nonebot/plugin/on.py | 6 +++--- tests/plugins/param/param_arg.py | 4 ++-- tests/test_param.py | 9 ++++----- 6 files changed, 28 insertions(+), 38 deletions(-) diff --git a/nonebot/consts.py b/nonebot/consts.py index 47ee68ab..8e0cf903 100644 --- a/nonebot/consts.py +++ b/nonebot/consts.py @@ -1,8 +1,7 @@ # used by Matcher RECEIVE_KEY = "_receive_{id}" LAST_RECEIVE_KEY = "_last_receive" -ARG_KEY = "_arg_{key}" -ARG_STR_KEY = "{key}" +ARG_KEY = "{key}" REJECT_TARGET = "_current_target" # used by Rule diff --git a/nonebot/matcher.py b/nonebot/matcher.py index f52f8190..b0e69998 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -28,6 +28,7 @@ from nonebot.rule import Rule from nonebot.log import logger from nonebot.dependencies import Dependent from nonebot.permission import USER, Permission +from nonebot.consts import ARG_KEY, RECEIVE_KEY, REJECT_TARGET, LAST_RECEIVE_KEY from nonebot.adapters import ( Bot, Event, @@ -35,13 +36,6 @@ from nonebot.adapters import ( MessageSegment, MessageTemplate, ) -from nonebot.consts import ( - ARG_KEY, - ARG_STR_KEY, - RECEIVE_KEY, - REJECT_TARGET, - LAST_RECEIVE_KEY, -) from nonebot.exception import ( PausedException, StopPropagation, @@ -483,7 +477,7 @@ class Matcher(metaclass=MatcherMeta): async def _key_getter(event: Event, matcher: "Matcher"): if matcher.get_target() == ARG_KEY.format(key=key): - matcher.set_arg(key, event) + matcher.set_arg(key, event.get_message()) return if matcher.get_arg(key): return @@ -654,15 +648,11 @@ class Matcher(metaclass=MatcherMeta): def get_last_receive(self, default: T = None) -> Union[Event, T]: return self.state.get(LAST_RECEIVE_KEY, default) - def get_arg(self, key: str, default: T = None) -> Union[Event, T]: + def get_arg(self, key: str, default: T = None) -> Union[Message, T]: return self.state.get(ARG_KEY.format(key=key), default) - def get_arg_str(self, key: str, default: T = None) -> Union[str, T]: - return self.state.get(ARG_STR_KEY.format(key=key), default) - - def set_arg(self, key: str, event: Event) -> None: - self.state[ARG_KEY.format(key=key)] = event - self.state[ARG_STR_KEY.format(key=key)] = str(event.get_message()) + def set_arg(self, key: str, message: Message) -> None: + self.state[ARG_KEY.format(key=key)] = message def set_target(self, target: str) -> None: self.state[REJECT_TARGET] = target diff --git a/nonebot/params.py b/nonebot/params.py index c067fb13..1e62d039 100644 --- a/nonebot/params.py +++ b/nonebot/params.py @@ -334,7 +334,7 @@ def LastReceived(default: Any = None) -> Any: class ArgInner: def __init__( - self, key: Optional[str], type: Literal["event", "message", "str"] + self, key: Optional[str], type: Literal["message", "str", "plaintext"] ) -> None: self.key = key self.type = type @@ -344,12 +344,12 @@ def Arg(key: Optional[str] = None) -> Any: return ArgInner(key, "message") -def ArgEvent(key: Optional[str] = None) -> Any: - return ArgInner(key, "event") +def ArgStr(key: Optional[str] = None) -> str: + return ArgInner(key, "str") # type: ignore -def ArgStr(key: Optional[str] = None) -> Any: - return ArgInner(key, "str") +def ArgPlainText(key: Optional[str] = None) -> str: + return ArgInner(key, "plaintext") # type: ignore class ArgParam(Param): @@ -361,13 +361,15 @@ class ArgParam(Param): return cls(Required, key=param.default.key or name, type=param.default.type) async def _solve(self, matcher: "Matcher", **kwargs: Any) -> Any: - event = matcher.get_arg(self.extra["key"]) - if self.extra["type"] == "event": - return event - elif self.extra["type"] == "message": - return event.get_message() + message = matcher.get_arg(self.extra["key"]) + if message is None: + return message + if self.extra["type"] == "message": + return message + elif self.extra["type"] == "str": + return str(message) else: - return matcher.get_arg_str(self.extra["key"]) + return message.extract_plain_text() class ExceptionParam(Param): diff --git a/nonebot/plugin/on.py b/nonebot/plugin/on.py index d302cfdf..0520488a 100644 --- a/nonebot/plugin/on.py +++ b/nonebot/plugin/on.py @@ -17,8 +17,6 @@ from nonebot.typing import ( T_PermissionChecker, ) from nonebot.rule import ( - PREFIX_KEY, - RAW_CMD_KEY, Rule, ArgumentParser, regex, @@ -395,7 +393,9 @@ def on_command( """ commands = set([cmd]) | (aliases or set()) - return on_message(command(*commands) & rule, **kwargs, _depth=_depth + 1) + return on_message( + command(*commands) & rule, block=False, **kwargs, _depth=_depth + 1 + ) def on_shell_command( diff --git a/tests/plugins/param/param_arg.py b/tests/plugins/param/param_arg.py index bd3e2bcf..b2c7c4b0 100644 --- a/tests/plugins/param/param_arg.py +++ b/tests/plugins/param/param_arg.py @@ -1,5 +1,5 @@ from nonebot.adapters import Event, Message -from nonebot.params import Arg, ArgStr, ArgEvent +from nonebot.params import Arg, ArgStr, ArgPlainText async def arg(key: Message = Arg()) -> Message: @@ -10,5 +10,5 @@ async def arg_str(key: str = ArgStr()) -> str: return key -async def arg_event(key: Event = ArgEvent()) -> Event: +async def arg_plain_text(key: str = ArgPlainText()) -> str: return key diff --git a/tests/test_param.py b/tests/test_param.py index 606ea08a..d23f61ff 100644 --- a/tests/test_param.py +++ b/tests/test_param.py @@ -216,12 +216,11 @@ async def test_arg(app: App, load_plugin): from nonebot.matcher import Matcher from nonebot.params import ArgParam - from plugins.param.param_arg import arg, arg_str, arg_event + from plugins.param.param_arg import arg, arg_str, arg_plain_text matcher = Matcher() message = make_fake_message()("text") - event = make_fake_event(_message=message)() - matcher.set_arg("key", event) + matcher.set_arg("key", message) async with app.test_dependent(arg, allow_types=[ArgParam]) as ctx: ctx.pass_params(matcher=matcher) @@ -231,9 +230,9 @@ async def test_arg(app: App, load_plugin): ctx.pass_params(matcher=matcher) ctx.should_return(str(message)) - async with app.test_dependent(arg_event, allow_types=[ArgParam]) as ctx: + async with app.test_dependent(arg_plain_text, allow_types=[ArgParam]) as ctx: ctx.pass_params(matcher=matcher) - ctx.should_return(event) + ctx.should_return(message.extract_plain_text()) @pytest.mark.asyncio From 6643f951efe37e44d179d150fa74e83a4442e732 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 24 Dec 2021 14:09:43 +0800 Subject: [PATCH 114/174] :bug: fix cannot reject preset arg --- nonebot/consts.py | 1 + nonebot/matcher.py | 29 +++++++++++++++++++++-------- tests/plugins/matcher.py | 21 +++++++++++++++++++-- tests/test_matcher.py | 8 ++++++++ 4 files changed, 49 insertions(+), 10 deletions(-) diff --git a/nonebot/consts.py b/nonebot/consts.py index 8e0cf903..11e3feaa 100644 --- a/nonebot/consts.py +++ b/nonebot/consts.py @@ -3,6 +3,7 @@ RECEIVE_KEY = "_receive_{id}" LAST_RECEIVE_KEY = "_last_receive" ARG_KEY = "{key}" REJECT_TARGET = "_current_target" +REJECT_CACHE_TARGET = "_next_target" # used by Rule PREFIX_KEY = "_prefix" diff --git a/nonebot/matcher.py b/nonebot/matcher.py index b0e69998..d33fed71 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -28,7 +28,6 @@ from nonebot.rule import Rule from nonebot.log import logger from nonebot.dependencies import Dependent from nonebot.permission import USER, Permission -from nonebot.consts import ARG_KEY, RECEIVE_KEY, REJECT_TARGET, LAST_RECEIVE_KEY from nonebot.adapters import ( Bot, Event, @@ -36,6 +35,13 @@ from nonebot.adapters import ( MessageSegment, MessageTemplate, ) +from nonebot.consts import ( + ARG_KEY, + RECEIVE_KEY, + REJECT_TARGET, + LAST_RECEIVE_KEY, + REJECT_CACHE_TARGET, +) from nonebot.exception import ( PausedException, StopPropagation, @@ -432,12 +438,12 @@ class Matcher(metaclass=MatcherMeta): """ async def _receive(event: Event, matcher: "Matcher") -> Union[None, NoReturn]: + matcher.set_target(RECEIVE_KEY.format(id=id)) if matcher.get_target() == RECEIVE_KEY.format(id=id): matcher.set_receive(id, event) return if matcher.get_receive(id): return - matcher.set_target(RECEIVE_KEY.format(id=id)) raise RejectedException _parameterless = [params.Depends(_receive), *(parameterless or [])] @@ -476,12 +482,13 @@ class Matcher(metaclass=MatcherMeta): """ async def _key_getter(event: Event, matcher: "Matcher"): + print(key, matcher.state) + matcher.set_target(ARG_KEY.format(key=key)) if matcher.get_target() == ARG_KEY.format(key=key): matcher.set_arg(key, event.get_message()) return if matcher.get_arg(key): return - matcher.set_target(ARG_KEY.format(key=key)) if prompt is not None: await matcher.send(prompt) raise RejectedException @@ -654,8 +661,11 @@ class Matcher(metaclass=MatcherMeta): def set_arg(self, key: str, message: Message) -> None: self.state[ARG_KEY.format(key=key)] = message - def set_target(self, target: str) -> None: - self.state[REJECT_TARGET] = target + def set_target(self, target: str, cache: bool = True) -> None: + if cache: + self.state[REJECT_CACHE_TARGET] = target + else: + self.state[REJECT_TARGET] = target def get_target(self, default: T = None) -> Union[str, T]: return self.state.get(REJECT_TARGET, default) @@ -680,6 +690,11 @@ class Matcher(metaclass=MatcherMeta): return USER(event.get_session_id(), perm=self.permission) return await updater(bot=bot, event=event, state=self.state, matcher=self) + async def resolve_reject(self): + handler = current_handler.get() + self.handlers.insert(0, handler) + self.state[REJECT_TARGET] = self.state[REJECT_CACHE_TARGET] + async def simple_run( self, bot: Bot, @@ -734,9 +749,7 @@ class Matcher(metaclass=MatcherMeta): await self.simple_run(bot, event, state, stack, dependency_cache) except RejectedException: - handler = current_handler.get() - self.handlers.insert(0, handler) - + await self.resolve_reject() type_ = await self.update_type(bot, event) permission = await self.update_permission(bot, event) diff --git a/tests/plugins/matcher.py b/tests/plugins/matcher.py index e9b13c1d..3621b850 100644 --- a/tests/plugins/matcher.py +++ b/tests/plugins/matcher.py @@ -1,6 +1,7 @@ from nonebot import on_message -from nonebot.adapters import Event -from nonebot.params import ArgStr, Received, LastReceived +from nonebot.matcher import Matcher +from nonebot.adapters import Event, Message +from nonebot.params import ArgStr, Received, EventMessage, LastReceived test_handle = on_message() @@ -54,3 +55,19 @@ async def combine(a: str = ArgStr(), b: str = ArgStr(), r: Event = Received()): assert a == "text_next" assert b == "text_next" assert str(r.get_message()) == "text_next" + + +test_preset = on_message() + + +@test_preset.handle() +async def preset(matcher: Matcher, message: Message = EventMessage()): + matcher.set_arg("a", message) + + +@test_preset.got("a") +async def reject_preset(a: str = ArgStr()): + if a == "text": + await test_preset.reject_arg("a") + + assert a == "text_next" diff --git a/tests/test_matcher.py b/tests/test_matcher.py index 3340afb8..403aeab1 100644 --- a/tests/test_matcher.py +++ b/tests/test_matcher.py @@ -9,6 +9,7 @@ async def test_matcher(app: App, load_plugin): from plugins.matcher import ( test_got, test_handle, + test_preset, test_combine, test_receive, ) @@ -58,3 +59,10 @@ async def test_matcher(app: App, load_plugin): ctx.receive_event(bot, event_next) ctx.should_rejected() ctx.receive_event(bot, event_next) + + assert len(test_preset.handlers) == 2 + async with app.test_matcher(test_preset) as ctx: + bot = ctx.create_bot() + ctx.receive_event(bot, event) + ctx.should_rejected() + ctx.receive_event(bot, event_next) From 6ed87f1910ae7106a52d8aa796560970565c82b4 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 24 Dec 2021 15:04:18 +0800 Subject: [PATCH 115/174] :loud_sound: add trace logs --- nonebot/__init__.py | 2 ++ nonebot/dependencies/__init__.py | 6 ++++++ nonebot/matcher.py | 7 ++++++- poetry.lock | 8 ++++---- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/nonebot/__init__.py b/nonebot/__init__.py index 78f7fc39..74811e10 100644 --- a/nonebot/__init__.py +++ b/nonebot/__init__.py @@ -216,11 +216,13 @@ def _resolve_combine_expr(obj_str: str) -> Type[Driver]: drivers[0], "Driver", default_prefix="nonebot.drivers." ) if len(drivers) == 1: + logger.trace(f"Detected driver {DriverClass} with no mixins.") return DriverClass mixins = [ _resolve_dot_notation(mixin, "Mixin", default_prefix="nonebot.drivers.") for mixin in drivers[1:] ] + logger.trace(f"Detected driver {DriverClass} with mixins {mixins}.") return combine_driver(DriverClass, *mixins) diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index 54853dee..147dcb1d 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -152,6 +152,12 @@ class Dependent(Generic[R]): ) ) + logger.trace( + f"Parsed dependent with call={call}, " + f"params={[param.field_info for param in dependent.params]}, " + f"parameterless={dependent.parameterless}" + ) + return dependent async def solve( diff --git a/nonebot/matcher.py b/nonebot/matcher.py index d33fed71..fa50f4c3 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -249,7 +249,6 @@ class Matcher(metaclass=MatcherMeta): - ``Type[Matcher]``: 新的事件响应器类 """ - NewMatcher = type( "Matcher", (Matcher,), @@ -282,6 +281,8 @@ class Matcher(metaclass=MatcherMeta): }, ) + logger.trace(f"Define new matcher {NewMatcher}") + matchers[priority].append(NewMatcher) return NewMatcher @@ -703,6 +704,10 @@ class Matcher(metaclass=MatcherMeta): stack: Optional[AsyncExitStack] = None, dependency_cache: Optional[T_DependencyCache] = None, ): + logger.trace( + f"Matcher {self} run with incoming args: " + f"bot={bot}, event={event}, state={state}" + ) b_t = current_bot.set(bot) e_t = current_event.set(event) m_t = current_matcher.set(self) diff --git a/poetry.lock b/poetry.lock index 7dc91309..e2611985 100644 --- a/poetry.lock +++ b/poetry.lock @@ -393,7 +393,7 @@ http2 = ["h2 (>=3,<5)"] [[package]] name = "hypercorn" -version = "0.13.1" +version = "0.13.2" description = "A ASGI Server based on Hyper libraries and inspired by Gunicorn" category = "main" optional = true @@ -555,7 +555,7 @@ pytest-asyncio = "^0.16.0" type = "git" url = "https://github.com/nonebot/nonebug.git" reference = "master" -resolved_reference = "6e2292f06b0b06dc2e1353ed1ef248a6c91fa2e4" +resolved_reference = "afc3c3fe2cf6300cdf1b5e1a897867a03a17e278" [[package]] name = "packaging" @@ -1636,8 +1636,8 @@ httpx = [ {file = "httpx-0.21.1.tar.gz", hash = "sha256:02af20df486b78892a614a7ccd4e4e86a5409ec4981ab0e422c579a887acad83"}, ] hypercorn = [ - {file = "Hypercorn-0.13.1-py3-none-any.whl", hash = "sha256:fcbfd5b691176cfcbf558cfa536909b2ef249af5528c99fcf941405c1c9aba74"}, - {file = "Hypercorn-0.13.1.tar.gz", hash = "sha256:3f55c7d0a51a93601d24fb773b88b1cd05c8ccb33e19294d1215bc0e19a6939c"}, + {file = "Hypercorn-0.13.2-py3-none-any.whl", hash = "sha256:ca18f91ab3fa823cbe9e949738f9f2cc07027cd647c80d8f93e4b1a2a175f112"}, + {file = "Hypercorn-0.13.2.tar.gz", hash = "sha256:6307be5cbdf6ba411967d4661202dc4f79bd511b5d318bc4eed88b09418427f8"}, ] hyperframe = [ {file = "hyperframe-6.0.1-py3-none-any.whl", hash = "sha256:0ec6bafd80d8ad2195c4f03aacba3a8265e57bc4cff261e802bf39970ed02a15"}, From 75e2ca77df56ec23daa247ed89992fd07c9eea2c Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 24 Dec 2021 19:02:11 +0800 Subject: [PATCH 116/174] :memo: write start docs --- website/docs/guide/README.md | 7 +- website/docs/guide/start/_category_.json | 4 + .../docs/guide/{ => start}/installation.md | 38 +- website/docs/guide/start/nb-cli.md | 11 + website/docs/guide/start/problem.md | 26 + website/sidebars.js | 132 +- website/src/components/Hero.tsx | 4 +- website/src/pages/index.tsx | 78 +- yarn.lock | 2531 +++++++++-------- 9 files changed, 1496 insertions(+), 1335 deletions(-) create mode 100644 website/docs/guide/start/_category_.json rename website/docs/guide/{ => start}/installation.md (74%) create mode 100644 website/docs/guide/start/nb-cli.md create mode 100644 website/docs/guide/start/problem.md diff --git a/website/docs/guide/README.md b/website/docs/guide/README.md index daa7704f..49306739 100644 --- a/website/docs/guide/README.md +++ b/website/docs/guide/README.md @@ -1,12 +1,7 @@ --- -sidebar_position: 1 +sidebar_position: 0 id: index slug: /guide - -options: - menu: - weight: 10 - category: guide --- # 概览 diff --git a/website/docs/guide/start/_category_.json b/website/docs/guide/start/_category_.json new file mode 100644 index 00000000..8f729133 --- /dev/null +++ b/website/docs/guide/start/_category_.json @@ -0,0 +1,4 @@ +{ + "position": 1, + "label": "开始" +} diff --git a/website/docs/guide/installation.md b/website/docs/guide/start/installation.md similarity index 74% rename from website/docs/guide/installation.md rename to website/docs/guide/start/installation.md index 081a0e2e..c5196ae3 100644 --- a/website/docs/guide/installation.md +++ b/website/docs/guide/start/installation.md @@ -1,18 +1,17 @@ --- -sidebar_position: 2 +sidebar_position: 0 +description: 通过脚手架, PyPI, GitHub 安装 NoneBot options: menu: - weight: 20 + weight: 10 category: guide --- -# 安装 - -## 安装 NoneBot +# 安装 NoneBot :::warning 注意 -请确保你的 Python 版本 >= 3.7。 +请确保你的 Python 版本 >= 3.7.3。 ::: :::warning 注意 @@ -24,28 +23,20 @@ pip uninstall nonebot ::: -### (推荐安装方式)通过脚手架安装 +## 通过脚手架安装 (推荐) -1. (推荐)使用你喜欢的 Python 环境管理工具(如 `poetry`)创建新的虚拟环境 +1. (可选) 使用你喜欢的 Python 环境管理工具 (如 `poetry`, `venv`, `conda` 等) 创建新的虚拟环境 2. 使用 `pip` 或 其他包管理工具 安装 `nb-cli`，`nonebot2` 会作为其依赖被一起安装 ```bash pip install nb-cli ``` -3. 点个 star 吧 + - nonebot2: [![nonebot2](https://img.shields.io/github/stars/nonebot/nonebot2?style=social)](https://github.com/nonebot/nonebot2) +## 不使用脚手架 (纯净安装) - nb-cli: [![nb-cli](https://img.shields.io/github/stars/nonebot/nb-cli?style=social)](https://github.com/nonebot/nb-cli) - -4. 如果有疑问，可以加群交流(点击链接直达) - - [![QQ Chat](https://img.shields.io/badge/QQ%E7%BE%A4-768887710-orange?style=social)](https://jq.qq.com/?_wv=1027&k=5OFifDh) - - [![Telegram Chat](https://img.shields.io/badge/telegram-cqhttp-blue?style=social)](https://t.me/cqhttp) - -### (纯净安装)不使用脚手架 +如果你不想使用脚手架，可以直接安装 `nonebot2`，并自行完成开发配置。 ```bash pip install nonebot2 @@ -53,14 +44,17 @@ pip install nonebot2 poetry add nonebot2 ``` +## 从 GitHub 安装 + 如果你需要使用最新的（可能**尚未发布**的）特性，可以直接从 GitHub 仓库安装： :::warning 注意 直接从 Github 仓库中安装意味着你将使用最新提交的代码，它们并没有进行充分的稳定性测试 + 在任何情况下请不要将其应用于生产环境! ::: -```bash +```bash title="Install From Github" # master分支 poetry add git+https://github.com/nonebot/nonebot2.git#master # dev分支 @@ -76,7 +70,7 @@ poetry install --no-dev # 推荐 pip install . # 不推荐 ``` -## 安装适配器 + diff --git a/website/docs/guide/start/nb-cli.md b/website/docs/guide/start/nb-cli.md new file mode 100644 index 00000000..7e794c78 --- /dev/null +++ b/website/docs/guide/start/nb-cli.md @@ -0,0 +1,11 @@ +--- +sidebar_position: 1 +description: 使用 nb-cli 帮助开发 + +options: + menu: + weight: 11 + category: guide +--- + +# 使用脚手架 diff --git a/website/docs/guide/start/problem.md b/website/docs/guide/start/problem.md new file mode 100644 index 00000000..b120ef69 --- /dev/null +++ b/website/docs/guide/start/problem.md @@ -0,0 +1,26 @@ +--- +--- + +# 遇到问题 + +如果在安装或者开发过程中遇到了任何问题，可以通过以下方式解决： + +1. 点击下方链接前往 GitHub ~~点击 star~~ ，前往 Issues 页面，在 `New Issue` Template 中选择 `Question` + + [![nonebot2](https://img.shields.io/github/stars/nonebot/nonebot2?style=social)](https://github.com/nonebot/nonebot2) + +2. 通过 QQ 群 (点击下方链接直达) + + [![QQ Chat](https://img.shields.io/badge/QQ%E7%BE%A4-768887710-orange?style=social)](https://jq.qq.com/?_wv=1027&k=5OFifDh) + +3. 通过 QQ 频道 + + 前往 QQ 频道搜索 `NoneBot` 点击加入 + +4. 通过 Telegram 群 (点击下方链接直达) + + [![Telegram Chat](https://img.shields.io/badge/telegram-cqhttp-blue?style=social)](https://t.me/cqhttp) + +5. 通过 Discord 服务器 (点击下方链接直达) + + [![Discord Server](https://discordapp.com/api/guilds/847819937858584596/widget.png?style=shield)](https://discord.gg/VKtE6Gdc4h) diff --git a/website/sidebars.js b/website/sidebars.js index 44577ae6..8786cf3f 100644 --- a/website/sidebars.js +++ b/website/sidebars.js @@ -14,67 +14,81 @@ /** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */ const sidebars = { // By default, Docusaurus generates a sidebar from the docs folder structure - guide: [ + tutorial: [ { - type: "category", - label: "开始", - collapsible: false, - items: [ - "guide/index", - "guide/installation", - "guide/getting-started", - "guide/creating-a-project", - "guide/basic-configuration", - ], - }, - { - type: "category", - label: "编写插件", - collapsible: false, - items: [ - "guide/loading-a-plugin", - "guide/creating-a-plugin", - "guide/creating-a-matcher", - "guide/creating-a-handler", - "guide/end-or-start", - ], - }, - { - type: "category", - label: "协议适配", - collapsible: false, - items: [ - "guide/cqhttp-guide", - "guide/ding-guide", - "guide/mirai-guide", - "guide/feishu-guide", - ], - }, - ], - advanced: [ - { - type: "category", - label: "进阶", - collapsible: false, - items: [ - "advanced/index", - "advanced/scheduler", - "advanced/permission", - "advanced/runtime-hook", - "advanced/export-and-require", - { - type: "category", - label: "高级事件处理", - items: [{ type: "autogenerated", dirName: "advanced/handler" }], - }, - ], - }, - { - type: "category", - label: "发布", - collapsible: false, - items: ["advanced/publish-plugin"], + type: "autogenerated", + dirName: "guide", }, + // { + // type: "category", + // label: "指南", + // items: [ + // { + // type: "category", + // label: "开始", + // collapsible: false, + // items: [ + // "guide/index", + // "guide/installation", + // "guide/getting-started", + // "guide/creating-a-project", + // "guide/basic-configuration", + // ], + // }, + // { + // type: "category", + // label: "编写插件", + // collapsible: false, + // items: [ + // "guide/loading-a-plugin", + // "guide/creating-a-plugin", + // "guide/creating-a-matcher", + // "guide/creating-a-handler", + // "guide/end-or-start", + // ], + // }, + // { + // type: "category", + // label: "协议适配", + // collapsible: false, + // items: [ + // "guide/cqhttp-guide", + // "guide/ding-guide", + // "guide/mirai-guide", + // "guide/feishu-guide", + // ], + // }, + // ], + // }, + // { + // type: "category", + // label: "进阶", + // items: [ + // { + // type: "category", + // label: "进阶", + // collapsible: false, + // items: [ + // "advanced/index", + // "advanced/scheduler", + // "advanced/permission", + // "advanced/runtime-hook", + // "advanced/export-and-require", + // { + // type: "category", + // label: "高级事件处理", + // items: [{ type: "autogenerated", dirName: "advanced/handler" }], + // }, + // ], + // }, + // { + // type: "category", + // label: "发布", + // collapsible: false, + // items: ["advanced/publish-plugin"], + // }, + // ], + // }, ], api: [{ type: "autogenerated", dirName: "api" }], diff --git a/website/src/components/Hero.tsx b/website/src/components/Hero.tsx index 489459ba..37eace6a 100644 --- a/website/src/components/Hero.tsx +++ b/website/src/components/Hero.tsx @@ -24,7 +24,7 @@ export function Hero(): JSX.Element { to="/docs/guide" className="inline-block bg-hero text-white font-bold rounded-lg px-6 py-3" > - 开始使用 + 开始使用
@@ -55,7 +55,7 @@ export function HeroFeature(props: PropsWithChildren): JSX.Element {

{tagline}

-

+

{title}

{description}

diff --git a/website/src/pages/index.tsx b/website/src/pages/index.tsx index 3b4cf010..fb8a6cfa 100644 --- a/website/src/pages/index.tsx +++ b/website/src/pages/index.tsx @@ -10,12 +10,12 @@ import type { Feature } from "../components/Hero"; import styles from "../css/index.module.css"; export default function Home() { - const feature: Feature = { + const firstFeature: Feature = { title: "Develop", tagline: "fast to code", description: "仅需两步，即可开始编写你的机器人", - }; - const features: [Feature, Feature] = [ + } as const; + const secondFeatures = [ { title: "Plugin", tagline: "build bot with plugins", @@ -26,13 +26,25 @@ export default function Home() { tagline: "write once run everywhere", description: "支持多种平台，以及多样的事件响应方式", }, + ] as const; + const thirdFeatures = [ + { + title: "Async", + tagline: "asynchronous first", + description: "异步优先式开发，提高运行效率", + }, + { + title: "DI", + tagline: "bultin dependency injection system", + description: "简单清晰的依赖注入系统，内置依赖函数减少用户代码", + }, ]; return (
- +
- +
- + + +
+
+
+
+ + + {[ + "from nonebot import on_message", + "# 注册一个消息响应器", + "matcher = on_message()", + "# 注册一个消息处理器", + "# 并重复收到的消息", + "@matcher.handle()", + "async def handler(event: Event) -> None:", + " await matcher.send(event.get_message())", + ].join("\n")} + + +
+
+ + + {[ + "from nonebot import on_command", + "# 注册一个命令响应器", + 'matcher = on_command("help", alias={"帮助"})', + "# 注册一个命令处理器", + "# 通过依赖注入获得命令名以及参数", + "@matcher.handle()", + "async def handler(cmd = Command(), arg = CommandArg()) -> None:", + " await matcher.send()", ].join("\n")} diff --git a/yarn.lock b/yarn.lock index df387078..301a2b5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -31,7 +31,7 @@ "@algolia/cache-common@4.11.0": version "4.11.0" resolved "https://registry.npmmirror.com/@algolia/cache-common/download/@algolia/cache-common-4.11.0.tgz#066fe6d58b18e4b028dbef9bb8de07c5e22a3594" - integrity sha1-Bm/m1YsY5LAo2++buN4HxeIqNZQ= + integrity sha512-lODcJRuPXqf+6mp0h6bOxPMlbNoyn3VfjBVcQh70EDP0/xExZbkpecgHyyZK4kWg+evu+mmgvTK3GVHnet/xKw== "@algolia/cache-in-memory@4.11.0": version "4.11.0" @@ -85,6 +85,11 @@ "@algolia/requester-common" "4.11.0" "@algolia/transporter" "4.11.0" +"@algolia/events@^4.0.1": + version "4.0.1" + resolved "https://registry.npmmirror.com/@algolia/events/download/@algolia/events-4.0.1.tgz#fd39e7477e7bc703d7f893b556f676c032af3950" + integrity sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ== + "@algolia/logger-common@4.11.0": version "4.11.0" resolved "https://registry.npmmirror.com/@algolia/logger-common/download/@algolia/logger-common-4.11.0.tgz#bac1c2d59d29dee378b57412c8edd435b97de663" @@ -127,20 +132,20 @@ "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.8.3": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/code-frame/download/@babel/code-frame-7.16.0.tgz?cache=0&sync_timestamp=1635560657003&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcode-frame%2Fdownload%2F%40babel%2Fcode-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" + resolved "https://registry.npmmirror.com/@babel/code-frame/download/@babel/code-frame-7.16.0.tgz?cache=0&sync_timestamp=1635560663383&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcode-frame%2Fdownload%2F%40babel%2Fcode-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" integrity sha1-DfyAMJvuyEEeZecGRhxAiwu5tDE= dependencies: "@babel/highlight" "^7.16.0" "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.0", "@babel/compat-data@^7.16.4": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/compat-data/download/@babel/compat-data-7.16.4.tgz?cache=0&sync_timestamp=1637102860099&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcompat-data%2Fdownload%2F%40babel%2Fcompat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" + resolved "https://registry.npmmirror.com/@babel/compat-data/download/@babel/compat-data-7.16.4.tgz?cache=0&sync_timestamp=1637102917946&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcompat-data%2Fdownload%2F%40babel%2Fcompat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q== "@babel/core@7.12.9": version "7.12.9" resolved "https://registry.npmmirror.com/@babel/core/download/@babel/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8" - integrity sha1-/UUMTsEM27mA4pKLeqeihIRZP8g= + integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ== dependencies: "@babel/code-frame" "^7.10.4" "@babel/generator" "^7.12.5" @@ -160,18 +165,18 @@ source-map "^0.5.0" "@babel/core@^7.12.16", "@babel/core@^7.12.3": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/core/download/@babel/core-7.16.0.tgz#c4ff44046f5fe310525cc9eb4ef5147f0c5374d4" - integrity sha1-xP9EBG9f4xBSXMnrTvUUfwxTdNQ= + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/core/download/@babel/core-7.16.5.tgz#924aa9e1ae56e1e55f7184c8bf073a50d8677f5c" + integrity sha512-wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ== dependencies: "@babel/code-frame" "^7.16.0" - "@babel/generator" "^7.16.0" - "@babel/helper-compilation-targets" "^7.16.0" - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helpers" "^7.16.0" - "@babel/parser" "^7.16.0" + "@babel/generator" "^7.16.5" + "@babel/helper-compilation-targets" "^7.16.3" + "@babel/helper-module-transforms" "^7.16.5" + "@babel/helpers" "^7.16.5" + "@babel/parser" "^7.16.5" "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.0" + "@babel/traverse" "^7.16.5" "@babel/types" "^7.16.0" convert-source-map "^1.7.0" debug "^4.1.0" @@ -180,10 +185,10 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.12.15", "@babel/generator@^7.12.5", "@babel/generator@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/generator/download/@babel/generator-7.16.0.tgz#d40f3d1d5075e62d3500bccb67f3daa8a95265b2" - integrity sha1-1A89HVB15i01ALzLZ/PaqKlSZbI= +"@babel/generator@^7.12.15", "@babel/generator@^7.12.5", "@babel/generator@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/generator/download/@babel/generator-7.16.5.tgz#26e1192eb8f78e0a3acaf3eede3c6fc96d22bedf" + integrity sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA== dependencies: "@babel/types" "^7.16.0" jsesc "^2.5.1" @@ -191,22 +196,22 @@ "@babel/helper-annotate-as-pure@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" + resolved "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.16.0.tgz?cache=0&sync_timestamp=1635560944976&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-annotate-as-pure%2Fdownload%2F%40babel%2Fhelper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" integrity sha1-mh8OvNpT2aLQAQjEzqzmpdXx8I0= dependencies: "@babel/types" "^7.16.0" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/download/@babel/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz#f1a686b92da794020c26582eb852e9accd0d7882" - integrity sha1-8aaGuS2nlAIMJlguuFLprM0NeII= +"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/download/@babel/helper-builder-binary-assignment-operator-visitor-7.16.5.tgz#a8429d064dce8207194b8bf05a70a9ea828746af" + integrity sha512-3JEA9G5dmmnIWdzaT9d0NmFRgYnWUThLsDaL7982H0XqqWr56lRrsmwheXFMjR+TMl7QMBb6mzy9kvgr1lRLUA== dependencies: "@babel/helper-explode-assignable-expression" "^7.16.0" "@babel/types" "^7.16.0" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.0", "@babel/helper-compilation-targets@^7.16.3": +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.3": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/download/@babel/helper-compilation-targets-7.16.3.tgz?cache=0&sync_timestamp=1636496295030&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-compilation-targets%2Fdownload%2F%40babel%2Fhelper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" + resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/download/@babel/helper-compilation-targets-7.16.3.tgz?cache=0&sync_timestamp=1636494857717&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-compilation-targets%2Fdownload%2F%40babel%2Fhelper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA== dependencies: "@babel/compat-data" "^7.16.0" @@ -214,21 +219,22 @@ browserslist "^4.17.5" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/download/@babel/helper-create-class-features-plugin-7.16.0.tgz#090d4d166b342a03a9fec37ef4fd5aeb9c7c6a4b" - integrity sha1-CQ1NFms0KgOp/sN+9P1a65x8aks= +"@babel/helper-create-class-features-plugin@^7.16.0", "@babel/helper-create-class-features-plugin@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/download/@babel/helper-create-class-features-plugin-7.16.5.tgz#5d1bcd096792c1ebec6249eebc6358eec55d0cad" + integrity sha512-NEohnYA7mkB8L5JhU7BLwcBdU3j83IziR9aseMueWGeAjblbul3zzb8UvJ3a1zuBiqCMObzCJHFqKIQE6hTVmg== dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" + "@babel/helper-environment-visitor" "^7.16.5" "@babel/helper-function-name" "^7.16.0" - "@babel/helper-member-expression-to-functions" "^7.16.0" + "@babel/helper-member-expression-to-functions" "^7.16.5" "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/helper-replace-supers" "^7.16.0" + "@babel/helper-replace-supers" "^7.16.5" "@babel/helper-split-export-declaration" "^7.16.0" "@babel/helper-create-regexp-features-plugin@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/download/@babel/helper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" + resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/download/@babel/helper-create-regexp-features-plugin-7.16.0.tgz?cache=0&sync_timestamp=1635566958507&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-create-regexp-features-plugin%2Fdownload%2F%40babel%2Fhelper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" integrity sha1-BrI0jON/zMT14Y3NjXUFPyp8RP8= dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -236,7 +242,7 @@ "@babel/helper-define-polyfill-provider@^0.3.0": version "0.3.0" - resolved "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/download/@babel/helper-define-polyfill-provider-0.3.0.tgz?cache=0&sync_timestamp=1636799795992&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-define-polyfill-provider%2Fdownload%2F%40babel%2Fhelper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971" + resolved "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/download/@babel/helper-define-polyfill-provider-0.3.0.tgz?cache=0&sync_timestamp=1636799963185&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-define-polyfill-provider%2Fdownload%2F%40babel%2Fhelper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971" integrity sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg== dependencies: "@babel/helper-compilation-targets" "^7.13.0" @@ -248,9 +254,16 @@ resolve "^1.14.2" semver "^6.1.2" +"@babel/helper-environment-visitor@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/helper-environment-visitor/download/@babel/helper-environment-visitor-7.16.5.tgz#f6a7f38b3c6d8b07c88faea083c46c09ef5451b8" + integrity sha512-ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg== + dependencies: + "@babel/types" "^7.16.0" + "@babel/helper-explode-assignable-expression@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-explode-assignable-expression/download/@babel/helper-explode-assignable-expression-7.16.0.tgz?cache=0&sync_timestamp=1635567269941&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-explode-assignable-expression%2Fdownload%2F%40babel%2Fhelper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778" + resolved "https://registry.npmmirror.com/@babel/helper-explode-assignable-expression/download/@babel/helper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778" integrity sha1-dTAXM3oV9G+cCfZ0z/EM7pudd3g= dependencies: "@babel/types" "^7.16.0" @@ -278,10 +291,10 @@ dependencies: "@babel/types" "^7.16.0" -"@babel/helper-member-expression-to-functions@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/download/@babel/helper-member-expression-to-functions-7.16.0.tgz#29287040efd197c77636ef75188e81da8bccd5a4" - integrity sha1-KShwQO/Rl8d2Nu91GI6B2ovM1aQ= +"@babel/helper-member-expression-to-functions@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/download/@babel/helper-member-expression-to-functions-7.16.5.tgz#1bc9f7e87354e86f8879c67b316cb03d3dc2caab" + integrity sha512-7fecSXq7ZrLE+TWshbGT+HyCLkxloWNhTbU2QM1NTI/tDqyf0oZiMcEfYtDuUDCo528EOlt39G1rftea4bRZIw== dependencies: "@babel/types" "^7.16.0" @@ -292,18 +305,18 @@ dependencies: "@babel/types" "^7.16.0" -"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-module-transforms/download/@babel/helper-module-transforms-7.16.0.tgz#1c82a8dd4cb34577502ebd2909699b194c3e9bb5" - integrity sha1-HIKo3UyzRXdQLr0pCWmbGUw+m7U= +"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/helper-module-transforms/download/@babel/helper-module-transforms-7.16.5.tgz#530ebf6ea87b500f60840578515adda2af470a29" + integrity sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ== dependencies: + "@babel/helper-environment-visitor" "^7.16.5" "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-replace-supers" "^7.16.0" "@babel/helper-simple-access" "^7.16.0" "@babel/helper-split-export-declaration" "^7.16.0" "@babel/helper-validator-identifier" "^7.15.7" "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.0" + "@babel/traverse" "^7.16.5" "@babel/types" "^7.16.0" "@babel/helper-optimise-call-expression@^7.16.0": @@ -315,96 +328,97 @@ "@babel/helper-plugin-utils@7.10.4": version "7.10.4" - resolved "https://registry.nlark.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.10.4.tgz?cache=0&sync_timestamp=1623280296194&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-plugin-utils%2Fdownload%2F%40babel%2Fhelper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" + resolved "https://registry.npmmirror.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" integrity sha1-L3WoMSadT2d95JmG3/WZJ1M883U= -"@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.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.14.5" - resolved "https://registry.nlark.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.14.5.tgz?cache=0&sync_timestamp=1623280296194&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-plugin-utils%2Fdownload%2F%40babel%2Fhelper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" - integrity sha1-WsgizpfuxGdBq3ClF5ceRDpwxak= +"@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.14.5", "@babel/helper-plugin-utils@^7.16.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.16.5.tgz#afe37a45f39fce44a3d50a7958129ea5b1a5c074" + integrity sha512-59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ== -"@babel/helper-remap-async-to-generator@^7.16.0", "@babel/helper-remap-async-to-generator@^7.16.4": - version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/download/@babel/helper-remap-async-to-generator-7.16.4.tgz?cache=0&sync_timestamp=1637103399116&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-remap-async-to-generator%2Fdownload%2F%40babel%2Fhelper-remap-async-to-generator-7.16.4.tgz#5d7902f61349ff6b963e07f06a389ce139fbfe6e" - integrity sha512-vGERmmhR+s7eH5Y/cp8PCVzj4XEjerq8jooMfxFdA5xVtAk9Sh4AQsrWgiErUEBjtGrBtOFKDUcWQFW4/dFwMA== +"@babel/helper-remap-async-to-generator@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/download/@babel/helper-remap-async-to-generator-7.16.5.tgz#e706646dc4018942acb4b29f7e185bc246d65ac3" + integrity sha512-X+aAJldyxrOmN9v3FKp+Hu1NO69VWgYgDGq6YDykwRPzxs5f2N+X988CBXS7EQahDU+Vpet5QYMqLk+nsp+Qxw== dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-wrap-function" "^7.16.0" + "@babel/helper-wrap-function" "^7.16.5" "@babel/types" "^7.16.0" -"@babel/helper-replace-supers@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-replace-supers/download/@babel/helper-replace-supers-7.16.0.tgz#73055e8d3cf9bcba8ddb55cad93fedc860f68f17" - integrity sha1-cwVejTz5vLqN21XK2T/tyGD2jxc= +"@babel/helper-replace-supers@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/helper-replace-supers/download/@babel/helper-replace-supers-7.16.5.tgz#96d3988bd0ab0a2d22c88c6198c3d3234ca25326" + integrity sha512-ao3seGVa/FZCMCCNDuBcqnBFSbdr8N2EW35mzojx3TwfIbdPmNK+JV6+2d5bR0Z71W5ocLnQp9en/cTF7pBJiQ== dependencies: - "@babel/helper-member-expression-to-functions" "^7.16.0" + "@babel/helper-environment-visitor" "^7.16.5" + "@babel/helper-member-expression-to-functions" "^7.16.5" "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/traverse" "^7.16.0" + "@babel/traverse" "^7.16.5" "@babel/types" "^7.16.0" "@babel/helper-simple-access@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-simple-access/download/@babel/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" + resolved "https://registry.npmmirror.com/@babel/helper-simple-access/download/@babel/helper-simple-access-7.16.0.tgz?cache=0&sync_timestamp=1635560942808&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-simple-access%2Fdownload%2F%40babel%2Fhelper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" integrity sha1-IdaidiDjg+N1NM9sELugGab5BRc= dependencies: "@babel/types" "^7.16.0" "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/download/@babel/helper-skip-transparent-expression-wrappers-7.16.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-skip-transparent-expression-wrappers%2Fdownload%2F%40babel%2Fhelper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" + resolved "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/download/@babel/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" integrity sha1-DuM4gHAUfDrgUeSH7KPrsOLouwk= dependencies: "@babel/types" "^7.16.0" "@babel/helper-split-export-declaration@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-split-export-declaration/download/@babel/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" + resolved "https://registry.npmmirror.com/@babel/helper-split-export-declaration/download/@babel/helper-split-export-declaration-7.16.0.tgz?cache=0&sync_timestamp=1635560943488&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-split-export-declaration%2Fdownload%2F%40babel%2Fhelper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" integrity sha1-KWcvQ2Y+k23zcKrrIr7ds7rsdDg= dependencies: "@babel/types" "^7.16.0" "@babel/helper-validator-identifier@^7.15.7": version "7.15.7" - resolved "https://registry.nlark.com/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.15.7.tgz?cache=0&sync_timestamp=1631920857390&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-validator-identifier%2Fdownload%2F%40babel%2Fhelper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" + resolved "https://registry.nlark.com/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.15.7.tgz?cache=0&sync_timestamp=1631920000984&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-validator-identifier%2Fdownload%2F%40babel%2Fhelper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" integrity sha1-Ig35k7/pBKSmsCq08zhaXr9uI4k= "@babel/helper-validator-option@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/helper-validator-option/download/@babel/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" + resolved "https://registry.nlark.com/@babel/helper-validator-option/download/@babel/helper-validator-option-7.14.5.tgz?cache=0&sync_timestamp=1623281108450&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-validator-option%2Fdownload%2F%40babel%2Fhelper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" integrity sha1-bnKh//GNXfy4eOHmLxoCHEty1aM= -"@babel/helper-wrap-function@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-wrap-function/download/@babel/helper-wrap-function-7.16.0.tgz?cache=0&sync_timestamp=1635567238019&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-wrap-function%2Fdownload%2F%40babel%2Fhelper-wrap-function-7.16.0.tgz#b3cf318afce774dfe75b86767cd6d68f3482e57c" - integrity sha1-s88xivzndN/nW4Z2fNbWjzSC5Xw= +"@babel/helper-wrap-function@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/helper-wrap-function/download/@babel/helper-wrap-function-7.16.5.tgz#0158fca6f6d0889c3fee8a6ed6e5e07b9b54e41f" + integrity sha512-2J2pmLBqUqVdJw78U0KPNdeE2qeuIyKoG4mKV7wAq3mc4jJG282UgjZw4ZYDnqiWQuS3Y3IYdF/AQ6CpyBV3VA== dependencies: "@babel/helper-function-name" "^7.16.0" "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.0" + "@babel/traverse" "^7.16.5" "@babel/types" "^7.16.0" -"@babel/helpers@^7.12.5", "@babel/helpers@^7.16.0": - version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/helpers/download/@babel/helpers-7.16.3.tgz?cache=0&sync_timestamp=1636496293613&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelpers%2Fdownload%2F%40babel%2Fhelpers-7.16.3.tgz#27fc64f40b996e7074dc73128c3e5c3e7f55c43c" - integrity sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w== +"@babel/helpers@^7.12.5", "@babel/helpers@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/helpers/download/@babel/helpers-7.16.5.tgz#29a052d4b827846dd76ece16f565b9634c554ebd" + integrity sha512-TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw== dependencies: "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.3" + "@babel/traverse" "^7.16.5" "@babel/types" "^7.16.0" "@babel/highlight@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/highlight/download/@babel/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" + resolved "https://registry.npmmirror.com/@babel/highlight/download/@babel/highlight-7.16.0.tgz?cache=0&sync_timestamp=1635560940881&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhighlight%2Fdownload%2F%40babel%2Fhighlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" integrity sha1-bOsysspLj182H7f9gh4/3fShclo= dependencies: "@babel/helper-validator-identifier" "^7.15.7" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.12.16", "@babel/parser@^7.12.7", "@babel/parser@^7.16.0", "@babel/parser@^7.16.3": - version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/parser/download/@babel/parser-7.16.4.tgz?cache=0&sync_timestamp=1637102852943&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fparser%2Fdownload%2F%40babel%2Fparser-7.16.4.tgz#d5f92f57cf2c74ffe9b37981c0e72fee7311372e" - integrity sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng== +"@babel/parser@^7.12.16", "@babel/parser@^7.12.7", "@babel/parser@^7.16.0", "@babel/parser@^7.16.5": + version "7.16.6" + resolved "https://registry.npmmirror.com/@babel/parser/download/@babel/parser-7.16.6.tgz#8f194828193e8fa79166f34a4b4e52f3e769a314" + integrity sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.2": version "7.16.2" @@ -422,78 +436,78 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-proposal-optional-chaining" "^7.16.0" -"@babel/plugin-proposal-async-generator-functions@^7.16.4": - version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-async-generator-functions/download/@babel/plugin-proposal-async-generator-functions-7.16.4.tgz?cache=0&sync_timestamp=1637103399235&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-proposal-async-generator-functions%2Fdownload%2F%40babel%2Fplugin-proposal-async-generator-functions-7.16.4.tgz#e606eb6015fec6fa5978c940f315eae4e300b081" - integrity sha512-/CUekqaAaZCQHleSK/9HajvcD/zdnJiKRiuUFq8ITE+0HsPzquf53cpFiqAwl/UfmJbR6n5uGPQSPdrmKOvHHg== +"@babel/plugin-proposal-async-generator-functions@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-async-generator-functions/download/@babel/plugin-proposal-async-generator-functions-7.16.5.tgz#fd3bd7e0d98404a3d4cbca15a72d533f8c9a2f67" + integrity sha512-C/FX+3HNLV6sz7AqbTQqEo1L9/kfrKjxcVtgyBCmvIgOjvuBVUWooDoi7trsLxOzCEo5FccjRvKHkfDsJFZlfA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-remap-async-to-generator" "^7.16.4" + "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-remap-async-to-generator" "^7.16.5" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-proposal-class-properties@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-class-properties/download/@babel/plugin-proposal-class-properties-7.16.0.tgz#c029618267ddebc7280fa286e0f8ca2a278a2d1a" - integrity sha1-wClhgmfd68coD6KG4PjKKieKLRo= +"@babel/plugin-proposal-class-properties@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-class-properties/download/@babel/plugin-proposal-class-properties-7.16.5.tgz#3269f44b89122110f6339806e05d43d84106468a" + integrity sha512-pJD3HjgRv83s5dv1sTnDbZOaTjghKEz8KUn1Kbh2eAIRhGuyQ1XSeI4xVXU3UlIEVA3DAyIdxqT1eRn7Wcn55A== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-proposal-class-static-block@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-class-static-block/download/@babel/plugin-proposal-class-static-block-7.16.0.tgz#5296942c564d8144c83eea347d0aa8a0b89170e7" - integrity sha1-UpaULFZNgUTIPuo0fQqooLiRcOc= +"@babel/plugin-proposal-class-static-block@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-class-static-block/download/@babel/plugin-proposal-class-static-block-7.16.5.tgz#df58ab015a7d3b0963aafc8f20792dcd834952a9" + integrity sha512-EEFzuLZcm/rNJ8Q5krK+FRKdVkd6FjfzT9tuSZql9sQn64K0hHA2KLJ0DqVot9/iV6+SsuadC5yI39zWnm+nmQ== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-proposal-dynamic-import@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-dynamic-import/download/@babel/plugin-proposal-dynamic-import-7.16.0.tgz?cache=0&sync_timestamp=1635566469916&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-proposal-dynamic-import%2Fdownload%2F%40babel%2Fplugin-proposal-dynamic-import-7.16.0.tgz#783eca61d50526202f9b296095453977e88659f1" - integrity sha1-eD7KYdUFJiAvmylglUU5d+iGWfE= +"@babel/plugin-proposal-dynamic-import@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-dynamic-import/download/@babel/plugin-proposal-dynamic-import-7.16.5.tgz#2e0d19d5702db4dcb9bc846200ca02f2e9d60e9e" + integrity sha512-P05/SJZTTvHz79LNYTF8ff5xXge0kk5sIIWAypcWgX4BTRUgyHc8wRxJ/Hk+mU0KXldgOOslKaeqnhthcDJCJQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-proposal-export-namespace-from@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-export-namespace-from/download/@babel/plugin-proposal-export-namespace-from-7.16.0.tgz#9c01dee40b9d6b847b656aaf4a3976a71740f222" - integrity sha1-nAHe5Auda4R7ZWqvSjl2pxdA8iI= +"@babel/plugin-proposal-export-namespace-from@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-export-namespace-from/download/@babel/plugin-proposal-export-namespace-from-7.16.5.tgz#3b4dd28378d1da2fea33e97b9f25d1c2f5bf1ac9" + integrity sha512-i+sltzEShH1vsVydvNaTRsgvq2vZsfyrd7K7vPLUU/KgS0D5yZMe6uipM0+izminnkKrEfdUnz7CxMRb6oHZWw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-proposal-json-strings@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-json-strings/download/@babel/plugin-proposal-json-strings-7.16.0.tgz#cae35a95ed1d2a7fa29c4dc41540b84a72e9ab25" - integrity sha1-yuNale0dKn+inE3EFUC4SnLpqyU= +"@babel/plugin-proposal-json-strings@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-json-strings/download/@babel/plugin-proposal-json-strings-7.16.5.tgz#1e726930fca139caab6b084d232a9270d9d16f9c" + integrity sha512-QQJueTFa0y9E4qHANqIvMsuxM/qcLQmKttBACtPCQzGUEizsXDACGonlPiSwynHfOa3vNw0FPMVvQzbuXwh4SQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-logical-assignment-operators/download/@babel/plugin-proposal-logical-assignment-operators-7.16.0.tgz#a711b8ceb3ffddd3ef88d3a49e86dbd3cc7db3fd" - integrity sha1-pxG4zrP/3dPviNOknobb08x9s/0= +"@babel/plugin-proposal-logical-assignment-operators@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-logical-assignment-operators/download/@babel/plugin-proposal-logical-assignment-operators-7.16.5.tgz#df1f2e4b5a0ec07abf061d2c18e53abc237d3ef5" + integrity sha512-xqibl7ISO2vjuQM+MzR3rkd0zfNWltk7n9QhaD8ghMmMceVguYrNDt7MikRyj4J4v3QehpnrU8RYLnC7z/gZLA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-nullish-coalescing-operator/download/@babel/plugin-proposal-nullish-coalescing-operator-7.16.0.tgz#44e1cce08fe2427482cf446a91bb451528ed0596" - integrity sha1-ROHM4I/iQnSCz0RqkbtFFSjtBZY= +"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-nullish-coalescing-operator/download/@babel/plugin-proposal-nullish-coalescing-operator-7.16.5.tgz#652555bfeeeee2d2104058c6225dc6f75e2d0f07" + integrity sha512-YwMsTp/oOviSBhrjwi0vzCUycseCYwoXnLiXIL3YNjHSMBHicGTz7GjVU/IGgz4DtOEXBdCNG72pvCX22ehfqg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-proposal-numeric-separator@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-numeric-separator/download/@babel/plugin-proposal-numeric-separator-7.16.0.tgz#5d418e4fbbf8b9b7d03125d3a52730433a373734" - integrity sha1-XUGOT7v4ubfQMSXTpScwQzo3NzQ= +"@babel/plugin-proposal-numeric-separator@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-numeric-separator/download/@babel/plugin-proposal-numeric-separator-7.16.5.tgz#edcb6379b6cf4570be64c45965d8da7a2debf039" + integrity sha512-DvB9l/TcsCRvsIV9v4jxR/jVP45cslTVC0PMVHvaJhhNuhn2Y1SOhCSFlPK777qLB5wb8rVDaNoqMTyOqtY5Iw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/plugin-syntax-numeric-separator" "^7.10.4" "@babel/plugin-proposal-object-rest-spread@7.12.1": @@ -505,115 +519,115 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.0" "@babel/plugin-transform-parameters" "^7.12.1" -"@babel/plugin-proposal-object-rest-spread@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-object-rest-spread/download/@babel/plugin-proposal-object-rest-spread-7.16.0.tgz#5fb32f6d924d6e6712810362a60e12a2609872e6" - integrity sha1-X7MvbZJNbmcSgQNipg4SomCYcuY= +"@babel/plugin-proposal-object-rest-spread@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-object-rest-spread/download/@babel/plugin-proposal-object-rest-spread-7.16.5.tgz#f30f80dacf7bc1404bf67f99c8d9c01665e830ad" + integrity sha512-UEd6KpChoyPhCoE840KRHOlGhEZFutdPDMGj+0I56yuTTOaT51GzmnEl/0uT41fB/vD2nT+Pci2KjezyE3HmUw== dependencies: - "@babel/compat-data" "^7.16.0" - "@babel/helper-compilation-targets" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/compat-data" "^7.16.4" + "@babel/helper-compilation-targets" "^7.16.3" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.16.0" + "@babel/plugin-transform-parameters" "^7.16.5" -"@babel/plugin-proposal-optional-catch-binding@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-optional-catch-binding/download/@babel/plugin-proposal-optional-catch-binding-7.16.0.tgz#5910085811ab4c28b00d6ebffa4ab0274d1e5f16" - integrity sha1-WRAIWBGrTCiwDW6/+kqwJ00eXxY= +"@babel/plugin-proposal-optional-catch-binding@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-optional-catch-binding/download/@babel/plugin-proposal-optional-catch-binding-7.16.5.tgz#1a5405765cf589a11a33a1fd75b2baef7d48b74e" + integrity sha512-ihCMxY1Iljmx4bWy/PIMJGXN4NS4oUj1MKynwO07kiKms23pNvIn1DMB92DNB2R0EA882sw0VXIelYGdtF7xEQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-optional-chaining/download/@babel/plugin-proposal-optional-chaining-7.16.0.tgz#56dbc3970825683608e9efb55ea82c2a2d6c8dc0" - integrity sha1-VtvDlwglaDYI6e+1XqgsKi1sjcA= +"@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-optional-chaining/download/@babel/plugin-proposal-optional-chaining-7.16.5.tgz#a5fa61056194d5059366c0009cb9a9e66ed75c1f" + integrity sha512-kzdHgnaXRonttiTfKYnSVafbWngPPr2qKw9BWYBESl91W54e+9R5pP70LtWxV56g0f05f/SQrwHYkfvbwcdQ/A== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-proposal-private-methods@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-private-methods/download/@babel/plugin-proposal-private-methods-7.16.0.tgz#b4dafb9c717e4301c5776b30d080d6383c89aff6" - integrity sha1-tNr7nHF+QwHFd2sw0IDWODyJr/Y= +"@babel/plugin-proposal-private-methods@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-private-methods/download/@babel/plugin-proposal-private-methods-7.16.5.tgz#2086f7d78c1b0c712d49b5c3fbc2d1ca21a7ee12" + integrity sha512-+yFMO4BGT3sgzXo+lrq7orX5mAZt57DwUK6seqII6AcJnJOIhBJ8pzKH47/ql/d426uQ7YhN8DpUFirQzqYSUA== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-proposal-private-property-in-object@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-private-property-in-object/download/@babel/plugin-proposal-private-property-in-object-7.16.0.tgz#69e935b2c5c79d2488112d886f0c4e2790fee76f" - integrity sha1-aek1ssXHnSSIES2IbwxOJ5D+528= +"@babel/plugin-proposal-private-property-in-object@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-private-property-in-object/download/@babel/plugin-proposal-private-property-in-object-7.16.5.tgz#a42d4b56005db3d405b12841309dbca647e7a21b" + integrity sha512-+YGh5Wbw0NH3y/E5YMu6ci5qTDmAEVNoZ3I54aB6nVEOZ5BQ7QJlwKq5pYVucQilMByGn/bvX0af+uNaPRCabA== dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-create-class-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-proposal-unicode-property-regex@^7.16.0", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-unicode-property-regex/download/@babel/plugin-proposal-unicode-property-regex-7.16.0.tgz#890482dfc5ea378e42e19a71e709728cabf18612" - integrity sha1-iQSC38XqN45C4Zpx5wlyjKvxhhI= +"@babel/plugin-proposal-unicode-property-regex@^7.16.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-unicode-property-regex/download/@babel/plugin-proposal-unicode-property-regex-7.16.5.tgz#35fe753afa7c572f322bd068ff3377bde0f37080" + integrity sha512-s5sKtlKQyFSatt781HQwv1hoM5BQ9qRH30r+dK56OLDsHmV74mzwJNX7R1yMuE7VZKG5O6q/gmOGSAO6ikTudg== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" - resolved "https://registry.nlark.com/@babel/plugin-syntax-async-generators/download/@babel/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + resolved "https://registry.nlark.com/@babel/plugin-syntax-async-generators/download/@babel/plugin-syntax-async-generators-7.8.4.tgz?cache=0&sync_timestamp=1618847046078&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-async-generators%2Fdownload%2F%40babel%2Fplugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" integrity sha1-qYP7Gusuw/btBCohD2QOkOeG/g0= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-class-properties@^7.12.13": version "7.12.13" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-class-properties/download/@babel/plugin-syntax-class-properties-7.12.13.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-syntax-class-properties%2Fdownload%2F%40babel%2Fplugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + resolved "https://registry.nlark.com/@babel/plugin-syntax-class-properties/download/@babel/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" integrity sha1-tcmHJ0xKOoK4lxR5aTGmtTVErhA= dependencies: "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-class-static-block@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-class-static-block/download/@babel/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" + resolved "https://registry.nlark.com/@babel/plugin-syntax-class-static-block/download/@babel/plugin-syntax-class-static-block-7.14.5.tgz?cache=0&sync_timestamp=1623281106862&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-class-static-block%2Fdownload%2F%40babel%2Fplugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" integrity sha1-GV34mxRrS3izv4l/16JXyEZZ1AY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-dynamic-import@^7.8.3": version "7.8.3" - resolved "https://registry.nlark.com/@babel/plugin-syntax-dynamic-import/download/@babel/plugin-syntax-dynamic-import-7.8.3.tgz?cache=0&sync_timestamp=1618847125283&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-dynamic-import%2Fdownload%2F%40babel%2Fplugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-dynamic-import/download/@babel/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" integrity sha1-Yr+Ysto80h1iYVT8lu5bPLaOrLM= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-export-namespace-from@^7.8.3": version "7.8.3" - resolved "https://registry.nlark.com/@babel/plugin-syntax-export-namespace-from/download/@babel/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-export-namespace-from/download/@babel/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" integrity sha1-AolkqbqA28CUyRXEh618TnpmRlo= dependencies: "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-json-strings@^7.8.3": version "7.8.3" - resolved "https://registry.nlark.com/@babel/plugin-syntax-json-strings/download/@babel/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-json-strings/download/@babel/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" integrity sha1-AcohtmjNghjJ5kDLbdiMVBKyyWo= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-jsx@7.12.1": version "7.12.1" - resolved "https://registry.npmmirror.com/@babel/plugin-syntax-jsx/download/@babel/plugin-syntax-jsx-7.12.1.tgz?cache=0&sync_timestamp=1635578642050&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-syntax-jsx%2Fdownload%2F%40babel%2Fplugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926" + resolved "https://registry.npmmirror.com/@babel/plugin-syntax-jsx/download/@babel/plugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926" integrity sha1-nZ01fMgYqnrnk1kXwSV/Z2d6CSY= dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-jsx@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-syntax-jsx/download/@babel/plugin-syntax-jsx-7.16.0.tgz?cache=0&sync_timestamp=1635578642050&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-syntax-jsx%2Fdownload%2F%40babel%2Fplugin-syntax-jsx-7.16.0.tgz#f9624394317365a9a88c82358d3f8471154698f1" - integrity sha1-+WJDlDFzZamojII1jT+EcRVGmPE= +"@babel/plugin-syntax-jsx@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-syntax-jsx/download/@babel/plugin-syntax-jsx-7.16.5.tgz#bf255d252f78bc8b77a17cadc37d1aa5b8ed4394" + integrity sha512-42OGssv9NPk4QHKVgIHlzeLgPOW5rGgfV5jzG90AhcXXIv6hu/eqj63w4VgvRxdvZY3AlYeDgPiSJ3BqAd1Y6Q== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/plugin-syntax-logical-assignment-operators@^7.10.4": version "7.10.4" @@ -624,14 +638,14 @@ "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": version "7.8.3" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-nullish-coalescing-operator/download/@babel/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + resolved "https://registry.nlark.com/@babel/plugin-syntax-nullish-coalescing-operator/download/@babel/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" integrity sha1-Fn7XA2iIYIH3S1w2xlqIwDtm0ak= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-numeric-separator@^7.10.4": version "7.10.4" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-numeric-separator/download/@babel/plugin-syntax-numeric-separator-7.10.4.tgz?cache=0&sync_timestamp=1593522054358&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-syntax-numeric-separator%2Fdownload%2F%40babel%2Fplugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + resolved "https://registry.nlark.com/@babel/plugin-syntax-numeric-separator/download/@babel/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" integrity sha1-ubBws+M1cM2f0Hun+pHA3Te5r5c= dependencies: "@babel/helper-plugin-utils" "^7.10.4" @@ -659,311 +673,312 @@ "@babel/plugin-syntax-private-property-in-object@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-private-property-in-object/download/@babel/plugin-syntax-private-property-in-object-7.14.5.tgz?cache=0&sync_timestamp=1623280423879&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-private-property-in-object%2Fdownload%2F%40babel%2Fplugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" + resolved "https://registry.nlark.com/@babel/plugin-syntax-private-property-in-object/download/@babel/plugin-syntax-private-property-in-object-7.14.5.tgz?cache=0&sync_timestamp=1623280462994&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-private-property-in-object%2Fdownload%2F%40babel%2Fplugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" integrity sha1-DcZnHsDqIrbpShEU+FeXDNOd4a0= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-top-level-await@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-top-level-await/download/@babel/plugin-syntax-top-level-await-7.14.5.tgz?cache=0&sync_timestamp=1623280427172&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-top-level-await%2Fdownload%2F%40babel%2Fplugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" + resolved "https://registry.nlark.com/@babel/plugin-syntax-top-level-await/download/@babel/plugin-syntax-top-level-await-7.14.5.tgz?cache=0&sync_timestamp=1623280464882&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-top-level-await%2Fdownload%2F%40babel%2Fplugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" integrity sha1-wc/a3DWmRiQAAfBhOCR7dBw02Uw= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-syntax-typescript/download/@babel/plugin-syntax-typescript-7.16.0.tgz#2feeb13d9334cc582ea9111d3506f773174179bb" - integrity sha1-L+6xPZM0zFguqREdNQb3cxdBebs= + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-syntax-typescript/download/@babel/plugin-syntax-typescript-7.16.5.tgz#f47a33e4eee38554f00fb6b2f894fa1f5649b0b3" + integrity sha512-/d4//lZ1Vqb4mZ5xTep3dDK888j7BGM/iKqBmndBaoYAFPlPKrGU608VVBz5JeyAb6YQDjRu1UKqj86UhwWVgw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-arrow-functions@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-arrow-functions/download/@babel/plugin-transform-arrow-functions-7.16.0.tgz#951706f8b449c834ed07bd474c0924c944b95a8e" - integrity sha1-lRcG+LRJyDTtB71HTAkkyUS5Wo4= +"@babel/plugin-transform-arrow-functions@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-arrow-functions/download/@babel/plugin-transform-arrow-functions-7.16.5.tgz#04c18944dd55397b521d9d7511e791acea7acf2d" + integrity sha512-8bTHiiZyMOyfZFULjsCnYOWG059FVMes0iljEHSfARhNgFfpsqE92OrCffv3veSw9rwMkYcFe9bj0ZoXU2IGtQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-async-to-generator@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-async-to-generator/download/@babel/plugin-transform-async-to-generator-7.16.0.tgz#df12637f9630ddfa0ef9d7a11bc414d629d38604" - integrity sha1-3xJjf5Yw3foO+dehG8QU1inThgQ= +"@babel/plugin-transform-async-to-generator@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-async-to-generator/download/@babel/plugin-transform-async-to-generator-7.16.5.tgz#89c9b501e65bb14c4579a6ce9563f859de9b34e4" + integrity sha512-TMXgfioJnkXU+XRoj7P2ED7rUm5jbnDWwlCuFVTpQboMfbSya5WrmubNBAMlk7KXvywpo8rd8WuYZkis1o2H8w== dependencies: "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-remap-async-to-generator" "^7.16.0" + "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-remap-async-to-generator" "^7.16.5" -"@babel/plugin-transform-block-scoped-functions@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/download/@babel/plugin-transform-block-scoped-functions-7.16.0.tgz?cache=0&sync_timestamp=1635567466710&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-block-scoped-functions%2Fdownload%2F%40babel%2Fplugin-transform-block-scoped-functions-7.16.0.tgz#c618763233ad02847805abcac4c345ce9de7145d" - integrity sha1-xhh2MjOtAoR4BavKxMNFzp3nFF0= +"@babel/plugin-transform-block-scoped-functions@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/download/@babel/plugin-transform-block-scoped-functions-7.16.5.tgz#af087494e1c387574260b7ee9b58cdb5a4e9b0b0" + integrity sha512-BxmIyKLjUGksJ99+hJyL/HIxLIGnLKtw772zYDER7UuycDZ+Xvzs98ZQw6NGgM2ss4/hlFAaGiZmMNKvValEjw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-block-scoping@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/download/@babel/plugin-transform-block-scoping-7.16.0.tgz?cache=0&sync_timestamp=1635567471555&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-block-scoping%2Fdownload%2F%40babel%2Fplugin-transform-block-scoping-7.16.0.tgz#bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16" - integrity sha1-vPQz+0gv6MPTtOimaxxKjnfTfBY= +"@babel/plugin-transform-block-scoping@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/download/@babel/plugin-transform-block-scoping-7.16.5.tgz#b91f254fe53e210eabe4dd0c40f71c0ed253c5e7" + integrity sha512-JxjSPNZSiOtmxjX7PBRBeRJTUKTyJ607YUYeT0QJCNdsedOe+/rXITjP08eG8xUpsLfPirgzdCFN+h0w6RI+pQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-classes@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-classes/download/@babel/plugin-transform-classes-7.16.0.tgz?cache=0&sync_timestamp=1635566945526&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-classes%2Fdownload%2F%40babel%2Fplugin-transform-classes-7.16.0.tgz#54cf5ff0b2242c6573d753cd4bfc7077a8b282f5" - integrity sha1-VM9f8LIkLGVz11PNS/xwd6iygvU= +"@babel/plugin-transform-classes@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-classes/download/@babel/plugin-transform-classes-7.16.5.tgz#6acf2ec7adb50fb2f3194dcd2909dbd056dcf216" + integrity sha512-DzJ1vYf/7TaCYy57J3SJ9rV+JEuvmlnvvyvYKFbk5u46oQbBvuB9/0w+YsVsxkOv8zVWKpDmUoj4T5ILHoXevA== dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" + "@babel/helper-environment-visitor" "^7.16.5" "@babel/helper-function-name" "^7.16.0" "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-replace-supers" "^7.16.0" + "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-replace-supers" "^7.16.5" "@babel/helper-split-export-declaration" "^7.16.0" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-computed-properties/download/@babel/plugin-transform-computed-properties-7.16.0.tgz?cache=0&sync_timestamp=1635567483688&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-computed-properties%2Fdownload%2F%40babel%2Fplugin-transform-computed-properties-7.16.0.tgz#e0c385507d21e1b0b076d66bed6d5231b85110b7" - integrity sha1-4MOFUH0h4bCwdtZr7W1SMbhRELc= +"@babel/plugin-transform-computed-properties@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-computed-properties/download/@babel/plugin-transform-computed-properties-7.16.5.tgz#2af91ebf0cceccfcc701281ada7cfba40a9b322a" + integrity sha512-n1+O7xtU5lSLraRzX88CNcpl7vtGdPakKzww74bVwpAIRgz9JVLJJpOLb0uYqcOaXVM0TL6X0RVeIJGD2CnCkg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-destructuring@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/download/@babel/plugin-transform-destructuring-7.16.0.tgz?cache=0&sync_timestamp=1635567488550&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-destructuring%2Fdownload%2F%40babel%2Fplugin-transform-destructuring-7.16.0.tgz#ad3d7e74584ad5ea4eadb1e6642146c590dee33c" - integrity sha1-rT1+dFhK1epOrbHmZCFGxZDe4zw= +"@babel/plugin-transform-destructuring@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/download/@babel/plugin-transform-destructuring-7.16.5.tgz#89ebc87499ac4a81b897af53bb5d3eed261bd568" + integrity sha512-GuRVAsjq+c9YPK6NeTkRLWyQskDC099XkBSVO+6QzbnOnH2d/4mBVXYStaPrZD3dFRfg00I6BFJ9Atsjfs8mlg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-dotall-regex@^7.16.0", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-dotall-regex/download/@babel/plugin-transform-dotall-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566946960&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-dotall-regex%2Fdownload%2F%40babel%2Fplugin-transform-dotall-regex-7.16.0.tgz#50bab00c1084b6162d0a58a818031cf57798e06f" - integrity sha1-ULqwDBCEthYtClioGAMc9XeY4G8= +"@babel/plugin-transform-dotall-regex@^7.16.5", "@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-dotall-regex/download/@babel/plugin-transform-dotall-regex-7.16.5.tgz#b40739c00b6686820653536d6d143e311de67936" + integrity sha512-iQiEMt8Q4/5aRGHpGVK2Zc7a6mx7qEAO7qehgSug3SDImnuMzgmm/wtJALXaz25zUj1PmnNHtShjFgk4PDx4nw== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-duplicate-keys@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/download/@babel/plugin-transform-duplicate-keys-7.16.0.tgz?cache=0&sync_timestamp=1635567498133&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-duplicate-keys%2Fdownload%2F%40babel%2Fplugin-transform-duplicate-keys-7.16.0.tgz#8bc2e21813e3e89e5e5bf3b60aa5fc458575a176" - integrity sha1-i8LiGBPj6J5eW/O2CqX8RYV1oXY= +"@babel/plugin-transform-duplicate-keys@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/download/@babel/plugin-transform-duplicate-keys-7.16.5.tgz#2450f2742325412b746d7d005227f5e8973b512a" + integrity sha512-81tijpDg2a6I1Yhj4aWY1l3O1J4Cg/Pd7LfvuaH2VVInAkXtzibz9+zSPdUM1WvuUi128ksstAP0hM5w48vQgg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-exponentiation-operator@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/download/@babel/plugin-transform-exponentiation-operator-7.16.0.tgz?cache=0&sync_timestamp=1635567503871&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-exponentiation-operator%2Fdownload%2F%40babel%2Fplugin-transform-exponentiation-operator-7.16.0.tgz#a180cd2881e3533cef9d3901e48dad0fbeff4be4" - integrity sha1-oYDNKIHjUzzvnTkB5I2tD77/S+Q= +"@babel/plugin-transform-exponentiation-operator@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/download/@babel/plugin-transform-exponentiation-operator-7.16.5.tgz#36e261fa1ab643cfaf30eeab38e00ed1a76081e2" + integrity sha512-12rba2HwemQPa7BLIKCzm1pT2/RuQHtSFHdNl41cFiC6oi4tcrp7gjB07pxQvFpcADojQywSjblQth6gJyE6CA== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-for-of@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-for-of/download/@babel/plugin-transform-for-of-7.16.0.tgz?cache=0&sync_timestamp=1635566911464&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-for-of%2Fdownload%2F%40babel%2Fplugin-transform-for-of-7.16.0.tgz#f7abaced155260e2461359bbc7c7248aca5e6bd2" - integrity sha1-96us7RVSYOJGE1m7x8ckispea9I= +"@babel/plugin-transform-for-of@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-for-of/download/@babel/plugin-transform-for-of-7.16.5.tgz#9b544059c6ca11d565457c0ff1f08e13ce225261" + integrity sha512-+DpCAJFPAvViR17PIMi9x2AE34dll5wNlXO43wagAX2YcRGgEVHCNFC4azG85b4YyyFarvkc/iD5NPrz4Oneqw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-function-name@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-function-name/download/@babel/plugin-transform-function-name-7.16.0.tgz?cache=0&sync_timestamp=1635566947920&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-function-name%2Fdownload%2F%40babel%2Fplugin-transform-function-name-7.16.0.tgz#02e3699c284c6262236599f751065c5d5f1f400e" - integrity sha1-AuNpnChMYmIjZZn3UQZcXV8fQA4= +"@babel/plugin-transform-function-name@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-function-name/download/@babel/plugin-transform-function-name-7.16.5.tgz#6896ebb6a5538a75d6a4086a277752f655a7bd15" + integrity sha512-Fuec/KPSpVLbGo6z1RPw4EE1X+z9gZk1uQmnYy7v4xr4TO9p41v1AoUuXEtyqAI7H+xNJYSICzRqZBhDEkd3kQ== dependencies: "@babel/helper-function-name" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-literals@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-literals/download/@babel/plugin-transform-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566912041&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-literals%2Fdownload%2F%40babel%2Fplugin-transform-literals-7.16.0.tgz#79711e670ffceb31bd298229d50f3621f7980cac" - integrity sha1-eXEeZw/86zG9KYIp1Q82IfeYDKw= +"@babel/plugin-transform-literals@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-literals/download/@babel/plugin-transform-literals-7.16.5.tgz#af392b90e3edb2bd6dc316844cbfd6b9e009d320" + integrity sha512-B1j9C/IfvshnPcklsc93AVLTrNVa69iSqztylZH6qnmiAsDDOmmjEYqOm3Ts2lGSgTSywnBNiqC949VdD0/gfw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-member-expression-literals@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-member-expression-literals/download/@babel/plugin-transform-member-expression-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566991360&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-member-expression-literals%2Fdownload%2F%40babel%2Fplugin-transform-member-expression-literals-7.16.0.tgz#5251b4cce01eaf8314403d21aedb269d79f5e64b" - integrity sha1-UlG0zOAer4MUQD0hrtsmnXn15ks= +"@babel/plugin-transform-member-expression-literals@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-member-expression-literals/download/@babel/plugin-transform-member-expression-literals-7.16.5.tgz#4bd6ecdc11932361631097b779ca5c7570146dd5" + integrity sha512-d57i3vPHWgIde/9Y8W/xSFUndhvhZN5Wu2TjRrN1MVz5KzdUihKnfDVlfP1U7mS5DNj/WHHhaE4/tTi4hIyHwQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-modules-amd@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/download/@babel/plugin-transform-modules-amd-7.16.0.tgz?cache=0&sync_timestamp=1635566912764&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-amd%2Fdownload%2F%40babel%2Fplugin-transform-modules-amd-7.16.0.tgz#09abd41e18dcf4fd479c598c1cef7bd39eb1337e" - integrity sha1-CavUHhjc9P1HnFmMHO97056xM34= +"@babel/plugin-transform-modules-amd@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/download/@babel/plugin-transform-modules-amd-7.16.5.tgz#92c0a3e83f642cb7e75fada9ab497c12c2616527" + integrity sha512-oHI15S/hdJuSCfnwIz+4lm6wu/wBn7oJ8+QrkzPPwSFGXk8kgdI/AIKcbR/XnD1nQVMg/i6eNaXpszbGuwYDRQ== dependencies: - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-module-transforms" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.5" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/download/@babel/plugin-transform-modules-commonjs-7.16.0.tgz?cache=0&sync_timestamp=1635566912532&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-commonjs%2Fdownload%2F%40babel%2Fplugin-transform-modules-commonjs-7.16.0.tgz#add58e638c8ddc4875bd9a9ecb5c594613f6c922" - integrity sha1-rdWOY4yN3Eh1vZqey1xZRhP2ySI= +"@babel/plugin-transform-modules-commonjs@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/download/@babel/plugin-transform-modules-commonjs-7.16.5.tgz#4ee03b089536f076b2773196529d27c32b9d7bde" + integrity sha512-ABhUkxvoQyqhCWyb8xXtfwqNMJD7tx+irIRnUh6lmyFud7Jln1WzONXKlax1fg/ey178EXbs4bSGNd6PngO+SQ== dependencies: - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-module-transforms" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/helper-simple-access" "^7.16.0" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-systemjs@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/download/@babel/plugin-transform-modules-systemjs-7.16.0.tgz?cache=0&sync_timestamp=1635566949693&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-systemjs%2Fdownload%2F%40babel%2Fplugin-transform-modules-systemjs-7.16.0.tgz#a92cf240afeb605f4ca16670453024425e421ea4" - integrity sha1-qSzyQK/rYF9MoWZwRTAkQl5CHqQ= +"@babel/plugin-transform-modules-systemjs@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/download/@babel/plugin-transform-modules-systemjs-7.16.5.tgz#07078ba2e3cc94fbdd06836e355c246e98ad006b" + integrity sha512-53gmLdScNN28XpjEVIm7LbWnD/b/TpbwKbLk6KV4KqC9WyU6rq1jnNmVG6UgAdQZVVGZVoik3DqHNxk4/EvrjA== dependencies: "@babel/helper-hoist-variables" "^7.16.0" - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-module-transforms" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/helper-validator-identifier" "^7.15.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-umd@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/download/@babel/plugin-transform-modules-umd-7.16.0.tgz?cache=0&sync_timestamp=1635566950831&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-modules-umd%2Fdownload%2F%40babel%2Fplugin-transform-modules-umd-7.16.0.tgz#195f26c2ad6d6a391b70880effce18ce625e06a7" - integrity sha1-GV8mwq1tajkbcIgO/84YzmJeBqc= +"@babel/plugin-transform-modules-umd@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/download/@babel/plugin-transform-modules-umd-7.16.5.tgz#caa9c53d636fb4e3c99fd35a4c9ba5e5cd7e002e" + integrity sha512-qTFnpxHMoenNHkS3VoWRdwrcJ3FhX567GvDA3hRZKF0Dj8Fmg0UzySZp3AP2mShl/bzcywb/UWAMQIjA1bhXvw== dependencies: - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-module-transforms" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-named-capturing-groups-regex@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-named-capturing-groups-regex/download/@babel/plugin-transform-named-capturing-groups-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566951624&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-named-capturing-groups-regex%2Fdownload%2F%40babel%2Fplugin-transform-named-capturing-groups-regex-7.16.0.tgz#d3db61cc5d5b97986559967cd5ea83e5c32096ca" - integrity sha1-09thzF1bl5hlWZZ81eqD5cMglso= +"@babel/plugin-transform-named-capturing-groups-regex@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-named-capturing-groups-regex/download/@babel/plugin-transform-named-capturing-groups-regex-7.16.5.tgz#4afd8cdee377ce3568f4e8a9ee67539b69886a3c" + integrity sha512-/wqGDgvFUeKELW6ex6QB7dLVRkd5ehjw34tpXu1nhKC0sFfmaLabIswnpf8JgDyV2NeDmZiwoOb0rAmxciNfjA== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.0" -"@babel/plugin-transform-new-target@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-new-target/download/@babel/plugin-transform-new-target-7.16.0.tgz?cache=0&sync_timestamp=1635566913480&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-new-target%2Fdownload%2F%40babel%2Fplugin-transform-new-target-7.16.0.tgz#af823ab576f752215a49937779a41ca65825ab35" - integrity sha1-r4I6tXb3UiFaSZN3eaQcplglqzU= +"@babel/plugin-transform-new-target@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-new-target/download/@babel/plugin-transform-new-target-7.16.5.tgz#759ea9d6fbbc20796056a5d89d13977626384416" + integrity sha512-ZaIrnXF08ZC8jnKR4/5g7YakGVL6go6V9ql6Jl3ecO8PQaQqFE74CuM384kezju7Z9nGCCA20BqZaR1tJ/WvHg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-object-super@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-object-super/download/@babel/plugin-transform-object-super-7.16.0.tgz?cache=0&sync_timestamp=1635566951968&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-object-super%2Fdownload%2F%40babel%2Fplugin-transform-object-super-7.16.0.tgz#fb20d5806dc6491a06296ac14ea8e8d6fedda72b" - integrity sha1-+yDVgG3GSRoGKWrBTqjo1v7dpys= +"@babel/plugin-transform-object-super@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-object-super/download/@babel/plugin-transform-object-super-7.16.5.tgz#8ccd9a1bcd3e7732ff8aa1702d067d8cd70ce380" + integrity sha512-tded+yZEXuxt9Jdtkc1RraW1zMF/GalVxaVVxh41IYwirdRgyAxxxCKZ9XB7LxZqmsjfjALxupNE1MIz9KH+Zg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-replace-supers" "^7.16.0" + "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-replace-supers" "^7.16.5" -"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.16.0", "@babel/plugin-transform-parameters@^7.16.3": - version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-parameters/download/@babel/plugin-transform-parameters-7.16.3.tgz?cache=0&sync_timestamp=1636496296752&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-parameters%2Fdownload%2F%40babel%2Fplugin-transform-parameters-7.16.3.tgz#fa9e4c874ee5223f891ee6fa8d737f4766d31d15" - integrity sha512-3MaDpJrOXT1MZ/WCmkOFo7EtmVVC8H4EUZVrHvFOsmwkk4lOjQj8rzv8JKUZV4YoQKeoIgk07GO+acPU9IMu/w== +"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-parameters/download/@babel/plugin-transform-parameters-7.16.5.tgz#4fc74b18a89638bd90aeec44a11793ecbe031dde" + integrity sha512-B3O6AL5oPop1jAVg8CV+haeUte9oFuY85zu0jwnRNZZi3tVAbJriu5tag/oaO2kGaQM/7q7aGPBlTI5/sr9enA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-property-literals@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/download/@babel/plugin-transform-property-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566914424&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-property-literals%2Fdownload%2F%40babel%2Fplugin-transform-property-literals-7.16.0.tgz#a95c552189a96a00059f6776dc4e00e3690c78d1" - integrity sha1-qVxVIYmpagAFn2d23E4A42kMeNE= +"@babel/plugin-transform-property-literals@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/download/@babel/plugin-transform-property-literals-7.16.5.tgz#58f1465a7202a2bb2e6b003905212dd7a79abe3f" + integrity sha512-+IRcVW71VdF9pEH/2R/Apab4a19LVvdVsr/gEeotH00vSDVlKD+XgfSIw+cgGWsjDB/ziqGv/pGoQZBIiQVXHg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/plugin-transform-react-constant-elements@^7.12.1": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-constant-elements/download/@babel/plugin-transform-react-constant-elements-7.16.0.tgz?cache=0&sync_timestamp=1635739052504&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-react-constant-elements%2Fdownload%2F%40babel%2Fplugin-transform-react-constant-elements-7.16.0.tgz#1483b894b8e6ef0709d260532fbd4db9fc27a0e6" - integrity sha1-FIO4lLjm7wcJ0mBTL71NufwnoOY= + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-constant-elements/download/@babel/plugin-transform-react-constant-elements-7.16.5.tgz#4b01ea6b14bd4e55ca92bb2d6c28dd9957118924" + integrity sha512-fdc1s5npHMZ9A+w9bYbrZu4499WyYPVaTTsRO8bU0GJcMuK4ejIX4lyjnpvi+YGLK/EhFQxWszqylO0vaMciFw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-react-display-name@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-display-name/download/@babel/plugin-transform-react-display-name-7.16.0.tgz#9a0ad8aa8e8790883a7bd2736f66229a58125676" - integrity sha1-mgrYqo6HkIg6e9Jzb2YimlgSVnY= +"@babel/plugin-transform-react-display-name@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-display-name/download/@babel/plugin-transform-react-display-name-7.16.5.tgz#d5e910327d7931fb9f8f9b6c6999473ceae5a286" + integrity sha512-dHYCOnzSsXFz8UcdNQIHGvg94qPL/teF7CCiCEMRxmA1G2p5Mq4JnKVowCDxYfiQ9D7RstaAp9kwaSI+sXbnhw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-react-jsx-development@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-jsx-development/download/@babel/plugin-transform-react-jsx-development-7.16.0.tgz#1cb52874678d23ab11d0d16488d54730807303ef" - integrity sha1-HLUodGeNI6sR0NFkiNVHMIBzA+8= +"@babel/plugin-transform-react-jsx-development@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-jsx-development/download/@babel/plugin-transform-react-jsx-development-7.16.5.tgz#87da9204c275ffb57f45d192a1120cf104bc1e86" + integrity sha512-uQSLacMZSGLCxOw20dzo1dmLlKkd+DsayoV54q3MHXhbqgPzoiGerZQgNPl/Ro8/OcXV2ugfnkx+rxdS0sN5Uw== dependencies: - "@babel/plugin-transform-react-jsx" "^7.16.0" + "@babel/plugin-transform-react-jsx" "^7.16.5" -"@babel/plugin-transform-react-jsx@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-jsx/download/@babel/plugin-transform-react-jsx-7.16.0.tgz#55b797d4960c3de04e07ad1c0476e2bc6a4889f1" - integrity sha1-VbeX1JYMPeBOB60cBHbivGpIifE= +"@babel/plugin-transform-react-jsx@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-jsx/download/@babel/plugin-transform-react-jsx-7.16.5.tgz#5298aedc5f81e02b1cb702e597e8d6a346675765" + integrity sha512-+arLIz1d7kmwX0fKxTxbnoeG85ONSnLpvdODa4P3pc1sS7CV1hfmtYWufkW/oYsPnkDrEeQFxhUWcFnrXW7jQQ== dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-jsx" "^7.16.0" + "@babel/helper-plugin-utils" "^7.16.5" + "@babel/plugin-syntax-jsx" "^7.16.5" "@babel/types" "^7.16.0" -"@babel/plugin-transform-react-pure-annotations@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-pure-annotations/download/@babel/plugin-transform-react-pure-annotations-7.16.0.tgz#23db6ddf558d8abde41b8ad9d59f48ad5532ccab" - integrity sha1-I9tt31WNir3kG4rZ1Z9IrVUyzKs= +"@babel/plugin-transform-react-pure-annotations@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-pure-annotations/download/@babel/plugin-transform-react-pure-annotations-7.16.5.tgz#6535d0fe67c7a3a26c5105f92c8cbcbe844cd94b" + integrity sha512-0nYU30hCxnCVCbRjSy9ahlhWZ2Sn6khbY4FqR91W+2RbSqkWEbVu2gXh45EqNy4Bq7sRU+H4i0/6YKwOSzh16A== dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-regenerator@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/download/@babel/plugin-transform-regenerator-7.16.0.tgz?cache=0&sync_timestamp=1635566914723&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-regenerator%2Fdownload%2F%40babel%2Fplugin-transform-regenerator-7.16.0.tgz#eaee422c84b0232d03aea7db99c97deeaf6125a4" - integrity sha1-6u5CLISwIy0Drqfbmcl97q9hJaQ= +"@babel/plugin-transform-regenerator@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/download/@babel/plugin-transform-regenerator-7.16.5.tgz#704cc6d8dd3dd4758267621ab7b36375238cef13" + integrity sha512-2z+it2eVWU8TtQQRauvGUqZwLy4+7rTfo6wO4npr+fvvN1SW30ZF3O/ZRCNmTuu4F5MIP8OJhXAhRV5QMJOuYg== dependencies: regenerator-transform "^0.14.2" -"@babel/plugin-transform-reserved-words@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/download/@babel/plugin-transform-reserved-words-7.16.0.tgz?cache=0&sync_timestamp=1635566914972&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-reserved-words%2Fdownload%2F%40babel%2Fplugin-transform-reserved-words-7.16.0.tgz#fff4b9dcb19e12619394bda172d14f2d04c0379c" - integrity sha1-//S53LGeEmGTlL2hctFPLQTAN5w= +"@babel/plugin-transform-reserved-words@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/download/@babel/plugin-transform-reserved-words-7.16.5.tgz#db95e98799675e193dc2b47d3e72a7c0651d0c30" + integrity sha512-aIB16u8lNcf7drkhXJRoggOxSTUAuihTSTfAcpynowGJOZiGf+Yvi7RuTwFzVYSYPmWyARsPqUGoZWWWxLiknw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/plugin-transform-runtime@^7.15.0": - version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-runtime/download/@babel/plugin-transform-runtime-7.16.4.tgz?cache=0&sync_timestamp=1637102846932&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-runtime%2Fdownload%2F%40babel%2Fplugin-transform-runtime-7.16.4.tgz#f9ba3c7034d429c581e1bd41b4952f3db3c2c7e8" - integrity sha512-pru6+yHANMTukMtEZGC4fs7XPwg35v8sj5CIEmE+gEkFljFiVJxEWxx/7ZDkTK+iZRYo1bFXBtfIN95+K3cJ5A== + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-runtime/download/@babel/plugin-transform-runtime-7.16.5.tgz#0cc3f01d69f299d5a42cd9ec43b92ea7a777b8db" + integrity sha512-gxpfS8XQWDbQ8oP5NcmpXxtEgCJkbO+W9VhZlOhr0xPyVaRjAQPOv7ZDj9fg0d5s9+NiVvMCE6gbkEkcsxwGRw== dependencies: "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" babel-plugin-polyfill-corejs2 "^0.3.0" babel-plugin-polyfill-corejs3 "^0.4.0" babel-plugin-polyfill-regenerator "^0.3.0" semver "^6.3.0" -"@babel/plugin-transform-shorthand-properties@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/download/@babel/plugin-transform-shorthand-properties-7.16.0.tgz?cache=0&sync_timestamp=1635566916554&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-shorthand-properties%2Fdownload%2F%40babel%2Fplugin-transform-shorthand-properties-7.16.0.tgz#090372e3141f7cc324ed70b3daf5379df2fa384d" - integrity sha1-CQNy4xQffMMk7XCz2vU3nfL6OE0= +"@babel/plugin-transform-shorthand-properties@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/download/@babel/plugin-transform-shorthand-properties-7.16.5.tgz#ccb60b1a23b799f5b9a14d97c5bc81025ffd96d7" + integrity sha512-ZbuWVcY+MAXJuuW7qDoCwoxDUNClfZxoo7/4swVbOW1s/qYLOMHlm9YRWMsxMFuLs44eXsv4op1vAaBaBaDMVg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-spread@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-spread/download/@babel/plugin-transform-spread-7.16.0.tgz?cache=0&sync_timestamp=1635566916819&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-spread%2Fdownload%2F%40babel%2Fplugin-transform-spread-7.16.0.tgz#d21ca099bbd53ab307a8621e019a7bd0f40cdcfb" - integrity sha1-0hygmbvVOrMHqGIeAZp70PQM3Ps= +"@babel/plugin-transform-spread@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-spread/download/@babel/plugin-transform-spread-7.16.5.tgz#912b06cff482c233025d3e69cf56d3e8fa166c29" + integrity sha512-5d6l/cnG7Lw4tGHEoga4xSkYp1euP7LAtrah1h1PgJ3JY7yNsjybsxQAnVK4JbtReZ/8z6ASVmd3QhYYKLaKZw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" -"@babel/plugin-transform-sticky-regex@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-sticky-regex/download/@babel/plugin-transform-sticky-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566917052&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-sticky-regex%2Fdownload%2F%40babel%2Fplugin-transform-sticky-regex-7.16.0.tgz#c35ea31a02d86be485f6aa510184b677a91738fd" - integrity sha1-w16jGgLYa+SF9qpRAYS2d6kXOP0= +"@babel/plugin-transform-sticky-regex@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-sticky-regex/download/@babel/plugin-transform-sticky-regex-7.16.5.tgz#593579bb2b5a8adfbe02cb43823275d9098f75f9" + integrity sha512-usYsuO1ID2LXxzuUxifgWtJemP7wL2uZtyrTVM4PKqsmJycdS4U4mGovL5xXkfUheds10Dd2PjoQLXw6zCsCbg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-template-literals@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/download/@babel/plugin-transform-template-literals-7.16.0.tgz?cache=0&sync_timestamp=1635566917280&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-template-literals%2Fdownload%2F%40babel%2Fplugin-transform-template-literals-7.16.0.tgz#a8eced3a8e7b8e2d40ec4ec4548a45912630d302" - integrity sha1-qOztOo57ji1A7E7EVIpFkSYw0wI= +"@babel/plugin-transform-template-literals@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/download/@babel/plugin-transform-template-literals-7.16.5.tgz#343651385fd9923f5aa2275ca352c5d9183e1773" + integrity sha512-gnyKy9RyFhkovex4BjKWL3BVYzUDG6zC0gba7VMLbQoDuqMfJ1SDXs8k/XK41Mmt1Hyp4qNAvGFb9hKzdCqBRQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-typeof-symbol@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/download/@babel/plugin-transform-typeof-symbol-7.16.0.tgz?cache=0&sync_timestamp=1635566920452&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-typeof-symbol%2Fdownload%2F%40babel%2Fplugin-transform-typeof-symbol-7.16.0.tgz#8b19a244c6f8c9d668dca6a6f754ad6ead1128f2" - integrity sha1-ixmiRMb4ydZo3Kam91Stbq0RKPI= +"@babel/plugin-transform-typeof-symbol@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/download/@babel/plugin-transform-typeof-symbol-7.16.5.tgz#a1d1bf2c71573fe30965d0e4cd6a3291202e20ed" + integrity sha512-ldxCkW180qbrvyCVDzAUZqB0TAeF8W/vGJoRcaf75awm6By+PxfJKvuqVAnq8N9wz5Xa6mSpM19OfVKKVmGHSQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-typescript@^7.16.0": +"@babel/plugin-transform-typescript@^7.16.1": version "7.16.1" resolved "https://registry.npmmirror.com/@babel/plugin-transform-typescript/download/@babel/plugin-transform-typescript-7.16.1.tgz#cc0670b2822b0338355bc1b3d2246a42b8166409" integrity sha1-zAZwsoIrAzg1W8Gz0iRqQrgWZAk= @@ -972,47 +987,47 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript" "^7.16.0" -"@babel/plugin-transform-unicode-escapes@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/download/@babel/plugin-transform-unicode-escapes-7.16.0.tgz?cache=0&sync_timestamp=1635566920674&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-unicode-escapes%2Fdownload%2F%40babel%2Fplugin-transform-unicode-escapes-7.16.0.tgz#1a354064b4c45663a32334f46fa0cf6100b5b1f3" - integrity sha1-GjVAZLTEVmOjIzT0b6DPYQC1sfM= +"@babel/plugin-transform-unicode-escapes@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/download/@babel/plugin-transform-unicode-escapes-7.16.5.tgz#80507c225af49b4f4ee647e2a0ce53d2eeff9e85" + integrity sha512-shiCBHTIIChGLdyojsKQjoAyB8MBwat25lKM7MJjbe1hE0bgIppD+LX9afr41lLHOhqceqeWl4FkLp+Bgn9o1Q== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" -"@babel/plugin-transform-unicode-regex@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-regex/download/@babel/plugin-transform-unicode-regex-7.16.0.tgz?cache=0&sync_timestamp=1635566921655&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-transform-unicode-regex%2Fdownload%2F%40babel%2Fplugin-transform-unicode-regex-7.16.0.tgz#293b80950177c8c85aede87cef280259fb995402" - integrity sha1-KTuAlQF3yMha7eh87ygCWfuZVAI= +"@babel/plugin-transform-unicode-regex@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-regex/download/@babel/plugin-transform-unicode-regex-7.16.5.tgz#ac84d6a1def947d71ffb832426aa53b83d7ed49e" + integrity sha512-GTJ4IW012tiPEMMubd7sD07iU9O/LOo8Q/oU4xNhcaq0Xn8+6TcUQaHtC8YxySo1T+ErQ8RaWogIEeFhKGNPzw== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.15.6": - version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/preset-env/download/@babel/preset-env-7.16.4.tgz?cache=0&sync_timestamp=1637103615805&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-env%2Fdownload%2F%40babel%2Fpreset-env-7.16.4.tgz#4f6ec33b2a3fe72d6bfdcdf3859500232563a2e3" - integrity sha512-v0QtNd81v/xKj4gNKeuAerQ/azeNn/G1B1qMLeXOcV8+4TWlD2j3NV1u8q29SDFBXx/NBq5kyEAO+0mpRgacjA== + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/preset-env/download/@babel/preset-env-7.16.5.tgz#2e94d922f4a890979af04ffeb6a6b4e44ba90847" + integrity sha512-MiJJW5pwsktG61NDxpZ4oJ1CKxM1ncam9bzRtx9g40/WkLRkxFP6mhpkYV0/DxcciqoiHicx291+eUQrXb/SfQ== dependencies: "@babel/compat-data" "^7.16.4" "@babel/helper-compilation-targets" "^7.16.3" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/helper-validator-option" "^7.14.5" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.2" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.0" - "@babel/plugin-proposal-async-generator-functions" "^7.16.4" - "@babel/plugin-proposal-class-properties" "^7.16.0" - "@babel/plugin-proposal-class-static-block" "^7.16.0" - "@babel/plugin-proposal-dynamic-import" "^7.16.0" - "@babel/plugin-proposal-export-namespace-from" "^7.16.0" - "@babel/plugin-proposal-json-strings" "^7.16.0" - "@babel/plugin-proposal-logical-assignment-operators" "^7.16.0" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.0" - "@babel/plugin-proposal-numeric-separator" "^7.16.0" - "@babel/plugin-proposal-object-rest-spread" "^7.16.0" - "@babel/plugin-proposal-optional-catch-binding" "^7.16.0" - "@babel/plugin-proposal-optional-chaining" "^7.16.0" - "@babel/plugin-proposal-private-methods" "^7.16.0" - "@babel/plugin-proposal-private-property-in-object" "^7.16.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.16.0" + "@babel/plugin-proposal-async-generator-functions" "^7.16.5" + "@babel/plugin-proposal-class-properties" "^7.16.5" + "@babel/plugin-proposal-class-static-block" "^7.16.5" + "@babel/plugin-proposal-dynamic-import" "^7.16.5" + "@babel/plugin-proposal-export-namespace-from" "^7.16.5" + "@babel/plugin-proposal-json-strings" "^7.16.5" + "@babel/plugin-proposal-logical-assignment-operators" "^7.16.5" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.5" + "@babel/plugin-proposal-numeric-separator" "^7.16.5" + "@babel/plugin-proposal-object-rest-spread" "^7.16.5" + "@babel/plugin-proposal-optional-catch-binding" "^7.16.5" + "@babel/plugin-proposal-optional-chaining" "^7.16.5" + "@babel/plugin-proposal-private-methods" "^7.16.5" + "@babel/plugin-proposal-private-property-in-object" "^7.16.5" + "@babel/plugin-proposal-unicode-property-regex" "^7.16.5" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" "@babel/plugin-syntax-class-static-block" "^7.14.5" @@ -1027,38 +1042,38 @@ "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.16.0" - "@babel/plugin-transform-async-to-generator" "^7.16.0" - "@babel/plugin-transform-block-scoped-functions" "^7.16.0" - "@babel/plugin-transform-block-scoping" "^7.16.0" - "@babel/plugin-transform-classes" "^7.16.0" - "@babel/plugin-transform-computed-properties" "^7.16.0" - "@babel/plugin-transform-destructuring" "^7.16.0" - "@babel/plugin-transform-dotall-regex" "^7.16.0" - "@babel/plugin-transform-duplicate-keys" "^7.16.0" - "@babel/plugin-transform-exponentiation-operator" "^7.16.0" - "@babel/plugin-transform-for-of" "^7.16.0" - "@babel/plugin-transform-function-name" "^7.16.0" - "@babel/plugin-transform-literals" "^7.16.0" - "@babel/plugin-transform-member-expression-literals" "^7.16.0" - "@babel/plugin-transform-modules-amd" "^7.16.0" - "@babel/plugin-transform-modules-commonjs" "^7.16.0" - "@babel/plugin-transform-modules-systemjs" "^7.16.0" - "@babel/plugin-transform-modules-umd" "^7.16.0" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.0" - "@babel/plugin-transform-new-target" "^7.16.0" - "@babel/plugin-transform-object-super" "^7.16.0" - "@babel/plugin-transform-parameters" "^7.16.3" - "@babel/plugin-transform-property-literals" "^7.16.0" - "@babel/plugin-transform-regenerator" "^7.16.0" - "@babel/plugin-transform-reserved-words" "^7.16.0" - "@babel/plugin-transform-shorthand-properties" "^7.16.0" - "@babel/plugin-transform-spread" "^7.16.0" - "@babel/plugin-transform-sticky-regex" "^7.16.0" - "@babel/plugin-transform-template-literals" "^7.16.0" - "@babel/plugin-transform-typeof-symbol" "^7.16.0" - "@babel/plugin-transform-unicode-escapes" "^7.16.0" - "@babel/plugin-transform-unicode-regex" "^7.16.0" + "@babel/plugin-transform-arrow-functions" "^7.16.5" + "@babel/plugin-transform-async-to-generator" "^7.16.5" + "@babel/plugin-transform-block-scoped-functions" "^7.16.5" + "@babel/plugin-transform-block-scoping" "^7.16.5" + "@babel/plugin-transform-classes" "^7.16.5" + "@babel/plugin-transform-computed-properties" "^7.16.5" + "@babel/plugin-transform-destructuring" "^7.16.5" + "@babel/plugin-transform-dotall-regex" "^7.16.5" + "@babel/plugin-transform-duplicate-keys" "^7.16.5" + "@babel/plugin-transform-exponentiation-operator" "^7.16.5" + "@babel/plugin-transform-for-of" "^7.16.5" + "@babel/plugin-transform-function-name" "^7.16.5" + "@babel/plugin-transform-literals" "^7.16.5" + "@babel/plugin-transform-member-expression-literals" "^7.16.5" + "@babel/plugin-transform-modules-amd" "^7.16.5" + "@babel/plugin-transform-modules-commonjs" "^7.16.5" + "@babel/plugin-transform-modules-systemjs" "^7.16.5" + "@babel/plugin-transform-modules-umd" "^7.16.5" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.5" + "@babel/plugin-transform-new-target" "^7.16.5" + "@babel/plugin-transform-object-super" "^7.16.5" + "@babel/plugin-transform-parameters" "^7.16.5" + "@babel/plugin-transform-property-literals" "^7.16.5" + "@babel/plugin-transform-regenerator" "^7.16.5" + "@babel/plugin-transform-reserved-words" "^7.16.5" + "@babel/plugin-transform-shorthand-properties" "^7.16.5" + "@babel/plugin-transform-spread" "^7.16.5" + "@babel/plugin-transform-sticky-regex" "^7.16.5" + "@babel/plugin-transform-template-literals" "^7.16.5" + "@babel/plugin-transform-typeof-symbol" "^7.16.5" + "@babel/plugin-transform-unicode-escapes" "^7.16.5" + "@babel/plugin-transform-unicode-regex" "^7.16.5" "@babel/preset-modules" "^0.1.5" "@babel/types" "^7.16.0" babel-plugin-polyfill-corejs2 "^0.3.0" @@ -1069,7 +1084,7 @@ "@babel/preset-modules@^0.1.5": version "0.1.5" - resolved "https://registry.npmmirror.com/@babel/preset-modules/download/@babel/preset-modules-0.1.5.tgz?cache=0&sync_timestamp=1635094844477&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-modules%2Fdownload%2F%40babel%2Fpreset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" + resolved "https://registry.npmmirror.com/@babel/preset-modules/download/@babel/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" integrity sha1-75Odbn8miCfhhBY43G/5VRXhFdk= dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -1079,61 +1094,62 @@ esutils "^2.0.2" "@babel/preset-react@^7.12.13", "@babel/preset-react@^7.12.5": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/preset-react/download/@babel/preset-react-7.16.0.tgz#f71d3e8dff5218478011df037fad52660ee6d82a" - integrity sha1-9x0+jf9SGEeAEd8Df61SZg7m2Co= + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/preset-react/download/@babel/preset-react-7.16.5.tgz#09df3b7a6522cb3e6682dc89b4dfebb97d22031b" + integrity sha512-3kzUOQeaxY/2vhPDS7CX/KGEGu/1bOYGvdRDJ2U5yjEz5o5jmIeTPLoiQBPGjfhPascLuW5OlMiPzwOOuB6txg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/helper-validator-option" "^7.14.5" - "@babel/plugin-transform-react-display-name" "^7.16.0" - "@babel/plugin-transform-react-jsx" "^7.16.0" - "@babel/plugin-transform-react-jsx-development" "^7.16.0" - "@babel/plugin-transform-react-pure-annotations" "^7.16.0" + "@babel/plugin-transform-react-display-name" "^7.16.5" + "@babel/plugin-transform-react-jsx" "^7.16.5" + "@babel/plugin-transform-react-jsx-development" "^7.16.5" + "@babel/plugin-transform-react-pure-annotations" "^7.16.5" "@babel/preset-typescript@^7.12.16": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/preset-typescript/download/@babel/preset-typescript-7.16.0.tgz#b0b4f105b855fb3d631ec036cdc9d1ffd1fa5eac" - integrity sha1-sLTxBbhV+z1jHsA2zcnR/9H6Xqw= + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/preset-typescript/download/@babel/preset-typescript-7.16.5.tgz#b86a5b0ae739ba741347d2f58c52f52e63cf1ba1" + integrity sha512-lmAWRoJ9iOSvs3DqOndQpj8XqXkzaiQs50VG/zESiI9D3eoZhGriU675xNCr0UwvsuXrhMAGvyk1w+EVWF3u8Q== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.5" "@babel/helper-validator-option" "^7.14.5" - "@babel/plugin-transform-typescript" "^7.16.0" + "@babel/plugin-transform-typescript" "^7.16.1" "@babel/runtime-corejs3@^7.15.4": - version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/runtime-corejs3/download/@babel/runtime-corejs3-7.16.3.tgz#1e25de4fa994c57c18e5fdda6cc810dac70f5590" - integrity sha512-IAdDC7T0+wEB4y2gbIL0uOXEYpiZEeuFUTVbdGq+UwCcF35T/tS8KrmMomEwEc5wBbyfH3PJVpTSUqrhPDXFcQ== + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/runtime-corejs3/download/@babel/runtime-corejs3-7.16.5.tgz#9057d879720c136193f0440bc400088212a74894" + integrity sha512-F1pMwvTiUNSAM8mc45kccMQxj31x3y3P+tA/X8hKNWp3/hUsxdGxZ3D3H8JIkxtfA8qGkaBTKvcmvStaYseAFw== dependencies: core-js-pure "^3.19.0" regenerator-runtime "^0.13.4" "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.15.4", "@babel/runtime@^7.8.4": - version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/runtime/download/@babel/runtime-7.16.3.tgz?cache=0&sync_timestamp=1636494920863&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5" - integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ== + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/runtime/download/@babel/runtime-7.16.5.tgz#7f3e34bf8bdbbadf03fbb7b1ea0d929569c9487a" + integrity sha512-TXWihFIS3Pyv5hzR7j6ihmeLkZfrXGxAr5UfSl8CHf+6q/wpiYDkUau0czckpYG8QmnCIuPpdLtuA9VmuGGyMA== dependencies: regenerator-runtime "^0.13.4" "@babel/template@^7.12.7", "@babel/template@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/template/download/@babel/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" + resolved "https://registry.npmmirror.com/@babel/template/download/@babel/template-7.16.0.tgz?cache=0&sync_timestamp=1635560664232&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Ftemplate%2Fdownload%2F%40babel%2Ftemplate-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" integrity sha1-0Wo16/TNdOICCDNW+rId2JNj3dY= dependencies: "@babel/code-frame" "^7.16.0" "@babel/parser" "^7.16.0" "@babel/types" "^7.16.0" -"@babel/traverse@^7.12.13", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.16.3": - version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/traverse/download/@babel/traverse-7.16.3.tgz?cache=0&sync_timestamp=1636496295750&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Ftraverse%2Fdownload%2F%40babel%2Ftraverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787" - integrity sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag== +"@babel/traverse@^7.12.13", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.5": + version "7.16.5" + resolved "https://registry.npmmirror.com/@babel/traverse/download/@babel/traverse-7.16.5.tgz#d7d400a8229c714a59b87624fc67b0f1fbd4b2b3" + integrity sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ== dependencies: "@babel/code-frame" "^7.16.0" - "@babel/generator" "^7.16.0" + "@babel/generator" "^7.16.5" + "@babel/helper-environment-visitor" "^7.16.5" "@babel/helper-function-name" "^7.16.0" "@babel/helper-hoist-variables" "^7.16.0" "@babel/helper-split-export-declaration" "^7.16.0" - "@babel/parser" "^7.16.3" + "@babel/parser" "^7.16.5" "@babel/types" "^7.16.0" debug "^4.1.0" globals "^11.1.0" @@ -1468,7 +1484,7 @@ "@hapi/hoek@^9.0.0": version "9.2.1" - resolved "https://registry.npmmirror.com/@hapi/hoek/download/@hapi/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" + resolved "https://registry.npmmirror.com/@hapi/hoek/download/@hapi/hoek-9.2.1.tgz?cache=0&sync_timestamp=1632777883600&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40hapi%2Fhoek%2Fdownload%2F%40hapi%2Fhoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" integrity sha1-lVEUKhmAUDdSU2tQUP2Z9KfxOxc= "@hapi/topo@^5.0.0": @@ -1480,7 +1496,7 @@ "@mdx-js/mdx@1.6.22", "@mdx-js/mdx@^1.6.21": version "1.6.22" - resolved "https://registry.npmmirror.com/@mdx-js/mdx/download/@mdx-js/mdx-1.6.22.tgz?cache=0&sync_timestamp=1637010128219&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40mdx-js%2Fmdx%2Fdownload%2F%40mdx-js%2Fmdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" + resolved "https://registry.npmmirror.com/@mdx-js/mdx/download/@mdx-js/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" integrity sha1-inIxV7+Q548X3A8nmVOY5scx8bo= dependencies: "@babel/core" "7.12.9" @@ -1505,12 +1521,12 @@ "@mdx-js/react@1.6.22", "@mdx-js/react@^1.6.21": version "1.6.22" - resolved "https://registry.npmmirror.com/@mdx-js/react/download/@mdx-js/react-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573" + resolved "https://registry.npmmirror.com/@mdx-js/react/download/@mdx-js/react-1.6.22.tgz?cache=0&sync_timestamp=1637010066448&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40mdx-js%2Freact%2Fdownload%2F%40mdx-js%2Freact-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573" integrity sha1-rgm0dE/dx0cU7p+dbxembnfENXM= "@mdx-js/runtime@^1.6.22": version "1.6.22" - resolved "https://registry.nlark.com/@mdx-js/runtime/download/@mdx-js/runtime-1.6.22.tgz#3edd388bf68a519ffa1aaf9c446b548165102345" + resolved "https://registry.npmmirror.com/@mdx-js/runtime/download/@mdx-js/runtime-1.6.22.tgz#3edd388bf68a519ffa1aaf9c446b548165102345" integrity sha1-Pt04i/aKUZ/6Gq+cRGtUgWUQI0U= dependencies: "@mdx-js/mdx" "1.6.22" @@ -1519,12 +1535,12 @@ "@mdx-js/util@1.6.22": version "1.6.22" - resolved "https://registry.npm.taobao.org/@mdx-js/util/download/@mdx-js/util-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40mdx-js%2Futil%2Fdownload%2F%40mdx-js%2Futil-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" + resolved "https://registry.npm.taobao.org/@mdx-js/util/download/@mdx-js/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" integrity sha1-IZ39ia5bl6iAHwFTI/+kti9FcYs= "@nodelib/fs.scandir@2.1.5": version "2.1.5" - resolved "https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz?cache=0&sync_timestamp=1622792738877&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.scandir%2Fdownload%2F%40nodelib%2Ffs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + resolved "https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" integrity sha1-dhnC6yGyVIP20WdUi0z9WnSIw9U= dependencies: "@nodelib/fs.stat" "2.0.5" @@ -1532,12 +1548,12 @@ "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" - resolved "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&sync_timestamp=1622792616417&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + resolved "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&sync_timestamp=1622792655362&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha1-W9Jir5Tp0lvR5xsF3u1Eh2oiLos= "@nodelib/fs.walk@^1.2.3": version "1.2.8" - resolved "https://registry.nlark.com/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + resolved "https://registry.nlark.com/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.8.tgz?cache=0&sync_timestamp=1625769815389&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.walk%2Fdownload%2F%40nodelib%2Ffs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" integrity sha1-6Vc36LtnRt3t9pxVaVNJTxlv5po= dependencies: "@nodelib/fs.scandir" "2.1.5" @@ -1545,12 +1561,12 @@ "@polka/url@^1.0.0-next.20": version "1.0.0-next.21" - resolved "https://registry.npmmirror.com/@polka/url/download/@polka/url-1.0.0-next.21.tgz?cache=0&sync_timestamp=1633093101880&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40polka%2Furl%2Fdownload%2F%40polka%2Furl-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" + resolved "https://registry.npmmirror.com/@polka/url/download/@polka/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha1-XeWiOFo1MJQn9gEZkrVEUU1VmqE= "@seznam/compose-react-refs@^1.0.6": version "1.0.6" - resolved "https://registry.npm.taobao.org/@seznam/compose-react-refs/download/@seznam/compose-react-refs-1.0.6.tgz#6ec4e70bdd6e32f8e70b4100f27267cf306bd8df" + resolved "https://registry.nlark.com/@seznam/compose-react-refs/download/@seznam/compose-react-refs-1.0.6.tgz#6ec4e70bdd6e32f8e70b4100f27267cf306bd8df" integrity sha1-bsTnC91uMvjnC0EA8nJnzzBr2N8= "@sideway/address@^4.1.3": @@ -1562,7 +1578,7 @@ "@sideway/formula@^3.0.0": version "3.0.0" - resolved "https://registry.npm.taobao.org/@sideway/formula/download/@sideway/formula-3.0.0.tgz?cache=0&sync_timestamp=1603525579815&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40sideway%2Fformula%2Fdownload%2F%40sideway%2Fformula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" + resolved "https://registry.nlark.com/@sideway/formula/download/@sideway/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" integrity sha1-/hWK7jLmvV3oUES+YVvAhHigoTw= "@sideway/pinpoint@^2.0.0": @@ -1572,7 +1588,7 @@ "@sindresorhus/is@^0.14.0": version "0.14.0" - resolved "https://registry.nlark.com/@sindresorhus/is/download/@sindresorhus/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" + resolved "https://registry.nlark.com/@sindresorhus/is/download/@sindresorhus/is-0.14.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40sindresorhus%2Fis%2Fdownload%2F%40sindresorhus%2Fis-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" integrity sha1-n7OjzzEyMoFR81PeRjLgHlIQK+o= "@slorber/static-site-generator-webpack-plugin@^4.0.0": @@ -1691,15 +1707,15 @@ "@szmarczak/http-timer@^1.1.2": version "1.1.2" - resolved "https://registry.nlark.com/@szmarczak/http-timer/download/@szmarczak/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" + resolved "https://registry.nlark.com/@szmarczak/http-timer/download/@szmarczak/http-timer-1.1.2.tgz?cache=0&sync_timestamp=1629502165113&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40szmarczak%2Fhttp-timer%2Fdownload%2F%40szmarczak%2Fhttp-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" integrity sha1-sWZeLEYaLNkvTBu/UNVFTeDUtCE= dependencies: defer-to-connect "^1.0.1" -"@tailwindcss/typography@^0.5.0-alpha.3": - version "0.5.0-alpha.3" - resolved "https://registry.npmmirror.com/@tailwindcss/typography/download/@tailwindcss/typography-0.5.0-alpha.3.tgz#b47e739cf7955f6c50c160882f213e78e5f8b0f4" - integrity sha512-ySYrwcf7SaLVL7XBH61euPX4xoAytD4HVvfE4XsdExQmxxiNhWNVkvxhtP+RAbk6n3A0m0a+p3W25E19YiGj2A== +"@tailwindcss/typography@^0.5.0": + version "0.5.0" + resolved "https://registry.npmmirror.com/@tailwindcss/typography/download/@tailwindcss/typography-0.5.0.tgz#47886ec46ac41e1211d24fea05301046d9b30906" + integrity sha512-1p/3C6C+JJziS/ghtG8ACYalbA2SyLJY27Pm33cVTlAoY6VQ7zfm2H64cPxUMBkVIlWXTtWHhZcZJPobMRmQAA== dependencies: lodash.castarray "^4.4.0" lodash.isplainobject "^4.0.6" @@ -1713,20 +1729,43 @@ "@tsconfig/docusaurus@^1.0.4": version "1.0.4" - resolved "https://registry.npmmirror.com/@tsconfig/docusaurus/download/@tsconfig/docusaurus-1.0.4.tgz#fc40f87a672568678d83533dd4031a09d75877ca" + resolved "https://registry.nlark.com/@tsconfig/docusaurus/download/@tsconfig/docusaurus-1.0.4.tgz#fc40f87a672568678d83533dd4031a09d75877ca" integrity sha1-/ED4emclaGeNg1M91AMaCddYd8o= -"@types/cssnano@^4.0.1": - version "4.0.1" - resolved "https://registry.npmmirror.com/@types/cssnano/download/@types/cssnano-4.0.1.tgz#67fa912753d80973a016e7684a47fedf338aacff" - integrity sha1-Z/qRJ1PYCXOgFudoSkf+3zOKrP8= +"@types/body-parser@*": + version "1.19.2" + resolved "https://registry.npmmirror.com/@types/body-parser/download/@types/body-parser-1.19.2.tgz?cache=0&sync_timestamp=1637264988188&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fbody-parser%2Fdownload%2F%40types%2Fbody-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" + integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== dependencies: - postcss "5 - 7" + "@types/connect" "*" + "@types/node" "*" + +"@types/bonjour@^3.5.9": + version "3.5.10" + resolved "https://registry.npmmirror.com/@types/bonjour/download/@types/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" + integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw== + dependencies: + "@types/node" "*" + +"@types/connect-history-api-fallback@^1.3.5": + version "1.3.5" + resolved "https://registry.npmmirror.com/@types/connect-history-api-fallback/download/@types/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" + integrity sha1-0feooJ0O1aV67lrpwYq5uAMgXa4= + dependencies: + "@types/express-serve-static-core" "*" + "@types/node" "*" + +"@types/connect@*": + version "3.4.35" + resolved "https://registry.npmmirror.com/@types/connect/download/@types/connect-3.4.35.tgz?cache=0&sync_timestamp=1637264533049&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fconnect%2Fdownload%2F%40types%2Fconnect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" + integrity sha1-X89q5EXkAh0fwiGaSHPMc6O7KtE= + dependencies: + "@types/node" "*" "@types/eslint-scope@^3.7.0": - version "3.7.1" - resolved "https://registry.npmmirror.com/@types/eslint-scope/download/@types/eslint-scope-3.7.1.tgz#8dc390a7b4f9dd9f1284629efce982e41612116e" - integrity sha1-jcOQp7T53Z8ShGKe/OmC5BYSEW4= + version "3.7.2" + resolved "https://registry.npmmirror.com/@types/eslint-scope/download/@types/eslint-scope-3.7.2.tgz#11e96a868c67acf65bf6f11d10bb89ea71d5e473" + integrity sha512-TzgYCWoPiTeRg6RQYgtuW7iODtVoKu3RVL72k3WohqhjfaOLK5Mg2T4Tg1o2bSfu0vPkoI48wdQFv5b/Xe04wQ== dependencies: "@types/eslint" "*" "@types/estree" "*" @@ -1741,9 +1780,28 @@ "@types/estree@*", "@types/estree@^0.0.50": version "0.0.50" - resolved "https://registry.npmmirror.com/@types/estree/download/@types/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" + resolved "https://registry.npmmirror.com/@types/estree/download/@types/estree-0.0.50.tgz?cache=0&sync_timestamp=1637264753186&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Festree%2Fdownload%2F%40types%2Festree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" integrity sha1-Hgyqk2TT/M0pMcPtlv2+ql1MyoM= +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": + version "4.17.27" + resolved "https://registry.npmmirror.com/@types/express-serve-static-core/download/@types/express-serve-static-core-4.17.27.tgz#7a776191e47295d2a05962ecbb3a4ce97e38b401" + integrity sha512-e/sVallzUTPdyOTiqi8O8pMdBBphscvI6E4JYaKlja4Lm+zh7UFSSdW5VMkRbhDtmrONqOUHOXRguPsDckzxNA== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + +"@types/express@*": + version "4.17.13" + resolved "https://registry.npmmirror.com/@types/express/download/@types/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + integrity sha1-p24plXKJmbq1GjP6vOHXBaNwkDQ= + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.18" + "@types/qs" "*" + "@types/serve-static" "*" + "@types/github-slugger@^1.3.0": version "1.3.0" resolved "https://registry.npmmirror.com/@types/github-slugger/download/@types/github-slugger-1.3.0.tgz#16ab393b30d8ae2a111ac748a015ac05a1fc5524" @@ -1767,15 +1825,15 @@ integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg== "@types/http-proxy@^1.17.5": - version "1.17.7" - resolved "https://registry.npmmirror.com/@types/http-proxy/download/@types/http-proxy-1.17.7.tgz#30ea85cc2c868368352a37f0d0d3581e24834c6f" - integrity sha1-MOqFzCyGg2g1Kjfw0NNYHiSDTG8= + version "1.17.8" + resolved "https://registry.npmmirror.com/@types/http-proxy/download/@types/http-proxy-1.17.8.tgz#968c66903e7e42b483608030ee85800f22d03f55" + integrity sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA== dependencies: "@types/node" "*" "@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.9" - resolved "https://registry.npmmirror.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz?cache=0&sync_timestamp=1637266073261&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fjson-schema%2Fdownload%2F%40types%2Fjson-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + resolved "https://registry.npmmirror.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha1-l+3JA36gw4WFMgsolk3eOznkZg0= "@types/mdast@^3.0.0": @@ -1785,10 +1843,15 @@ dependencies: "@types/unist" "*" +"@types/mime@^1": + version "1.3.2" + resolved "https://registry.npmmirror.com/@types/mime/download/@types/mime-1.3.2.tgz?cache=0&sync_timestamp=1637267348464&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fmime%2Fdownload%2F%40types%2Fmime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" + integrity sha1-k+Jb+e51/g/YC1lLxP6w6GIRG1o= + "@types/node@*": - version "16.11.11" - resolved "https://registry.npmmirror.com/@types/node/download/@types/node-16.11.11.tgz#6ea7342dfb379ea1210835bada87b3c512120234" - integrity sha512-KB0sixD67CeecHC33MYn+eYARkqTheIRNuu97y2XMjR7Wu3XibO1vaY6VBV6O/a89SPI81cEUIYT87UqUWlZNw== + version "17.0.4" + resolved "https://registry.npmmirror.com/@types/node/download/@types/node-17.0.4.tgz#fec0ce0526abb6062fd206d72a642811b887a111" + integrity sha512-6xwbrW4JJiJLgF+zNypN5wr2ykM9/jHcL7rQ8fZe2vuftggjzZeRSM4OwRc6Xk8qWjwJ99qVHo/JgOGmomWRog== "@types/parse-json@^4.0.0": version "4.0.0" @@ -1802,25 +1865,35 @@ "@types/prop-types@*": version "15.7.4" - resolved "https://registry.npmmirror.com/@types/prop-types/download/@types/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + resolved "https://registry.npmmirror.com/@types/prop-types/download/@types/prop-types-15.7.4.tgz?cache=0&sync_timestamp=1637270164807&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fprop-types%2Fdownload%2F%40types%2Fprop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" integrity sha1-/PcgXCXf95Xuea8eMNosl5CAjxE= "@types/q@^1.5.1": version "1.5.5" - resolved "https://registry.npmmirror.com/@types/q/download/@types/q-1.5.5.tgz?cache=0&sync_timestamp=1637268455272&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fq%2Fdownload%2F%40types%2Fq-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" + resolved "https://registry.npmmirror.com/@types/q/download/@types/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" integrity sha1-daKo59irSyMEFFBdkjNdHctTpt8= +"@types/qs@*": + version "6.9.7" + resolved "https://registry.npmmirror.com/@types/qs/download/@types/qs-6.9.7.tgz?cache=0&sync_timestamp=1637268454704&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fqs%2Fdownload%2F%40types%2Fqs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" + integrity sha1-Y7t9Bn2xB8weRXwwO8JdUR/r9ss= + +"@types/range-parser@*": + version "1.2.4" + resolved "https://registry.npmmirror.com/@types/range-parser/download/@types/range-parser-1.2.4.tgz?cache=0&sync_timestamp=1637268455466&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Frange-parser%2Fdownload%2F%40types%2Frange-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" + integrity sha1-zWZ7z90CUhOq+3ylkVqTJZCs3Nw= + "@types/react-helmet@*": - version "6.1.4" - resolved "https://registry.npmmirror.com/@types/react-helmet/download/@types/react-helmet-6.1.4.tgz#3e54a3eb37ba7fb34ffafc64f425be4e68df03b9" - integrity sha1-PlSj6ze6f7NP+vxk9CW+TmjfA7k= + version "6.1.5" + resolved "https://registry.npmmirror.com/@types/react-helmet/download/@types/react-helmet-6.1.5.tgz#35f89a6b1646ee2bc342a33a9a6c8777933f9083" + integrity sha512-/ICuy7OHZxR0YCAZLNg9r7I9aijWUWvxaPR6uTuyxe8tAj5RL4Sw1+R6NhXUtOsarkGYPmaHdBDvuXh2DIN/uA== dependencies: "@types/react" "*" "@types/react-router-config@*": - version "5.0.3" - resolved "https://registry.nlark.com/@types/react-router-config/download/@types/react-router-config-5.0.3.tgz?cache=0&sync_timestamp=1629709123097&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Freact-router-config%2Fdownload%2F%40types%2Freact-router-config-5.0.3.tgz#72a53561bcb5e13b82c576527b818fa2579591c7" - integrity sha1-cqU1Yby14TuCxXZSe4GPoleVkcc= + version "5.0.4" + resolved "https://registry.npmmirror.com/@types/react-router-config/download/@types/react-router-config-5.0.4.tgz#fea3b063ed6b6b24f64efce323e5afba4b9b6e96" + integrity sha512-wJIRO2JcR/prphs4h7Fadx48vlqC3qMyTImqOLHkpwWCYBq9SnC+UAOBVZM4pCrzdIvUoXQy3b18+J6LXEKVpw== dependencies: "@types/history" "*" "@types/react" "*" @@ -1828,7 +1901,7 @@ "@types/react-router-dom@*": version "5.3.2" - resolved "https://registry.npmmirror.com/@types/react-router-dom/download/@types/react-router-dom-5.3.2.tgz?cache=0&sync_timestamp=1637449508387&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Freact-router-dom%2Fdownload%2F%40types%2Freact-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee" + resolved "https://registry.npmmirror.com/@types/react-router-dom/download/@types/react-router-dom-5.3.2.tgz?cache=0&sync_timestamp=1637450082491&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Freact-router-dom%2Fdownload%2F%40types%2Freact-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee" integrity sha1-69jhRc8FbbXGbrHaxjxy9S6FQu4= dependencies: "@types/history" "*" @@ -1844,9 +1917,9 @@ "@types/react" "*" "@types/react@*": - version "17.0.37" - resolved "https://registry.npmmirror.com/@types/react/download/@types/react-17.0.37.tgz#6884d0aa402605935c397ae689deed115caad959" - integrity sha512-2FS1oTqBGcH/s0E+CjrCCR9+JMpsu9b69RTFO+40ua43ZqP5MmQ4iUde/dMjWR909KxZwmOQIFq6AV6NjEG5xg== + version "17.0.38" + resolved "https://registry.npmmirror.com/@types/react/download/@types/react-17.0.38.tgz#f24249fefd89357d5fa71f739a686b8d7c7202bd" + integrity sha512-SI92X1IA+FMnP3qM5m4QReluXzhcmovhZnLNm3pyeQlooi02qI7sLiepEYqT678uNiyc25XfCqxREFpy3W7YhQ== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -1854,22 +1927,51 @@ "@types/retry@^0.12.0": version "0.12.1" - resolved "https://registry.npmmirror.com/@types/retry/download/@types/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" + resolved "https://registry.npmmirror.com/@types/retry/download/@types/retry-0.12.1.tgz?cache=0&sync_timestamp=1637270319130&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fretry%2Fdownload%2F%40types%2Fretry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" integrity sha1-2PHA0Nwjr61twWqemToIZXdLQGU= "@types/scheduler@*": version "0.16.2" - resolved "https://registry.npmmirror.com/@types/scheduler/download/@types/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + resolved "https://registry.npmmirror.com/@types/scheduler/download/@types/scheduler-0.16.2.tgz?cache=0&sync_timestamp=1637270322974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fscheduler%2Fdownload%2F%40types%2Fscheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" integrity sha1-GmL4lSVyPd4kuhsBsJK/XfitTTk= +"@types/serve-index@^1.9.1": + version "1.9.1" + resolved "https://registry.npmmirror.com/@types/serve-index/download/@types/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" + integrity sha1-G16FNwoZLAHsbOxHNc8pFzN6Yng= + dependencies: + "@types/express" "*" + +"@types/serve-static@*": + version "1.13.10" + resolved "https://registry.npmmirror.com/@types/serve-static/download/@types/serve-static-1.13.10.tgz?cache=0&sync_timestamp=1637270658875&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fserve-static%2Fdownload%2F%40types%2Fserve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" + integrity sha1-9eDOh5fS18xevtpIpSyWxPpHqNk= + dependencies: + "@types/mime" "^1" + "@types/node" "*" + +"@types/sockjs@^0.3.33": + version "0.3.33" + resolved "https://registry.npmmirror.com/@types/sockjs/download/@types/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f" + integrity sha1-Vw06C5msmVNg4xNv1gRRE7G9I28= + dependencies: + "@types/node" "*" + "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3": version "2.0.6" - resolved "https://registry.npmmirror.com/@types/unist/download/@types/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" + resolved "https://registry.npmmirror.com/@types/unist/download/@types/unist-2.0.6.tgz?cache=0&sync_timestamp=1637272115806&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Funist%2Fdownload%2F%40types%2Funist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" integrity sha1-JQp7FsO5H2cqJFUuxkZ47rHToI0= +"@types/ws@^8.2.2": + version "8.2.2" + resolved "https://registry.npmmirror.com/@types/ws/download/@types/ws-8.2.2.tgz#7c5be4decb19500ae6b3d563043cd407bf366c21" + integrity sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg== + dependencies: + "@types/node" "*" + "@webassemblyjs/ast@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.1.tgz?cache=0&sync_timestamp=1625473420080&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fast%2Fdownload%2F%40webassemblyjs%2Fast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" + resolved "https://registry.nlark.com/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.1.tgz?cache=0&sync_timestamp=1625473466238&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fast%2Fdownload%2F%40webassemblyjs%2Fast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" integrity sha1-K/12fq4aaZb0Mv9+jX/HVnnAtqc= dependencies: "@webassemblyjs/helper-numbers" "1.11.1" @@ -1877,17 +1979,17 @@ "@webassemblyjs/floating-point-hex-parser@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" + resolved "https://registry.nlark.com/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.11.1.tgz?cache=0&sync_timestamp=1625473463638&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Ffloating-point-hex-parser%2Fdownload%2F%40webassemblyjs%2Ffloating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" integrity sha1-9sYacF8P16auyqToGY8j2dwXnk8= "@webassemblyjs/helper-api-error@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.11.1.tgz?cache=0&sync_timestamp=1625473412127&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-api-error%2Fdownload%2F%40webassemblyjs%2Fhelper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" + resolved "https://registry.nlark.com/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" integrity sha1-GmMZLYeI5cASgAump6RscFKI/RY= "@webassemblyjs/helper-buffer@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.11.1.tgz?cache=0&sync_timestamp=1625473414638&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-buffer%2Fdownload%2F%40webassemblyjs%2Fhelper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" + resolved "https://registry.nlark.com/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" integrity sha1-gyqQDrREiEzemnytRn+BUA9eWrU= "@webassemblyjs/helper-numbers@1.11.1": @@ -1901,7 +2003,7 @@ "@webassemblyjs/helper-wasm-bytecode@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.11.1.tgz?cache=0&sync_timestamp=1625473415013&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-wasm-bytecode%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" + resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.11.1.tgz?cache=0&sync_timestamp=1625473463016&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-wasm-bytecode%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" integrity sha1-8ygkHkHnsZnQsgwY6IQpxEMyleE= "@webassemblyjs/helper-wasm-section@1.11.1": @@ -1930,12 +2032,12 @@ "@webassemblyjs/utf8@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.11.1.tgz?cache=0&sync_timestamp=1625473462317&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Futf8%2Fdownload%2F%40webassemblyjs%2Futf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" + resolved "https://registry.nlark.com/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" integrity sha1-0fi3ZDaefG5rrjUOhU3smlnwo/8= "@webassemblyjs/wasm-edit@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.11.1.tgz?cache=0&sync_timestamp=1625473490556&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-edit%2Fdownload%2F%40webassemblyjs%2Fwasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.11.1.tgz?cache=0&sync_timestamp=1625473468202&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-edit%2Fdownload%2F%40webassemblyjs%2Fwasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" integrity sha1-rSBuv0v5WgWM6YgKjAksXeyBk9Y= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -1960,7 +2062,7 @@ "@webassemblyjs/wasm-opt@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-opt/download/@webassemblyjs/wasm-opt-1.11.1.tgz?cache=0&sync_timestamp=1625473467198&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-opt%2Fdownload%2F%40webassemblyjs%2Fwasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-opt/download/@webassemblyjs/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" integrity sha1-ZXtMIgL0zzs0X4pMZGHIwkGJhfI= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -1995,7 +2097,7 @@ "@xtuc/long@4.2.2": version "4.2.2" - resolved "https://registry.npm.taobao.org/@xtuc/long/download/@xtuc/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + resolved "https://registry.nlark.com/@xtuc/long/download/@xtuc/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha1-0pHGpOl5ibXGHZrPOWrk/hM6cY0= accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: @@ -2013,7 +2115,7 @@ acorn-dynamic-import@^4.0.0: acorn-import-assertions@^1.7.6: version "1.8.0" - resolved "https://registry.npmmirror.com/acorn-import-assertions/download/acorn-import-assertions-1.8.0.tgz?cache=0&sync_timestamp=1633349407828&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Facorn-import-assertions%2Fdownload%2Facorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" + resolved "https://registry.npmmirror.com/acorn-import-assertions/download/acorn-import-assertions-1.8.0.tgz?cache=0&sync_timestamp=1633349167595&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Facorn-import-assertions%2Fdownload%2Facorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" integrity sha1-uitZOc5iwjjbbZPYHJsRGym4Vek= acorn-jsx@^5.0.1: @@ -2032,12 +2134,12 @@ acorn-node@^1.6.1: acorn-walk@^7.0.0: version "7.2.0" - resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-7.2.0.tgz?cache=0&sync_timestamp=1630916608758&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-7.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha1-DeiJpgEgOQmw++B7iTjcIdLpZ7w= acorn-walk@^8.0.0: version "8.2.0" - resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-8.2.0.tgz?cache=0&sync_timestamp=1630916608758&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-8.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha1-dBIQ8uJCZFRQiFOi9E0KuDt/acE= acorn@^6.1.1: @@ -2057,12 +2159,12 @@ acorn@^8.0.4, acorn@^8.4.1: address@^1.0.1, address@^1.1.2: version "1.1.2" - resolved "https://registry.npm.taobao.org/address/download/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" + resolved "https://registry.nlark.com/address/download/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" integrity sha1-vxEWycdYxRt6kz0pa3LCIe2UKLY= aggregate-error@^3.0.0: version "3.1.0" - resolved "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.1.0.tgz?cache=0&sync_timestamp=1618681553608&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faggregate-error%2Fdownload%2Faggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + resolved "https://registry.nlark.com/aggregate-error/download/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" integrity sha1-kmcP9Q9TWb23o+DUDQ7DDFc3aHo= dependencies: clean-stack "^2.0.0" @@ -2070,26 +2172,26 @@ aggregate-error@^3.0.0: ajv-formats@^2.1.1: version "2.1.1" - resolved "https://registry.npmmirror.com/ajv-formats/download/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + resolved "https://registry.npmmirror.com/ajv-formats/download/ajv-formats-2.1.1.tgz?cache=0&sync_timestamp=1636312243183&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-formats%2Fdownload%2Fajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" integrity sha1-bmaUAGWet0lzu/LjMycYCgmWtSA= dependencies: ajv "^8.0.0" ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: version "3.5.2" - resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1637523824664&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1637523772179&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha1-MfKdpatuANHC0yms97WSlhTVAU0= ajv-keywords@^5.0.0: version "5.1.0" - resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-5.1.0.tgz?cache=0&sync_timestamp=1637523824664&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-5.1.0.tgz?cache=0&sync_timestamp=1637523772179&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== dependencies: fast-deep-equal "^3.1.3" ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" - resolved "https://registry.npmmirror.com/ajv/download/ajv-6.12.6.tgz?cache=0&sync_timestamp=1637522259668&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + resolved "https://registry.npmmirror.com/ajv/download/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha1-uvWmLoArB9l3A0WG+MO69a3ybfQ= dependencies: fast-deep-equal "^3.1.1" @@ -2099,7 +2201,7 @@ ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: ajv@^8.0.0, ajv@^8.8.0: version "8.8.2" - resolved "https://registry.npmmirror.com/ajv/download/ajv-8.8.2.tgz?cache=0&sync_timestamp=1637522259668&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv%2Fdownload%2Fajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb" + resolved "https://registry.npmmirror.com/ajv/download/ajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb" integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw== dependencies: fast-deep-equal "^3.1.1" @@ -2108,15 +2210,15 @@ ajv@^8.0.0, ajv@^8.8.0: uri-js "^4.2.2" algoliasearch-helper@^3.5.5: - version "3.6.2" - resolved "https://registry.npmmirror.com/algoliasearch-helper/download/algoliasearch-helper-3.6.2.tgz#45e19b12589cfa0c611b573287f65266ea2cc14a" - integrity sha1-ReGbElic+gxhG1cyh/ZSZuoswUo= + version "3.7.0" + resolved "https://registry.npmmirror.com/algoliasearch-helper/download/algoliasearch-helper-3.7.0.tgz#c0a0493df84d850360f664ad7a9d4fc78a94fd78" + integrity sha512-XJ3QfERBLfeVCyTVx80gon7r3/rgm/CE8Ha1H7cbablRe/X7SfYQ14g/eO+MhjVKIQp+gy9oC6G5ilmLwS1k6w== dependencies: - events "^1.1.1" + "@algolia/events" "^4.0.1" algoliasearch@^4.0.0, algoliasearch@^4.11.0: version "4.11.0" - resolved "https://registry.npmmirror.com/algoliasearch/download/algoliasearch-4.11.0.tgz?cache=0&sync_timestamp=1634738335372&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Falgoliasearch%2Fdownload%2Falgoliasearch-4.11.0.tgz#234befb3ac355c094077f0edf3777240b1ee013c" + resolved "https://registry.npmmirror.com/algoliasearch/download/algoliasearch-4.11.0.tgz?cache=0&sync_timestamp=1634738174058&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Falgoliasearch%2Fdownload%2Falgoliasearch-4.11.0.tgz#234befb3ac355c094077f0edf3777240b1ee013c" integrity sha1-I0vvs6w1XAlAd/Dt83dyQLHuATw= dependencies: "@algolia/cache-browser-local-storage" "4.11.0" @@ -2136,29 +2238,29 @@ algoliasearch@^4.0.0, algoliasearch@^4.11.0: alphanum-sort@^1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/alphanum-sort/download/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" + resolved "https://registry.nlark.com/alphanum-sort/download/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= ansi-align@^3.0.0: version "3.0.1" - resolved "https://registry.npmmirror.com/ansi-align/download/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" + resolved "https://registry.npmmirror.com/ansi-align/download/ansi-align-3.0.1.tgz?cache=0&sync_timestamp=1632743673432&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fansi-align%2Fdownload%2Fansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" integrity sha1-DN8S4RGs53OobpofrRIlxDyxmlk= dependencies: string-width "^4.1.0" ansi-html-community@^0.0.8: version "0.0.8" - resolved "https://registry.nlark.com/ansi-html-community/download/ansi-html-community-0.0.8.tgz?cache=0&sync_timestamp=1631016068950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-html-community%2Fdownload%2Fansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" + resolved "https://registry.nlark.com/ansi-html-community/download/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" integrity sha1-afvE1sy+OD+XNpNK40w/gpDxv0E= ansi-regex@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-5.0.1.tgz?cache=0&sync_timestamp=1631634988487&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-regex%2Fdownload%2Fansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha1-CCyyyJyf6GWaMRpTvWpNxTAdswQ= ansi-regex@^6.0.1: version "6.0.1" - resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-6.0.1.tgz?cache=0&sync_timestamp=1631634988487&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-regex%2Fdownload%2Fansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" integrity sha1-MYPjj66aZdfLXlOUXNWJfQJgoGo= ansi-styles@^3.2.1: @@ -2185,8 +2287,8 @@ anymatch@~3.1.2: arg@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/arg/download/arg-5.0.1.tgz?cache=0&sync_timestamp=1629166537485&other_urls=https%3A%2F%2Fregistry.nlark.com%2Farg%2Fdownload%2Farg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb" - integrity sha1-6wyaj3d4bK0q+P8rhiiZhC17ats= + resolved "https://registry.npmmirror.com/arg/download/arg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb" + integrity sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA== argparse@^1.0.7: version "1.0.10" @@ -2212,7 +2314,7 @@ array-flatten@^2.1.0: array-union@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/array-union/download/array-union-2.1.0.tgz?cache=0&sync_timestamp=1614624262896&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Farray-union%2Fdownload%2Farray-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + resolved "https://registry.npm.taobao.org/array-union/download/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha1-t5hCCtvrHego2ErNii4j0+/oXo0= async@^2.6.2: @@ -2224,13 +2326,13 @@ async@^2.6.2: at-least-node@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/at-least-node/download/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + resolved "https://registry.npm.taobao.org/at-least-node/download/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha1-YCzUtG6EStTv/JKoARo8RuAjjcI= autoprefixer@^10.3.1, autoprefixer@^10.3.5, autoprefixer@^10.3.7: version "10.4.0" resolved "https://registry.npmmirror.com/autoprefixer/download/autoprefixer-10.4.0.tgz#c3577eb32a1079a440ec253e404eaf1eb21388c8" - integrity sha1-w1d+syoQeaRA7CU+QE6vHrITiMg= + integrity sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA== dependencies: browserslist "^4.17.5" caniuse-lite "^1.0.30001272" @@ -2242,13 +2344,13 @@ autoprefixer@^10.3.1, autoprefixer@^10.3.5, autoprefixer@^10.3.7: axios@^0.21.1: version "0.21.4" resolved "https://registry.npmmirror.com/axios/download/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" - integrity sha1-xnuQ3AVo5cHPKwuFjEO6KOLtpXU= + integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== dependencies: follow-redirects "^1.14.0" babel-loader@^8.2.2: version "8.2.3" - resolved "https://registry.npmmirror.com/babel-loader/download/babel-loader-8.2.3.tgz?cache=0&sync_timestamp=1634769533620&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-loader%2Fdownload%2Fbabel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" + resolved "https://registry.npmmirror.com/babel-loader/download/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" integrity sha1-iYa0Dxpkys/LS4QpMgCF72ixNC0= dependencies: find-cache-dir "^3.3.1" @@ -2258,7 +2360,7 @@ babel-loader@^8.2.2: babel-plugin-apply-mdx-type-prop@1.6.22: version "1.6.22" - resolved "https://registry.npm.taobao.org/babel-plugin-apply-mdx-type-prop/download/babel-plugin-apply-mdx-type-prop-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-apply-mdx-type-prop%2Fdownload%2Fbabel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b" + resolved "https://registry.npm.taobao.org/babel-plugin-apply-mdx-type-prop/download/babel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b" integrity sha1-0hbo/Q3pHePxR47zIx4FRGvIcFs= dependencies: "@babel/helper-plugin-utils" "7.10.4" @@ -2266,28 +2368,28 @@ babel-plugin-apply-mdx-type-prop@1.6.22: babel-plugin-dynamic-import-node@2.3.0: version "2.3.0" - resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.0.tgz?cache=0&sync_timestamp=1618846958717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" + resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.0.tgz?cache=0&sync_timestamp=1618846790496&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" integrity sha1-8A9Qe9qjw+P/bn5emNkKesq5b38= dependencies: object.assign "^4.1.0" babel-plugin-dynamic-import-node@^2.3.3: version "2.3.3" - resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.3.tgz?cache=0&sync_timestamp=1618846958717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" + resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.3.tgz?cache=0&sync_timestamp=1618846790496&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" integrity sha1-hP2hnJduxcbe/vV/lCez3vZuF6M= dependencies: object.assign "^4.1.0" babel-plugin-extract-import-names@1.6.22: version "1.6.22" - resolved "https://registry.npm.taobao.org/babel-plugin-extract-import-names/download/babel-plugin-extract-import-names-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-extract-import-names%2Fdownload%2Fbabel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc" + resolved "https://registry.npm.taobao.org/babel-plugin-extract-import-names/download/babel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc" integrity sha1-3l+aKOsS8+sleL90RyIE5m0aE9w= dependencies: "@babel/helper-plugin-utils" "7.10.4" babel-plugin-polyfill-corejs2@^0.3.0: version "0.3.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/download/babel-plugin-polyfill-corejs2-0.3.0.tgz?cache=0&sync_timestamp=1636799843170&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs2%2Fdownload%2Fbabel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/download/babel-plugin-polyfill-corejs2-0.3.0.tgz?cache=0&sync_timestamp=1636799826882&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs2%2Fdownload%2Fbabel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd" integrity sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA== dependencies: "@babel/compat-data" "^7.13.11" @@ -2296,7 +2398,7 @@ babel-plugin-polyfill-corejs2@^0.3.0: babel-plugin-polyfill-corejs3@^0.4.0: version "0.4.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/download/babel-plugin-polyfill-corejs3-0.4.0.tgz?cache=0&sync_timestamp=1636799842810&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs3%2Fdownload%2Fbabel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/download/babel-plugin-polyfill-corejs3-0.4.0.tgz?cache=0&sync_timestamp=1636799935761&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs3%2Fdownload%2Fbabel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087" integrity sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.0" @@ -2304,25 +2406,25 @@ babel-plugin-polyfill-corejs3@^0.4.0: babel-plugin-polyfill-regenerator@^0.3.0: version "0.3.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/download/babel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/download/babel-plugin-polyfill-regenerator-0.3.0.tgz?cache=0&sync_timestamp=1636799716073&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-regenerator%2Fdownload%2Fbabel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be" integrity sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.0" bail@^1.0.0: version "1.0.5" - resolved "https://registry.npmmirror.com/bail/download/bail-1.0.5.tgz?cache=0&sync_timestamp=1636274632406&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbail%2Fdownload%2Fbail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" + resolved "https://registry.npmmirror.com/bail/download/bail-1.0.5.tgz?cache=0&sync_timestamp=1636274421830&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbail%2Fdownload%2Fbail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" integrity sha1-tvoTNASjksvB+MS/Y/WVM1Hnp3Y= balanced-match@^1.0.0: version "1.0.2" - resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.2.tgz?cache=0&sync_timestamp=1617714233441&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbalanced-match%2Fdownload%2Fbalanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4= batch@0.6.1: version "0.6.1" - resolved "https://registry.nlark.com/batch/download/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" - integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= + resolved "https://registry.npmmirror.com/batch/download/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" + integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw== big.js@^5.2.2: version "5.2.2" @@ -2336,28 +2438,28 @@ binary-extensions@^2.0.0: bluebird@^3.7.1: version "3.7.2" - resolved "https://registry.npm.taobao.org/bluebird/download/bluebird-3.7.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbluebird%2Fdownload%2Fbluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + resolved "https://registry.nlark.com/bluebird/download/bluebird-3.7.2.tgz?cache=0&sync_timestamp=1622605302685&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbluebird%2Fdownload%2Fbluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha1-nyKcFb4nJFT/qXOs4NvueaGww28= -body-parser@1.19.0: - version "1.19.0" - resolved "https://registry.npm.taobao.org/body-parser/download/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" - integrity sha1-lrJwnlfJxOCab9Zqj9l5hE9p8Io= +body-parser@1.19.1: + version "1.19.1" + resolved "https://registry.npmmirror.com/body-parser/download/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4" + integrity sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA== dependencies: - bytes "3.1.0" + bytes "3.1.1" content-type "~1.0.4" debug "2.6.9" depd "~1.1.2" - http-errors "1.7.2" + http-errors "1.8.1" iconv-lite "0.4.24" on-finished "~2.3.0" - qs "6.7.0" - raw-body "2.4.0" - type-is "~1.6.17" + qs "6.9.6" + raw-body "2.4.2" + type-is "~1.6.18" bonjour@^3.5.0: version "3.5.0" - resolved "https://registry.npm.taobao.org/bonjour/download/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" + resolved "https://registry.nlark.com/bonjour/download/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU= dependencies: array-flatten "^2.1.0" @@ -2388,7 +2490,7 @@ boxen@^5.0.0, boxen@^5.0.1: brace-expansion@^1.1.7: version "1.1.11" - resolved "https://registry.nlark.com/brace-expansion/download/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + resolved "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" integrity sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0= dependencies: balanced-match "^1.0.0" @@ -2401,13 +2503,13 @@ braces@^3.0.1, braces@~3.0.2: dependencies: fill-range "^7.0.1" -browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.18.1: - version "4.18.1" - resolved "https://registry.npmmirror.com/browserslist/download/browserslist-4.18.1.tgz?cache=0&sync_timestamp=1636994462878&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbrowserslist%2Fdownload%2Fbrowserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f" - integrity sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ== +browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.19.1: + version "4.19.1" + resolved "https://registry.npmmirror.com/browserslist/download/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3" + integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A== dependencies: - caniuse-lite "^1.0.30001280" - electron-to-chromium "^1.3.896" + caniuse-lite "^1.0.30001286" + electron-to-chromium "^1.4.17" escalade "^3.1.1" node-releases "^2.0.1" picocolors "^1.0.0" @@ -2427,7 +2529,7 @@ buble-jsx-only@^0.19.8: buffer-from@^1.0.0: version "1.1.2" - resolved "https://registry.nlark.com/buffer-from/download/buffer-from-1.1.2.tgz?cache=0&sync_timestamp=1627578450949&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbuffer-from%2Fdownload%2Fbuffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + resolved "https://registry.nlark.com/buffer-from/download/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha1-KxRqb9cugLT1XSVfNe1Zo6mkG9U= buffer-indexof@^1.0.0: @@ -2440,14 +2542,14 @@ bytes@3.0.0: resolved "https://registry.npmmirror.com/bytes/download/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= -bytes@3.1.0: - version "3.1.0" - resolved "https://registry.npmmirror.com/bytes/download/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha1-9s95M6Ng4FiPqf3oVlHNx/gF0fY= +bytes@3.1.1: + version "3.1.1" + resolved "https://registry.npmmirror.com/bytes/download/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a" + integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg== cacheable-request@^6.0.0: version "6.1.0" - resolved "https://registry.nlark.com/cacheable-request/download/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" + resolved "https://registry.nlark.com/cacheable-request/download/cacheable-request-6.1.0.tgz?cache=0&sync_timestamp=1623237504263&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcacheable-request%2Fdownload%2Fcacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" integrity sha1-IP+4vRYrpL4R6VZ9gj22UQUsqRI= dependencies: clone-response "^1.0.2" @@ -2460,7 +2562,7 @@ cacheable-request@^6.0.0: call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/call-bind/download/call-bind-1.0.2.tgz?cache=0&sync_timestamp=1610403020286&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcall-bind%2Fdownload%2Fcall-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + resolved "https://registry.nlark.com/call-bind/download/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha1-sdTonmiBGcPJqQOtMKuy9qkZvjw= dependencies: function-bind "^1.1.1" @@ -2486,7 +2588,7 @@ camelcase-css@2.0.1, camelcase-css@^2.0.1: camelcase@^6.2.0: version "6.2.1" - resolved "https://registry.npmmirror.com/camelcase/download/camelcase-6.2.1.tgz?cache=0&sync_timestamp=1636945130104&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" + resolved "https://registry.npmmirror.com/camelcase/download/camelcase-6.2.1.tgz?cache=0&sync_timestamp=1636945151239&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== caniuse-api@^3.0.0: @@ -2499,10 +2601,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001280: - version "1.0.30001285" - resolved "https://registry.npmmirror.com/caniuse-lite/download/caniuse-lite-1.0.30001285.tgz#fe1e52229187e11d6670590790d669b9e03315b7" - integrity sha512-KAOkuUtcQ901MtmvxfKD+ODHH9YVDYnBt+TGYSz2KIfnq22CiArbUxXPN9067gNbgMlnNYRSwho8OPXZPALB9Q== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001286: + version "1.0.30001292" + resolved "https://registry.npmmirror.com/caniuse-lite/download/caniuse-lite-1.0.30001292.tgz#4a55f61c06abc9595965cfd77897dc7bc1cdc456" + integrity sha512-jnT4Tq0Q4ma+6nncYQVe7d73kmDmE9C3OGTx3MvW7lBM/eY1S1DZTMBON7dqV481RhNiS5OxD7k9JQvmDOTirw== ccount@^1.0.0, ccount@^1.0.3: version "1.1.0" @@ -2528,22 +2630,22 @@ chalk@^4.1.0, chalk@^4.1.2: character-entities-legacy@^1.0.0: version "1.1.4" - resolved "https://registry.npmmirror.com/character-entities-legacy/download/character-entities-legacy-1.1.4.tgz?cache=0&sync_timestamp=1635911807340&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities-legacy%2Fdownload%2Fcharacter-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" + resolved "https://registry.npmmirror.com/character-entities-legacy/download/character-entities-legacy-1.1.4.tgz?cache=0&sync_timestamp=1635911795757&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities-legacy%2Fdownload%2Fcharacter-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" integrity sha1-lLwYRdznClu50uzHSHJWYSk9j8E= character-entities@^1.0.0: version "1.2.4" - resolved "https://registry.npmmirror.com/character-entities/download/character-entities-1.2.4.tgz?cache=0&sync_timestamp=1635868930605&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities%2Fdownload%2Fcharacter-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" + resolved "https://registry.npmmirror.com/character-entities/download/character-entities-1.2.4.tgz?cache=0&sync_timestamp=1635869130345&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities%2Fdownload%2Fcharacter-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" integrity sha1-4Sw5Obfq9OWxXnrUxeKOHUjFsWs= character-reference-invalid@^1.0.0: version "1.1.4" - resolved "https://registry.npmmirror.com/character-reference-invalid/download/character-reference-invalid-1.1.4.tgz?cache=0&sync_timestamp=1636446304022&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-reference-invalid%2Fdownload%2Fcharacter-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" + resolved "https://registry.npmmirror.com/character-reference-invalid/download/character-reference-invalid-1.1.4.tgz?cache=0&sync_timestamp=1636446288388&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-reference-invalid%2Fdownload%2Fcharacter-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" integrity sha1-CDMpzaDq4nKrPbvzfpo4LBOvFWA= cheerio@^0.22.0: version "0.22.0" - resolved "https://registry.nlark.com/cheerio/download/cheerio-0.22.0.tgz?cache=0&sync_timestamp=1623167648923&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcheerio%2Fdownload%2Fcheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" + resolved "https://registry.nlark.com/cheerio/download/cheerio-0.22.0.tgz?cache=0&sync_timestamp=1623167701954&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcheerio%2Fdownload%2Fcheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4= dependencies: css-select "~1.2.0" @@ -2566,7 +2668,7 @@ cheerio@^0.22.0: chokidar@^3.4.2, chokidar@^3.5.2: version "3.5.2" resolved "https://registry.npmmirror.com/chokidar/download/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" - integrity sha1-26OXb8rbAW9m/TZQIdkWANAcHnU= + integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== dependencies: anymatch "~3.1.2" braces "~3.0.2" @@ -2621,19 +2723,19 @@ clone-deep@^4.0.1: clone-response@^1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/clone-response/download/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" + resolved "https://registry.nlark.com/clone-response/download/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= dependencies: mimic-response "^1.0.0" clsx@^1.1.1: version "1.1.1" - resolved "https://registry.npm.taobao.org/clsx/download/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" + resolved "https://registry.nlark.com/clsx/download/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" integrity sha1-mLMTT5q73yOyZjSRrOE8XAOnMYg= coa@^2.0.2: version "2.0.2" - resolved "https://registry.npmmirror.com/coa/download/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" + resolved "https://registry.npmmirror.com/coa/download/coa-2.0.2.tgz?cache=0&sync_timestamp=1636035838814&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcoa%2Fdownload%2Fcoa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" integrity sha1-Q/bCEVG07yv1cYfbDXPeIp4+fsM= dependencies: "@types/q" "^1.5.1" @@ -2642,41 +2744,41 @@ coa@^2.0.2: collapse-white-space@^1.0.2: version "1.0.6" - resolved "https://registry.npm.taobao.org/collapse-white-space/download/collapse-white-space-1.0.6.tgz?cache=0&sync_timestamp=1615196586817&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcollapse-white-space%2Fdownload%2Fcollapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287" + resolved "https://registry.npmmirror.com/collapse-white-space/download/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287" integrity sha1-5jYpwAFmZXkgYNu+t5xCI50sUoc= color-convert@^1.9.0: version "1.9.3" - resolved "https://registry.nlark.com/color-convert/download/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + resolved "https://registry.npmmirror.com/color-convert/download/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg= dependencies: color-name "1.1.3" color-convert@^2.0.1: version "2.0.1" - resolved "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + resolved "https://registry.npmmirror.com/color-convert/download/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" integrity sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM= dependencies: color-name "~1.1.4" color-name@1.1.3: version "1.1.3" - resolved "https://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + resolved "https://registry.nlark.com/color-name/download/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= color-name@^1.1.4, color-name@~1.1.4: version "1.1.4" - resolved "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + resolved "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha1-wqCah6y95pVD3m9j+jmVyCbFNqI= colord@^2.9.1: - version "2.9.1" - resolved "https://registry.npmmirror.com/colord/download/colord-2.9.1.tgz#c961ea0efeb57c9f0f4834458f26cb9cc4a3f90e" - integrity sha1-yWHqDv61fJ8PSDRFjybLnMSj+Q4= + version "2.9.2" + resolved "https://registry.npmmirror.com/colord/download/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1" + integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ== colorette@^2.0.10: version "2.0.16" - resolved "https://registry.npmmirror.com/colorette/download/colorette-2.0.16.tgz?cache=0&sync_timestamp=1633673160250&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcolorette%2Fdownload%2Fcolorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" + resolved "https://registry.npmmirror.com/colorette/download/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" integrity sha1-cTua+E/bAAE58EVGvUqT9ipQhdo= combine-promises@^1.1.0: @@ -2686,44 +2788,44 @@ combine-promises@^1.1.0: comma-separated-tokens@^1.0.0: version "1.0.8" - resolved "https://registry.nlark.com/comma-separated-tokens/download/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" + resolved "https://registry.npmmirror.com/comma-separated-tokens/download/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" integrity sha1-YyuAthF4Z6FY8QgK1Jiy++fj9eo= commander@^2.20.0: version "2.20.3" - resolved "https://registry.npmmirror.com/commander/download/commander-2.20.3.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha1-/UhehMA+tIgcIHIrpIA16FMa6zM= + resolved "https://registry.npmmirror.com/commander/download/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== commander@^5.1.0: version "5.1.0" - resolved "https://registry.npmmirror.com/commander/download/commander-5.1.0.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" - integrity sha1-Rqu9FlL44Fm92u+Zu9yyrZzxea4= + resolved "https://registry.npmmirror.com/commander/download/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" + integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== commander@^7.2.0: version "7.2.0" - resolved "https://registry.npmmirror.com/commander/download/commander-7.2.0.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" - integrity sha1-o2y1fQtQHOEI5NIFWaFQo5HZerc= + resolved "https://registry.npmmirror.com/commander/download/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== commander@^8.3.0: version "8.3.0" - resolved "https://registry.npmmirror.com/commander/download/commander-8.3.0.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" - integrity sha1-SDfqGy2me5xhamevuw+v7lZ7ymY= + resolved "https://registry.npmmirror.com/commander/download/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" + integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== commondir@^1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/commondir/download/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + resolved "https://registry.npm.taobao.org/commondir/download/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= compressible@~2.0.16: version "2.0.18" - resolved "https://registry.npm.taobao.org/compressible/download/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" + resolved "https://registry.nlark.com/compressible/download/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" integrity sha1-r1PMprBw1MPAdQ+9dyhqbXzEb7o= dependencies: mime-db ">= 1.43.0 < 2" compression@^1.7.4: version "1.7.4" - resolved "https://registry.nlark.com/compression/download/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" + resolved "https://registry.npm.taobao.org/compression/download/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" integrity sha1-lVI+/xcMpXwpoMpB5v4TH0Hlu48= dependencies: accepts "~1.3.5" @@ -2736,7 +2838,7 @@ compression@^1.7.4: concat-map@0.0.1: version "0.0.1" - resolved "https://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + resolved "https://registry.nlark.com/concat-map/download/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= configstore@^5.0.1: @@ -2753,25 +2855,25 @@ configstore@^5.0.1: connect-history-api-fallback@^1.6.0: version "1.6.0" - resolved "https://registry.npm.taobao.org/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" + resolved "https://registry.nlark.com/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz?cache=0&sync_timestamp=1618847040596&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fconnect-history-api-fallback%2Fdownload%2Fconnect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha1-izIIk1kwjRERFdgcrT/Oq4iPl7w= consola@^2.15.3: version "2.15.3" - resolved "https://registry.npm.taobao.org/consola/download/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550" + resolved "https://registry.nlark.com/consola/download/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550" integrity sha1-LhH5jWpL5x/3LgvfB70j4Sy2FVA= content-disposition@0.5.2: version "0.5.2" - resolved "https://registry.nlark.com/content-disposition/download/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" + resolved "https://registry.npmmirror.com/content-disposition/download/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ= -content-disposition@0.5.3: - version "0.5.3" - resolved "https://registry.nlark.com/content-disposition/download/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" - integrity sha1-4TDK9+cnkIfFYWwgB9BIVpiYT70= +content-disposition@0.5.4: + version "0.5.4" + resolved "https://registry.npmmirror.com/content-disposition/download/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" + integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== dependencies: - safe-buffer "5.1.2" + safe-buffer "5.2.1" content-type@~1.0.4: version "1.0.4" @@ -2787,22 +2889,22 @@ convert-source-map@^1.7.0: cookie-signature@1.0.6: version "1.0.6" - resolved "https://registry.nlark.com/cookie-signature/download/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + resolved "https://registry.npm.taobao.org/cookie-signature/download/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= -cookie@0.4.0: - version "0.4.0" - resolved "https://registry.npm.taobao.org/cookie/download/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" - integrity sha1-vrQ35wIrO21JAZ0IhmUwPr6cFLo= +cookie@0.4.1: + version "0.4.1" + resolved "https://registry.npm.taobao.org/cookie/download/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" + integrity sha1-r9cT/ibr0hupXOth+agRblClN9E= copy-text-to-clipboard@^3.0.1: version "3.0.1" - resolved "https://registry.nlark.com/copy-text-to-clipboard/download/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c" + resolved "https://registry.npm.taobao.org/copy-text-to-clipboard/download/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c" integrity sha1-jL+PkOCkfxLkokdDc2Jl0Ve85pw= copy-webpack-plugin@^9.0.1: version "9.1.0" - resolved "https://registry.npmmirror.com/copy-webpack-plugin/download/copy-webpack-plugin-9.1.0.tgz?cache=0&sync_timestamp=1637161372227&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcopy-webpack-plugin%2Fdownload%2Fcopy-webpack-plugin-9.1.0.tgz#2d2c460c4c4695ec0a58afb2801a1205256c4e6b" + resolved "https://registry.npmmirror.com/copy-webpack-plugin/download/copy-webpack-plugin-9.1.0.tgz#2d2c460c4c4695ec0a58afb2801a1205256c4e6b" integrity sha512-rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA== dependencies: fast-glob "^3.2.7" @@ -2813,31 +2915,31 @@ copy-webpack-plugin@^9.0.1: serialize-javascript "^6.0.0" core-js-compat@^3.18.0, core-js-compat@^3.19.1: - version "3.19.3" - resolved "https://registry.npmmirror.com/core-js-compat/download/core-js-compat-3.19.3.tgz#de75e5821c5ce924a0a1e7b7d5c2cb973ff388aa" - integrity sha512-59tYzuWgEEVU9r+SRgceIGXSSUn47JknoiXW6Oq7RW8QHjXWz3/vp8pa7dbtuVu40sewz3OP3JmQEcDdztrLhA== + version "3.20.1" + resolved "https://registry.npmmirror.com/core-js-compat/download/core-js-compat-3.20.1.tgz#96917b4db634fbbbc7b36575b2e8fcbf7e4f9691" + integrity sha512-AVhKZNpqMV3Jz8hU0YEXXE06qoxtQGsAqU0u1neUngz5IusDJRX/ZJ6t3i7mS7QxNyEONbCo14GprkBrxPlTZA== dependencies: - browserslist "^4.18.1" + browserslist "^4.19.1" semver "7.0.0" core-js-pure@^3.19.0: - version "3.19.3" - resolved "https://registry.npmmirror.com/core-js-pure/download/core-js-pure-3.19.3.tgz#c69b2b36b58927317824994b532ec3f0f7e49607" - integrity sha512-N3JruInmCyt7EJj5mAq3csCgGYgiSqu7p7TQp2KOztr180/OAIxyIvL1FCjzgmQk/t3Yniua50Fsak7FShI9lA== + version "3.20.1" + resolved "https://registry.npmmirror.com/core-js-pure/download/core-js-pure-3.20.1.tgz#f7a2c62f98de83e4da8fca7b78846d3a2f542145" + integrity sha512-yeNNr3L9cEBwNy6vhhIJ0nko7fE7uFO6PgawcacGt2VWep4WqQx0RiqlkgSP7kqUMC1IKdfO9qPeWXcUheHLVQ== core-js@^3.18.0: - version "3.19.3" - resolved "https://registry.npmmirror.com/core-js/download/core-js-3.19.3.tgz#6df8142a996337503019ff3235a7022d7cdf4559" - integrity sha512-LeLBMgEGSsG7giquSzvgBrTS7V5UL6ks3eQlUSbN8dJStlLFiRzUm5iqsRyzUB8carhfKjkJ2vzKqE6z1Vga9g== + version "3.20.1" + resolved "https://registry.npmmirror.com/core-js/download/core-js-3.20.1.tgz#eb1598047b7813572f1dc24b7c6a95528c99eef3" + integrity sha512-btdpStYFQScnNVQ5slVcr858KP0YWYjV16eGJQw8Gg7CWtu/2qNvIM3qVRIR3n1pK2R9NNOrTevbvAYxajwEjg== core-util-is@~1.0.0: version "1.0.3" - resolved "https://registry.nlark.com/core-util-is/download/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + resolved "https://registry.nlark.com/core-util-is/download/core-util-is-1.0.3.tgz?cache=0&sync_timestamp=1630420570787&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-util-is%2Fdownload%2Fcore-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha1-pgQtNjTCsn6TKPg3uWX6yDgI24U= cosmiconfig@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-6.0.0.tgz?cache=0&sync_timestamp=1629586119976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" + resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-6.0.0.tgz?cache=0&sync_timestamp=1629585969900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" integrity sha1-2k/uhTxS9rHmk19BwaL8UL1KmYI= dependencies: "@types/parse-json" "^4.0.0" @@ -2848,7 +2950,7 @@ cosmiconfig@^6.0.0: cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: version "7.0.1" - resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz?cache=0&sync_timestamp=1629586119976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz?cache=0&sync_timestamp=1629585969900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" integrity sha1-cU11ZSLKzoZ4Z8y0R0xdAbuuXW0= dependencies: "@types/parse-json" "^4.0.0" @@ -2859,7 +2961,7 @@ cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: cross-env@^7.0.3: version "7.0.3" - resolved "https://registry.npm.taobao.org/cross-env/download/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + resolved "https://registry.npmmirror.com/cross-env/download/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" integrity sha1-hlJkspZ33AFbqEGJGJZd0jL8VM8= dependencies: cross-spawn "^7.0.1" @@ -2880,7 +2982,7 @@ crypto-random-string@^2.0.0: css-declaration-sorter@^6.0.3: version "6.1.3" - resolved "https://registry.nlark.com/css-declaration-sorter/download/css-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2" + resolved "https://registry.nlark.com/css-declaration-sorter/download/css-declaration-sorter-6.1.3.tgz?cache=0&sync_timestamp=1630965563343&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcss-declaration-sorter%2Fdownload%2Fcss-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2" integrity sha1-6YUuTPlAunn1CdlCWxN9H5RDjcI= dependencies: timsort "^0.3.0" @@ -2902,11 +3004,10 @@ css-loader@^5.1.1: semver "^7.3.5" css-minimizer-webpack-plugin@^3.0.2: - version "3.2.0" - resolved "https://registry.npmmirror.com/css-minimizer-webpack-plugin/download/css-minimizer-webpack-plugin-3.2.0.tgz#f59c56ec11137b37f000081bd19b450095094ad2" - integrity sha512-5q4myvkmm29jRlI73Fl8Mc008i6o6hCEKnV6/fOrzRVDWD6EFGwDRX+SM2qCVeZ7XiztRDKHpTGDUeUMAOOagg== + version "3.3.1" + resolved "https://registry.npmmirror.com/css-minimizer-webpack-plugin/download/css-minimizer-webpack-plugin-3.3.1.tgz#5afc4507a4ec13dd223f043cda8953ee0bf6ecfa" + integrity sha512-SHA7Hu/EiF0dOwdmV2+agvqYpG+ljlUa7Dvn1AVOmSH3N8KOERoaM9lGpstz9nGsoTjANGyUXdrxl/EwdMScRg== dependencies: - "@types/cssnano" "^4.0.1" cssnano "^5.0.6" jest-worker "^27.0.2" postcss "^8.3.5" @@ -2921,7 +3022,7 @@ css-select-base-adapter@^0.1.1: css-select@^2.0.0: version "2.1.0" - resolved "https://registry.nlark.com/css-select/download/css-select-2.1.0.tgz?cache=0&sync_timestamp=1622994276976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcss-select%2Fdownload%2Fcss-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" + resolved "https://registry.npmmirror.com/css-select/download/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" integrity sha1-ajRlM1ZjWTSoG6ymjQJVQyEF2+8= dependencies: boolbase "^1.0.0" @@ -2930,19 +3031,19 @@ css-select@^2.0.0: nth-check "^1.0.2" css-select@^4.1.3: - version "4.1.3" - resolved "https://registry.nlark.com/css-select/download/css-select-4.1.3.tgz?cache=0&sync_timestamp=1622994276976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcss-select%2Fdownload%2Fcss-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" - integrity sha1-pwRA9wMX8maRGK10/xBeZYSccGc= + version "4.2.0" + resolved "https://registry.npmmirror.com/css-select/download/css-select-4.2.0.tgz#ab28276d3afb00cc05e818bd33eb030f14f57895" + integrity sha512-6YVG6hsH9yIb/si3Th/is8Pex7qnVHO6t7q7U6TIUnkQASGbS8tnUDBftnPynLNnuUl/r2+PTd0ekiiq7R0zJw== dependencies: boolbase "^1.0.0" - css-what "^5.0.0" - domhandler "^4.2.0" - domutils "^2.6.0" - nth-check "^2.0.0" + css-what "^5.1.0" + domhandler "^4.3.0" + domutils "^2.8.0" + nth-check "^2.0.1" css-select@~1.2.0: version "1.2.0" - resolved "https://registry.nlark.com/css-select/download/css-select-1.2.0.tgz?cache=0&sync_timestamp=1622994276976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcss-select%2Fdownload%2Fcss-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" + resolved "https://registry.npmmirror.com/css-select/download/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg= dependencies: boolbase "~1.0.0" @@ -2968,45 +3069,45 @@ css-tree@^1.1.2, css-tree@^1.1.3: css-what@2.1: version "2.1.3" - resolved "https://registry.npmmirror.com/css-what/download/css-what-2.1.3.tgz?cache=0&sync_timestamp=1633863955744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-what%2Fdownload%2Fcss-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" + resolved "https://registry.npmmirror.com/css-what/download/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" integrity sha1-ptdgRXM2X+dGhsPzEcVlE9iChfI= css-what@^3.2.1: version "3.4.2" - resolved "https://registry.npmmirror.com/css-what/download/css-what-3.4.2.tgz?cache=0&sync_timestamp=1633863955744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-what%2Fdownload%2Fcss-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" + resolved "https://registry.npmmirror.com/css-what/download/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" integrity sha1-6nAm/LAXd+295SEk4h8yfnrpUOQ= -css-what@^5.0.0: +css-what@^5.1.0: version "5.1.0" - resolved "https://registry.npmmirror.com/css-what/download/css-what-5.1.0.tgz?cache=0&sync_timestamp=1633863955744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-what%2Fdownload%2Fcss-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" + resolved "https://registry.npmmirror.com/css-what/download/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" integrity sha1-P3tweq32M7r2LCzrhXm1RbtA9/4= cssesc@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/cssesc/download/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + resolved "https://registry.npm.taobao.org/cssesc/download/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4= cssnano-preset-advanced@^5.1.4: - version "5.1.8" - resolved "https://registry.npmmirror.com/cssnano-preset-advanced/download/cssnano-preset-advanced-5.1.8.tgz#48678297b93d4964cd437ed1fa28d7f11ebf353c" - integrity sha512-QUR5/s3ZKX4hdrefOdTMdyzZ5RbBIt+GxcDh7bmu2yG21PqszQBtA02QG9ilsI1E7OCjkM4KlzaGtQ75GdGa3g== + version "5.1.9" + resolved "https://registry.npmmirror.com/cssnano-preset-advanced/download/cssnano-preset-advanced-5.1.9.tgz#7f392122a5b26368cb05d30750d7a50d6ede7f8b" + integrity sha512-lWyaSP22ixL8pi9k+yz7VQwa1OHDCZ3SIZeq5K40NIRDII42ua2pO9HRtWQ9N+xh/AQTTHZR4ZOSxouB7VjCIQ== dependencies: autoprefixer "^10.3.7" - cssnano-preset-default "^5.1.8" + cssnano-preset-default "^5.1.9" postcss-discard-unused "^5.0.1" postcss-merge-idents "^5.0.1" postcss-reduce-idents "^5.0.1" postcss-zindex "^5.0.1" -cssnano-preset-default@^5.1.8: - version "5.1.8" - resolved "https://registry.npmmirror.com/cssnano-preset-default/download/cssnano-preset-default-5.1.8.tgz#7525feb1b72f7b06e57f55064cbdae341d79dea2" - integrity sha512-zWMlP0+AMPBVE852SqTrP0DnhTcTA2C1wAF92TKZ3Va+aUVqLIhkqKlnJIXXdqXD7RN+S1ujuWmNpvrJBiM/vg== +cssnano-preset-default@^5.1.9: + version "5.1.9" + resolved "https://registry.npmmirror.com/cssnano-preset-default/download/cssnano-preset-default-5.1.9.tgz#79628ac48eccbdad570f70b4018cc38d43d1b7df" + integrity sha512-RhkEucqlQ+OxEi14K1p8gdXcMQy1mSpo7P1oC44oRls7BYIj8p+cht4IFBFV3W4iOjTP8EUB33XV1fX9KhDzyA== dependencies: css-declaration-sorter "^6.0.3" cssnano-utils "^2.0.1" postcss-calc "^8.0.0" - postcss-colormin "^5.2.1" + postcss-colormin "^5.2.2" postcss-convert-values "^5.0.2" postcss-discard-comments "^5.0.1" postcss-discard-duplicates "^5.0.1" @@ -3025,7 +3126,7 @@ cssnano-preset-default@^5.1.8: postcss-normalize-string "^5.0.1" postcss-normalize-timing-functions "^5.0.1" postcss-normalize-unicode "^5.0.1" - postcss-normalize-url "^5.0.3" + postcss-normalize-url "^5.0.4" postcss-normalize-whitespace "^5.0.1" postcss-ordered-values "^5.0.2" postcss-reduce-initial "^5.0.2" @@ -3039,12 +3140,11 @@ cssnano-utils@^2.0.1: integrity sha1-hmCqKzfthp0uLyKRgZapqLZJjOI= cssnano@^5.0.6, cssnano@^5.0.8: - version "5.0.12" - resolved "https://registry.npmmirror.com/cssnano/download/cssnano-5.0.12.tgz#2c083a1c786fc9dc2d5522bd3c0e331b7cd302ab" - integrity sha512-U38V4x2iJ3ijPdeWqUrEr4eKBB5PbEKsNP5T8xcik2Au3LeMtiMHX0i2Hu9k51FcKofNZumbrcdC6+a521IUHg== + version "5.0.14" + resolved "https://registry.npmmirror.com/cssnano/download/cssnano-5.0.14.tgz#99bc550f663b48c38e9b8e0ae795697c9de84b47" + integrity sha512-qzhRkFvBhv08tbyKCIfWbxBXmkIpLl1uNblt8SpTHkgLfON5OCPX/CCnkdNmEosvo8bANQYmTTMEgcVBlisHaw== dependencies: - cssnano-preset-default "^5.1.8" - is-resolvable "^1.1.0" + cssnano-preset-default "^5.1.9" lilconfig "^2.0.3" yaml "^1.10.2" @@ -3057,20 +3157,20 @@ csso@^4.0.2, csso@^4.2.0: csstype@^3.0.2: version "3.0.10" - resolved "https://registry.npmmirror.com/csstype/download/csstype-3.0.10.tgz?cache=0&sync_timestamp=1637224514674&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcsstype%2Fdownload%2Fcsstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" + resolved "https://registry.npmmirror.com/csstype/download/csstype-3.0.10.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcsstype%2Fdownload%2Fcsstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA== debug@2.6.9, debug@^2.6.0: version "2.6.9" resolved "https://registry.npmmirror.com/debug/download/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8= + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" debug@^3.1.1: version "3.2.7" resolved "https://registry.npmmirror.com/debug/download/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha1-clgLfpFF+zm2Z2+cXl+xALk0F5o= + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" @@ -3083,14 +3183,14 @@ debug@^4.1.0, debug@^4.1.1: decompress-response@^3.3.0: version "3.3.0" - resolved "https://registry.npm.taobao.org/decompress-response/download/decompress-response-3.3.0.tgz?cache=0&sync_timestamp=1613125280468&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdecompress-response%2Fdownload%2Fdecompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" + resolved "https://registry.npmmirror.com/decompress-response/download/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= dependencies: mimic-response "^1.0.0" deep-equal@^1.0.1: version "1.1.1" - resolved "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz?cache=0&sync_timestamp=1606860754950&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeep-equal%2Fdownload%2Fdeep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + resolved "https://registry.nlark.com/deep-equal/download/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" integrity sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o= dependencies: is-arguments "^1.0.4" @@ -3102,12 +3202,12 @@ deep-equal@^1.0.1: deep-extend@^0.6.0: version "0.6.0" - resolved "https://registry.nlark.com/deep-extend/download/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + resolved "https://registry.npm.taobao.org/deep-extend/download/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha1-xPp8lUBKF6nD6Mp+FTcxK3NjMKw= deepmerge@^4.2.2: version "4.2.2" - resolved "https://registry.nlark.com/deepmerge/download/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + resolved "https://registry.npm.taobao.org/deepmerge/download/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha1-RNLqNnm49NT/ujPwPYZfwee/SVU= default-gateway@^6.0.3: @@ -3124,12 +3224,12 @@ defer-to-connect@^1.0.1: define-lazy-prop@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/define-lazy-prop/download/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + resolved "https://registry.npm.taobao.org/define-lazy-prop/download/define-lazy-prop-2.0.0.tgz?cache=0&sync_timestamp=1618387627365&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdefine-lazy-prop%2Fdownload%2Fdefine-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha1-P3rkIRKbyqrJvHSQXJigAJ7J7n8= define-properties@^1.1.3: version "1.1.3" - resolved "https://registry.npm.taobao.org/define-properties/download/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + resolved "https://registry.nlark.com/define-properties/download/define-properties-1.1.3.tgz?cache=0&sync_timestamp=1618847174317&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdefine-properties%2Fdownload%2Fdefine-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" integrity sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE= dependencies: object-keys "^1.0.12" @@ -3141,7 +3241,7 @@ defined@^1.0.0: del@^6.0.0: version "6.0.0" - resolved "https://registry.npm.taobao.org/del/download/del-6.0.0.tgz?cache=0&sync_timestamp=1618321540358&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdel%2Fdownload%2Fdel-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" + resolved "https://registry.npm.taobao.org/del/download/del-6.0.0.tgz?cache=0&sync_timestamp=1615984345486&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdel%2Fdownload%2Fdel-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" integrity sha1-C0DQMyzqdD8WFPgYvk/rcXcUyVI= dependencies: globby "^11.0.1" @@ -3165,7 +3265,7 @@ destroy@~1.0.4: detab@2.0.4: version "2.0.4" - resolved "https://registry.nlark.com/detab/download/detab-2.0.4.tgz?cache=0&sync_timestamp=1629724300992&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdetab%2Fdownload%2Fdetab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43" + resolved "https://registry.nlark.com/detab/download/detab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43" integrity sha1-uSeJIGmv9AX7uaGG/pekSpKpS0M= dependencies: repeat-string "^1.5.4" @@ -3202,12 +3302,12 @@ detective@^5.2.0: didyoumean@^1.2.2: version "1.2.2" - resolved "https://registry.nlark.com/didyoumean/download/didyoumean-1.2.2.tgz?cache=0&sync_timestamp=1624543452248&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdidyoumean%2Fdownload%2Fdidyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" + resolved "https://registry.nlark.com/didyoumean/download/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" integrity sha1-mJNG/+noObRVXs9WZu3qDT6K0Dc= dir-glob@^3.0.1: version "3.0.1" - resolved "https://registry.npm.taobao.org/dir-glob/download/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + resolved "https://registry.nlark.com/dir-glob/download/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" integrity sha1-Vtv3PZkqSpO6FYT0U0Bj/S5BcX8= dependencies: path-type "^4.0.0" @@ -3219,12 +3319,12 @@ dlv@^1.1.3: dns-equal@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/dns-equal/download/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" + resolved "https://registry.nlark.com/dns-equal/download/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= dns-packet@^1.3.1: version "1.3.4" - resolved "https://registry.nlark.com/dns-packet/download/dns-packet-1.3.4.tgz?cache=0&sync_timestamp=1625480066754&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdns-packet%2Fdownload%2Fdns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" + resolved "https://registry.npmmirror.com/dns-packet/download/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" integrity sha1-40VQZYJKJQe6iGxVqJljuxB97G8= dependencies: ip "^1.1.0" @@ -3238,19 +3338,19 @@ dns-txt@^2.0.2: buffer-indexof "^1.0.0" docusaurus-preset-nonepress@canary: - version "0.0.0-121" - resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-121.tgz#5a4c0e674f08732bd12848622373e54978a3facd" - integrity sha512-7en9+oUzYC2rws7bPJj+qW5piflQp1iK5tq3ApZuiA8ceQHGY8RWmQeR5cRITfEpkf9BKzcyKR3gIvkii8vj1g== + version "0.0.0-122" + resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-122.tgz#7daaef39d45984852b30d30ac69751c0f4eba586" + integrity sha512-EOFVl1xV/vbTTOdMLyXnXEAKg4jEmm9CR8HbUQlEX2/+y5mLpGMAafGEXEyxzZT1KlfQcpGKhCMkMDhcWY8gRg== dependencies: "@docusaurus/core" "2.0.0-beta.9" "@docusaurus/plugin-content-docs" "2.0.0-beta.9" "@docusaurus/plugin-content-pages" "2.0.0-beta.9" - docusaurus-theme-nonepress "0.0.0-121" + docusaurus-theme-nonepress "0.0.0-122" -docusaurus-theme-nonepress@0.0.0-121: - version "0.0.0-121" - resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-121.tgz#cea842b9bff63b4ce52130f37555d068be1d106e" - integrity sha512-hxYbbRlUef5JYGWMtS0aS5vh+1+9WXUl+3ljD4Oaq0ATp93L+q7F9q7+i+YJTl3d0Z2/i2xH9ms8Vvt4sID0dQ== +docusaurus-theme-nonepress@0.0.0-122: + version "0.0.0-122" + resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-122.tgz#0ca3649b3f7c56ca421eab05ab41e889d8c5bc5a" + integrity sha512-fk+miOhRYYpM4hzPTFsYYXnDq0nV66uhASVbV2L1RxxrJOebcdvHJxuFPelh42NsQNQBDq/ypOS2mjO9yfTcoQ== dependencies: "@docsearch/react" "^3.0.0-alpha.39" "@docusaurus/core" "2.0.0-beta.9" @@ -3268,7 +3368,7 @@ docusaurus-theme-nonepress@0.0.0-121: "@mdx-js/mdx" "^1.6.21" "@mdx-js/react" "^1.6.21" "@seznam/compose-react-refs" "^1.0.6" - "@tailwindcss/typography" "^0.5.0-alpha.3" + "@tailwindcss/typography" "^0.5.0" algoliasearch "^4.11.0" algoliasearch-helper "^3.5.5" autoprefixer "^10.3.1" @@ -3285,7 +3385,7 @@ docusaurus-theme-nonepress@0.0.0-121: prismjs "^1.23.0" react-cool-onclickoutside "^1.6.2" react-router-dom "^5.2.0" - tailwindcss ">=3.0.0 || >=3.0.0-alpha.1" + tailwindcss "^3.0.0" dom-converter@^0.2.0: version "0.2.0" @@ -3296,7 +3396,7 @@ dom-converter@^0.2.0: dom-serializer@0: version "0.2.2" - resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.2.2.tgz?cache=0&sync_timestamp=1621256918158&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" + resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.2.2.tgz?cache=0&sync_timestamp=1621256830355&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" integrity sha1-GvuB9TNxcXXUeGVd68XjMtn5u1E= dependencies: domelementtype "^2.0.1" @@ -3304,7 +3404,7 @@ dom-serializer@0: dom-serializer@^1.0.1: version "1.3.2" - resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-1.3.2.tgz?cache=0&sync_timestamp=1621256918158&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" + resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-1.3.2.tgz?cache=0&sync_timestamp=1621256830355&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" integrity sha1-YgZDfTLO767HFhgDIwx6ILwbTZE= dependencies: domelementtype "^2.0.1" @@ -3313,7 +3413,7 @@ dom-serializer@^1.0.1: dom-serializer@~0.1.0: version "0.1.1" - resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.1.1.tgz?cache=0&sync_timestamp=1621256918158&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" + resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.1.1.tgz?cache=0&sync_timestamp=1621256830355&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" integrity sha1-HsQFnihLq+027sKUHUqXChic58A= dependencies: domelementtype "^1.3.0" @@ -3321,12 +3421,12 @@ dom-serializer@~0.1.0: domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: version "1.3.1" - resolved "https://registry.nlark.com/domelementtype/download/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" + resolved "https://registry.npm.taobao.org/domelementtype/download/domelementtype-1.3.1.tgz?cache=0&sync_timestamp=1617298545989&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomelementtype%2Fdownload%2Fdomelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha1-0EjESzew0Qp/Kj1f7j9DM9eQSB8= domelementtype@^2.0.1, domelementtype@^2.2.0: version "2.2.0" - resolved "https://registry.nlark.com/domelementtype/download/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + resolved "https://registry.npm.taobao.org/domelementtype/download/domelementtype-2.2.0.tgz?cache=0&sync_timestamp=1617298545989&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomelementtype%2Fdownload%2Fdomelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" integrity sha1-mgtsJ4LtahxzI9QiZxg9+b2LHVc= domhandler@^2.3.0: @@ -3336,7 +3436,7 @@ domhandler@^2.3.0: dependencies: domelementtype "1" -domhandler@^4.0.0, domhandler@^4.2.0: +domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.0: version "4.3.0" resolved "https://registry.npmmirror.com/domhandler/download/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626" integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g== @@ -3359,7 +3459,7 @@ domutils@^1.5.1, domutils@^1.7.0: dom-serializer "0" domelementtype "1" -domutils@^2.5.2, domutils@^2.6.0: +domutils@^2.5.2, domutils@^2.8.0: version "2.8.0" resolved "https://registry.nlark.com/domutils/download/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" integrity sha1-RDfe9dtuLR9dbuhZvZXKfQIEgTU= @@ -3370,7 +3470,7 @@ domutils@^2.5.2, domutils@^2.6.0: dot-case@^3.0.4: version "3.0.4" - resolved "https://registry.npm.taobao.org/dot-case/download/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" + resolved "https://registry.nlark.com/dot-case/download/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" integrity sha1-mytnDQCkMWZ6inW6Kc0bmICc51E= dependencies: no-case "^3.0.4" @@ -3378,7 +3478,7 @@ dot-case@^3.0.4: dot-prop@^5.2.0: version "5.3.0" - resolved "https://registry.npm.taobao.org/dot-prop/download/dot-prop-5.3.0.tgz?cache=0&sync_timestamp=1605778245785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdot-prop%2Fdownload%2Fdot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + resolved "https://registry.nlark.com/dot-prop/download/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" integrity sha1-kMzOcIzZzYLMTcjD3dmr3VWyDog= dependencies: is-obj "^2.0.0" @@ -3390,7 +3490,7 @@ duplexer3@^0.1.4: duplexer@^0.1.1, duplexer@^0.1.2: version "0.1.2" - resolved "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fduplexer%2Fdownload%2Fduplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" + resolved "https://registry.nlark.com/duplexer/download/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha1-Or5DrvODX4rgd9E23c4PJ2sEAOY= ee-first@1.1.1: @@ -3398,14 +3498,14 @@ ee-first@1.1.1: resolved "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.896: - version "1.4.11" - resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.11.tgz#303c9deebbe90c68bf5c2c81a88a3bf4522c8810" - integrity sha512-2OhsaYgsWGhWjx2et8kaUcdktPbBGjKM2X0BReUCKcSCPttEY+hz2zie820JLbttU8jwL92+JJysWwkut3wZgA== +electron-to-chromium@^1.4.17: + version "1.4.28" + resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.28.tgz#fef0e92e281df6d568f482d8d53c34ca5374de48" + integrity sha512-Gzbf0wUtKfyPaqf0Plz+Ctinf9eQIzxEqBHwSvbGfeOm9GMNdLxyu1dNiCUfM+x6r4BE0xUJNh3Nmg9gfAtTmg== emoji-regex@^8.0.0: version "8.0.0" - resolved "https://registry.npmmirror.com/emoji-regex/download/emoji-regex-8.0.0.tgz?cache=0&sync_timestamp=1632751333727&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Femoji-regex%2Fdownload%2Femoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + resolved "https://registry.npmmirror.com/emoji-regex/download/emoji-regex-8.0.0.tgz?cache=0&sync_timestamp=1632811716250&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Femoji-regex%2Fdownload%2Femoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha1-6Bj9ac5cz8tARZT4QpY79TFkzDc= emojis-list@^3.0.0: @@ -3415,7 +3515,7 @@ emojis-list@^3.0.0: emoticon@^3.2.0: version "3.2.0" - resolved "https://registry.npmmirror.com/emoticon/download/emoticon-3.2.0.tgz?cache=0&sync_timestamp=1636290949842&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Femoticon%2Fdownload%2Femoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f" + resolved "https://registry.npmmirror.com/emoticon/download/emoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f" integrity sha1-wAjKfXYg+sdC/hv0r4/4/tFUrn8= encodeurl@~1.0.2: @@ -3432,7 +3532,7 @@ end-of-stream@^1.1.0: enhanced-resolve@^5.8.3: version "5.8.3" - resolved "https://registry.nlark.com/enhanced-resolve/download/enhanced-resolve-5.8.3.tgz?cache=0&sync_timestamp=1632130840337&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" + resolved "https://registry.nlark.com/enhanced-resolve/download/enhanced-resolve-5.8.3.tgz?cache=0&sync_timestamp=1632130808043&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" integrity sha1-bVUtRlzOBCP1s9cYUR6lOCansvA= dependencies: graceful-fs "^4.2.4" @@ -3450,14 +3550,14 @@ entities@^2.0.0: error-ex@^1.3.1: version "1.3.2" - resolved "https://registry.npm.taobao.org/error-ex/download/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + resolved "https://registry.nlark.com/error-ex/download/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" integrity sha1-tKxAZIEH/c3PriQvQovqihTU8b8= dependencies: is-arrayish "^0.2.1" es-abstract@^1.17.2, es-abstract@^1.19.1: version "1.19.1" - resolved "https://registry.npmmirror.com/es-abstract/download/es-abstract-1.19.1.tgz?cache=0&sync_timestamp=1633234313248&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-abstract%2Fdownload%2Fes-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" + resolved "https://registry.npmmirror.com/es-abstract/download/es-abstract-1.19.1.tgz?cache=0&sync_timestamp=1633234258828&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-abstract%2Fdownload%2Fes-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" integrity sha1-1IhXlodpFpWd547aoN9FZicRXsM= dependencies: call-bind "^1.0.2" @@ -3483,7 +3583,7 @@ es-abstract@^1.17.2, es-abstract@^1.19.1: es-module-lexer@^0.9.0: version "0.9.3" - resolved "https://registry.npmmirror.com/es-module-lexer/download/es-module-lexer-0.9.3.tgz?cache=0&sync_timestamp=1633646154044&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-module-lexer%2Fdownload%2Fes-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" + resolved "https://registry.npmmirror.com/es-module-lexer/download/es-module-lexer-0.9.3.tgz?cache=0&sync_timestamp=1633649003753&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-module-lexer%2Fdownload%2Fes-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" integrity sha1-bxPbAMw4QXE32vdDZvU1yOtDjxk= es-to-primitive@^1.2.1: @@ -3497,7 +3597,7 @@ es-to-primitive@^1.2.1: escalade@^3.1.1: version "3.1.1" - resolved "https://registry.npm.taobao.org/escalade/download/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + resolved "https://registry.nlark.com/escalade/download/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha1-2M/ccACWXFoBdLSoLqpcBVJ0LkA= escape-goat@^2.0.0: @@ -3527,7 +3627,7 @@ escape-string-regexp@^4.0.0: eslint-scope@5.1.1: version "5.1.1" - resolved "https://registry.npmmirror.com/eslint-scope/download/eslint-scope-5.1.1.tgz?cache=0&sync_timestamp=1637466913662&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Feslint-scope%2Fdownload%2Feslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + resolved "https://registry.npmmirror.com/eslint-scope/download/eslint-scope-5.1.1.tgz?cache=0&sync_timestamp=1637466831846&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Feslint-scope%2Fdownload%2Feslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha1-54blmmbLkrP2wfsNUIqrF0hI9Iw= dependencies: esrecurse "^4.3.0" @@ -3535,24 +3635,24 @@ eslint-scope@5.1.1: esprima@^4.0.0: version "4.0.1" - resolved "https://registry.nlark.com/esprima/download/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + resolved "https://registry.npm.taobao.org/esprima/download/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha1-E7BM2z5sXRnfkatph6hpVhmwqnE= esrecurse@^4.3.0: version "4.3.0" - resolved "https://registry.npm.taobao.org/esrecurse/download/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + resolved "https://registry.nlark.com/esrecurse/download/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" integrity sha1-eteWTWeauyi+5yzsY3WLHF0smSE= dependencies: estraverse "^5.2.0" estraverse@^4.1.1: version "4.3.0" - resolved "https://registry.npmmirror.com/estraverse/download/estraverse-4.3.0.tgz?cache=0&sync_timestamp=1635237716974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + resolved "https://registry.npmmirror.com/estraverse/download/estraverse-4.3.0.tgz?cache=0&sync_timestamp=1635237706876&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha1-OYrT88WiSUi+dyXoPRGn3ijNvR0= estraverse@^5.2.0: version "5.3.0" - resolved "https://registry.npmmirror.com/estraverse/download/estraverse-5.3.0.tgz?cache=0&sync_timestamp=1635237716974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + resolved "https://registry.npmmirror.com/estraverse/download/estraverse-5.3.0.tgz?cache=0&sync_timestamp=1635237706876&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" integrity sha1-LupSkHAvJquP5TcDcP+GyWXSESM= esutils@^2.0.2: @@ -3567,7 +3667,7 @@ eta@^1.12.3: etag@~1.8.1: version "1.8.1" - resolved "https://registry.nlark.com/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + resolved "https://registry.npm.taobao.org/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= eval@^0.1.4: @@ -3579,22 +3679,17 @@ eval@^0.1.4: eventemitter3@^4.0.0: version "4.0.7" - resolved "https://registry.nlark.com/eventemitter3/download/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + resolved "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha1-Lem2j2Uo1WRO9cWVJqG0oHMGFp8= -events@^1.1.1: - version "1.1.1" - resolved "https://registry.npmmirror.com/events/download/events-1.1.1.tgz?cache=0&sync_timestamp=1636449286836&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fevents%2Fdownload%2Fevents-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" - integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= - events@^3.2.0: version "3.3.0" - resolved "https://registry.npmmirror.com/events/download/events-3.3.0.tgz?cache=0&sync_timestamp=1636449286836&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fevents%2Fdownload%2Fevents-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + resolved "https://registry.npmmirror.com/events/download/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha1-Mala0Kkk4tLEGagTrrLE6HjqdAA= execa@^5.0.0: version "5.1.1" - resolved "https://registry.npmmirror.com/execa/download/execa-5.1.1.tgz?cache=0&sync_timestamp=1637147188673&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fexeca%2Fdownload%2Fexeca-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + resolved "https://registry.npmmirror.com/execa/download/execa-5.1.1.tgz?cache=0&sync_timestamp=1637147207309&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fexeca%2Fdownload%2Fexeca-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" integrity sha1-+ArZy/Qpj3vR1MlVXCHpN0HEEd0= dependencies: cross-spawn "^7.0.3" @@ -3608,16 +3703,16 @@ execa@^5.0.0: strip-final-newline "^2.0.0" express@^4.17.1: - version "4.17.1" - resolved "https://registry.nlark.com/express/download/express-4.17.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fexpress%2Fdownload%2Fexpress-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" - integrity sha1-RJH8OGBc9R+GKdOcK10Cb5ikwTQ= + version "4.17.2" + resolved "https://registry.npmmirror.com/express/download/express-4.17.2.tgz#c18369f265297319beed4e5558753cc8c1364cb3" + integrity sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg== dependencies: accepts "~1.3.7" array-flatten "1.1.1" - body-parser "1.19.0" - content-disposition "0.5.3" + body-parser "1.19.1" + content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.4.0" + cookie "0.4.1" cookie-signature "1.0.6" debug "2.6.9" depd "~1.1.2" @@ -3631,13 +3726,13 @@ express@^4.17.1: on-finished "~2.3.0" parseurl "~1.3.3" path-to-regexp "0.1.7" - proxy-addr "~2.0.5" - qs "6.7.0" + proxy-addr "~2.0.7" + qs "6.9.6" range-parser "~1.2.1" - safe-buffer "5.1.2" - send "0.17.1" - serve-static "1.14.1" - setprototypeof "1.1.1" + safe-buffer "5.2.1" + send "0.17.2" + serve-static "1.14.2" + setprototypeof "1.2.0" statuses "~1.5.0" type-is "~1.6.18" utils-merge "1.0.1" @@ -3652,7 +3747,7 @@ extend-shallow@^2.0.1: extend@^3.0.0: version "3.0.2" - resolved "https://registry.nlark.com/extend/download/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + resolved "https://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo= fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: @@ -3673,7 +3768,7 @@ fast-glob@^3.1.1, fast-glob@^3.2.7: fast-json-stable-stringify@^2.0.0: version "2.1.0" - resolved "https://registry.nlark.com/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + resolved "https://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM= fast-url-parser@1.1.3: @@ -3699,14 +3794,14 @@ faye-websocket@^0.11.3: feed@^4.2.2: version "4.2.2" - resolved "https://registry.npm.taobao.org/feed/download/feed-4.2.2.tgz#865783ef6ed12579e2c44bbef3c9113bc4956a7e" + resolved "https://registry.npmmirror.com/feed/download/feed-4.2.2.tgz#865783ef6ed12579e2c44bbef3c9113bc4956a7e" integrity sha1-hleD727RJXnixEu+88kRO8SVan4= dependencies: xml-js "^1.6.11" file-loader@^6.2.0: version "6.2.0" - resolved "https://registry.nlark.com/file-loader/download/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" + resolved "https://registry.npm.taobao.org/file-loader/download/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" integrity sha1-uu98+OGEDfMl5DkLRISHlIDuvk0= dependencies: loader-utils "^2.0.0" @@ -3719,14 +3814,14 @@ filesize@^6.1.0: fill-range@^7.0.1: version "7.0.1" - resolved "https://registry.npm.taobao.org/fill-range/download/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + resolved "https://registry.nlark.com/fill-range/download/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" integrity sha1-GRmmp8df44ssfHflGYU12prN2kA= dependencies: to-regex-range "^5.0.1" finalhandler@~1.1.2: version "1.1.2" - resolved "https://registry.nlark.com/finalhandler/download/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + resolved "https://registry.npm.taobao.org/finalhandler/download/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" integrity sha1-t+fQAP/RGTjQ/bBTUG9uur6fWH0= dependencies: debug "2.6.9" @@ -3739,7 +3834,7 @@ finalhandler@~1.1.2: find-cache-dir@^3.3.1: version "3.3.2" - resolved "https://registry.nlark.com/find-cache-dir/download/find-cache-dir-3.3.2.tgz?cache=0&sync_timestamp=1630259965392&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffind-cache-dir%2Fdownload%2Ffind-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + resolved "https://registry.nlark.com/find-cache-dir/download/find-cache-dir-3.3.2.tgz?cache=0&sync_timestamp=1630260035189&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffind-cache-dir%2Fdownload%2Ffind-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" integrity sha1-swxbbv8HMHMa6pu9nb7L2AJW1ks= dependencies: commondir "^1.0.1" @@ -3748,23 +3843,23 @@ find-cache-dir@^3.3.1: find-up@^3.0.0: version "3.0.0" - resolved "https://registry.npmmirror.com/find-up/download/find-up-3.0.0.tgz?cache=0&sync_timestamp=1633620747957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffind-up%2Fdownload%2Ffind-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + resolved "https://registry.npmmirror.com/find-up/download/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" integrity sha1-SRafHXmTQwZG2mHsxa41XCHJe3M= dependencies: locate-path "^3.0.0" find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" - resolved "https://registry.npmmirror.com/find-up/download/find-up-4.1.0.tgz?cache=0&sync_timestamp=1633620747957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffind-up%2Fdownload%2Ffind-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + resolved "https://registry.npmmirror.com/find-up/download/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" integrity sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk= dependencies: locate-path "^5.0.0" path-exists "^4.0.0" follow-redirects@^1.0.0, follow-redirects@^1.14.0: - version "1.14.5" - resolved "https://registry.npmmirror.com/follow-redirects/download/follow-redirects-1.14.5.tgz#f09a5848981d3c772b5392309778523f8d85c381" - integrity sha1-8JpYSJgdPHcrU5Iwl3hSP42Fw4E= + version "1.14.6" + resolved "https://registry.npmmirror.com/follow-redirects/download/follow-redirects-1.14.6.tgz#8cfb281bbc035b3c067d6cd975b0f6ade6e855cd" + integrity sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A== fork-ts-checker-webpack-plugin@^6.0.5: version "6.5.0" @@ -3821,7 +3916,7 @@ fs-extra@^9.0.0: fs-monkey@1.0.3: version "1.0.3" - resolved "https://registry.npm.taobao.org/fs-monkey/download/fs-monkey-1.0.3.tgz?cache=0&sync_timestamp=1617593422622&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-monkey%2Fdownload%2Ffs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" + resolved "https://registry.npm.taobao.org/fs-monkey/download/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" integrity sha1-rjrJLVO7Mo7+DpodlUH2rY1I4tM= fs.realpath@^1.0.0: @@ -3846,7 +3941,7 @@ gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2: get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: version "1.1.1" - resolved "https://registry.npm.taobao.org/get-intrinsic/download/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + resolved "https://registry.nlark.com/get-intrinsic/download/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" integrity sha1-FfWfN2+FXERpY5SPDSTNNje0q8Y= dependencies: function-bind "^1.1.1" @@ -3855,7 +3950,7 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: get-own-enumerable-property-symbols@^3.0.0: version "3.0.2" - resolved "https://registry.npm.taobao.org/get-own-enumerable-property-symbols/download/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" + resolved "https://registry.nlark.com/get-own-enumerable-property-symbols/download/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" integrity sha1-tf3nfyLL4185C04ImSLFC85u9mQ= get-stream@^4.1.0: @@ -3887,19 +3982,19 @@ get-symbol-description@^1.0.0: github-slugger@^1.4.0: version "1.4.0" - resolved "https://registry.nlark.com/github-slugger/download/github-slugger-1.4.0.tgz?cache=0&sync_timestamp=1629817837468&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fgithub-slugger%2Fdownload%2Fgithub-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" + resolved "https://registry.nlark.com/github-slugger/download/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" integrity sha1-IG65bNsi7lb9xToo1aMCM4RjRE4= glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" - resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-5.1.2.tgz?cache=0&sync_timestamp=1632954501757&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha1-hpgyxYA0/mikCTwX3BXoNA2EAcQ= dependencies: is-glob "^4.0.1" glob-parent@^6.0.1, glob-parent@^6.0.2: version "6.0.2" - resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-6.0.2.tgz?cache=0&sync_timestamp=1632954501757&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" integrity sha1-bSN9mQg5UMeSkPJMdkKj3poo+eM= dependencies: is-glob "^4.0.3" @@ -3912,7 +4007,7 @@ glob-to-regexp@^0.4.1: glob@^7.0.0, glob@^7.1.3, glob@^7.1.6: version "7.2.0" resolved "https://registry.npmmirror.com/glob/download/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha1-0VU1r3cy4C6Uj0xBYovZECk/YCM= + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -3923,7 +4018,7 @@ glob@^7.0.0, glob@^7.1.3, glob@^7.1.6: global-dirs@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/global-dirs/download/global-dirs-3.0.0.tgz?cache=0&sync_timestamp=1610454716901&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobal-dirs%2Fdownload%2Fglobal-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" + resolved "https://registry.npmmirror.com/global-dirs/download/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" integrity sha1-cKdv6E6jFas3sfVXbL3n1I73JoY= dependencies: ini "2.0.0" @@ -3937,7 +4032,7 @@ global-modules@^2.0.0: global-prefix@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/global-prefix/download/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" + resolved "https://registry.npm.taobao.org/global-prefix/download/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" integrity sha1-/IX3MGTfafUEIfR/iD/luRO6m5c= dependencies: ini "^1.3.5" @@ -3946,7 +4041,7 @@ global-prefix@^3.0.0: globals@^11.1.0: version "11.12.0" - resolved "https://registry.npmmirror.com/globals/download/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + resolved "https://registry.npmmirror.com/globals/download/globals-11.12.0.tgz?cache=0&sync_timestamp=1635390798667&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglobals%2Fdownload%2Fglobals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha1-q4eVM4hooLq9hSV1gBjCp+uVxC4= globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.0.4: @@ -4010,7 +4105,7 @@ gzip-size@^6.0.0: handle-thing@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/handle-thing/download/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" + resolved "https://registry.npm.taobao.org/handle-thing/download/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" integrity sha1-hX95zjWVgMNA1DCBzGSJcNC7I04= has-bigints@^1.0.1: @@ -4020,29 +4115,29 @@ has-bigints@^1.0.1: has-flag@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/has-flag/download/has-flag-3.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + resolved "https://registry.nlark.com/has-flag/download/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= has-flag@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + resolved "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s= has-symbols@^1.0.1, has-symbols@^1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.2.tgz?cache=0&sync_timestamp=1614443557459&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhas-symbols%2Fdownload%2Fhas-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + resolved "https://registry.nlark.com/has-symbols/download/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha1-Fl0wcMADCXUqEjakeTMeOsVvFCM= has-tostringtag@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/has-tostringtag/download/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + resolved "https://registry.nlark.com/has-tostringtag/download/has-tostringtag-1.0.0.tgz?cache=0&sync_timestamp=1628198671004&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-tostringtag%2Fdownload%2Fhas-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" integrity sha1-fhM4GKfTlHNPlB5zw9P5KR5liyU= dependencies: has-symbols "^1.0.2" has-yarn@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/has-yarn/download/has-yarn-2.1.0.tgz?cache=0&sync_timestamp=1631299286113&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-yarn%2Fdownload%2Fhas-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" + resolved "https://registry.nlark.com/has-yarn/download/has-yarn-2.1.0.tgz?cache=0&sync_timestamp=1631298711761&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-yarn%2Fdownload%2Fhas-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" integrity sha1-E34RNUp7W/EapctknPDG8/8rLnc= has@^1.0.3: @@ -4054,7 +4149,7 @@ has@^1.0.3: hast-to-hyperscript@^9.0.0: version "9.0.1" - resolved "https://registry.nlark.com/hast-to-hyperscript/download/hast-to-hyperscript-9.0.1.tgz?cache=0&sync_timestamp=1627029601196&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-to-hyperscript%2Fdownload%2Fhast-to-hyperscript-9.0.1.tgz#9b67fd188e4c81e8ad66f803855334173920218d" + resolved "https://registry.nlark.com/hast-to-hyperscript/download/hast-to-hyperscript-9.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-to-hyperscript%2Fdownload%2Fhast-to-hyperscript-9.0.1.tgz#9b67fd188e4c81e8ad66f803855334173920218d" integrity sha1-m2f9GI5MgeitZvgDhVM0FzkgIY0= dependencies: "@types/unist" "^2.0.3" @@ -4067,7 +4162,7 @@ hast-to-hyperscript@^9.0.0: hast-util-from-parse5@^5.0.0: version "5.0.3" - resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" + resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-5.0.3.tgz?cache=0&sync_timestamp=1627032098094&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-util-from-parse5%2Fdownload%2Fhast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" integrity sha1-MIncDuLM9uyLxBaRm1GlSlieCXw= dependencies: ccount "^1.0.3" @@ -4078,7 +4173,7 @@ hast-util-from-parse5@^5.0.0: hast-util-from-parse5@^6.0.0: version "6.0.1" - resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" + resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-6.0.1.tgz?cache=0&sync_timestamp=1627032098094&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-util-from-parse5%2Fdownload%2Fhast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" integrity sha1-VU40q97qJax29b2VCh8BgOCzvCo= dependencies: "@types/parse5" "^5.0.0" @@ -4095,7 +4190,7 @@ hast-util-parse-selector@^2.0.0: hast-util-raw@6.0.1: version "6.0.1" - resolved "https://registry.npmmirror.com/hast-util-raw/download/hast-util-raw-6.0.1.tgz?cache=0&sync_timestamp=1636450214370&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhast-util-raw%2Fdownload%2Fhast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977" + resolved "https://registry.npmmirror.com/hast-util-raw/download/hast-util-raw-6.0.1.tgz?cache=0&sync_timestamp=1636449577205&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhast-util-raw%2Fdownload%2Fhast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977" integrity sha1-lzsVkwt1Kae2aYTJgUi0ZSaIWXc= dependencies: "@types/hast" "^2.0.0" @@ -4122,7 +4217,7 @@ hast-util-to-parse5@^6.0.0: hastscript@^5.0.0: version "5.1.2" - resolved "https://registry.nlark.com/hastscript/download/hastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a" + resolved "https://registry.nlark.com/hastscript/download/hastscript-5.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhastscript%2Fdownload%2Fhastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a" integrity sha1-veLC5W0Exi3SToxd8ojQUKNV+4o= dependencies: comma-separated-tokens "^1.0.0" @@ -4132,7 +4227,7 @@ hastscript@^5.0.0: hastscript@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/hastscript/download/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" + resolved "https://registry.nlark.com/hastscript/download/hastscript-6.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhastscript%2Fdownload%2Fhastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" integrity sha1-6HaNfqxWw/3qyKkoMNWOgR5b9kA= dependencies: "@types/hast" "^2.0.0" @@ -4143,7 +4238,7 @@ hastscript@^6.0.0: he@^1.2.0: version "1.2.0" - resolved "https://registry.nlark.com/he/download/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + resolved "https://registry.npm.taobao.org/he/download/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha1-hK5l+n6vsWX922FWauFLrwVmTw8= history@^4.9.0: @@ -4177,7 +4272,7 @@ hpack.js@^2.1.6: html-entities@^2.3.2: version "2.3.2" - resolved "https://registry.npm.taobao.org/html-entities/download/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" + resolved "https://registry.nlark.com/html-entities/download/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" integrity sha1-dgtARoXLHXlOT0t0QzLjsA3P5Ig= html-minifier-terser@^6.0.2: @@ -4195,7 +4290,7 @@ html-minifier-terser@^6.0.2: html-tags@^3.1.0: version "3.1.0" - resolved "https://registry.nlark.com/html-tags/download/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" + resolved "https://registry.npm.taobao.org/html-tags/download/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" integrity sha1-e15vfmZen7QfMAB+2eDUHpf7IUA= html-void-elements@^1.0.0: @@ -4205,8 +4300,8 @@ html-void-elements@^1.0.0: html-webpack-plugin@^5.4.0: version "5.5.0" - resolved "https://registry.npmmirror.com/html-webpack-plugin/download/html-webpack-plugin-5.5.0.tgz?cache=0&sync_timestamp=1635212582127&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtml-webpack-plugin%2Fdownload%2Fhtml-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" - integrity sha1-w5EZNvV2gcH59Ni2jBWM2d/lL1A= + resolved "https://registry.npmmirror.com/html-webpack-plugin/download/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" + integrity sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw== dependencies: "@types/html-minifier-terser" "^6.0.0" html-minifier-terser "^6.0.2" @@ -4216,7 +4311,7 @@ html-webpack-plugin@^5.4.0: htmlparser2@^3.9.1: version "3.10.1" - resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-3.10.1.tgz?cache=0&sync_timestamp=1636640841489&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" + resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-3.10.1.tgz?cache=0&sync_timestamp=1636641539121&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" integrity sha1-vWedw/WYl7ajS7EHSchVu1OpOS8= dependencies: domelementtype "^1.3.1" @@ -4228,7 +4323,7 @@ htmlparser2@^3.9.1: htmlparser2@^6.1.0: version "6.1.0" - resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-6.1.0.tgz?cache=0&sync_timestamp=1636640841489&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" + resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-6.1.0.tgz?cache=0&sync_timestamp=1636641539121&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" integrity sha1-xNditsM3GgXb5l6UrkOp+EX7j7c= dependencies: domelementtype "^2.0.1" @@ -4243,23 +4338,23 @@ http-cache-semantics@^4.0.0: http-deceiver@^1.2.7: version "1.2.7" - resolved "https://registry.npm.taobao.org/http-deceiver/download/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" + resolved "https://registry.nlark.com/http-deceiver/download/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= -http-errors@1.7.2: - version "1.7.2" - resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.7.2.tgz?cache=0&sync_timestamp=1636932216570&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" - integrity sha1-T1ApzxMjnzEDblsuVSkrz7zIXI8= +http-errors@1.8.1: + version "1.8.1" + resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c" + integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g== dependencies: depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.1" + inherits "2.0.4" + setprototypeof "1.2.0" statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" + toidentifier "1.0.1" http-errors@~1.6.2: version "1.6.3" - resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.6.3.tgz?cache=0&sync_timestamp=1636932216570&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" + resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= dependencies: depd "~1.1.2" @@ -4267,17 +4362,6 @@ http-errors@~1.6.2: setprototypeof "1.1.0" statuses ">= 1.4.0 < 2" -http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.npmmirror.com/http-errors/download/http-errors-1.7.3.tgz?cache=0&sync_timestamp=1636932216570&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhttp-errors%2Fdownload%2Fhttp-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" - integrity sha1-bGGeT5xgMIw4UZSYwU+7EKrOuwY= - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - http-parser-js@>=0.5.1: version "0.5.5" resolved "https://registry.npmmirror.com/http-parser-js/download/http-parser-js-0.5.5.tgz#d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5" @@ -4285,7 +4369,7 @@ http-parser-js@>=0.5.1: http-proxy-middleware@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/http-proxy-middleware/download/http-proxy-middleware-2.0.1.tgz?cache=0&sync_timestamp=1625172260511&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhttp-proxy-middleware%2Fdownload%2Fhttp-proxy-middleware-2.0.1.tgz#7ef3417a479fb7666a571e09966c66a39bd2c15f" + resolved "https://registry.nlark.com/http-proxy-middleware/download/http-proxy-middleware-2.0.1.tgz#7ef3417a479fb7666a571e09966c66a39bd2c15f" integrity sha1-fvNBekeft2ZqVx4Jlmxmo5vSwV8= dependencies: "@types/http-proxy" "^1.17.5" @@ -4296,7 +4380,7 @@ http-proxy-middleware@^2.0.0: http-proxy@^1.18.1: version "1.18.1" - resolved "https://registry.npm.taobao.org/http-proxy/download/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + resolved "https://registry.nlark.com/http-proxy/download/http-proxy-1.18.1.tgz?cache=0&sync_timestamp=1618847045732&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhttp-proxy%2Fdownload%2Fhttp-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" integrity sha1-QBVB8FNIhLv5UmAzTnL4juOXZUk= dependencies: eventemitter3 "^4.0.0" @@ -4305,25 +4389,25 @@ http-proxy@^1.18.1: human-signals@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/human-signals/download/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + resolved "https://registry.nlark.com/human-signals/download/human-signals-2.1.0.tgz?cache=0&sync_timestamp=1624364695595&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhuman-signals%2Fdownload%2Fhuman-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha1-3JH8ukLk0G5Kuu0zs+ejwC9RTqA= iconv-lite@0.4.24: version "0.4.24" - resolved "https://registry.nlark.com/iconv-lite/download/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + resolved "https://registry.nlark.com/iconv-lite/download/iconv-lite-0.4.24.tgz?cache=0&sync_timestamp=1621826342262&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ficonv-lite%2Fdownload%2Ficonv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha1-ICK0sl+93CHS9SSXSkdKr+czkIs= dependencies: safer-buffer ">= 2.1.2 < 3" icss-utils@^5.0.0, icss-utils@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/icss-utils/download/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + resolved "https://registry.npm.taobao.org/icss-utils/download/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" integrity sha1-xr5oWKvQE9do6YNmrkfiXViHsa4= ignore@^5.1.4: - version "5.1.9" - resolved "https://registry.npmmirror.com/ignore/download/ignore-5.1.9.tgz?cache=0&sync_timestamp=1635926740448&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fignore%2Fdownload%2Fignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb" - integrity sha1-nsGly+jhRG7GDUQgBg1Dqm5zgvs= + version "5.2.0" + resolved "https://registry.npmmirror.com/ignore/download/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" + integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== immer@^9.0.6: version "9.0.7" @@ -4339,7 +4423,7 @@ import-cwd@^3.0.0: import-fresh@^3.1.0, import-fresh@^3.2.1, import-fresh@^3.2.2, import-fresh@^3.3.0: version "3.3.0" - resolved "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz?cache=0&sync_timestamp=1608469579940&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimport-fresh%2Fdownload%2Fimport-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + resolved "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha1-NxYsJfy566oublPVtNiM4X2eDCs= dependencies: parent-module "^1.0.0" @@ -4354,7 +4438,7 @@ import-from@^3.0.0: import-lazy@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/import-lazy/download/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + resolved "https://registry.nlark.com/import-lazy/download/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= imurmurhash@^0.1.4: @@ -4364,7 +4448,7 @@ imurmurhash@^0.1.4: indent-string@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/indent-string/download/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + resolved "https://registry.npm.taobao.org/indent-string/download/indent-string-4.0.0.tgz?cache=0&sync_timestamp=1618679561483&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Findent-string%2Fdownload%2Findent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha1-Yk+PRJfWGbLZdoUx1Y9BIoVNclE= inflight@^1.0.4: @@ -4377,12 +4461,12 @@ inflight@^1.0.4: inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: version "2.0.4" - resolved "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + resolved "https://registry.nlark.com/inherits/download/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w= inherits@2.0.3: version "2.0.3" - resolved "https://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + resolved "https://registry.nlark.com/inherits/download/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= ini@2.0.0: @@ -4411,7 +4495,7 @@ internal-slot@^1.0.3: interpret@^1.0.0: version "1.4.0" - resolved "https://registry.nlark.com/interpret/download/interpret-1.4.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Finterpret%2Fdownload%2Finterpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + resolved "https://registry.npmmirror.com/interpret/download/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha1-Zlq4vE2iendKQFhOgS4+D6RbGh4= ip@^1.1.0: @@ -4429,11 +4513,6 @@ ipaddr.js@^2.0.1: resolved "https://registry.nlark.com/ipaddr.js/download/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" integrity sha1-7KJWp6h36Reus2iwp0l930LvgcA= -is-absolute-url@^3.0.3: - version "3.0.3" - resolved "https://registry.nlark.com/is-absolute-url/download/is-absolute-url-3.0.3.tgz?cache=0&sync_timestamp=1628691816236&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-absolute-url%2Fdownload%2Fis-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" - integrity sha1-lsaiK2ojkpsR6gr7GDbDatSl1pg= - is-alphabetical@1.0.4, is-alphabetical@^1.0.0: version "1.0.4" resolved "https://registry.npmmirror.com/is-alphabetical/download/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d" @@ -4449,7 +4528,7 @@ is-alphanumerical@^1.0.0: is-arguments@^1.0.4: version "1.1.1" - resolved "https://registry.nlark.com/is-arguments/download/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + resolved "https://registry.nlark.com/is-arguments/download/is-arguments-1.1.1.tgz?cache=0&sync_timestamp=1628201919104&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-arguments%2Fdownload%2Fis-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" integrity sha1-FbP4j9oB8ql/7ITKdhpWDxI++ps= dependencies: call-bind "^1.0.2" @@ -4476,7 +4555,7 @@ is-binary-path@~2.1.0: is-boolean-object@^1.1.0: version "1.1.2" - resolved "https://registry.nlark.com/is-boolean-object/download/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + resolved "https://registry.nlark.com/is-boolean-object/download/is-boolean-object-1.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-boolean-object%2Fdownload%2Fis-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" integrity sha1-XG3CACRt2TIa5LiFoRS7H3X2Nxk= dependencies: call-bind "^1.0.2" @@ -4484,31 +4563,31 @@ is-boolean-object@^1.1.0: is-buffer@^2.0.0: version "2.0.5" - resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.5.tgz?cache=0&sync_timestamp=1604429876103&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-buffer%2Fdownload%2Fis-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" + resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.5.tgz?cache=0&sync_timestamp=1604432327227&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-buffer%2Fdownload%2Fis-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha1-68JS5ADSL/jXf6CYiIIaJKZYwZE= is-callable@^1.1.4, is-callable@^1.2.4: version "1.2.4" - resolved "https://registry.nlark.com/is-callable/download/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + resolved "https://registry.nlark.com/is-callable/download/is-callable-1.2.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-callable%2Fdownload%2Fis-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha1-RzAdWN0CWUB4ZVR4U99tYf5HGUU= is-ci@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/is-ci/download/is-ci-2.0.0.tgz?cache=0&sync_timestamp=1635261114993&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-ci%2Fdownload%2Fis-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + resolved "https://registry.npmmirror.com/is-ci/download/is-ci-2.0.0.tgz?cache=0&sync_timestamp=1635261061017&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-ci%2Fdownload%2Fis-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" integrity sha1-a8YzQYGBDgS1wis9WJ/cpVAmQEw= dependencies: ci-info "^2.0.0" is-core-module@^2.2.0: version "2.8.0" - resolved "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" + resolved "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz?cache=0&sync_timestamp=1634236731601&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-core-module%2Fdownload%2Fis-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" integrity sha1-AyEzbD0JJeSX/Zf12VyxFKXM1Ug= dependencies: has "^1.0.3" is-date-object@^1.0.1: version "1.0.5" - resolved "https://registry.nlark.com/is-date-object/download/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + resolved "https://registry.nlark.com/is-date-object/download/is-date-object-1.0.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-date-object%2Fdownload%2Fis-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" integrity sha1-CEHVU25yTCVZe/bqYuG9OCmN8x8= dependencies: has-tostringtag "^1.0.0" @@ -4520,17 +4599,17 @@ is-decimal@^1.0.0: is-docker@^2.0.0, is-docker@^2.1.1: version "2.2.1" - resolved "https://registry.nlark.com/is-docker/download/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + resolved "https://registry.nlark.com/is-docker/download/is-docker-2.2.1.tgz?cache=0&sync_timestamp=1630451108035&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-docker%2Fdownload%2Fis-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha1-M+6r4jz+hvFL3kQIoCwM+4U6zao= is-extendable@^0.1.0: version "0.1.1" - resolved "https://registry.npm.taobao.org/is-extendable/download/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + resolved "https://registry.nlark.com/is-extendable/download/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= is-extglob@^2.1.1: version "2.1.1" - resolved "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + resolved "https://registry.nlark.com/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= is-fullwidth-code-point@^3.0.0: @@ -4540,7 +4619,7 @@ is-fullwidth-code-point@^3.0.0: is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" - resolved "https://registry.npmmirror.com/is-glob/download/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + resolved "https://registry.npmmirror.com/is-glob/download/is-glob-4.0.3.tgz?cache=0&sync_timestamp=1632934586547&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-glob%2Fdownload%2Fis-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha1-ZPYeQsu7LuwgcanawLKLoeZdUIQ= dependencies: is-extglob "^2.1.1" @@ -4552,20 +4631,20 @@ is-hexadecimal@^1.0.0: is-installed-globally@^0.4.0: version "0.4.0" - resolved "https://registry.npm.taobao.org/is-installed-globally/download/is-installed-globally-0.4.0.tgz?cache=0&sync_timestamp=1610875398433&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-installed-globally%2Fdownload%2Fis-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" + resolved "https://registry.npm.taobao.org/is-installed-globally/download/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" integrity sha1-mg/UB5ScMPhutpWe8beZTtC3tSA= dependencies: global-dirs "^3.0.0" is-path-inside "^3.0.2" is-negative-zero@^2.0.1: - version "2.0.1" - resolved "https://registry.nlark.com/is-negative-zero/download/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" - integrity sha1-PedGwY3aIxkkGlNnWQjY92bxHCQ= + version "2.0.2" + resolved "https://registry.npmmirror.com/is-negative-zero/download/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" + integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== is-npm@^5.0.0: version "5.0.0" - resolved "https://registry.nlark.com/is-npm/download/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" + resolved "https://registry.nlark.com/is-npm/download/is-npm-5.0.0.tgz?cache=0&sync_timestamp=1631992770984&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-npm%2Fdownload%2Fis-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" integrity sha1-Q+jWXMVuG2f41HJiz2ZwmRk/Rag= is-number-object@^1.0.4: @@ -4582,12 +4661,12 @@ is-number@^7.0.0: is-obj@^1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/is-obj/download/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + resolved "https://registry.npm.taobao.org/is-obj/download/is-obj-1.0.1.tgz?cache=0&sync_timestamp=1618600919478&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-obj%2Fdownload%2Fis-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= is-obj@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/is-obj/download/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + resolved "https://registry.npm.taobao.org/is-obj/download/is-obj-2.0.0.tgz?cache=0&sync_timestamp=1618600919478&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-obj%2Fdownload%2Fis-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha1-Rz+wXZc3BeP9liBUUBjKjiLvSYI= is-path-cwd@^2.2.0: @@ -4597,17 +4676,17 @@ is-path-cwd@^2.2.0: is-path-inside@^3.0.2: version "3.0.3" - resolved "https://registry.nlark.com/is-path-inside/download/is-path-inside-3.0.3.tgz?cache=0&sync_timestamp=1620046845369&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-path-inside%2Fdownload%2Fis-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + resolved "https://registry.nlark.com/is-path-inside/download/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha1-0jE2LlOgf/Kw4Op/7QSRYf/RYoM= is-plain-obj@^2.0.0: version "2.1.0" - resolved "https://registry.nlark.com/is-plain-obj/download/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" + resolved "https://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" integrity sha1-ReQuN/zPH0Dajl927iFRWEDAkoc= is-plain-obj@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/is-plain-obj/download/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" + resolved "https://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" integrity sha1-r28uoUrFpkYYOlu9tbqrvBVq2dc= is-plain-object@^2.0.4: @@ -4627,17 +4706,12 @@ is-regex@^1.0.4, is-regex@^1.1.4: is-regexp@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/is-regexp/download/is-regexp-1.0.0.tgz?cache=0&sync_timestamp=1617816768041&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-regexp%2Fdownload%2Fis-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" + resolved "https://registry.npmmirror.com/is-regexp/download/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk= -is-resolvable@^1.1.0: - version "1.1.0" - resolved "https://registry.npm.taobao.org/is-resolvable/download/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" - integrity sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg= - is-root@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/is-root/download/is-root-2.1.0.tgz?cache=0&sync_timestamp=1617783382597&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-root%2Fdownload%2Fis-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" + resolved "https://registry.npm.taobao.org/is-root/download/is-root-2.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-root%2Fdownload%2Fis-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" integrity sha1-gJ4YEpzxEpZEMCpPhUQDXVGYSpw= is-shared-array-buffer@^1.0.1: @@ -4659,7 +4733,7 @@ is-string@^1.0.5, is-string@^1.0.7: is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" - resolved "https://registry.nlark.com/is-symbol/download/is-symbol-1.0.4.tgz?cache=0&sync_timestamp=1620501182675&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-symbol%2Fdownload%2Fis-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + resolved "https://registry.nlark.com/is-symbol/download/is-symbol-1.0.4.tgz?cache=0&sync_timestamp=1620501174327&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-symbol%2Fdownload%2Fis-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" integrity sha1-ptrJO2NbBjymhyI23oiRClevE5w= dependencies: has-symbols "^1.0.2" @@ -4670,11 +4744,11 @@ is-typedarray@^1.0.0: integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= is-weakref@^1.0.1: - version "1.0.1" - resolved "https://registry.nlark.com/is-weakref/download/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2" - integrity sha1-hC26TsF/qayYUN8tbvvBc3J08qI= + version "1.0.2" + resolved "https://registry.npmmirror.com/is-weakref/download/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" + integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" is-whitespace-character@^1.0.0: version "1.0.4" @@ -4683,45 +4757,45 @@ is-whitespace-character@^1.0.0: is-word-character@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-word-character/download/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230" + resolved "https://registry.npmmirror.com/is-word-character/download/is-word-character-1.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-word-character%2Fdownload%2Fis-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230" integrity sha1-zg5zIW+YWZBgWS9i/zE1TdvrAjA= is-wsl@^2.1.1, is-wsl@^2.2.0: version "2.2.0" - resolved "https://registry.npm.taobao.org/is-wsl/download/is-wsl-2.2.0.tgz?cache=0&sync_timestamp=1592843177178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-wsl%2Fdownload%2Fis-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + resolved "https://registry.nlark.com/is-wsl/download/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" integrity sha1-dKTHbnfKn9P5MvKQwX6jJs0VcnE= dependencies: is-docker "^2.0.0" is-yarn-global@^0.3.0: version "0.3.0" - resolved "https://registry.nlark.com/is-yarn-global/download/is-yarn-global-0.3.0.tgz?cache=0&sync_timestamp=1619356824740&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-yarn-global%2Fdownload%2Fis-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" + resolved "https://registry.nlark.com/is-yarn-global/download/is-yarn-global-0.3.0.tgz?cache=0&sync_timestamp=1619356554445&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-yarn-global%2Fdownload%2Fis-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" integrity sha1-1QLTOCWQ6jAEiTdGdUyJE5lz4jI= isarray@0.0.1: version "0.0.1" - resolved "https://registry.nlark.com/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + resolved "https://registry.npm.taobao.org/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= isarray@~1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + resolved "https://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= isexe@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + resolved "https://registry.nlark.com/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= isobject@^3.0.1: version "3.0.1" - resolved "https://registry.nlark.com/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + resolved "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -jest-worker@^27.0.2, jest-worker@^27.0.6: - version "27.4.2" - resolved "https://registry.npmmirror.com/jest-worker/download/jest-worker-27.4.2.tgz#0fb123d50955af1a450267787f340a1bf7e12bc4" - integrity sha512-0QMy/zPovLfUPyHuOuuU4E+kGACXXE84nRnq6lBVI9GJg5DCBiA97SATi+ZP8CpiJwEQy1oCPjRBf8AnLjN+Ag== +jest-worker@^27.0.2, jest-worker@^27.4.1: + version "27.4.5" + resolved "https://registry.npmmirror.com/jest-worker/download/jest-worker-27.4.5.tgz#d696e3e46ae0f24cff3fa7195ffba22889262242" + integrity sha512-f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg== dependencies: "@types/node" "*" merge-stream "^2.0.0" @@ -4740,12 +4814,12 @@ joi@^17.4.0, joi@^17.4.2: "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/js-tokens/download/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + resolved "https://registry.nlark.com/js-tokens/download/js-tokens-4.0.0.tgz?cache=0&sync_timestamp=1619345098261&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-tokens%2Fdownload%2Fjs-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha1-GSA/tZmR35jjoocFDUZHzerzJJk= js-yaml@^3.13.1: version "3.14.1" - resolved "https://registry.nlark.com/js-yaml/download/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + resolved "https://registry.npm.taobao.org/js-yaml/download/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha1-2ugS/bOCX6MGYJqHFzg8UMNqBTc= dependencies: argparse "^1.0.7" @@ -4753,7 +4827,7 @@ js-yaml@^3.13.1: js-yaml@^4.0.0: version "4.1.0" - resolved "https://registry.nlark.com/js-yaml/download/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + resolved "https://registry.npm.taobao.org/js-yaml/download/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" integrity sha1-wftl+PUBeQHN0slRhkuhhFihBgI= dependencies: argparse "^2.0.1" @@ -4780,17 +4854,17 @@ json-parse-better-errors@^1.0.2: json-parse-even-better-errors@^2.3.0: version "2.3.1" - resolved "https://registry.npm.taobao.org/json-parse-even-better-errors/download/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + resolved "https://registry.nlark.com/json-parse-even-better-errors/download/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha1-fEeAWpQxmSjgV3dAXcEuH3pO4C0= json-schema-traverse@^0.4.1: version "0.4.1" - resolved "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + resolved "https://registry.nlark.com/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha1-afaofZUTq4u4/mO9sJecRI5oRmA= json-schema-traverse@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + resolved "https://registry.nlark.com/json-schema-traverse/download/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha1-rnvLNlard6c7pcSb9lTzjmtoYOI= json5@^1.0.1: @@ -4809,7 +4883,7 @@ json5@^2.1.2: jsonfile@^6.0.1: version "6.1.0" - resolved "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + resolved "https://registry.nlark.com/jsonfile/download/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" integrity sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4= dependencies: universalify "^2.0.0" @@ -4825,7 +4899,7 @@ keyv@^3.0.0: kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.3" - resolved "https://registry.nlark.com/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + resolved "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0= kleur@^3.0.3: @@ -4835,24 +4909,24 @@ kleur@^3.0.3: klona@^2.0.5: version "2.0.5" - resolved "https://registry.npmmirror.com/klona/download/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" + resolved "https://registry.npmmirror.com/klona/download/klona-2.0.5.tgz?cache=0&sync_timestamp=1635385383825&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fklona%2Fdownload%2Fklona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" integrity sha1-0WZXTZAHY5XZljqnqSj6u412r7w= latest-version@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/latest-version/download/latest-version-5.1.0.tgz?cache=0&sync_timestamp=1626951682795&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flatest-version%2Fdownload%2Flatest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + resolved "https://registry.nlark.com/latest-version/download/latest-version-5.1.0.tgz?cache=0&sync_timestamp=1626951703884&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flatest-version%2Fdownload%2Flatest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" integrity sha1-EZ3+kI/jjRXfpD7NE/oS7Igy+s4= dependencies: package-json "^6.3.0" leven@^3.1.0: version "3.1.0" - resolved "https://registry.nlark.com/leven/download/leven-3.1.0.tgz?cache=0&sync_timestamp=1628597917913&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fleven%2Fdownload%2Fleven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + resolved "https://registry.nlark.com/leven/download/leven-3.1.0.tgz?cache=0&sync_timestamp=1628597922950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fleven%2Fdownload%2Fleven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" integrity sha1-d4kd6DQGTMy6gq54QrtrFKE+1/I= lilconfig@^2.0.3: version "2.0.4" - resolved "https://registry.npmmirror.com/lilconfig/download/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" + resolved "https://registry.npmmirror.com/lilconfig/download/lilconfig-2.0.4.tgz?cache=0&sync_timestamp=1636150747257&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flilconfig%2Fdownload%2Flilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" integrity sha1-9FB9BD1wWLOAtqj1y3vNSzTO4II= lines-and-columns@^1.1.6: @@ -4862,12 +4936,12 @@ lines-and-columns@^1.1.6: loader-runner@^4.2.0: version "4.2.0" - resolved "https://registry.nlark.com/loader-runner/download/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" + resolved "https://registry.npm.taobao.org/loader-runner/download/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" integrity sha1-1wIjgNZtFMX7HUlriYZOvP1Hg4Q= loader-utils@^1.4.0: version "1.4.0" - resolved "https://registry.npmmirror.com/loader-utils/download/loader-utils-1.4.0.tgz?cache=0&sync_timestamp=1636687889409&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" + resolved "https://registry.npmmirror.com/loader-utils/download/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" integrity sha1-xXm140yzSxp07cbB+za/o3HVphM= dependencies: big.js "^5.2.2" @@ -4876,7 +4950,7 @@ loader-utils@^1.4.0: loader-utils@^2.0.0: version "2.0.2" - resolved "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz?cache=0&sync_timestamp=1636687889409&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" + resolved "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" integrity sha1-1uO0+4GHByGuTghoqxHdY4NowSk= dependencies: big.js "^5.2.2" @@ -4915,12 +4989,12 @@ lodash.castarray@^4.4.0: lodash.debounce@^4.0.8: version "4.0.8" - resolved "https://registry.nlark.com/lodash.debounce/download/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + resolved "https://registry.nlark.com/lodash.debounce/download/lodash.debounce-4.0.8.tgz?cache=0&sync_timestamp=1618847031591&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flodash.debounce%2Fdownload%2Flodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= lodash.defaults@^4.0.1: version "4.2.0" - resolved "https://registry.npm.taobao.org/lodash.defaults/download/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" + resolved "https://registry.nlark.com/lodash.defaults/download/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= lodash.filter@^4.4.0: @@ -4930,7 +5004,7 @@ lodash.filter@^4.4.0: lodash.flatten@^4.2.0: version "4.4.0" - resolved "https://registry.npm.taobao.org/lodash.flatten/download/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" + resolved "https://registry.nlark.com/lodash.flatten/download/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= lodash.foreach@^4.3.0: @@ -4940,27 +5014,27 @@ lodash.foreach@^4.3.0: lodash.isplainobject@^4.0.6: version "4.0.6" - resolved "https://registry.npm.taobao.org/lodash.isplainobject/download/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + resolved "https://registry.nlark.com/lodash.isplainobject/download/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= lodash.map@^4.4.0: version "4.6.0" - resolved "https://registry.npm.taobao.org/lodash.map/download/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" + resolved "https://registry.nlark.com/lodash.map/download/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= lodash.memoize@^4.1.2: version "4.1.2" - resolved "https://registry.nlark.com/lodash.memoize/download/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + resolved "https://registry.npm.taobao.org/lodash.memoize/download/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= lodash.merge@^4.4.0, lodash.merge@^4.6.2: version "4.6.2" - resolved "https://registry.npm.taobao.org/lodash.merge/download/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + resolved "https://registry.nlark.com/lodash.merge/download/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha1-VYqlO0O2YeGSWgr9+japoQhf5Xo= lodash.pick@^4.2.1: version "4.4.0" - resolved "https://registry.npm.taobao.org/lodash.pick/download/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" + resolved "https://registry.nlark.com/lodash.pick/download/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= lodash.reduce@^4.4.0: @@ -4975,79 +5049,79 @@ lodash.reject@^4.4.0: lodash.some@^4.4.0: version "4.6.0" - resolved "https://registry.npm.taobao.org/lodash.some/download/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" + resolved "https://registry.nlark.com/lodash.some/download/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0= lodash.uniq@4.5.0, lodash.uniq@^4.5.0: version "4.5.0" - resolved "https://registry.npm.taobao.org/lodash.uniq/download/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + resolved "https://registry.nlark.com/lodash.uniq/download/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" - resolved "https://registry.nlark.com/lodash/download/lodash-4.17.21.tgz?cache=0&sync_timestamp=1618847150612&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flodash%2Fdownload%2Flodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw= + resolved "https://registry.npmmirror.com/lodash/download/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" - resolved "https://registry.nlark.com/loose-envify/download/loose-envify-1.4.0.tgz?cache=0&sync_timestamp=1627566748051&other_urls=https%3A%2F%2Fregistry.nlark.com%2Floose-envify%2Fdownload%2Floose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + resolved "https://registry.nlark.com/loose-envify/download/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8= dependencies: js-tokens "^3.0.0 || ^4.0.0" lower-case@^2.0.2: version "2.0.2" - resolved "https://registry.npm.taobao.org/lower-case/download/lower-case-2.0.2.tgz?cache=0&sync_timestamp=1606867514181&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flower-case%2Fdownload%2Flower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" + resolved "https://registry.nlark.com/lower-case/download/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" integrity sha1-b6I3xj29xKgsoP2ILkci3F5jTig= dependencies: tslib "^2.0.3" lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-1.0.1.tgz?cache=0&sync_timestamp=1634551715073&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flowercase-keys%2Fdownload%2Flowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" integrity sha1-b54wtHCE2XGnyCD/FabFFnt0wm8= lowercase-keys@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-2.0.0.tgz?cache=0&sync_timestamp=1634551715073&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flowercase-keys%2Fdownload%2Flowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha1-JgPni3tLAAbLyi+8yKMgJVislHk= lru-cache@^6.0.0: version "6.0.0" - resolved "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + resolved "https://registry.nlark.com/lru-cache/download/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" integrity sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ= dependencies: yallist "^4.0.0" magic-string@^0.25.3: version "0.25.7" - resolved "https://registry.npm.taobao.org/magic-string/download/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" + resolved "https://registry.nlark.com/magic-string/download/magic-string-0.25.7.tgz?cache=0&sync_timestamp=1618847046304&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmagic-string%2Fdownload%2Fmagic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" integrity sha1-P0l9b9NMZpxnmNy4IfLvMfVEUFE= dependencies: sourcemap-codec "^1.4.4" make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" - resolved "https://registry.nlark.com/make-dir/download/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + resolved "https://registry.npm.taobao.org/make-dir/download/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha1-QV6WcEazp/HRhSd9hKpYIDcmoT8= dependencies: semver "^6.0.0" markdown-escapes@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/markdown-escapes/download/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" + resolved "https://registry.npmmirror.com/markdown-escapes/download/markdown-escapes-1.0.4.tgz?cache=0&sync_timestamp=1635887464232&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmarkdown-escapes%2Fdownload%2Fmarkdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" integrity sha1-yVQV70UUmddgK5EJXzyOiXX3hTU= mdast-squeeze-paragraphs@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/mdast-squeeze-paragraphs/download/mdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97" + resolved "https://registry.nlark.com/mdast-squeeze-paragraphs/download/mdast-squeeze-paragraphs-4.0.0.tgz?cache=0&sync_timestamp=1627994916092&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-squeeze-paragraphs%2Fdownload%2Fmdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97" integrity sha1-fEwRRnnDvuJ+8QtY4uAVvnnx75c= dependencies: unist-util-remove "^2.0.0" mdast-util-definitions@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/mdast-util-definitions/download/mdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2" + resolved "https://registry.nlark.com/mdast-util-definitions/download/mdast-util-definitions-4.0.0.tgz?cache=0&sync_timestamp=1627293635701&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-util-definitions%2Fdownload%2Fmdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2" integrity sha1-xcGoTbeZFztNz3ZDzamZ5EDCTbI= dependencies: unist-util-visit "^2.0.0" @@ -5068,7 +5142,7 @@ mdast-util-to-hast@10.0.1: mdast-util-to-string@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/mdast-util-to-string/download/mdast-util-to-string-2.0.0.tgz?cache=0&sync_timestamp=1619426190900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-util-to-string%2Fdownload%2Fmdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" + resolved "https://registry.nlark.com/mdast-util-to-string/download/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" integrity sha1-uM/mpxPhCRy1tyj8SIhaR2f4uXs= mdn-data@2.0.14: @@ -5105,7 +5179,7 @@ merge-descriptors@1.0.1: merge-stream@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/merge-stream/download/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + resolved "https://registry.nlark.com/merge-stream/download/merge-stream-2.0.0.tgz?cache=0&sync_timestamp=1622025345923&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmerge-stream%2Fdownload%2Fmerge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha1-UoI2KaFN0AyXcPtq1H3GMQ8sH2A= merge2@^1.3.0: @@ -5128,24 +5202,24 @@ micromatch@^4.0.2, micromatch@^4.0.4: mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": version "1.51.0" - resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.51.0.tgz?cache=0&sync_timestamp=1636425932298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.51.0.tgz?cache=0&sync_timestamp=1636425951030&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== mime-db@~1.33.0: version "1.33.0" - resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.33.0.tgz?cache=0&sync_timestamp=1636425932298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" + resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.33.0.tgz?cache=0&sync_timestamp=1636425951030&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" integrity sha1-o0kgUKXLm2NFBUHjnZeI0icng9s= mime-types@2.1.18: version "2.1.18" - resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.18.tgz?cache=0&sync_timestamp=1636432275511&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" + resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.18.tgz?cache=0&sync_timestamp=1636432244120&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" integrity sha1-bzI/YKg9ERRvgx/xH9ZuL+VQO7g= dependencies: mime-db "~1.33.0" mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24: version "2.1.34" - resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.34.tgz?cache=0&sync_timestamp=1636432275511&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" + resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.34.tgz?cache=0&sync_timestamp=1636432244120&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== dependencies: mime-db "1.51.0" @@ -5157,7 +5231,7 @@ mime@1.6.0: mimic-fn@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/mimic-fn/download/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + resolved "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs= mimic-response@^1.0.0, mimic-response@^1.0.1: @@ -5167,7 +5241,7 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: mini-create-react-context@^0.4.0: version "0.4.1" - resolved "https://registry.nlark.com/mini-create-react-context/download/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" + resolved "https://registry.npm.taobao.org/mini-create-react-context/download/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" integrity sha1-ByFxVhv9ySLaCKYMIZekl8wtHV4= dependencies: "@babel/runtime" "^7.12.1" @@ -5175,7 +5249,7 @@ mini-create-react-context@^0.4.0: mini-css-extract-plugin@^1.6.0: version "1.6.2" - resolved "https://registry.npmmirror.com/mini-css-extract-plugin/download/mini-css-extract-plugin-1.6.2.tgz?cache=0&sync_timestamp=1637170529830&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" + resolved "https://registry.npmmirror.com/mini-css-extract-plugin/download/mini-css-extract-plugin-1.6.2.tgz?cache=0&sync_timestamp=1637170563108&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" integrity sha1-gxcrT9gS+PxKCdb20W+ST1OZDKg= dependencies: loader-utils "^2.0.0" @@ -5189,14 +5263,14 @@ minimalistic-assert@^1.0.0: minimatch@3.0.4, minimatch@^3.0.4: version "3.0.4" - resolved "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + resolved "https://registry.nlark.com/minimatch/download/minimatch-3.0.4.tgz?cache=0&sync_timestamp=1618846754554&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fminimatch%2Fdownload%2Fminimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM= dependencies: brace-expansion "^1.1.7" minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" - resolved "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + resolved "https://registry.nlark.com/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1618847017774&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI= mkdirp@^0.5.5, mkdirp@~0.5.1: @@ -5216,17 +5290,12 @@ ms@2.0.0: resolved "https://registry.npmmirror.com/ms/download/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= -ms@2.1.1: - version "2.1.1" - resolved "https://registry.npmmirror.com/ms/download/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo= - ms@2.1.2: version "2.1.2" resolved "https://registry.npmmirror.com/ms/download/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk= -ms@^2.1.1: +ms@2.1.3, ms@^2.1.1: version "2.1.3" resolved "https://registry.npmmirror.com/ms/download/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha1-V0yBOM4dK1hh8LRFedut1gxmFbI= @@ -5247,16 +5316,16 @@ multicast-dns@^6.0.1: nanoid@^3.1.30: version "3.1.30" resolved "https://registry.npmmirror.com/nanoid/download/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362" - integrity sha1-Y/k8xUjSoRPcXfvGO/oJ4rm2Q2I= + integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ== negotiator@0.6.2: version "0.6.2" - resolved "https://registry.npm.taobao.org/negotiator/download/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + resolved "https://registry.nlark.com/negotiator/download/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha1-/qz3zPUlp3rpY0Q2pkiD/+yjRvs= neo-async@^2.6.2: version "2.6.2" - resolved "https://registry.npm.taobao.org/neo-async/download/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + resolved "https://registry.nlark.com/neo-async/download/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha1-tKr7k+OustgXTKU88WOrfXMIMF8= no-case@^3.0.4: @@ -5269,24 +5338,24 @@ no-case@^3.0.4: node-emoji@^1.10.0: version "1.11.0" - resolved "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz?cache=0&sync_timestamp=1628672555671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-emoji%2Fdownload%2Fnode-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" + resolved "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" integrity sha1-aaAVDmlG4vEV6dfqTfeXHiYoMBw= dependencies: lodash "^4.17.21" node-forge@^0.10.0: version "0.10.0" - resolved "https://registry.npm.taobao.org/node-forge/download/node-forge-0.10.0.tgz?cache=0&sync_timestamp=1599010726129&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-forge%2Fdownload%2Fnode-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" + resolved "https://registry.nlark.com/node-forge/download/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha1-Mt6ir7Ppkm8C7lzoeUkCaRpna/M= node-releases@^2.0.1: version "2.0.1" - resolved "https://registry.npmmirror.com/node-releases/download/node-releases-2.0.1.tgz?cache=0&sync_timestamp=1634806914912&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnode-releases%2Fdownload%2Fnode-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" + resolved "https://registry.npmmirror.com/node-releases/download/node-releases-2.0.1.tgz?cache=0&sync_timestamp=1634806960337&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnode-releases%2Fdownload%2Fnode-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" integrity sha1-PR05XyBPHy8ppUNYuftnh2WtL8U= normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/normalize-path/download/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + resolved "https://registry.nlark.com/normalize-path/download/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU= normalize-range@^0.1.2: @@ -5306,33 +5375,33 @@ normalize-url@^6.0.1: npm-run-path@^4.0.1: version "4.0.1" - resolved "https://registry.npmmirror.com/npm-run-path/download/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + resolved "https://registry.npmmirror.com/npm-run-path/download/npm-run-path-4.0.1.tgz?cache=0&sync_timestamp=1633420566316&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnpm-run-path%2Fdownload%2Fnpm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha1-t+zR5e1T2o43pV4cImnguX7XSOo= dependencies: path-key "^3.0.0" nprogress@^0.2.0: version "0.2.0" - resolved "https://registry.npm.taobao.org/nprogress/download/nprogress-0.2.0.tgz#cb8f34c53213d895723fcbab907e9422adbcafb1" - integrity sha1-y480xTIT2JVyP8urkH6UIq28r7E= + resolved "https://registry.npmmirror.com/nprogress/download/nprogress-0.2.0.tgz#cb8f34c53213d895723fcbab907e9422adbcafb1" + integrity sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA== nth-check@^1.0.2, nth-check@~1.0.1: version "1.0.2" - resolved "https://registry.nlark.com/nth-check/download/nth-check-1.0.2.tgz?cache=0&sync_timestamp=1631793617973&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" + resolved "https://registry.nlark.com/nth-check/download/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" integrity sha1-sr0pXDfj3VijvwcAN2Zjuk2c8Fw= dependencies: boolbase "~1.0.0" -nth-check@^2.0.0: +nth-check@^2.0.1: version "2.0.1" - resolved "https://registry.nlark.com/nth-check/download/nth-check-2.0.1.tgz?cache=0&sync_timestamp=1631793617973&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" + resolved "https://registry.nlark.com/nth-check/download/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" integrity sha1-Lv4WL1w9oGoolZ+9PbddvuqfD8I= dependencies: boolbase "^1.0.0" object-assign@^4.1.1: version "4.1.1" - resolved "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + resolved "https://registry.npmmirror.com/object-assign/download/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= object-hash@^2.2.0: @@ -5341,13 +5410,13 @@ object-hash@^2.2.0: integrity sha1-WtUYWB7vxEO9djRyuP8unCwNVKU= object-inspect@^1.11.0, object-inspect@^1.9.0: - version "1.11.1" - resolved "https://registry.npmmirror.com/object-inspect/download/object-inspect-1.11.1.tgz#d4bd7d7de54b9a75599f59a00bd698c1f1c6549b" - integrity sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA== + version "1.12.0" + resolved "https://registry.npmmirror.com/object-inspect/download/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" + integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== object-is@^1.0.1: version "1.1.5" - resolved "https://registry.nlark.com/object-is/download/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + resolved "https://registry.npm.taobao.org/object-is/download/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" integrity sha1-ud7qpfx/GEag+uzc7sE45XePU6w= dependencies: call-bind "^1.0.2" @@ -5370,7 +5439,7 @@ object.assign@^4.1.0, object.assign@^4.1.2: object.getownpropertydescriptors@^2.1.0: version "2.1.3" - resolved "https://registry.npmmirror.com/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.1.3.tgz?cache=0&sync_timestamp=1633321822200&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" + resolved "https://registry.npmmirror.com/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.1.3.tgz?cache=0&sync_timestamp=1633321702182&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" integrity sha1-siPPOOF/77l6Y8EMkd9yzLOG354= dependencies: call-bind "^1.0.2" @@ -5379,7 +5448,7 @@ object.getownpropertydescriptors@^2.1.0: object.values@^1.1.0: version "1.1.5" - resolved "https://registry.npmmirror.com/object.values/download/object.values-1.1.5.tgz?cache=0&sync_timestamp=1633326898457&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.values%2Fdownload%2Fobject.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" + resolved "https://registry.npmmirror.com/object.values/download/object.values-1.1.5.tgz?cache=0&sync_timestamp=1633327765894&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.values%2Fdownload%2Fobject.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" integrity sha1-lZ9j486e8QhyAzMIITHkpFm3Fqw= dependencies: call-bind "^1.0.2" @@ -5388,12 +5457,12 @@ object.values@^1.1.0: obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" - resolved "https://registry.npm.taobao.org/obuf/download/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" + resolved "https://registry.nlark.com/obuf/download/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha1-Cb6jND1BhZ69RGKS0RydTbYZCE4= on-finished@~2.3.0: version "2.3.0" - resolved "https://registry.npm.taobao.org/on-finished/download/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + resolved "https://registry.nlark.com/on-finished/download/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= dependencies: ee-first "1.1.1" @@ -5412,14 +5481,14 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: onetime@^5.1.2: version "5.1.2" - resolved "https://registry.nlark.com/onetime/download/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + resolved "https://registry.npm.taobao.org/onetime/download/onetime-5.1.2.tgz?cache=0&sync_timestamp=1617889724435&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fonetime%2Fdownload%2Fonetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha1-0Oluu1awdHbfHdnEgG5SN5hcpF4= dependencies: mimic-fn "^2.1.0" open@^7.0.2: version "7.4.2" - resolved "https://registry.npmmirror.com/open/download/open-7.4.2.tgz?cache=0&sync_timestamp=1635048357738&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fopen%2Fdownload%2Fopen-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" + resolved "https://registry.npmmirror.com/open/download/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" integrity sha1-uBR+Jtzz5CYxbHMAif1x7dKcIyE= dependencies: is-docker "^2.0.0" @@ -5427,7 +5496,7 @@ open@^7.0.2: open@^8.0.9: version "8.4.0" - resolved "https://registry.npmmirror.com/open/download/open-8.4.0.tgz?cache=0&sync_timestamp=1635048357738&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fopen%2Fdownload%2Fopen-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" + resolved "https://registry.npmmirror.com/open/download/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" integrity sha1-NFMhrhj4E4+CVlqRD9xrOejCRPg= dependencies: define-lazy-prop "^2.0.0" @@ -5436,7 +5505,7 @@ open@^8.0.9: opener@^1.5.2: version "1.5.2" - resolved "https://registry.nlark.com/opener/download/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" + resolved "https://registry.nlark.com/opener/download/opener-1.5.2.tgz?cache=0&sync_timestamp=1618847055043&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fopener%2Fdownload%2Fopener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" integrity sha1-XTfh81B3udysQwE3InGv3rKhNZg= p-cancelable@^1.0.0: @@ -5446,35 +5515,35 @@ p-cancelable@^1.0.0: p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" - resolved "https://registry.nlark.com/p-limit/download/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + resolved "https://registry.nlark.com/p-limit/download/p-limit-2.3.0.tgz?cache=0&sync_timestamp=1628812721654&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-limit%2Fdownload%2Fp-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" integrity sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE= dependencies: p-try "^2.0.0" p-locate@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/p-locate/download/p-locate-3.0.0.tgz?cache=0&sync_timestamp=1629892721671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-locate%2Fdownload%2Fp-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + resolved "https://registry.nlark.com/p-locate/download/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" integrity sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ= dependencies: p-limit "^2.0.0" p-locate@^4.1.0: version "4.1.0" - resolved "https://registry.nlark.com/p-locate/download/p-locate-4.1.0.tgz?cache=0&sync_timestamp=1629892721671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-locate%2Fdownload%2Fp-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + resolved "https://registry.nlark.com/p-locate/download/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" integrity sha1-o0KLtwiLOmApL2aRkni3wpetTwc= dependencies: p-limit "^2.2.0" p-map@^4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/p-map/download/p-map-4.0.0.tgz?cache=0&sync_timestamp=1635931861684&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-map%2Fdownload%2Fp-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + resolved "https://registry.npmmirror.com/p-map/download/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" integrity sha1-uy+Vpe2i7BaOySdOBqdHw+KQTSs= dependencies: aggregate-error "^3.0.0" p-retry@^4.5.0: version "4.6.1" - resolved "https://registry.npmmirror.com/p-retry/download/p-retry-4.6.1.tgz?cache=0&sync_timestamp=1635967027504&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-retry%2Fdownload%2Fp-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" + resolved "https://registry.npmmirror.com/p-retry/download/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" integrity sha1-j83dXN96Z6CRGpzy7w5d9/YCMWw= dependencies: "@types/retry" "^0.12.0" @@ -5482,7 +5551,7 @@ p-retry@^4.5.0: p-try@^2.0.0: version "2.2.0" - resolved "https://registry.npmmirror.com/p-try/download/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + resolved "https://registry.npmmirror.com/p-try/download/p-try-2.2.0.tgz?cache=0&sync_timestamp=1633364397780&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-try%2Fdownload%2Fp-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha1-yyhoVA4xPWHeWPr741zpAE1VQOY= package-json@^6.3.0: @@ -5549,7 +5618,7 @@ parse5@^6.0.0: parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" - resolved "https://registry.npm.taobao.org/parseurl/download/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + resolved "https://registry.nlark.com/parseurl/download/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ= pascal-case@^3.1.2: @@ -5562,12 +5631,12 @@ pascal-case@^3.1.2: path-exists@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/path-exists/download/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + resolved "https://registry.nlark.com/path-exists/download/path-exists-3.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpath-exists%2Fdownload%2Fpath-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= path-exists@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/path-exists/download/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + resolved "https://registry.nlark.com/path-exists/download/path-exists-4.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpath-exists%2Fdownload%2Fpath-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" integrity sha1-UTvb4tO5XXdi6METfvoZXGxhtbM= path-is-absolute@^1.0.0: @@ -5577,12 +5646,12 @@ path-is-absolute@^1.0.0: path-is-inside@1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/path-is-inside/download/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" + resolved "https://registry.nlark.com/path-is-inside/download/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" - resolved "https://registry.nlark.com/path-key/download/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + resolved "https://registry.npm.taobao.org/path-key/download/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha1-WB9q3mWMu6ZaDTOA3ndTKVBU83U= path-parse@^1.0.6: @@ -5592,61 +5661,56 @@ path-parse@^1.0.6: path-to-regexp@0.1.7: version "0.1.7" - resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + resolved "https://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= path-to-regexp@2.2.1: version "2.2.1" - resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" + resolved "https://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" integrity sha1-kLYXAloWOBqHm8gqONTovesrz0U= path-to-regexp@^1.7.0: version "1.8.0" - resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" + resolved "https://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" integrity sha1-iHs7qdhDk+h6CgufTLdWGYtTVIo= dependencies: isarray "0.0.1" path-type@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/path-type/download/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + resolved "https://registry.npm.taobao.org/path-type/download/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs= -picocolors@^0.2.1: - version "0.2.1" - resolved "https://registry.npmmirror.com/picocolors/download/picocolors-0.2.1.tgz?cache=0&sync_timestamp=1634093378416&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f" - integrity sha1-VwZw95NkaFHRuhNZlpYqutWHhZ8= - picocolors@^1.0.0: version "1.0.0" - resolved "https://registry.npmmirror.com/picocolors/download/picocolors-1.0.0.tgz?cache=0&sync_timestamp=1634093378416&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + resolved "https://registry.npmmirror.com/picocolors/download/picocolors-1.0.0.tgz?cache=0&sync_timestamp=1634093339035&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha1-y1vcdP8/UYkiNur3nWi8RFZKuBw= picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: version "2.3.0" - resolved "https://registry.nlark.com/picomatch/download/picomatch-2.3.0.tgz?cache=0&sync_timestamp=1621648246651&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpicomatch%2Fdownload%2Fpicomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + resolved "https://registry.nlark.com/picomatch/download/picomatch-2.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpicomatch%2Fdownload%2Fpicomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" integrity sha1-8fBh3o9qS/AiiS4tEoI0+5gwKXI= pify@^2.3.0: version "2.3.0" - resolved "https://registry.nlark.com/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + resolved "https://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= pify@^4.0.1: version "4.0.1" - resolved "https://registry.nlark.com/pify/download/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + resolved "https://registry.npm.taobao.org/pify/download/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE= pkg-dir@^4.1.0: version "4.2.0" - resolved "https://registry.npmmirror.com/pkg-dir/download/pkg-dir-4.2.0.tgz?cache=0&sync_timestamp=1633498133295&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-dir%2Fdownload%2Fpkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + resolved "https://registry.npmmirror.com/pkg-dir/download/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" integrity sha1-8JkTPfft5CLoHR2ESCcO6z5CYfM= dependencies: find-up "^4.0.0" pkg-up@^3.1.0: version "3.1.0" - resolved "https://registry.npmmirror.com/pkg-up/download/pkg-up-3.1.0.tgz?cache=0&sync_timestamp=1636035118070&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-up%2Fdownload%2Fpkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" + resolved "https://registry.npmmirror.com/pkg-up/download/pkg-up-3.1.0.tgz?cache=0&sync_timestamp=1636035062199&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-up%2Fdownload%2Fpkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" integrity sha1-EA7CNcwVDk/UJRlBJZaihRKg3vU= dependencies: find-up "^3.0.0" @@ -5668,31 +5732,31 @@ postcss-calc@^8.0.0: postcss-selector-parser "^6.0.2" postcss-value-parser "^4.0.2" -postcss-colormin@^5.2.1: - version "5.2.1" - resolved "https://registry.npmmirror.com/postcss-colormin/download/postcss-colormin-5.2.1.tgz?cache=0&sync_timestamp=1635857516973&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-colormin%2Fdownload%2Fpostcss-colormin-5.2.1.tgz#6e444a806fd3c578827dbad022762df19334414d" - integrity sha1-bkRKgG/TxXiCfbrQInYt8ZM0QU0= +postcss-colormin@^5.2.2: + version "5.2.2" + resolved "https://registry.npmmirror.com/postcss-colormin/download/postcss-colormin-5.2.2.tgz#019cd6912bef9e7e0924462c5e4ffae241e2f437" + integrity sha512-tSEe3NpqWARUTidDlF0LntPkdlhXqfDFuA1yslqpvvGAfpZ7oBaw+/QXd935NKm2U9p4PED0HDZlzmMk7fVC6g== dependencies: browserslist "^4.16.6" caniuse-api "^3.0.0" colord "^2.9.1" - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" postcss-convert-values@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-convert-values/download/postcss-convert-values-5.0.2.tgz?cache=0&sync_timestamp=1635857664165&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-convert-values%2Fdownload%2Fpostcss-convert-values-5.0.2.tgz#879b849dc3677c7d6bc94b6a2c1a3f0808798059" + resolved "https://registry.npmmirror.com/postcss-convert-values/download/postcss-convert-values-5.0.2.tgz#879b849dc3677c7d6bc94b6a2c1a3f0808798059" integrity sha1-h5uEncNnfH1ryUtqLBo/CAh5gFk= dependencies: postcss-value-parser "^4.1.0" postcss-discard-comments@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-comments/download/postcss-discard-comments-5.0.1.tgz?cache=0&sync_timestamp=1621449592883&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-comments%2Fdownload%2Fpostcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" + resolved "https://registry.nlark.com/postcss-discard-comments/download/postcss-discard-comments-5.0.1.tgz?cache=0&sync_timestamp=1621449558287&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-comments%2Fdownload%2Fpostcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" integrity sha1-nq5LdHz3YNMfJEfCfwYZ1XGJAf4= postcss-discard-duplicates@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-duplicates/download/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" + resolved "https://registry.nlark.com/postcss-discard-duplicates/download/postcss-discard-duplicates-5.0.1.tgz?cache=0&sync_timestamp=1621449558296&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-duplicates%2Fdownload%2Fpostcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" integrity sha1-aPfMZFj+a6suRsn1WuUoafaA5m0= postcss-discard-empty@^5.0.1: @@ -5702,7 +5766,7 @@ postcss-discard-empty@^5.0.1: postcss-discard-overridden@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-overridden/download/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" + resolved "https://registry.nlark.com/postcss-discard-overridden/download/postcss-discard-overridden-5.0.1.tgz?cache=0&sync_timestamp=1621449732464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-overridden%2Fdownload%2Fpostcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" integrity sha1-RUtB9wcwC5gQmnUAXKSrD/J0OsY= postcss-discard-unused@^5.0.1: @@ -5714,7 +5778,7 @@ postcss-discard-unused@^5.0.1: postcss-import@^14.0.2: version "14.0.2" - resolved "https://registry.nlark.com/postcss-import/download/postcss-import-14.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-import%2Fdownload%2Fpostcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1" + resolved "https://registry.nlark.com/postcss-import/download/postcss-import-14.0.2.tgz?cache=0&sync_timestamp=1620671193913&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-import%2Fdownload%2Fpostcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1" integrity sha1-YO/3fmvpLntn/kaex5fZQkyuGqE= dependencies: postcss-value-parser "^4.0.0" @@ -5723,7 +5787,7 @@ postcss-import@^14.0.2: postcss-js@^3.0.3: version "3.0.3" - resolved "https://registry.nlark.com/postcss-js/download/postcss-js-3.0.3.tgz#2f0bd370a2e8599d45439f6970403b5873abda33" + resolved "https://registry.npm.taobao.org/postcss-js/download/postcss-js-3.0.3.tgz#2f0bd370a2e8599d45439f6970403b5873abda33" integrity sha1-LwvTcKLoWZ1FQ59pcEA7WHOr2jM= dependencies: camelcase-css "^2.0.1" @@ -5757,7 +5821,7 @@ postcss-merge-idents@^5.0.1: postcss-merge-longhand@^5.0.4: version "5.0.4" - resolved "https://registry.npmmirror.com/postcss-merge-longhand/download/postcss-merge-longhand-5.0.4.tgz#41f4f3270282ea1a145ece078b7679f0cef21c32" + resolved "https://registry.npmmirror.com/postcss-merge-longhand/download/postcss-merge-longhand-5.0.4.tgz?cache=0&sync_timestamp=1637084835421&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-longhand%2Fdownload%2Fpostcss-merge-longhand-5.0.4.tgz#41f4f3270282ea1a145ece078b7679f0cef21c32" integrity sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw== dependencies: postcss-value-parser "^4.1.0" @@ -5765,7 +5829,7 @@ postcss-merge-longhand@^5.0.4: postcss-merge-rules@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-merge-rules/download/postcss-merge-rules-5.0.3.tgz?cache=0&sync_timestamp=1637085394901&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-rules%2Fdownload%2Fpostcss-merge-rules-5.0.3.tgz#b5cae31f53129812a77e3eb1eeee448f8cf1a1db" + resolved "https://registry.npmmirror.com/postcss-merge-rules/download/postcss-merge-rules-5.0.3.tgz?cache=0&sync_timestamp=1637085530842&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-rules%2Fdownload%2Fpostcss-merge-rules-5.0.3.tgz#b5cae31f53129812a77e3eb1eeee448f8cf1a1db" integrity sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg== dependencies: browserslist "^4.16.6" @@ -5791,7 +5855,7 @@ postcss-minify-gradients@^5.0.3: postcss-minify-params@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-minify-params/download/postcss-minify-params-5.0.2.tgz#1b644da903473fbbb18fbe07b8e239883684b85c" + resolved "https://registry.npmmirror.com/postcss-minify-params/download/postcss-minify-params-5.0.2.tgz?cache=0&sync_timestamp=1637084835630&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-minify-params%2Fdownload%2Fpostcss-minify-params-5.0.2.tgz#1b644da903473fbbb18fbe07b8e239883684b85c" integrity sha512-qJAPuBzxO1yhLad7h2Dzk/F7n1vPyfHfCCh5grjGfjhi1ttCnq4ZXGIW77GSrEbh9Hus9Lc/e/+tB4vh3/GpDg== dependencies: alphanum-sort "^1.0.2" @@ -5801,7 +5865,7 @@ postcss-minify-params@^5.0.2: postcss-minify-selectors@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/postcss-minify-selectors/download/postcss-minify-selectors-5.1.0.tgz?cache=0&sync_timestamp=1621449593365&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-minify-selectors%2Fdownload%2Fpostcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" + resolved "https://registry.nlark.com/postcss-minify-selectors/download/postcss-minify-selectors-5.1.0.tgz?cache=0&sync_timestamp=1621449558355&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-minify-selectors%2Fdownload%2Fpostcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" integrity sha1-Q4XIRdOXn/FgKRd0Uj/6VOr9WlQ= dependencies: alphanum-sort "^1.0.2" @@ -5809,12 +5873,12 @@ postcss-minify-selectors@^5.1.0: postcss-modules-extract-imports@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/postcss-modules-extract-imports/download/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" + resolved "https://registry.npm.taobao.org/postcss-modules-extract-imports/download/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" integrity sha1-zaHwR8CugMl9vijD52pDuIAldB0= postcss-modules-local-by-default@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/postcss-modules-local-by-default/download/postcss-modules-local-by-default-4.0.0.tgz?cache=0&sync_timestamp=1602587625149&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-local-by-default%2Fdownload%2Fpostcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" + resolved "https://registry.nlark.com/postcss-modules-local-by-default/download/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" integrity sha1-67tU+uFZjuz99pGgKz/zs5ClpRw= dependencies: icss-utils "^5.0.0" @@ -5823,33 +5887,33 @@ postcss-modules-local-by-default@^4.0.0: postcss-modules-scope@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/postcss-modules-scope/download/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" + resolved "https://registry.nlark.com/postcss-modules-scope/download/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" integrity sha1-nvMVFFbTu/oSDKRImN/Kby+gHwY= dependencies: postcss-selector-parser "^6.0.4" postcss-modules-values@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/postcss-modules-values/download/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + resolved "https://registry.npm.taobao.org/postcss-modules-values/download/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" integrity sha1-18Xn5ow7s8myfL9Iyguz/7RgLJw= dependencies: icss-utils "^5.0.0" postcss-nested@5.0.6: version "5.0.6" - resolved "https://registry.nlark.com/postcss-nested/download/postcss-nested-5.0.6.tgz?cache=0&sync_timestamp=1627468122159&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-nested%2Fdownload%2Fpostcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" + resolved "https://registry.nlark.com/postcss-nested/download/postcss-nested-5.0.6.tgz?cache=0&sync_timestamp=1627468102377&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-nested%2Fdownload%2Fpostcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" integrity sha1-RmND9/yNPUavPn26P81H0FKpRbw= dependencies: postcss-selector-parser "^6.0.6" postcss-normalize-charset@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-charset/download/postcss-normalize-charset-5.0.1.tgz?cache=0&sync_timestamp=1621449593655&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-charset%2Fdownload%2Fpostcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" + resolved "https://registry.nlark.com/postcss-normalize-charset/download/postcss-normalize-charset-5.0.1.tgz?cache=0&sync_timestamp=1621449558308&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-charset%2Fdownload%2Fpostcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" integrity sha1-EhVZ0b68VayNJK839nvU2p79kdA= postcss-normalize-display-values@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-display-values/download/postcss-normalize-display-values-5.0.1.tgz?cache=0&sync_timestamp=1621449599414&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-display-values%2Fdownload%2Fpostcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" + resolved "https://registry.nlark.com/postcss-normalize-display-values/download/postcss-normalize-display-values-5.0.1.tgz?cache=0&sync_timestamp=1621449652268&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-display-values%2Fdownload%2Fpostcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" integrity sha1-YmULllmBqVXf/ugzY0U9uC9q0f0= dependencies: cssnano-utils "^2.0.1" @@ -5893,25 +5957,24 @@ postcss-normalize-unicode@^5.0.1: browserslist "^4.16.0" postcss-value-parser "^4.1.0" -postcss-normalize-url@^5.0.3: - version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-normalize-url/download/postcss-normalize-url-5.0.3.tgz#42eca6ede57fe69075fab0f88ac8e48916ef931c" - integrity sha512-qWiUMbvkRx3kc1Dp5opzUwc7MBWZcSDK2yofCmdvFBCpx+zFPkxBC1FASQ59Pt+flYfj/nTZSkmF56+XG5elSg== +postcss-normalize-url@^5.0.4: + version "5.0.4" + resolved "https://registry.npmmirror.com/postcss-normalize-url/download/postcss-normalize-url-5.0.4.tgz#3b0322c425e31dd275174d0d5db0e466f50810fb" + integrity sha512-cNj3RzK2pgQQyNp7dzq0dqpUpQ/wYtdDZM3DepPmFjCmYIfceuD9VIAcOdvrNetjIU65g1B4uwdP/Krf6AFdXg== dependencies: - is-absolute-url "^3.0.3" normalize-url "^6.0.1" - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" postcss-normalize-whitespace@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-whitespace/download/postcss-normalize-whitespace-5.0.1.tgz?cache=0&sync_timestamp=1621449593892&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-whitespace%2Fdownload%2Fpostcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" + resolved "https://registry.nlark.com/postcss-normalize-whitespace/download/postcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" integrity sha1-sLQLW8rINYX/B+rS2vLc++7vjpo= dependencies: postcss-value-parser "^4.1.0" postcss-ordered-values@^5.0.2: version "5.0.2" - resolved "https://registry.nlark.com/postcss-ordered-values/download/postcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" + resolved "https://registry.nlark.com/postcss-ordered-values/download/postcss-ordered-values-5.0.2.tgz?cache=0&sync_timestamp=1623330460500&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-ordered-values%2Fdownload%2Fpostcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" integrity sha1-HzUUJpd74A4PdlsxZK11PayO0EQ= dependencies: cssnano-utils "^2.0.1" @@ -5934,16 +5997,16 @@ postcss-reduce-initial@^5.0.2: postcss-reduce-transforms@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-reduce-transforms/download/postcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640" + resolved "https://registry.nlark.com/postcss-reduce-transforms/download/postcss-reduce-transforms-5.0.1.tgz?cache=0&sync_timestamp=1621449730895&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-reduce-transforms%2Fdownload%2Fpostcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640" integrity sha1-k8EvahWUdKpxHVJpkj4jg87c9kA= dependencies: cssnano-utils "^2.0.1" postcss-value-parser "^4.1.0" -postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6: - version "6.0.6" - resolved "https://registry.nlark.com/postcss-selector-parser/download/postcss-selector-parser-6.0.6.tgz?cache=0&sync_timestamp=1620752924836&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-selector-parser%2Fdownload%2Fpostcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" - integrity sha1-LFu6gXSsL2mBq2MaQqsO5UrzMuo= +postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.7: + version "6.0.8" + resolved "https://registry.npmmirror.com/postcss-selector-parser/download/postcss-selector-parser-6.0.8.tgz#f023ed7a9ea736cd7ef70342996e8e78645a7914" + integrity sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -5957,7 +6020,7 @@ postcss-sort-media-queries@^4.1.0: postcss-svgo@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-svgo/download/postcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30" + resolved "https://registry.npmmirror.com/postcss-svgo/download/postcss-svgo-5.0.3.tgz?cache=0&sync_timestamp=1635857761721&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-svgo%2Fdownload%2Fpostcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30" integrity sha1-2UUYV1bl36rgf57bDTyuf/efmzA= dependencies: postcss-value-parser "^4.1.0" @@ -5965,13 +6028,13 @@ postcss-svgo@^5.0.3: postcss-unique-selectors@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-unique-selectors/download/postcss-unique-selectors-5.0.2.tgz#5d6893daf534ae52626708e0d62250890108c0c1" + resolved "https://registry.npmmirror.com/postcss-unique-selectors/download/postcss-unique-selectors-5.0.2.tgz?cache=0&sync_timestamp=1637084835538&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-unique-selectors%2Fdownload%2Fpostcss-unique-selectors-5.0.2.tgz#5d6893daf534ae52626708e0d62250890108c0c1" integrity sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA== dependencies: alphanum-sort "^1.0.2" postcss-selector-parser "^6.0.5" -postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: +postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: version "4.2.0" resolved "https://registry.npmmirror.com/postcss-value-parser/download/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== @@ -5981,18 +6044,10 @@ postcss-zindex@^5.0.1: resolved "https://registry.nlark.com/postcss-zindex/download/postcss-zindex-5.0.1.tgz#c585724beb69d356af8c7e68847b28d6298ece03" integrity sha1-xYVyS+tp01avjH5ohHso1imOzgM= -"postcss@5 - 7": - version "7.0.39" - resolved "https://registry.npmmirror.com/postcss/download/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309" - integrity sha1-liQ3XZZWMOLh8sAqk1yCpZy0gwk= - dependencies: - picocolors "^0.2.1" - source-map "^0.6.1" - postcss@^8.1.6, postcss@^8.2.15, postcss@^8.3.5, postcss@^8.3.7: - version "8.4.4" - resolved "https://registry.npmmirror.com/postcss/download/postcss-8.4.4.tgz#d53d4ec6a75fd62557a66bb41978bf47ff0c2869" - integrity sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q== + version "8.4.5" + resolved "https://registry.npmmirror.com/postcss/download/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95" + integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg== dependencies: nanoid "^3.1.30" picocolors "^1.0.0" @@ -6028,8 +6083,8 @@ prism-react-renderer@^1.2.1: prismjs@^1.23.0: version "1.25.0" - resolved "https://registry.nlark.com/prismjs/download/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756" - integrity sha1-b4It8b2tllc0sxCzFaIzFc+Zl1Y= + resolved "https://registry.npmmirror.com/prismjs/download/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756" + integrity sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg== process-nextick-args@~2.0.0: version "2.0.1" @@ -6038,20 +6093,20 @@ process-nextick-args@~2.0.0: prompts@^2.4.0, prompts@^2.4.1: version "2.4.2" - resolved "https://registry.npmmirror.com/prompts/download/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" + resolved "https://registry.npmmirror.com/prompts/download/prompts-2.4.2.tgz?cache=0&sync_timestamp=1633642460453&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fprompts%2Fdownload%2Fprompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" integrity sha1-e1fnOzpIAprRDr1E90sBcipMsGk= dependencies: kleur "^3.0.3" sisteransi "^1.0.5" prop-types@^15.6.2, prop-types@^15.7.2: - version "15.7.2" - resolved "https://registry.nlark.com/prop-types/download/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha1-UsQedbjIfnK52TYOAga5ncv/psU= + version "15.8.0" + resolved "https://registry.npmmirror.com/prop-types/download/prop-types-15.8.0.tgz#d237e624c45a9846e469f5f31117f970017ff588" + integrity sha512-fDGekdaHh65eI3lMi5OnErU6a8Ighg2KjcjQxO7m8VHyWjcPyj5kiOgV1LQDOOOgVy3+5FgjXvdSSX7B8/5/4g== dependencies: loose-envify "^1.4.0" object-assign "^4.1.1" - react-is "^16.8.1" + react-is "^16.13.1" property-information@^5.0.0, property-information@^5.3.0: version "5.6.0" @@ -6060,9 +6115,9 @@ property-information@^5.0.0, property-information@^5.3.0: dependencies: xtend "^4.0.0" -proxy-addr@~2.0.5: +proxy-addr@~2.0.7: version "2.0.7" - resolved "https://registry.nlark.com/proxy-addr/download/proxy-addr-2.0.7.tgz?cache=0&sync_timestamp=1622509170257&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fproxy-addr%2Fdownload%2Fproxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + resolved "https://registry.nlark.com/proxy-addr/download/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" integrity sha1-8Z/mnOqzEe65S0LnDowgcPm6ECU= dependencies: forwarded "0.2.0" @@ -6070,7 +6125,7 @@ proxy-addr@~2.0.5: pump@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/pump/download/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + resolved "https://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" integrity sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ= dependencies: end-of-stream "^1.1.0" @@ -6093,7 +6148,7 @@ punycode@^2.1.0: pupa@^2.1.1: version "2.1.1" - resolved "https://registry.nlark.com/pupa/download/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" + resolved "https://registry.nlark.com/pupa/download/pupa-2.1.1.tgz?cache=0&sync_timestamp=1631543593292&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpupa%2Fdownload%2Fpupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" integrity sha1-9ej9SvwsXZeCj6pSNUnth0SiDWI= dependencies: escape-goat "^2.0.0" @@ -6103,10 +6158,10 @@ q@^1.1.2: resolved "https://registry.nlark.com/q/download/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= -qs@6.7.0: - version "6.7.0" - resolved "https://registry.npmmirror.com/qs/download/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" - integrity sha1-QdwaAV49WB8WIXdr4xr7KHapsbw= +qs@6.9.6: + version "6.9.6" + resolved "https://registry.npmmirror.com/qs/download/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee" + integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ== querystring@0.2.0: version "0.2.0" @@ -6120,39 +6175,39 @@ queue-microtask@^1.2.2: quick-lru@^5.1.1: version "5.1.1" - resolved "https://registry.npmmirror.com/quick-lru/download/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + resolved "https://registry.npmmirror.com/quick-lru/download/quick-lru-5.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fquick-lru%2Fdownload%2Fquick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" integrity sha1-NmST5rPkKjpoheLpnRj4D7eoyTI= randombytes@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/randombytes/download/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + resolved "https://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" integrity sha1-32+ENy8CcNxlzfYpE0mrekc9Tyo= dependencies: safe-buffer "^5.1.0" range-parser@1.2.0: version "1.2.0" - resolved "https://registry.nlark.com/range-parser/download/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" + resolved "https://registry.npm.taobao.org/range-parser/download/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4= range-parser@^1.2.1, range-parser@~1.2.1: version "1.2.1" - resolved "https://registry.nlark.com/range-parser/download/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + resolved "https://registry.npm.taobao.org/range-parser/download/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE= -raw-body@2.4.0: - version "2.4.0" - resolved "https://registry.npmmirror.com/raw-body/download/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" - integrity sha1-oc5vucm8NWylLoklarWQWeE9AzI= +raw-body@2.4.2: + version "2.4.2" + resolved "https://registry.npmmirror.com/raw-body/download/raw-body-2.4.2.tgz?cache=0&sync_timestamp=1637116849434&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fraw-body%2Fdownload%2Fraw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32" + integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ== dependencies: - bytes "3.1.0" - http-errors "1.7.2" + bytes "3.1.1" + http-errors "1.8.1" iconv-lite "0.4.24" unpipe "1.0.0" rc@^1.2.8: version "1.2.8" - resolved "https://registry.nlark.com/rc/download/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + resolved "https://registry.npm.taobao.org/rc/download/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha1-zZJL9SAKB1uDwYjNa54hG3/A0+0= dependencies: deep-extend "^0.6.0" @@ -6198,7 +6253,7 @@ react-dev-utils@12.0.0-next.47: react-dom@^17.0.1: version "17.0.2" resolved "https://registry.npmmirror.com/react-dom/download/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" - integrity sha1-7P+2hF462Nv83EmPDQqTlzZQLCM= + integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -6206,13 +6261,13 @@ react-dom@^17.0.1: react-error-overlay@7.0.0-next.54+1465357b: version "7.0.0-next.54" - resolved "https://registry.npmmirror.com/react-error-overlay/download/react-error-overlay-7.0.0-next.54.tgz?cache=0&sync_timestamp=1633373332600&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-error-overlay%2Fdownload%2Freact-error-overlay-7.0.0-next.54.tgz#c1eb5ab86aee15e9552e6d97897b08f2bd06d140" + resolved "https://registry.npmmirror.com/react-error-overlay/download/react-error-overlay-7.0.0-next.54.tgz#c1eb5ab86aee15e9552e6d97897b08f2bd06d140" integrity sha1-wetauGruFelVLm2XiXsI8r0G0UA= react-error-overlay@^6.0.9: - version "6.0.9" - resolved "https://registry.npmmirror.com/react-error-overlay/download/react-error-overlay-6.0.9.tgz?cache=0&sync_timestamp=1633373332600&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-error-overlay%2Fdownload%2Freact-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a" - integrity sha1-PHQwEMk1lgjDdezWvHbzXZOZWwo= + version "6.0.10" + resolved "https://registry.npmmirror.com/react-error-overlay/download/react-error-overlay-6.0.10.tgz#0fe26db4fa85d9dbb8624729580e90e7159a59a6" + integrity sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA== react-fast-compare@^3.1.1: version "3.2.0" @@ -6221,7 +6276,7 @@ react-fast-compare@^3.1.1: react-helmet@^6.1.0: version "6.1.0" - resolved "https://registry.npm.taobao.org/react-helmet/download/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726" + resolved "https://registry.nlark.com/react-helmet/download/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726" integrity sha1-p1DVFlyxPPIT5EdHUCZS55RGhyY= dependencies: object-assign "^4.1.1" @@ -6229,7 +6284,7 @@ react-helmet@^6.1.0: react-fast-compare "^3.1.1" react-side-effect "^2.1.0" -react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1: +react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: version "16.13.1" resolved "https://registry.npmmirror.com/react-is/download/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha1-eJcppNw23imZ3BVt1sHZwYzqVqQ= @@ -6243,15 +6298,15 @@ react-loadable-ssr-addon-v5-slorber@^1.0.1: react-router-config@^5.1.1: version "5.1.1" - resolved "https://registry.nlark.com/react-router-config/download/react-router-config-5.1.1.tgz#0f4263d1a80c6b2dc7b9c1902c9526478194a988" + resolved "https://registry.npm.taobao.org/react-router-config/download/react-router-config-5.1.1.tgz#0f4263d1a80c6b2dc7b9c1902c9526478194a988" integrity sha1-D0Jj0agMay3HucGQLJUmR4GUqYg= dependencies: "@babel/runtime" "^7.1.2" react-router-dom@^5.2.0: version "5.3.0" - resolved "https://registry.npmmirror.com/react-router-dom/download/react-router-dom-5.3.0.tgz?cache=0&sync_timestamp=1636500332816&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Freact-router-dom%2Fdownload%2Freact-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363" - integrity sha1-2hv7U1oOiacSqTuX3Xb0etHzI2M= + resolved "https://registry.npmmirror.com/react-router-dom/download/react-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363" + integrity sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ== dependencies: "@babel/runtime" "^7.12.13" history "^4.9.0" @@ -6279,20 +6334,20 @@ react-router@5.2.1, react-router@^5.2.0: react-side-effect@^2.1.0: version "2.1.1" - resolved "https://registry.npm.taobao.org/react-side-effect/download/react-side-effect-2.1.1.tgz#66c5701c3e7560ab4822a4ee2742dee215d72eb3" + resolved "https://registry.nlark.com/react-side-effect/download/react-side-effect-2.1.1.tgz#66c5701c3e7560ab4822a4ee2742dee215d72eb3" integrity sha1-ZsVwHD51YKtIIqTuJ0Le4hXXLrM= react@^17.0.1: version "17.0.2" resolved "https://registry.npmmirror.com/react/download/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" - integrity sha1-0LXMUW0p6z7uOD91tihkz7aAADc= + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" read-cache@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/read-cache/download/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" + resolved "https://registry.nlark.com/read-cache/download/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q= dependencies: pify "^2.3.0" @@ -6321,7 +6376,7 @@ readable-stream@^3.0.6, readable-stream@^3.1.1: readdirp@~3.6.0: version "3.6.0" - resolved "https://registry.npm.taobao.org/readdirp/download/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + resolved "https://registry.nlark.com/readdirp/download/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" integrity sha1-dKNwvYVxFuJFspzJc0DNQxoCpsc= dependencies: picomatch "^2.2.1" @@ -6333,21 +6388,21 @@ reading-time@^1.5.0: rechoir@^0.6.2: version "0.6.2" - resolved "https://registry.nlark.com/rechoir/download/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" + resolved "https://registry.nlark.com/rechoir/download/rechoir-0.6.2.tgz?cache=0&sync_timestamp=1627101677944&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frechoir%2Fdownload%2Frechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= dependencies: resolve "^1.1.6" recursive-readdir@^2.2.2: version "2.2.2" - resolved "https://registry.npm.taobao.org/recursive-readdir/download/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f" + resolved "https://registry.nlark.com/recursive-readdir/download/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f" integrity sha1-mUb7MnThYo3m42svZxSVO0hFCU8= dependencies: minimatch "3.0.4" regenerate-unicode-properties@^9.0.0: version "9.0.0" - resolved "https://registry.nlark.com/regenerate-unicode-properties/download/regenerate-unicode-properties-9.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerate-unicode-properties%2Fdownload%2Fregenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" + resolved "https://registry.nlark.com/regenerate-unicode-properties/download/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" integrity sha1-VNCccRXh9T3CMUqXSzLBw0Tv4yY= dependencies: regenerate "^1.4.2" @@ -6379,7 +6434,7 @@ regexp.prototype.flags@^1.2.0: regexpu-core@^4.5.4, regexpu-core@^4.7.1: version "4.8.0" - resolved "https://registry.nlark.com/regexpu-core/download/regexpu-core-4.8.0.tgz?cache=0&sync_timestamp=1631619103170&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregexpu-core%2Fdownload%2Fregexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" + resolved "https://registry.nlark.com/regexpu-core/download/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" integrity sha1-5WBbo2G2excYR4UBMnUC9EeamPA= dependencies: regenerate "^1.4.2" @@ -6391,14 +6446,14 @@ regexpu-core@^4.5.4, regexpu-core@^4.7.1: registry-auth-token@^4.0.0: version "4.2.1" - resolved "https://registry.npm.taobao.org/registry-auth-token/download/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" + resolved "https://registry.nlark.com/registry-auth-token/download/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" integrity sha1-bXtABkQZGJcszV/tzUHcMix5slA= dependencies: rc "^1.2.8" registry-url@^5.0.0: version "5.1.0" - resolved "https://registry.npm.taobao.org/registry-url/download/registry-url-5.1.0.tgz?cache=0&sync_timestamp=1618681893788&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregistry-url%2Fdownload%2Fregistry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + resolved "https://registry.npm.taobao.org/registry-url/download/registry-url-5.1.0.tgz?cache=0&sync_timestamp=1618682318998&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregistry-url%2Fdownload%2Fregistry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" integrity sha1-6YM0tQ1UNLgRNrROxjjZwgCcUAk= dependencies: rc "^1.2.8" @@ -6410,14 +6465,14 @@ regjsgen@^0.5.2: regjsparser@^0.7.0: version "0.7.0" - resolved "https://registry.nlark.com/regjsparser/download/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968" + resolved "https://registry.npmmirror.com/regjsparser/download/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968" integrity sha1-prZntUyIXhi1JVTLSWDvcRh+mWg= dependencies: jsesc "~0.5.0" rehype-parse@^6.0.2: version "6.0.2" - resolved "https://registry.nlark.com/rehype-parse/download/rehype-parse-6.0.2.tgz?cache=0&sync_timestamp=1630413716153&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frehype-parse%2Fdownload%2Frehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" + resolved "https://registry.nlark.com/rehype-parse/download/rehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" integrity sha1-rrP91oCF+feW8dMTeuK4WphAaWQ= dependencies: hast-util-from-parse5 "^5.0.0" @@ -6468,7 +6523,7 @@ remark-mdx-remove-imports@^1.6.22: remark-mdx@1.6.22: version "1.6.22" - resolved "https://registry.npmmirror.com/remark-mdx/download/remark-mdx-1.6.22.tgz?cache=0&sync_timestamp=1637012565094&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-mdx%2Fdownload%2Fremark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd" + resolved "https://registry.npmmirror.com/remark-mdx/download/remark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd" integrity sha1-BqjasH3P3VfzNzr3+GvQ6ZIQi70= dependencies: "@babel/core" "7.12.9" @@ -6482,7 +6537,7 @@ remark-mdx@1.6.22: remark-parse@8.0.3: version "8.0.3" - resolved "https://registry.npmmirror.com/remark-parse/download/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1" + resolved "https://registry.npmmirror.com/remark-parse/download/remark-parse-8.0.3.tgz?cache=0&sync_timestamp=1637259967297&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-parse%2Fdownload%2Fremark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1" integrity sha1-nGKqOzW3mkhkVMaQRykGB19Ax+E= dependencies: ccount "^1.0.0" @@ -6504,7 +6559,7 @@ remark-parse@8.0.3: remark-squeeze-paragraphs@4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/remark-squeeze-paragraphs/download/remark-squeeze-paragraphs-4.0.0.tgz#76eb0e085295131c84748c8e43810159c5653ead" + resolved "https://registry.npmmirror.com/remark-squeeze-paragraphs/download/remark-squeeze-paragraphs-4.0.0.tgz?cache=0&sync_timestamp=1635765426012&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-squeeze-paragraphs%2Fdownload%2Fremark-squeeze-paragraphs-4.0.0.tgz#76eb0e085295131c84748c8e43810159c5653ead" integrity sha1-dusOCFKVExyEdIyOQ4EBWcVlPq0= dependencies: mdast-squeeze-paragraphs "^4.0.0" @@ -6522,12 +6577,12 @@ renderkid@^3.0.0: repeat-string@^1.5.4: version "1.6.1" - resolved "https://registry.nlark.com/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + resolved "https://registry.npm.taobao.org/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= require-from-string@^2.0.2: version "2.0.2" - resolved "https://registry.nlark.com/require-from-string/download/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + resolved "https://registry.npmmirror.com/require-from-string/download/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha1-iaf92TgmEmcxjq/hT5wy5ZjDaQk= "require-like@>= 0.1.1": @@ -6542,22 +6597,22 @@ requires-port@^1.0.0: resolve-from@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + resolved "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz?cache=0&sync_timestamp=1622605305717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fresolve-from%2Fdownload%2Fresolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY= resolve-from@^5.0.0: version "5.0.0" - resolved "https://registry.nlark.com/resolve-from/download/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + resolved "https://registry.nlark.com/resolve-from/download/resolve-from-5.0.0.tgz?cache=0&sync_timestamp=1622605305717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fresolve-from%2Fdownload%2Fresolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha1-w1IlhD3493bfIcV1V7wIfp39/Gk= resolve-pathname@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/resolve-pathname/download/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" + resolved "https://registry.nlark.com/resolve-pathname/download/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" integrity sha1-mdAiJNPPJjaJvsuzk7xWAxMCXc0= resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2: version "1.20.0" - resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + resolved "https://registry.nlark.com/resolve/download/resolve-1.20.0.tgz?cache=0&sync_timestamp=1631633008759&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fresolve%2Fdownload%2Fresolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha1-YpoBP7P3B1XW8LeTXMHCxTeLGXU= dependencies: is-core-module "^2.2.0" @@ -6565,7 +6620,7 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2 responselike@^1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/responselike/download/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + resolved "https://registry.nlark.com/responselike/download/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= dependencies: lowercase-keys "^1.0.0" @@ -6577,12 +6632,12 @@ retry@^0.13.1: reusify@^1.0.4: version "1.0.4" - resolved "https://registry.npm.taobao.org/reusify/download/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + resolved "https://registry.nlark.com/reusify/download/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha1-kNo4Kx4SbvwCFG6QhFqI2xKSXXY= rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" - resolved "https://registry.npm.taobao.org/rimraf/download/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + resolved "https://registry.npmmirror.com/rimraf/download/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha1-8aVAK6YiCtUswSgrrBrjqkn9Bho= dependencies: glob "^7.1.3" @@ -6594,26 +6649,26 @@ rtl-detect@^1.0.4: run-parallel@^1.1.9: version "1.2.0" - resolved "https://registry.nlark.com/run-parallel/download/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + resolved "https://registry.npm.taobao.org/run-parallel/download/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" integrity sha1-ZtE2jae9+SHrnZW9GpIp5/IaQ+4= dependencies: queue-microtask "^1.2.2" rxjs@^7.1.0: version "7.4.0" - resolved "https://registry.npmmirror.com/rxjs/download/rxjs-7.4.0.tgz?cache=0&sync_timestamp=1633556708772&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Frxjs%2Fdownload%2Frxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68" + resolved "https://registry.npmmirror.com/rxjs/download/rxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68" integrity sha1-oSpE1+6/AW9f8kQbh/KMmlHOvGg= dependencies: tslib "~2.1.0" safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" - resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.1.2.tgz?cache=0&sync_timestamp=1618847044058&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsafe-buffer%2Fdownload%2Fsafe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha1-mR7GnSluAxN0fVm9/St0XDX4go0= -safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: version "5.2.1" - resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.2.1.tgz?cache=0&sync_timestamp=1618847044058&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsafe-buffer%2Fdownload%2Fsafe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha1-Hq+fqb2x/dTsdfWPnNtOa3gn7sY= "safer-buffer@>= 2.1.2 < 3": @@ -6623,7 +6678,7 @@ safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: sax@^1.2.4, sax@~1.2.4: version "1.2.4" - resolved "https://registry.nlark.com/sax/download/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + resolved "https://registry.npm.taobao.org/sax/download/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha1-KBYjTiN4vdxOU1T6tcqold9xANk= scheduler@^0.20.2: @@ -6636,7 +6691,7 @@ scheduler@^0.20.2: schema-utils@2.7.0: version "2.7.0" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" integrity sha1-FxUfdtjq5n+793lgwzxnatn078c= dependencies: "@types/json-schema" "^7.0.4" @@ -6645,7 +6700,7 @@ schema-utils@2.7.0: schema-utils@^2.6.5: version "2.7.1" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha1-HKTzLRskxZDCA7jnpQvw6kzTlNc= dependencies: "@types/json-schema" "^7.0.5" @@ -6654,7 +6709,7 @@ schema-utils@^2.6.5: schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: version "3.1.1" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-3.1.1.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-3.1.1.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" integrity sha1-vHTEtraZXB2I92qLd76nIZ4MgoE= dependencies: "@types/json-schema" "^7.0.8" @@ -6663,7 +6718,7 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: schema-utils@^4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-4.0.0.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-4.0.0.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== dependencies: "@types/json-schema" "^7.0.9" @@ -6673,7 +6728,7 @@ schema-utils@^4.0.0: section-matter@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/section-matter/download/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167" + resolved "https://registry.nlark.com/section-matter/download/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167" integrity sha1-6QQZU1BngOwB1Z8pKhnHuFC4QWc= dependencies: extend-shallow "^2.0.1" @@ -6693,37 +6748,37 @@ selfsigned@^1.10.11: semver-diff@^3.1.1: version "3.1.1" - resolved "https://registry.nlark.com/semver-diff/download/semver-diff-3.1.1.tgz?cache=0&sync_timestamp=1620044887257&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver-diff%2Fdownload%2Fsemver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" + resolved "https://registry.nlark.com/semver-diff/download/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" integrity sha1-Bfd85Z8yXgDicGr9Z7tQbdscoys= dependencies: semver "^6.3.0" semver@7.0.0: version "7.0.0" - resolved "https://registry.nlark.com/semver/download/semver-7.0.0.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + resolved "https://registry.npm.taobao.org/semver/download/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha1-XzyjV2HkfgWyBsba/yz4FPAxa44= semver@^5.4.1: version "5.7.1" - resolved "https://registry.nlark.com/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + resolved "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha1-qVT5Ma66UI0we78Gnv8MAclhFvc= semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" - resolved "https://registry.nlark.com/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + resolved "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0= semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.5" - resolved "https://registry.nlark.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + resolved "https://registry.npm.taobao.org/semver/download/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc= dependencies: lru-cache "^6.0.0" -send@0.17.1: - version "0.17.1" - resolved "https://registry.nlark.com/send/download/send-0.17.1.tgz?cache=0&sync_timestamp=1618846901933&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsend%2Fdownload%2Fsend-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" - integrity sha1-wdiwWfeQD3Rm3Uk4vcROEd2zdsg= +send@0.17.2: + version "0.17.2" + resolved "https://registry.npmmirror.com/send/download/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" + integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww== dependencies: debug "2.6.9" depd "~1.1.2" @@ -6732,16 +6787,16 @@ send@0.17.1: escape-html "~1.0.3" etag "~1.8.1" fresh "0.5.2" - http-errors "~1.7.2" + http-errors "1.8.1" mime "1.6.0" - ms "2.1.1" + ms "2.1.3" on-finished "~2.3.0" range-parser "~1.2.1" statuses "~1.5.0" serialize-javascript@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/serialize-javascript/download/serialize-javascript-6.0.0.tgz?cache=0&sync_timestamp=1624284111898&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + resolved "https://registry.nlark.com/serialize-javascript/download/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" integrity sha1-765diPRdeSQUHai1w6en5mP+/rg= dependencies: randombytes "^2.1.0" @@ -6762,7 +6817,7 @@ serve-handler@^6.1.3: serve-index@^1.9.1: version "1.9.1" - resolved "https://registry.npm.taobao.org/serve-index/download/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" + resolved "https://registry.nlark.com/serve-index/download/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= dependencies: accepts "~1.3.4" @@ -6773,43 +6828,43 @@ serve-index@^1.9.1: mime-types "~2.1.17" parseurl "~1.3.2" -serve-static@1.14.1: - version "1.14.1" - resolved "https://registry.nlark.com/serve-static/download/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" - integrity sha1-Zm5jbcTwEPfvKZcKiKZ0MgiYsvk= +serve-static@1.14.2: + version "1.14.2" + resolved "https://registry.npmmirror.com/serve-static/download/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa" + integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ== dependencies: encodeurl "~1.0.2" escape-html "~1.0.3" parseurl "~1.3.3" - send "0.17.1" + send "0.17.2" setprototypeof@1.1.0: version "1.1.0" - resolved "https://registry.nlark.com/setprototypeof/download/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" + resolved "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" integrity sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY= -setprototypeof@1.1.1: - version "1.1.1" - resolved "https://registry.nlark.com/setprototypeof/download/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" - integrity sha1-fpWsskqpL1iF4KvvW6ExMw1K5oM= +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha1-ZsmiSnP5/CjL5msJ/tPTPcrxtCQ= shallow-clone@^3.0.0: version "3.0.1" - resolved "https://registry.npm.taobao.org/shallow-clone/download/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + resolved "https://registry.nlark.com/shallow-clone/download/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" integrity sha1-jymBrZJTH1UDWwH7IwdppA4C76M= dependencies: kind-of "^6.0.2" shebang-command@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/shebang-command/download/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + resolved "https://registry.npm.taobao.org/shebang-command/download/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" integrity sha1-zNCvT4g1+9wmW4JGGq8MNmY/NOo= dependencies: shebang-regex "^3.0.0" shebang-regex@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/shebang-regex/download/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + resolved "https://registry.nlark.com/shebang-regex/download/shebang-regex-3.0.0.tgz?cache=0&sync_timestamp=1628896299850&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fshebang-regex%2Fdownload%2Fshebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha1-rhbxZE2HPsrYQ7AwexQzYtTEIXI= shell-quote@^1.7.2: @@ -6828,7 +6883,7 @@ shelljs@^0.8.4: side-channel@^1.0.4: version "1.0.4" - resolved "https://registry.npm.taobao.org/side-channel/download/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + resolved "https://registry.nlark.com/side-channel/download/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" integrity sha1-785cj9wQTudRslxY1CkAEfpeos8= dependencies: call-bind "^1.0.0" @@ -6837,7 +6892,7 @@ side-channel@^1.0.4: signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.6" - resolved "https://registry.npmmirror.com/signal-exit/download/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + resolved "https://registry.npmmirror.com/signal-exit/download/signal-exit-3.0.6.tgz?cache=0&sync_timestamp=1637255687504&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsignal-exit%2Fdownload%2Fsignal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== sirv@^1.0.7: @@ -6851,7 +6906,7 @@ sirv@^1.0.7: sisteransi@^1.0.5: version "1.0.5" - resolved "https://registry.npm.taobao.org/sisteransi/download/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" + resolved "https://registry.nlark.com/sisteransi/download/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" integrity sha1-E01oEpd1ZDfMBcoBNw06elcQde0= slash@^3.0.0: @@ -6875,17 +6930,17 @@ sort-css-media-queries@2.0.4: source-list-map@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" + resolved "https://registry.npm.taobao.org/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha1-OZO9hzv8SEecyp6jpUeDXHwVSzQ= source-map-js@^1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/source-map-js/download/source-map-js-1.0.1.tgz?cache=0&sync_timestamp=1636400753943&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-js%2Fdownload%2Fsource-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" + resolved "https://registry.npmmirror.com/source-map-js/download/source-map-js-1.0.1.tgz?cache=0&sync_timestamp=1636400772640&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-js%2Fdownload%2Fsource-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA== source-map-support@~0.5.20: version "0.5.21" - resolved "https://registry.npmmirror.com/source-map-support/download/source-map-support-0.5.21.tgz?cache=0&sync_timestamp=1637320298732&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-support%2Fdownload%2Fsource-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + resolved "https://registry.npmmirror.com/source-map-support/download/source-map-support-0.5.21.tgz?cache=0&sync_timestamp=1637320322789&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-support%2Fdownload%2Fsource-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" @@ -6893,32 +6948,32 @@ source-map-support@~0.5.20: source-map@^0.5.0: version "0.5.7" - resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + resolved "https://registry.nlark.com/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" - resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + resolved "https://registry.nlark.com/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM= source-map@~0.7.2: version "0.7.3" - resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + resolved "https://registry.nlark.com/source-map/download/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha1-UwL4FpAxc1ImVECS5kmB91F1A4M= sourcemap-codec@^1.4.4: version "1.4.8" - resolved "https://registry.npm.taobao.org/sourcemap-codec/download/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" + resolved "https://registry.nlark.com/sourcemap-codec/download/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" integrity sha1-6oBL2UhXQC5pktBaOO8a41qatMQ= space-separated-tokens@^1.0.0: version "1.1.5" - resolved "https://registry.nlark.com/space-separated-tokens/download/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899" + resolved "https://registry.npmmirror.com/space-separated-tokens/download/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899" integrity sha1-hfMsPRDZaCAH6RdBTdxcJtGqaJk= spdy-transport@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/spdy-transport/download/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" + resolved "https://registry.npm.taobao.org/spdy-transport/download/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" integrity sha1-ANSGOmQArXXfkzYaFghgXl3NzzE= dependencies: debug "^4.1.0" @@ -6930,7 +6985,7 @@ spdy-transport@^3.0.0: spdy@^4.0.2: version "4.0.2" - resolved "https://registry.nlark.com/spdy/download/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" + resolved "https://registry.npm.taobao.org/spdy/download/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" integrity sha1-t09GYgOj7aRSwCSSuR+56EonZ3s= dependencies: debug "^4.1.0" @@ -6941,7 +6996,7 @@ spdy@^4.0.2: sprintf-js@~1.0.2: version "1.0.3" - resolved "https://registry.nlark.com/sprintf-js/download/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + resolved "https://registry.nlark.com/sprintf-js/download/sprintf-js-1.0.3.tgz?cache=0&sync_timestamp=1618847174560&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsprintf-js%2Fdownload%2Fsprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= stable@^0.1.8: @@ -6951,29 +7006,29 @@ stable@^0.1.8: state-toggle@^1.0.0: version "1.0.3" - resolved "https://registry.npm.taobao.org/state-toggle/download/state-toggle-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstate-toggle%2Fdownload%2Fstate-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" + resolved "https://registry.nlark.com/state-toggle/download/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" integrity sha1-4SOxaojhQxObCcaFIiG8mBWRff4= "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" - resolved "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz?cache=0&sync_timestamp=1609654090567&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstatuses%2Fdownload%2Fstatuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + resolved "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= std-env@^2.2.1: version "2.3.1" - resolved "https://registry.npmmirror.com/std-env/download/std-env-2.3.1.tgz?cache=0&sync_timestamp=1636124771178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-2.3.1.tgz#d42271908819c243f8defc77a140fc1fcee336a1" + resolved "https://registry.npmmirror.com/std-env/download/std-env-2.3.1.tgz?cache=0&sync_timestamp=1636125537684&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-2.3.1.tgz#d42271908819c243f8defc77a140fc1fcee336a1" integrity sha1-1CJxkIgZwkP43vx3oUD8H87jNqE= dependencies: ci-info "^3.1.1" std-env@^3.0.1: version "3.0.1" - resolved "https://registry.npmmirror.com/std-env/download/std-env-3.0.1.tgz?cache=0&sync_timestamp=1636124771178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" + resolved "https://registry.npmmirror.com/std-env/download/std-env-3.0.1.tgz?cache=0&sync_timestamp=1636125537684&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" integrity sha1-vEy8DkOGEBl+NMLXnD3zC0kfUYI= string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.2: version "4.2.3" - resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz?cache=0&sync_timestamp=1632421309919&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstring-width%2Fdownload%2Fstring-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha1-JpxxF9J7Ba0uU2gwqOyJXvnG0BA= dependencies: emoji-regex "^8.0.0" @@ -6990,7 +7045,7 @@ string.prototype.trimend@^1.0.4: string.prototype.trimstart@^1.0.4: version "1.0.4" - resolved "https://registry.npm.taobao.org/string.prototype.trimstart/download/string.prototype.trimstart-1.0.4.tgz?cache=0&sync_timestamp=1614127232940&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring.prototype.trimstart%2Fdownload%2Fstring.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + resolved "https://registry.npm.taobao.org/string.prototype.trimstart/download/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" integrity sha1-s2OZr0qymZtMnGSL16P7K7Jv7u0= dependencies: call-bind "^1.0.2" @@ -7012,7 +7067,7 @@ string_decoder@~1.1.1: stringify-object@^3.3.0: version "3.3.0" - resolved "https://registry.nlark.com/stringify-object/download/stringify-object-3.3.0.tgz?cache=0&sync_timestamp=1629673547261&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstringify-object%2Fdownload%2Fstringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" + resolved "https://registry.nlark.com/stringify-object/download/stringify-object-3.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstringify-object%2Fdownload%2Fstringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" integrity sha1-cDBlrvyhkwDTzoivT1s5VtdVZik= dependencies: get-own-enumerable-property-symbols "^3.0.0" @@ -7021,14 +7076,14 @@ stringify-object@^3.3.0: strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" - resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-6.0.1.tgz?cache=0&sync_timestamp=1632432619223&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha1-nibGPTD1NEPpSJSVshBdN7Z6hdk= dependencies: ansi-regex "^5.0.1" strip-ansi@^7.0.0: version "7.0.1" - resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" + resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-7.0.1.tgz?cache=0&sync_timestamp=1632432619223&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" integrity sha1-YXQKCM42th5Q5lZT8HBg0ACXX7I= dependencies: ansi-regex "^6.0.1" @@ -7040,7 +7095,7 @@ strip-bom-string@^1.0.0: strip-final-newline@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/strip-final-newline/download/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + resolved "https://registry.nlark.com/strip-final-newline/download/strip-final-newline-2.0.0.tgz?cache=0&sync_timestamp=1620046435959&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstrip-final-newline%2Fdownload%2Fstrip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha1-ibhS+y/L6Tb29LMYevsKEsGrWK0= strip-json-comments@~2.0.1: @@ -7050,14 +7105,14 @@ strip-json-comments@~2.0.1: style-to-object@0.3.0, style-to-object@^0.3.0: version "0.3.0" - resolved "https://registry.nlark.com/style-to-object/download/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" + resolved "https://registry.npm.taobao.org/style-to-object/download/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" integrity sha1-sbeQ0gWZHMeDgBlnIUl57hmnbkY= dependencies: inline-style-parser "0.1.1" stylehacks@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/stylehacks/download/stylehacks-5.0.1.tgz?cache=0&sync_timestamp=1621449595596&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstylehacks%2Fdownload%2Fstylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" + resolved "https://registry.nlark.com/stylehacks/download/stylehacks-5.0.1.tgz?cache=0&sync_timestamp=1621449652268&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstylehacks%2Fdownload%2Fstylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" integrity sha1-Mj7FVBmFIJhoBjiMf9rrw40sBvs= dependencies: browserslist "^4.16.0" @@ -7092,7 +7147,7 @@ svg-parser@^2.0.2: svgo@^1.2.2: version "1.3.2" resolved "https://registry.npmmirror.com/svgo/download/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" - integrity sha1-ttxRHAYzRsnkFbgeQ0ARRbltQWc= + integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw== dependencies: chalk "^2.4.1" coa "^2.0.2" @@ -7111,7 +7166,7 @@ svgo@^1.2.2: svgo@^2.7.0: version "2.8.0" resolved "https://registry.npmmirror.com/svgo/download/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" - integrity sha1-T/gMzmcQ3CeV8MfHQQHmdkz8zSQ= + integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== dependencies: "@trysound/sax" "0.2.0" commander "^7.2.0" @@ -7121,10 +7176,10 @@ svgo@^2.7.0: picocolors "^1.0.0" stable "^0.1.8" -"tailwindcss@>=3.0.0 || >=3.0.0-alpha.1": - version "3.0.0-alpha.2" - resolved "https://registry.npmmirror.com/tailwindcss/download/tailwindcss-3.0.0-alpha.2.tgz#9f0f797aeabc0294169d732f3379538222e0a44a" - integrity sha512-DLPLL927a05mhwTAPMPgSk1EFLAsWc0qmZeB1yHDSRAj/Bfn0nvdFTqj2u/8FnM5EiS20nsqCZ/HFfXzzaFOZg== +tailwindcss@^3.0.0: + version "3.0.7" + resolved "https://registry.npmmirror.com/tailwindcss/download/tailwindcss-3.0.7.tgz#15936881f042a7eb8d6f2b6a454bac9f51181bbd" + integrity sha512-rZdKNHtC64jcQncLoWOuCzj4lQDTAgLtgK3WmQS88tTdpHh9OwLqULTQxI3tw9AMJsqSpCKlmcjW/8CSnni6zQ== dependencies: arg "^5.0.1" chalk "^4.1.2" @@ -7142,28 +7197,28 @@ svgo@^2.7.0: postcss-js "^3.0.3" postcss-load-config "^3.1.0" postcss-nested "5.0.6" - postcss-selector-parser "^6.0.6" - postcss-value-parser "^4.1.0" + postcss-selector-parser "^6.0.7" + postcss-value-parser "^4.2.0" quick-lru "^5.1.1" resolve "^1.20.0" tmp "^0.2.1" tapable@^1.0.0: version "1.1.3" - resolved "https://registry.nlark.com/tapable/download/tapable-1.1.3.tgz?cache=0&sync_timestamp=1631526982870&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftapable%2Fdownload%2Ftapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" - integrity sha1-ofzMBrWNth/XpF2i2kT186Pme6I= + resolved "https://registry.npmmirror.com/tapable/download/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" + integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0: version "2.2.1" - resolved "https://registry.nlark.com/tapable/download/tapable-2.2.1.tgz?cache=0&sync_timestamp=1631526982870&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftapable%2Fdownload%2Ftapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" - integrity sha1-GWenPvQGCoLxKrlq+G1S/bdu7KA= + resolved "https://registry.npmmirror.com/tapable/download/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" + integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.4: - version "5.2.5" - resolved "https://registry.npmmirror.com/terser-webpack-plugin/download/terser-webpack-plugin-5.2.5.tgz?cache=0&sync_timestamp=1636385968704&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-5.2.5.tgz#ce65b9880a0c36872555c4874f45bbdb02ee32c9" - integrity sha512-3luOVHku5l0QBeYS8r4CdHYWEGMmIj3H1U64jgkdZzECcSOJAyJ9TjuqcQZvw1Y+4AOBN9SeYJPJmFn2cM4/2g== + version "5.3.0" + resolved "https://registry.npmmirror.com/terser-webpack-plugin/download/terser-webpack-plugin-5.3.0.tgz#21641326486ecf91d8054161c816e464435bae9f" + integrity sha512-LPIisi3Ol4chwAaPP8toUJ3L4qCM1G0wao7L3qNv57Drezxj6+VEyySpPw4B1HSO2Eg/hDY/MNF5XihCAoqnsQ== dependencies: - jest-worker "^27.0.6" + jest-worker "^27.4.1" schema-utils "^3.1.1" serialize-javascript "^6.0.0" source-map "^0.6.1" @@ -7171,7 +7226,7 @@ terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.4: terser@^5.10.0, terser@^5.7.2: version "5.10.0" - resolved "https://registry.npmmirror.com/terser/download/terser-5.10.0.tgz?cache=0&sync_timestamp=1636988229781&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fterser%2Fdownload%2Fterser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" + resolved "https://registry.npmmirror.com/terser/download/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA== dependencies: commander "^2.20.0" @@ -7180,7 +7235,7 @@ terser@^5.10.0, terser@^5.7.2: text-table@^0.2.0: version "0.2.0" - resolved "https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + resolved "https://registry.nlark.com/text-table/download/text-table-0.2.0.tgz?cache=0&sync_timestamp=1618847142316&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftext-table%2Fdownload%2Ftext-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= thunky@^1.0.2: @@ -7190,17 +7245,17 @@ thunky@^1.0.2: timsort@^0.3.0: version "0.3.0" - resolved "https://registry.npm.taobao.org/timsort/download/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" + resolved "https://registry.nlark.com/timsort/download/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= tiny-invariant@^1.0.2: version "1.2.0" - resolved "https://registry.npmmirror.com/tiny-invariant/download/tiny-invariant-1.2.0.tgz?cache=0&sync_timestamp=1635822367356&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftiny-invariant%2Fdownload%2Ftiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" + resolved "https://registry.npmmirror.com/tiny-invariant/download/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" integrity sha1-oRQfhrZyqRSMcul4oZpzublKFak= tiny-warning@^1.0.0, tiny-warning@^1.0.3: version "1.0.3" - resolved "https://registry.npm.taobao.org/tiny-warning/download/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" + resolved "https://registry.nlark.com/tiny-warning/download/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" integrity sha1-lKMNtFPfTGQ9D9VmBg1gqHXYR1Q= tmp@^0.2.1: @@ -7227,10 +7282,10 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -toidentifier@1.0.0: - version "1.0.0" - resolved "https://registry.npmmirror.com/toidentifier/download/toidentifier-1.0.0.tgz?cache=0&sync_timestamp=1636938467744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftoidentifier%2Fdownload%2Ftoidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" - integrity sha1-fhvjRw8ed5SLxD2Uo8j013UrpVM= +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.npmmirror.com/toidentifier/download/toidentifier-1.0.1.tgz?cache=0&sync_timestamp=1636938512912&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftoidentifier%2Fdownload%2Ftoidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== totalist@^1.0.0: version "1.1.0" @@ -7239,12 +7294,12 @@ totalist@^1.0.0: trim-trailing-lines@^1.0.0: version "1.1.4" - resolved "https://registry.npm.taobao.org/trim-trailing-lines/download/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0" + resolved "https://registry.nlark.com/trim-trailing-lines/download/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0" integrity sha1-vUq77HzIgEYvELLItc4djR7HwsA= trim@0.0.1: version "0.0.1" - resolved "https://registry.npm.taobao.org/trim/download/trim-0.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftrim%2Fdownload%2Ftrim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" + resolved "https://registry.nlark.com/trim/download/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0= trough@^1.0.0: @@ -7254,12 +7309,12 @@ trough@^1.0.0: tslib@^2.0.3, tslib@^2.3.1: version "2.3.1" - resolved "https://registry.nlark.com/tslib/download/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + resolved "https://registry.nlark.com/tslib/download/tslib-2.3.1.tgz?cache=0&sync_timestamp=1628722556410&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftslib%2Fdownload%2Ftslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha1-6KM1rdXOrlGqJh0ypJAVjvBC7wE= tslib@~2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/tslib/download/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" + resolved "https://registry.nlark.com/tslib/download/tslib-2.1.0.tgz?cache=0&sync_timestamp=1628722556410&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftslib%2Fdownload%2Ftslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" integrity sha1-2mCGDxwuyqVwOrfTm8Bba/mIuXo= type-fest@^0.20.2: @@ -7267,7 +7322,7 @@ type-fest@^0.20.2: resolved "https://registry.npmmirror.com/type-fest/download/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha1-G/IH9LKPkVg2ZstfvTJ4hzAc1fQ= -type-is@~1.6.17, type-is@~1.6.18: +type-is@~1.6.18: version "1.6.18" resolved "https://registry.nlark.com/type-is/download/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha1-TlUs0F3wlGfcvE73Od6J8s83wTE= @@ -7277,19 +7332,19 @@ type-is@~1.6.17, type-is@~1.6.18: typedarray-to-buffer@^3.1.5: version "3.1.5" - resolved "https://registry.npm.taobao.org/typedarray-to-buffer/download/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + resolved "https://registry.nlark.com/typedarray-to-buffer/download/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" integrity sha1-qX7nqf9CaRufeD/xvFES/j/KkIA= dependencies: is-typedarray "^1.0.0" typescript@^4.3.5: - version "4.5.2" - resolved "https://registry.npmmirror.com/typescript/download/typescript-4.5.2.tgz#8ac1fba9f52256fdb06fb89e4122fa6a346c2998" - integrity sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw== + version "4.5.4" + resolved "https://registry.npmmirror.com/typescript/download/typescript-4.5.4.tgz#a17d3a0263bf5c8723b9c52f43c5084edf13c2e8" + integrity sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg== unbox-primitive@^1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/unbox-primitive/download/unbox-primitive-1.0.1.tgz?cache=0&sync_timestamp=1616706302651&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funbox-primitive%2Fdownload%2Funbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + resolved "https://registry.nlark.com/unbox-primitive/download/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" integrity sha1-CF4hViXsMWJXTciFmr7nilmxRHE= dependencies: function-bind "^1.1.1" @@ -7299,7 +7354,7 @@ unbox-primitive@^1.0.1: unherit@^1.0.4: version "1.1.3" - resolved "https://registry.nlark.com/unherit/download/unherit-1.1.3.tgz?cache=0&sync_timestamp=1626423419302&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funherit%2Fdownload%2Funherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" + resolved "https://registry.nlark.com/unherit/download/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" integrity sha1-bJtQPytBsmIzDIDpHIYUq9qmnCI= dependencies: inherits "^2.0.0" @@ -7307,12 +7362,12 @@ unherit@^1.0.4: unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631615505724&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-canonical-property-names-ecmascript%2Fdownload%2Funicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" + resolved "https://registry.nlark.com/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" integrity sha1-MBrNxSVjFnDTn2FG4Od/9rvevdw= unicode-match-property-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-match-property-ecmascript/download/unicode-match-property-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618607567&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-ecmascript%2Fdownload%2Funicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" + resolved "https://registry.nlark.com/unicode-match-property-ecmascript/download/unicode-match-property-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618601397&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-ecmascript%2Fdownload%2Funicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" integrity sha1-VP0W4OyxZ88Ezx91a9zJLrp5dsM= dependencies: unicode-canonical-property-names-ecmascript "^2.0.0" @@ -7320,17 +7375,17 @@ unicode-match-property-ecmascript@^2.0.0: unicode-match-property-value-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-match-property-value-ecmascript/download/unicode-match-property-value-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618107717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-value-ecmascript%2Fdownload%2Funicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" + resolved "https://registry.nlark.com/unicode-match-property-value-ecmascript/download/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" integrity sha1-GgGqVyR8FMVouJd1pUk4eIGJpxQ= unicode-property-aliases-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-property-aliases-ecmascript/download/unicode-property-aliases-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631609408629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-property-aliases-ecmascript%2Fdownload%2Funicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" + resolved "https://registry.nlark.com/unicode-property-aliases-ecmascript/download/unicode-property-aliases-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631609367398&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-property-aliases-ecmascript%2Fdownload%2Funicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" integrity sha1-CjbLmlhcT2q9Ua0d7dsoXBZSl8g= unified@9.2.0: version "9.2.0" - resolved "https://registry.npmmirror.com/unified/download/unified-9.2.0.tgz?cache=0&sync_timestamp=1637256334405&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" + resolved "https://registry.npmmirror.com/unified/download/unified-9.2.0.tgz?cache=0&sync_timestamp=1637256247526&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" integrity sha1-Z6YsYnxAWJ7eu/YPU+39TYIgJ/g= dependencies: bail "^1.0.0" @@ -7342,7 +7397,7 @@ unified@9.2.0: unified@^8.4.2: version "8.4.2" - resolved "https://registry.npmmirror.com/unified/download/unified-8.4.2.tgz?cache=0&sync_timestamp=1637256334405&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" + resolved "https://registry.npmmirror.com/unified/download/unified-8.4.2.tgz?cache=0&sync_timestamp=1637256247526&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" integrity sha1-E61YtKQ3+qJ1GkpMahb2gMUA//E= dependencies: bail "^1.0.0" @@ -7353,19 +7408,19 @@ unified@^8.4.2: unique-string@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unique-string/download/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" + resolved "https://registry.npm.taobao.org/unique-string/download/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" integrity sha1-OcZFH4GvsnSd4rIz4/fF6IQ72J0= dependencies: crypto-random-string "^2.0.0" unist-builder@2.0.3, unist-builder@^2.0.0: version "2.0.3" - resolved "https://registry.nlark.com/unist-builder/download/unist-builder-2.0.3.tgz?cache=0&sync_timestamp=1618816093327&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-builder%2Fdownload%2Funist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436" + resolved "https://registry.nlark.com/unist-builder/download/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436" integrity sha1-d2SHEbXYavCULzNDl6M8XpFRZDY= unist-util-generated@^1.0.0: version "1.1.6" - resolved "https://registry.nlark.com/unist-util-generated/download/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" + resolved "https://registry.npm.taobao.org/unist-util-generated/download/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" integrity sha1-WrUfaJ4pkqRyvrGzXyzn/y8yTUs= unist-util-is@^4.0.0: @@ -7375,12 +7430,12 @@ unist-util-is@^4.0.0: unist-util-position@^3.0.0: version "3.1.0" - resolved "https://registry.nlark.com/unist-util-position/download/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" + resolved "https://registry.nlark.com/unist-util-position/download/unist-util-position-3.1.0.tgz?cache=0&sync_timestamp=1620915237724&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-position%2Fdownload%2Funist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" integrity sha1-HELuYwH41S9H0U9iu9t5ZXH6LUc= unist-util-remove-position@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/unist-util-remove-position/download/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" + resolved "https://registry.nlark.com/unist-util-remove-position/download/unist-util-remove-position-2.0.1.tgz?cache=0&sync_timestamp=1627848251490&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-remove-position%2Fdownload%2Funist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" integrity sha1-XRnKef26cSMBmZsrc1U8qPOzUsw= dependencies: unist-util-visit "^2.0.0" @@ -7401,7 +7456,7 @@ unist-util-remove@^2.0.0: unist-util-stringify-position@^2.0.0: version "2.0.3" - resolved "https://registry.nlark.com/unist-util-stringify-position/download/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" + resolved "https://registry.nlark.com/unist-util-stringify-position/download/unist-util-stringify-position-2.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-stringify-position%2Fdownload%2Funist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" integrity sha1-zOO/oc34W6c3XR1bF73Eytqb2do= dependencies: "@types/unist" "^2.0.2" @@ -7416,7 +7471,7 @@ unist-util-visit-parents@^3.0.0: unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist-util-visit@^2.0.2, unist-util-visit@^2.0.3: version "2.0.3" - resolved "https://registry.npmmirror.com/unist-util-visit/download/unist-util-visit-2.0.3.tgz?cache=0&sync_timestamp=1632405194557&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funist-util-visit%2Fdownload%2Funist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" + resolved "https://registry.npmmirror.com/unist-util-visit/download/unist-util-visit-2.0.3.tgz?cache=0&sync_timestamp=1632405961713&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funist-util-visit%2Fdownload%2Funist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" integrity sha1-w3A4kxRt9HIDu4qXla9H17lxIIw= dependencies: "@types/unist" "^2.0.0" @@ -7425,7 +7480,7 @@ unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist- universalify@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz?cache=0&sync_timestamp=1603180004159&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + resolved "https://registry.nlark.com/universalify/download/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc= unpipe@1.0.0, unpipe@~1.0.0: @@ -7435,12 +7490,12 @@ unpipe@1.0.0, unpipe@~1.0.0: unquote@~1.1.1: version "1.1.1" - resolved "https://registry.npm.taobao.org/unquote/download/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" + resolved "https://registry.nlark.com/unquote/download/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ= update-notifier@^5.1.0: version "5.1.0" - resolved "https://registry.npm.taobao.org/update-notifier/download/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" + resolved "https://registry.nlark.com/update-notifier/download/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" integrity sha1-SrDXx/NqIx3XMWz3cpMT8CFNmtk= dependencies: boxen "^5.0.0" @@ -7460,7 +7515,7 @@ update-notifier@^5.1.0: uri-js@^4.2.2: version "4.4.1" - resolved "https://registry.npm.taobao.org/uri-js/download/uri-js-4.4.1.tgz?cache=0&sync_timestamp=1610237641463&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Furi-js%2Fdownload%2Furi-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + resolved "https://registry.nlark.com/uri-js/download/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" integrity sha1-mxpSWVIlhZ5V9mnZKPiMbFfyp34= dependencies: punycode "^2.1.0" @@ -7476,22 +7531,22 @@ url-loader@^4.1.1: url-parse-lax@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/url-parse-lax/download/url-parse-lax-3.0.0.tgz?cache=0&sync_timestamp=1628548236896&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl-parse-lax%2Fdownload%2Furl-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + resolved "https://registry.nlark.com/url-parse-lax/download/url-parse-lax-3.0.0.tgz?cache=0&sync_timestamp=1628547550655&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl-parse-lax%2Fdownload%2Furl-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= dependencies: prepend-http "^2.0.0" url@^0.11.0: version "0.11.0" - resolved "https://registry.nlark.com/url/download/url-0.11.0.tgz?cache=0&sync_timestamp=1618846952693&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl%2Fdownload%2Furl-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= + resolved "https://registry.npmmirror.com/url/download/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" + integrity sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ== dependencies: punycode "1.3.2" querystring "0.2.0" util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" - resolved "https://registry.npm.taobao.org/util-deprecate/download/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + resolved "https://registry.nlark.com/util-deprecate/download/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= util.promisify@~1.0.0: @@ -7516,17 +7571,17 @@ utility-types@^3.10.0: utils-merge@1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/utils-merge/download/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + resolved "https://registry.nlark.com/utils-merge/download/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= uuid@^8.3.2: version "8.3.2" resolved "https://registry.npmmirror.com/uuid/download/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha1-gNW1ztJxu5r2xEXyGhoExgbO++I= + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== value-equal@^1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/value-equal/download/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" + resolved "https://registry.nlark.com/value-equal/download/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" integrity sha1-Hgt5THNMXAyt4XnEN9NW2TGjTWw= vary@~1.1.2: @@ -7541,7 +7596,7 @@ vfile-location@^3.0.0, vfile-location@^3.2.0: vfile-message@^2.0.0: version "2.0.4" - resolved "https://registry.nlark.com/vfile-message/download/vfile-message-2.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fvfile-message%2Fdownload%2Fvfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" + resolved "https://registry.nlark.com/vfile-message/download/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" integrity sha1-W0O4gXHUCerlhHfRPyPdQdUsNxo= dependencies: "@types/unist" "^2.0.0" @@ -7549,7 +7604,7 @@ vfile-message@^2.0.0: vfile@^4.0.0: version "4.2.1" - resolved "https://registry.npmmirror.com/vfile/download/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624" + resolved "https://registry.npmmirror.com/vfile/download/vfile-4.2.1.tgz?cache=0&sync_timestamp=1635657951041&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvfile%2Fdownload%2Fvfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624" integrity sha1-A/Hc4o/GJcYlvGUUNQ+9sA+p5iQ= dependencies: "@types/unist" "^2.0.0" @@ -7590,7 +7645,7 @@ web-namespaces@^1.0.0, web-namespaces@^1.1.2: webpack-bundle-analyzer@^4.4.2: version "4.5.0" - resolved "https://registry.npmmirror.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" + resolved "https://registry.npmmirror.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-4.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-bundle-analyzer%2Fdownload%2Fwebpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" integrity sha1-Gw7qKUfnNSh1Sm+a8+kbK24PedU= dependencies: acorn "^8.0.4" @@ -7603,10 +7658,10 @@ webpack-bundle-analyzer@^4.4.2: sirv "^1.0.7" ws "^7.3.1" -webpack-dev-middleware@^5.2.1: - version "5.2.2" - resolved "https://registry.npmmirror.com/webpack-dev-middleware/download/webpack-dev-middleware-5.2.2.tgz?cache=0&sync_timestamp=1637165517894&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-dev-middleware%2Fdownload%2Fwebpack-dev-middleware-5.2.2.tgz#eb5193faa5479ca1086b9f7bed68b89c731bff62" - integrity sha512-DjZyYrsHhkikAFNvSNKrpnziXukU1EChFAh9j4LAm6ndPLPW8cN0KhM7T+RAiOqsQ6ABfQ8hoKIs9IWMTjov+w== +webpack-dev-middleware@^5.3.0: + version "5.3.0" + resolved "https://registry.npmmirror.com/webpack-dev-middleware/download/webpack-dev-middleware-5.3.0.tgz#8fc02dba6e72e1d373eca361623d84610f27be7c" + integrity sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg== dependencies: colorette "^2.0.10" memfs "^3.2.2" @@ -7615,10 +7670,15 @@ webpack-dev-middleware@^5.2.1: schema-utils "^4.0.0" webpack-dev-server@^4.4.0: - version "4.6.0" - resolved "https://registry.npmmirror.com/webpack-dev-server/download/webpack-dev-server-4.6.0.tgz#e8648601c440172d9b6f248d28db98bed335315a" - integrity sha512-oojcBIKvx3Ya7qs1/AVWHDgmP1Xml8rGsEBnSobxU/UJSX1xP1GPM3MwsAnDzvqcVmVki8tV7lbcsjEjk0PtYg== + version "4.7.1" + resolved "https://registry.npmmirror.com/webpack-dev-server/download/webpack-dev-server-4.7.1.tgz#4fe8f7435843dd2e676d687846f7a3d53f758c0d" + integrity sha512-bkoNgFyqlF/CT726Axtf/ELHHYsTZJWz3QJ6HqstWPbalhjAPunlPH9bwt/Lr5cLb+uoLmsta6svVplVzq8beA== dependencies: + "@types/bonjour" "^3.5.9" + "@types/connect-history-api-fallback" "^1.3.5" + "@types/serve-index" "^1.9.1" + "@types/sockjs" "^0.3.33" + "@types/ws" "^8.2.2" ansi-html-community "^0.0.8" bonjour "^3.5.0" chokidar "^3.5.2" @@ -7641,13 +7701,12 @@ webpack-dev-server@^4.4.0: sockjs "^0.3.21" spdy "^4.0.2" strip-ansi "^7.0.0" - url "^0.11.0" - webpack-dev-middleware "^5.2.1" + webpack-dev-middleware "^5.3.0" ws "^8.1.0" webpack-merge@^5.8.0: version "5.8.0" - resolved "https://registry.nlark.com/webpack-merge/download/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" + resolved "https://registry.nlark.com/webpack-merge/download/webpack-merge-5.8.0.tgz?cache=0&sync_timestamp=1623054906070&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwebpack-merge%2Fdownload%2Fwebpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" integrity sha1-Kznb8ir4d3atdEw5AiNzHTCmj2E= dependencies: clone-deep "^4.0.1" @@ -7655,7 +7714,7 @@ webpack-merge@^5.8.0: webpack-sources@^1.1.0, webpack-sources@^1.4.3: version "1.4.3" - resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1636982701357&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" + resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1636982763649&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha1-7t2OwLko+/HL/plOItLYkPMwqTM= dependencies: source-list-map "^2.0.0" @@ -7663,7 +7722,7 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.3: webpack-sources@^3.2.2: version "3.2.2" - resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-3.2.2.tgz?cache=0&sync_timestamp=1636982701357&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260" + resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-3.2.2.tgz?cache=0&sync_timestamp=1636982763649&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260" integrity sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw== webpack@^5.61.0: @@ -7698,7 +7757,7 @@ webpack@^5.61.0: webpackbar@^5.0.0-3: version "5.0.2" - resolved "https://registry.npmmirror.com/webpackbar/download/webpackbar-5.0.2.tgz?cache=0&sync_timestamp=1636124846959&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpackbar%2Fdownload%2Fwebpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" + resolved "https://registry.npmmirror.com/webpackbar/download/webpackbar-5.0.2.tgz?cache=0&sync_timestamp=1636125538348&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpackbar%2Fdownload%2Fwebpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" integrity sha1-091GYhHHOFJ0HfyEK3VW3LwrBXA= dependencies: chalk "^4.1.0" @@ -7717,7 +7776,7 @@ websocket-driver@>=0.5.1, websocket-driver@^0.7.4: websocket-extensions@>=0.1.1: version "0.1.4" - resolved "https://registry.nlark.com/websocket-extensions/download/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + resolved "https://registry.npm.taobao.org/websocket-extensions/download/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha1-f4RzvIOd/YdgituV1+sHUhFXikI= which-boxed-primitive@^1.0.2: @@ -7747,19 +7806,19 @@ which@^2.0.1: widest-line@^3.1.0: version "3.1.0" - resolved "https://registry.npmmirror.com/widest-line/download/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" + resolved "https://registry.npmmirror.com/widest-line/download/widest-line-3.1.0.tgz?cache=0&sync_timestamp=1634023966185&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwidest-line%2Fdownload%2Fwidest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" integrity sha1-gpIzO79my0X/DeFgOxNreuFJbso= dependencies: string-width "^4.0.0" wildcard@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/wildcard/download/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" + resolved "https://registry.nlark.com/wildcard/download/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" integrity sha1-p30g5SAMb6qsl55LOq3Hs91/j+w= wrap-ansi@^7.0.0: version "7.0.0" - resolved "https://registry.nlark.com/wrap-ansi/download/wrap-ansi-7.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwrap-ansi%2Fdownload%2Fwrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + resolved "https://registry.nlark.com/wrap-ansi/download/wrap-ansi-7.0.0.tgz?cache=0&sync_timestamp=1631557201275&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwrap-ansi%2Fdownload%2Fwrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha1-Z+FFz/UQpqaYS98RUpEdadLrnkM= dependencies: ansi-styles "^4.0.0" @@ -7787,9 +7846,9 @@ ws@^7.3.1: integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== ws@^8.1.0: - version "8.3.0" - resolved "https://registry.npmmirror.com/ws/download/ws-8.3.0.tgz#7185e252c8973a60d57170175ff55fdbd116070d" - integrity sha512-Gs5EZtpqZzLvmIM59w4igITU57lrtYVFneaa434VROv4thzJyV6UjIL3D42lslWlI+D4KzLYnxSwtfuiO79sNw== + version "8.4.0" + resolved "https://registry.npmmirror.com/ws/download/ws-8.4.0.tgz#f05e982a0a88c604080e8581576e2a063802bed6" + integrity sha512-IHVsKe2pjajSUIl4KYMQOdlyliovpEPquKkqbwswulszzI7r0SfQrxnXdWAEqOlDCLrVSJzo+O1hAwdog2sKSQ== xdg-basedir@^4.0.0: version "4.0.0" @@ -7805,20 +7864,20 @@ xml-js@^1.6.11: xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2: version "4.0.2" - resolved "https://registry.npm.taobao.org/xtend/download/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + resolved "https://registry.nlark.com/xtend/download/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q= yallist@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/yallist/download/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + resolved "https://registry.nlark.com/yallist/download/yallist-4.0.0.tgz?cache=0&sync_timestamp=1622604530774&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fyallist%2Fdownload%2Fyallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI= yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: version "1.10.2" - resolved "https://registry.npmmirror.com/yaml/download/yaml-1.10.2.tgz?cache=0&sync_timestamp=1636797186957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyaml%2Fdownload%2Fyaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + resolved "https://registry.npmmirror.com/yaml/download/yaml-1.10.2.tgz?cache=0&sync_timestamp=1636797252827&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyaml%2Fdownload%2Fyaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha1-IwHF/78StGfejaIzOkWeKeeSDks= zwitch@^1.0.0: version "1.0.5" - resolved "https://registry.npm.taobao.org/zwitch/download/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" + resolved "https://registry.nlark.com/zwitch/download/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" integrity sha1-0R1zgf/tFrdC9q97PyI9XNn+mSA= From 80258fe2d44e39118bdd82571c52a279569d241e Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 24 Dec 2021 23:15:28 +0800 Subject: [PATCH 117/174] :alembic: add support for data json file --- nonebot/drivers/_model.py | 40 +++++++++++++++++++++++++++++++++----- nonebot/drivers/aiohttp.py | 8 +++++++- nonebot/drivers/fastapi.py | 30 +++++++++++++++++++++++++--- nonebot/drivers/httpx.py | 3 +++ nonebot/drivers/quart.py | 22 +++++++++++++++++---- 5 files changed, 90 insertions(+), 13 deletions(-) diff --git a/nonebot/drivers/_model.py b/nonebot/drivers/_model.py index d217ab33..a5998373 100644 --- a/nonebot/drivers/_model.py +++ b/nonebot/drivers/_model.py @@ -2,6 +2,8 @@ import abc from enum import Enum from http.cookiejar import Cookie, CookieJar from typing import ( + IO, + Any, Dict, List, Tuple, @@ -9,7 +11,6 @@ from typing import ( Mapping, Iterator, Optional, - Sequence, MutableMapping, ) @@ -19,21 +20,34 @@ from multidict import CIMultiDict RawURL = Tuple[bytes, bytes, Optional[int], bytes] SimpleQuery = Union[str, int, float] -QueryVariable = Union[SimpleQuery, Sequence[SimpleQuery]] +QueryVariable = Union[SimpleQuery, List[SimpleQuery]] QueryTypes = Union[ - None, str, Mapping[str, QueryVariable], Sequence[Tuple[str, QueryVariable]] + None, str, Mapping[str, QueryVariable], List[Tuple[str, QueryVariable]] ] HeaderTypes = Union[ None, CIMultiDict[str], Dict[str, str], - Sequence[Tuple[str, str]], + List[Tuple[str, str]], ] -ContentTypes = Union[str, bytes, None] CookieTypes = Union[None, "Cookies", CookieJar, Dict[str, str], List[Tuple[str, str]]] +ContentTypes = Union[str, bytes, None] +DataTypes = Union[dict, None] +FileContent = Union[IO[bytes], bytes] +FileType = Tuple[Optional[str], FileContent, Optional[str]] +FileTypes = Union[ + # file (or bytes) + FileContent, + # (filename, file (or bytes)) + Tuple[Optional[str], FileContent], + # (filename, file (or bytes), content_type) + FileType, +] +FilesTypes = Union[Dict[str, FileTypes], List[Tuple[str, FileTypes]], None] + class HTTPVersion(Enum): H10 = "1.0" @@ -51,6 +65,9 @@ class Request: headers: HeaderTypes = None, cookies: CookieTypes = None, content: ContentTypes = None, + data: DataTypes = None, + json: Any = None, + files: FilesTypes = None, version: Union[str, HTTPVersion] = HTTPVersion.H11, timeout: Optional[float] = None, ): @@ -93,6 +110,19 @@ class Request: # body self.content: ContentTypes = content + self.data: DataTypes = data + self.json: Any = json + self.files: Optional[List[Tuple[str, FileType]]] = None + if files: + self.files = [] + files_ = files.items() if isinstance(files, dict) else files + for name, file_info in files_: + if not isinstance(file_info, tuple): + self.files.append((name, (None, file_info, None))) + elif len(file_info) == 2: + self.files.append((name, (file_info[0], file_info[1], None))) + else: + self.files.append((name, file_info)) # type: ignore def __repr__(self) -> str: class_name = self.__class__.__name__ diff --git a/nonebot/drivers/aiohttp.py b/nonebot/drivers/aiohttp.py index f935342c..3f0784d9 100644 --- a/nonebot/drivers/aiohttp.py +++ b/nonebot/drivers/aiohttp.py @@ -35,11 +35,17 @@ class Mixin(ForwardMixin): raise RuntimeError(f"Unsupported HTTP version: {setup.version}") timeout = aiohttp.ClientTimeout(setup.timeout) + files = None + if setup.files: + files = aiohttp.FormData() + for name, file in setup.files: + files.add_field(name, file[1], content_type=file[2], filename=file[0]) async with aiohttp.ClientSession(version=version) as session: async with session.request( setup.method, setup.url, - data=setup.content, + data=setup.content or setup.data or files, + json=setup.json, headers=setup.headers, timeout=timeout, ) as response: diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index 41bd6c71..57170a59 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -11,17 +11,17 @@ FastAPI 驱动适配 """ import logging -from typing import List, Callable, Optional +from typing import Any, List, Tuple, Callable, Optional import uvicorn from pydantic import BaseSettings from fastapi.responses import Response -from fastapi import FastAPI, Request, status +from fastapi import FastAPI, Request, UploadFile, status from starlette.websockets import WebSocket, WebSocketState +from ._model import FileTypes from nonebot.config import Env from nonebot.typing import overrides -from nonebot.utils import escape_tag from nonebot.config import Config as NoneBotConfig from nonebot.drivers import Request as BaseRequest from nonebot.drivers import WebSocket as BaseWebSocket @@ -238,12 +238,36 @@ class Driver(ReverseDriver): request: Request, setup: HTTPServerSetup, ) -> Response: + json: Any = None + try: + json = await request.json() + except Exception: + pass + + data: Optional[dict] = None + files: Optional[List[Tuple[str, FileTypes]]] = None + try: + form = await request.form() + data = {} + files = [] + for key, value in form.multi_items(): + if isinstance(value, UploadFile): + files.append( + (key, (value.filename, value.file, value.content_type)) + ) + else: + data[key] = value + except Exception: + pass http_request = BaseRequest( request.method, str(request.url), headers=request.headers.items(), cookies=request.cookies, content=await request.body(), + data=data, + json=json, + files=files, version=request.scope["http_version"], ) diff --git a/nonebot/drivers/httpx.py b/nonebot/drivers/httpx.py index 09234710..f6789ab4 100644 --- a/nonebot/drivers/httpx.py +++ b/nonebot/drivers/httpx.py @@ -30,6 +30,9 @@ class Mixin(ForwardMixin): setup.method, str(setup.url), content=setup.content, + data=setup.data, + json=setup.json, + files=setup.files, headers=tuple(setup.headers.items()), timeout=setup.timeout, ) diff --git a/nonebot/drivers/quart.py b/nonebot/drivers/quart.py index 89822ee6..68eedd67 100644 --- a/nonebot/drivers/quart.py +++ b/nonebot/drivers/quart.py @@ -8,15 +8,14 @@ Quart 驱动适配 https://pgjones.gitlab.io/quart/index.html """ -from typing import List, TypeVar, Callable, Optional, Coroutine +from typing import List, Tuple, TypeVar, Callable, Optional, Coroutine import uvicorn from pydantic import BaseSettings +from ._model import FileTypes from nonebot.config import Env -from nonebot.log import logger from nonebot.typing import overrides -from nonebot.utils import escape_tag from nonebot.config import Config as NoneBotConfig from nonebot.drivers import Request as BaseRequest from nonebot.drivers import WebSocket as BaseWebSocket @@ -24,9 +23,9 @@ from nonebot.drivers import ReverseDriver, HTTPServerSetup, WebSocketServerSetup try: from quart import request as _request - import werkzeug.exceptions as exceptions from quart import websocket as _websocket from quart import Quart, Request, Response + from quart.datastructures import FileStorage from quart import Websocket as QuartWebSocket except ImportError: raise ValueError("Please install Quart by using `pip install nonebot2[quart]`") @@ -213,6 +212,18 @@ class Driver(ReverseDriver): async def _handle_http(self, setup: HTTPServerSetup) -> Response: request: Request = _request + json = None + if request.is_json: + json = await request.get_json() + + data = await request.form + files_dict = await request.files + files: List[Tuple[str, FileTypes]] = [] + key: str + value: FileStorage + for key, value in files_dict.items(): + files.append((key, (value.filename, value.stream, value.content_type))) + http_request = BaseRequest( request.method, request.url, @@ -221,6 +232,9 @@ class Driver(ReverseDriver): content=await request.get_data( cache=False, as_text=False, parse_form_data=False ), + data=data or None, + json=json, + files=files or None, version=request.http_version, ) From 2f5e523b5a8d5f61ff9528dcb5171ef0fea32cd7 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sat, 25 Dec 2021 00:11:48 +0800 Subject: [PATCH 118/174] :memo: write install guide and init tutorial --- website/docs/guide/start/editor-support.md | 33 +++++++++++++++ website/docs/guide/start/install-adapter.md | 40 ++++++++++++++++++ website/docs/guide/start/install-driver.md | 42 +++++++++++++++++++ website/docs/guide/start/install-plugin.md | 40 ++++++++++++++++++ website/docs/guide/start/installation.md | 4 ++ website/docs/guide/start/nb-cli.md | 4 +- .../guide/start/{problem.md => question.md} | 2 + website/docs/guide/tutorial/_category_.json | 4 ++ .../{ => tutorial}/creating-a-project.md | 14 +++---- 9 files changed, 174 insertions(+), 9 deletions(-) create mode 100644 website/docs/guide/start/editor-support.md create mode 100644 website/docs/guide/start/install-adapter.md create mode 100644 website/docs/guide/start/install-driver.md create mode 100644 website/docs/guide/start/install-plugin.md rename website/docs/guide/start/{problem.md => question.md} (94%) create mode 100644 website/docs/guide/tutorial/_category_.json rename website/docs/guide/{ => tutorial}/creating-a-project.md (83%) diff --git a/website/docs/guide/start/editor-support.md b/website/docs/guide/start/editor-support.md new file mode 100644 index 00000000..6afe0b3c --- /dev/null +++ b/website/docs/guide/start/editor-support.md @@ -0,0 +1,33 @@ +--- +sidebar_position: 80 +description: 编辑器支持 +--- + +# 编辑器支持 + +框架基于 [PEP484](https://www.python.org/dev/peps/pep-0484/), [PEP 561](https://www.python.org/dev/peps/pep-0517/), [PEP8](https://www.python.org/dev/peps/pep-0008/) 等规范进行开发并且是 **Fully Typed**。框架使用 `pyright` (`pylance`) 工具进行类型检查，确保代码可以被编辑器正确解析。 + +## 编辑器推荐配置 + +### Visual Studio Code + +在 Visual Studio Code 中，可以使用 `pylance` Language Server 并启用 `Type Checking` 以达到最佳开发体验。 + +向 `.vscode` 文件夹中对应文件添加以下配置并在 VSCode 插件面板安装推荐插件： + +```json title=extensions.json +{ + "recommendations": ["ms-python.python", "ms-python.vscode-pylance"] +} +``` + +```json title=settings.json +{ + "python.languageServer": "Pylance", + "python.analysis.typeCheckingMode": "basic" +} +``` + +### 其他 + +欢迎提交 Pull Request 添加其他编辑器配置推荐。点击左下角 `Edit this page` 前往编辑。 diff --git a/website/docs/guide/start/install-adapter.md b/website/docs/guide/start/install-adapter.md new file mode 100644 index 00000000..4906a0e1 --- /dev/null +++ b/website/docs/guide/start/install-adapter.md @@ -0,0 +1,40 @@ +--- +sidebar_position: 2 +description: 通过脚手架, pip 安装适配器 +--- + +# 安装协议适配器 + +## 查看 + +前往 [商店](/store) 即可查看所有协议适配器。 + +或者使用 `nb-cli` 命令行查看： + +```bash +nb adapter list +``` + +## 安装 + +前往 [商店](/store) 点击复制 `nb-cli` 安装命令至命令行执行即可安装。 + +或者自行输入命令安装： + +```bash +nb adapter install +``` + +或者使用交互模式安装： + +```bash +nb adapter install +``` + +也可以使用 `pip` 安装 + +```bash +pip install +``` + + diff --git a/website/docs/guide/start/install-driver.md b/website/docs/guide/start/install-driver.md new file mode 100644 index 00000000..4707cb00 --- /dev/null +++ b/website/docs/guide/start/install-driver.md @@ -0,0 +1,42 @@ +--- +sidebar_position: 1 +description: 通过脚手架, pip 安装驱动器 +--- + +# 安装驱动器 + +NoneBot 在默认安装情况下内置了 `fastapi` 服务端驱动器，其他驱动器如 `httpx`, `aiohttp` 则需要额外安装。 + +## 查看 + +前往 [商店](/store) 即可查看所有驱动器。 + +或者使用 `nb-cli` 命令行查看： + +```bash +nb driver list +``` + +## 安装 + +前往 [商店](/store) 点击复制 `nb-cli` 安装命令至命令行执行即可安装。 + +或者自行输入命令安装： + +```bash +nb driver install +``` + +或者使用交互模式安装： + +```bash +nb driver install +``` + +也可以使用 `pip` 安装 + +```bash +pip install +``` + + diff --git a/website/docs/guide/start/install-plugin.md b/website/docs/guide/start/install-plugin.md new file mode 100644 index 00000000..7d459141 --- /dev/null +++ b/website/docs/guide/start/install-plugin.md @@ -0,0 +1,40 @@ +--- +sidebar_position: 3 +description: 通过脚手架, pip 安装插件 +--- + +# 安装第三方插件 + +## 查看 + +前往 [商店](/store) 即可查看所有发布的插件。 + +或者使用 `nb-cli` 命令行查看： + +```bash +nb plugin list +``` + +## 安装 + +前往 [商店](/store) 点击复制 `nb-cli` 安装命令至命令行执行即可安装。 + +或者自行输入命令安装： + +```bash +nb plugin install +``` + +或者使用交互模式安装： + +```bash +nb plugin install +``` + +也可以使用 `pip` 安装 + +```bash +pip install +``` + + diff --git a/website/docs/guide/start/installation.md b/website/docs/guide/start/installation.md index c5196ae3..5ff6463d 100644 --- a/website/docs/guide/start/installation.md +++ b/website/docs/guide/start/installation.md @@ -34,6 +34,10 @@ pip uninstall nonebot +:::important 提示 +`nb-cli` 的使用方法详见 [使用脚手架](./nb-cli.md) +::: + ## 不使用脚手架 (纯净安装) 如果你不想使用脚手架，可以直接安装 `nonebot2`，并自行完成开发配置。 diff --git a/website/docs/guide/start/nb-cli.md b/website/docs/guide/start/nb-cli.md index 7e794c78..5ff94380 100644 --- a/website/docs/guide/start/nb-cli.md +++ b/website/docs/guide/start/nb-cli.md @@ -1,5 +1,5 @@ --- -sidebar_position: 1 +sidebar_position: 90 description: 使用 nb-cli 帮助开发 options: @@ -9,3 +9,5 @@ options: --- # 使用脚手架 + + diff --git a/website/docs/guide/start/problem.md b/website/docs/guide/start/question.md similarity index 94% rename from website/docs/guide/start/problem.md rename to website/docs/guide/start/question.md index b120ef69..e7f0fcf1 100644 --- a/website/docs/guide/start/problem.md +++ b/website/docs/guide/start/question.md @@ -1,4 +1,6 @@ --- +sidebar-position: 100 +description: 如何获取帮助 --- # 遇到问题 diff --git a/website/docs/guide/tutorial/_category_.json b/website/docs/guide/tutorial/_category_.json new file mode 100644 index 00000000..df4a90ff --- /dev/null +++ b/website/docs/guide/tutorial/_category_.json @@ -0,0 +1,4 @@ +{ + "position": 2, + "label": "教程" +} diff --git a/website/docs/guide/creating-a-project.md b/website/docs/guide/tutorial/creating-a-project.md similarity index 83% rename from website/docs/guide/creating-a-project.md rename to website/docs/guide/tutorial/creating-a-project.md index ce2a76b0..3013c2c7 100644 --- a/website/docs/guide/creating-a-project.md +++ b/website/docs/guide/tutorial/creating-a-project.md @@ -1,17 +1,13 @@ --- -sidebar_position: 4 +sidebar_position: 0 options: menu: - weight: 40 + weight: 20 category: guide --- -# 创建一个完整的项目 - -上一章中我们已经运行了一个简单的 NoneBot 实例，在这一章，我们将从零开始一个完整的项目。 - -## 目录结构 +# 创建项目 可以使用 `nb-cli` 或者自行创建完整的项目目录： @@ -19,6 +15,8 @@ options: nb create ``` +## 目录结构 + :::vue AweSome-Bot @@ -46,7 +44,7 @@ AweSome-Bot :::warning 提示 如果您使用如 `VSCode` / `PyCharm` 等 IDE 启动 nonebot，请检查 IDE 当前工作空间目录是否与当前侧边栏打开目录一致。 -- 注意：在二者不一致的环境下可能导致 nonebot 读取配置文件和插件等不符合预期 +> 注意：在二者不一致的环境下可能导致 nonebot 读取配置文件和插件等不符合预期 ::: From e62ce9301116c8d1188a943225be8d410782b0b1 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sat, 25 Dec 2021 13:52:28 +0800 Subject: [PATCH 119/174] :memo: update create project doc --- .../docs/guide/tutorial/creating-a-project.md | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/website/docs/guide/tutorial/creating-a-project.md b/website/docs/guide/tutorial/creating-a-project.md index 3013c2c7..abab2b61 100644 --- a/website/docs/guide/tutorial/creating-a-project.md +++ b/website/docs/guide/tutorial/creating-a-project.md @@ -1,5 +1,6 @@ --- sidebar_position: 0 +description: 创建并运行项目 options: menu: @@ -37,7 +38,8 @@ AweSome-Bot - `awesome_bot/plugins` 或 `src/plugins`: 用于存放编写的 bot 插件 - `.env`, `.env.dev`, `.env.prod`: 各环境配置文件 - `bot.py`: bot 入口文件 -- `pyproject.toml`: 项目依赖管理文件，默认使用 [poetry](https://python-poetry.org/) +- `pyproject.toml`: 项目插件配置文件 +- `Dockerfile`, `docker-compose.yml`: Docker 镜像配置文件 ## 启动 Bot @@ -48,17 +50,19 @@ AweSome-Bot ::: -通过 `nb-cli` +1. 通过 `nb-cli` -```bash -nb run [--file=bot.py] [--app=app] -``` + ```bash + nb run [--file=bot.py] [--app=app] + ``` -或 + 其中 `--file` 参数可以指定 bot 入口文件，默认为 `bot.py`，`--app` 参数可以指定 asgi server，默认为 `app`。 -```bash -python bot.py -``` +2. 直接通过 `python` 启动 + + ```bash + python bot.py + ``` :::tip 提示 如果在 bot 入口文件内定义了 asgi server， `nb-cli` 将会为你启动**冷重载模式**（当文件发生变动时自动重启 NoneBot 实例） From 188eb110c5c877eaaf681ab021faf861fef0ceda Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sat, 25 Dec 2021 14:04:53 +0800 Subject: [PATCH 120/174] :alembic: add proxy support --- nonebot/drivers/_model.py | 3 +++ nonebot/drivers/aiohttp.py | 6 ++++-- nonebot/drivers/httpx.py | 8 ++++++-- nonebot/drivers/quart.py | 4 +++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/nonebot/drivers/_model.py b/nonebot/drivers/_model.py index a5998373..0484e054 100644 --- a/nonebot/drivers/_model.py +++ b/nonebot/drivers/_model.py @@ -70,6 +70,7 @@ class Request: files: FilesTypes = None, version: Union[str, HTTPVersion] = HTTPVersion.H11, timeout: Optional[float] = None, + proxy: Optional[str] = None, ): # method self.method: str = ( @@ -81,6 +82,8 @@ class Request: self.version: HTTPVersion = HTTPVersion(version) # timeout self.timeout: Optional[float] = timeout + # proxy + self.proxy: Optional[str] = proxy # url if isinstance(url, tuple): diff --git a/nonebot/drivers/aiohttp.py b/nonebot/drivers/aiohttp.py index 3f0784d9..264e78e8 100644 --- a/nonebot/drivers/aiohttp.py +++ b/nonebot/drivers/aiohttp.py @@ -40,7 +40,7 @@ class Mixin(ForwardMixin): files = aiohttp.FormData() for name, file in setup.files: files.add_field(name, file[1], content_type=file[2], filename=file[0]) - async with aiohttp.ClientSession(version=version) as session: + async with aiohttp.ClientSession(version=version, trust_env=True) as session: async with session.request( setup.method, setup.url, @@ -48,6 +48,7 @@ class Mixin(ForwardMixin): json=setup.json, headers=setup.headers, timeout=timeout, + proxy=setup.proxy, ) as response: res = Response( response.status, @@ -66,12 +67,13 @@ class Mixin(ForwardMixin): else: raise RuntimeError(f"Unsupported HTTP version: {setup.version}") - session = aiohttp.ClientSession(version=version) + session = aiohttp.ClientSession(version=version, trust_env=True) ws = await session.ws_connect( setup.url, method=setup.method, timeout=setup.timeout or 10, headers=setup.headers, + proxy=setup.proxy, ) websocket = WebSocket(request=setup, session=session, websocket=ws) return websocket diff --git a/nonebot/drivers/httpx.py b/nonebot/drivers/httpx.py index f6789ab4..742b6b6c 100644 --- a/nonebot/drivers/httpx.py +++ b/nonebot/drivers/httpx.py @@ -12,7 +12,9 @@ from nonebot.drivers import ( try: import httpx except ImportError: - raise ImportError("Please install httpx by using `pip install nonebot2[httpx]`") + raise ImportError( + "Please install httpx by using `pip install nonebot2[httpx]`" + ) from None class Mixin(ForwardMixin): @@ -24,7 +26,9 @@ class Mixin(ForwardMixin): @overrides(ForwardMixin) async def request(self, setup: Request) -> Response: async with httpx.AsyncClient( - http2=setup.version == HTTPVersion.H2, follow_redirects=True + http2=setup.version == HTTPVersion.H2, + proxies=setup.proxy, + follow_redirects=True, ) as client: response = await client.request( setup.method, diff --git a/nonebot/drivers/quart.py b/nonebot/drivers/quart.py index 68eedd67..fbd66a25 100644 --- a/nonebot/drivers/quart.py +++ b/nonebot/drivers/quart.py @@ -28,7 +28,9 @@ try: from quart.datastructures import FileStorage from quart import Websocket as QuartWebSocket except ImportError: - raise ValueError("Please install Quart by using `pip install nonebot2[quart]`") + raise ValueError( + "Please install Quart by using `pip install nonebot2[quart]`" + ) from None _AsyncCallable = TypeVar("_AsyncCallable", bound=Callable[..., Coroutine]) From 9b9941e6c5a3d9432c149b06c629e13490c0b629 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sat, 25 Dec 2021 14:57:29 +0800 Subject: [PATCH 121/174] :bulb: write config docs --- nonebot/config.py | 57 +------- website/docs/guide/basic-configuration.md | 95 ------------ website/docs/guide/start/install-adapter.md | 2 +- website/docs/guide/start/install-driver.md | 2 +- website/docs/guide/start/install-plugin.md | 2 +- website/docs/guide/start/installation.md | 2 +- website/docs/guide/start/nb-cli.md | 2 +- website/docs/guide/tutorial/choose-driver.md | 11 ++ website/docs/guide/tutorial/configuration.md | 144 +++++++++++++++++++ website/docs/guide/tutorial/custom-logger.md | 0 10 files changed, 166 insertions(+), 151 deletions(-) delete mode 100644 website/docs/guide/basic-configuration.md create mode 100644 website/docs/guide/tutorial/choose-driver.md create mode 100644 website/docs/guide/tutorial/configuration.md create mode 100644 website/docs/guide/tutorial/custom-logger.md diff --git a/nonebot/config.py b/nonebot/config.py index 99507fa7..c8d2cc19 100644 --- a/nonebot/config.py +++ b/nonebot/config.py @@ -153,16 +153,18 @@ class Config(BaseConfig): """ # nonebot configs - driver: str = "nonebot.drivers.fastapi" + driver: str = "~fastapi" """ - **类型**: ``str`` - - **默认值**: ``"nonebot.drivers.fastapi"`` + - **默认值**: ``"~fastapi"`` :说明: - NoneBot 运行所使用的 ``Driver`` 。继承自 ``nonebot.driver.BaseDriver`` 。 + NoneBot 运行所使用的 ``Driver`` 。继承自 ``nonebot.drivers.Driver`` 。 - 配置格式为 ``[:]``，默认类名为 ``Driver``。 + 配置格式为 ``[:][+[:]]*``。 + + ``~`` 为 ``nonebot.drivers.`` 的缩写。 """ host: IPvAnyAddress = IPv4Address("127.0.0.1") # type: ignore """ @@ -212,21 +214,6 @@ class Config(BaseConfig): """ # bot connection configs - api_root: Dict[str, str] = {} - """ - - **类型**: ``Dict[str, str]`` - - **默认值**: ``{}`` - - :说明: - - 以机器人 ID 为键，上报地址为值的字典，环境变量或文件中应使用 json 序列化。 - - :示例: - - .. code-block:: default - - API_ROOT={"123456": "http://127.0.0.1:5700"} - """ api_timeout: Optional[float] = 30.0 """ - **类型**: ``Optional[float]`` @@ -236,38 +223,6 @@ class Config(BaseConfig): API 请求超时时间，单位: 秒。 """ - access_token: Optional[str] = None - """ - - **类型**: ``Optional[str]`` - - **默认值**: ``None`` - - :说明: - - API 请求以及上报所需密钥，在请求头中携带。 - - :示例: - - .. code-block:: http - - POST /cqhttp/ HTTP/1.1 - Authorization: Bearer kSLuTF2GC2Q4q4ugm3 - """ - secret: Optional[str] = None - """ - - **类型**: ``Optional[str]`` - - **默认值**: ``None`` - - :说明: - - HTTP POST 形式上报所需签名，在请求头中携带。 - - :示例: - - .. code-block:: http - - POST /cqhttp/ HTTP/1.1 - X-Signature: sha1=f9ddd4863ace61e64f462d41ca311e3d2c1176e2 - """ # bot runtime configs superusers: Set[str] = set() diff --git a/website/docs/guide/basic-configuration.md b/website/docs/guide/basic-configuration.md deleted file mode 100644 index 9a7cc59c..00000000 --- a/website/docs/guide/basic-configuration.md +++ /dev/null @@ -1,95 +0,0 @@ ---- -sidebar_position: 5 - -options: - menu: - weight: 50 - category: guide ---- - -# 基本配置 - -到目前为止我们还在使用 NoneBot 的默认行为，在开始编写自己的插件之前，我们先尝试在配置文件上动动手脚，让 NoneBot 表现出不同的行为。 - -在上一章节中，我们创建了默认的项目结构，其中 `.env` 和 `.env.*` 均为项目的配置文件，下面将介绍几种 NoneBot 配置方式。 - -:::danger 警告 -请勿将敏感信息写入配置文件并提交至开源仓库！ -::: - -## .env 文件 - -NoneBot 在启动时将会从系统环境变量或者 `.env` 文件中寻找变量 `ENVIRONMENT` (大小写不敏感)，默认值为 `prod`。 -这将引导 NoneBot 从系统环境变量或者 `.env.{ENVIRONMENT}` 文件中进一步加载具体配置。 - -`.env` 文件是基础环境配置文件，该文件中的配置项在不同环境下都会被加载，但会被 `.env.{ENVIRONMENT}` 文件中的配置所覆盖。 - -现在，我们在 `.env` 文件中写入当前环境信息： - -```bash -# .env -ENVIRONMENT=dev -CUSTOM_CONFIG=common config # 这个配置项在任何环境中都会被加载 -``` - -如你所想，之后 NoneBot 就会从 `.env.dev` 文件中加载环境变量。 - -## .env.\* 文件 - -NoneBot 使用 [pydantic](https://pydantic-docs.helpmanual.io/) 进行配置管理，会从 `.env.{ENVIRONMENT}` 文件中获悉环境配置。 - -可以在 NoneBot 初始化时指定加载某个环境配置文件: `nonebot.init(_env_file=".env.dev")`，这将忽略你在 `.env` 中设置的 `ENVIRONMENT` 。 - -:::warning 提示 -由于 `pydantic` 使用 JSON 解析配置项，请确保配置项值为 JSON 格式的数据。如： - -```bash -list=["123456789", "987654321", 1] -test={"hello": "world"} -``` - -如果配置项值解析失败将作为字符串处理。 -::: - -示例及说明： - -```bash -HOST=0.0.0.0 # 配置 NoneBot 监听的 IP/主机名 -PORT=8080 # 配置 NoneBot 监听的端口 -DEBUG=true # 开启 debug 模式 **请勿在生产环境开启** -SUPERUSERS=["123456789", "987654321"] # 配置 NoneBot 超级用户 -NICKNAME=["awesome", "bot"] # 配置机器人的昵称 -COMMAND_START=["/", ""] # 配置命令起始字符 -COMMAND_SEP=["."] # 配置命令分割字符 - -# Custom Configs -CUSTOM_CONFIG1="config in env file" -CUSTOM_CONFIG2= # 留空则从系统环境变量读取，如不存在则为空字符串 -``` - -详细的配置项参考 [Config Reference](../api/config.md) 。 - -## 系统环境变量 - -如果在系统环境变量中定义了配置，则一样会被读取。 - -## bot.py 文件 - -配置项也可以在 NoneBot 初始化时传入。此处可以传入任意合法 Python 变量。当然也可以在初始化完成后修改或新增。 - -示例： - -```python -# bot.py -import nonebot - -nonebot.init(custom_config3="config on init") - -config = nonebot.get_driver().config -config.custom_config3 = "changed after init" -config.custom_config4 = "new config after init" -``` - -## 优先级 - -`bot.py` 文件( `nonebot.init` ) > 系统环境变量 > `.env` `.env.*` 文件 diff --git a/website/docs/guide/start/install-adapter.md b/website/docs/guide/start/install-adapter.md index 4906a0e1..1959c619 100644 --- a/website/docs/guide/start/install-adapter.md +++ b/website/docs/guide/start/install-adapter.md @@ -37,4 +37,4 @@ nb adapter install pip install ``` - + diff --git a/website/docs/guide/start/install-driver.md b/website/docs/guide/start/install-driver.md index 4707cb00..8845821f 100644 --- a/website/docs/guide/start/install-driver.md +++ b/website/docs/guide/start/install-driver.md @@ -39,4 +39,4 @@ nb driver install pip install ``` - + diff --git a/website/docs/guide/start/install-plugin.md b/website/docs/guide/start/install-plugin.md index 7d459141..a2acd1e1 100644 --- a/website/docs/guide/start/install-plugin.md +++ b/website/docs/guide/start/install-plugin.md @@ -37,4 +37,4 @@ nb plugin install pip install ``` - + diff --git a/website/docs/guide/start/installation.md b/website/docs/guide/start/installation.md index 5ff6463d..4f430cce 100644 --- a/website/docs/guide/start/installation.md +++ b/website/docs/guide/start/installation.md @@ -32,7 +32,7 @@ pip uninstall nonebot pip install nb-cli ``` - + :::important 提示 `nb-cli` 的使用方法详见 [使用脚手架](./nb-cli.md) diff --git a/website/docs/guide/start/nb-cli.md b/website/docs/guide/start/nb-cli.md index 5ff94380..6472d4e7 100644 --- a/website/docs/guide/start/nb-cli.md +++ b/website/docs/guide/start/nb-cli.md @@ -10,4 +10,4 @@ options: # 使用脚手架 - + diff --git a/website/docs/guide/tutorial/choose-driver.md b/website/docs/guide/tutorial/choose-driver.md new file mode 100644 index 00000000..1e518223 --- /dev/null +++ b/website/docs/guide/tutorial/choose-driver.md @@ -0,0 +1,11 @@ +--- +sidebar_position: 5 +description: 各驱动器的功能与区别 + +options: + menu: + weight: 25 + category: guide +--- + +# 选择驱动器 diff --git a/website/docs/guide/tutorial/configuration.md b/website/docs/guide/tutorial/configuration.md new file mode 100644 index 00000000..653a3af7 --- /dev/null +++ b/website/docs/guide/tutorial/configuration.md @@ -0,0 +1,144 @@ +--- +sidebar_position: 1 +description: 项目配置方式与配置项 + +options: + menu: + weight: 21 + category: guide +--- + +# 配置 + +在上一章节中，我们创建了默认的项目结构，其中 `.env` 和 `.env.*` 均为项目的配置文件，下面将介绍几种 NoneBot 配置方式以及配置项。 + +:::danger 警告 +请勿将敏感信息写入配置文件并提交至开源仓库！ +::: + +## 配置方式 + +### .env 文件 + +NoneBot 在启动时将会从系统环境变量或者 `.env` 文件中寻找变量 `ENVIRONMENT` (大小写不敏感)，默认值为 `prod`。 +这将引导 NoneBot 从系统环境变量或者 `.env.{ENVIRONMENT}` 文件中进一步加载具体配置。 + +`.env` 文件是基础环境配置文件，该文件中的配置项在不同环境下都会被加载，但会被 `.env.{ENVIRONMENT}` 文件中的配置所覆盖。 + +NoneBot 使用 [pydantic](https://pydantic-docs.helpmanual.io/) 进行配置处理，并对 `pydantic` 的行为做出了更改，详见下方说明。 + +现在，我们在 `.env` 文件中写入当前环境信息： + +```bash +# .env +ENVIRONMENT=dev +CUSTOM_CONFIG=common config # 这个配置项在任何环境中都会被加载 +``` + +如你所想，之后 NoneBot 就会从 `.env.dev` 文件中加载环境变量。 + +:::important 参考文档 +`.env` 相关文件的加载使用 `dotenv` 语法，请参考 [`dotenv` 文档](https://saurabh-kumar.com/python-dotenv/) +::: + +:::warning 提示 +由于 `pydantic` 使用 JSON 解析配置项，请确保配置项值为 JSON 格式的数据。如： + +```bash +list=["123456789", "987654321", 1] +test={"hello": "world"} +``` + +如果配置项值解析失败将作为 **字符串** 处理。 + +特别的，如果配置项 **为空** ，则会从 **系统环境变量** 中获取值，如果不存在则为空字符串。 +::: + +### .env.\* 文件 + +NoneBot 默认会从 `.env.{ENVIRONMENT}` 文件加载配置，但是可以在 NoneBot 初始化时指定加载某个环境配置文件: `nonebot.init(_env_file=".env.dev")`，这将忽略你在 `.env` 中设置的 `ENVIRONMENT` 。 + +配置语法与 `.env` 文件相同。 + +示例及说明： + +```bash +HOST=0.0.0.0 # 配置 NoneBot 监听的 IP/主机名 +PORT=8080 # 配置 NoneBot 监听的端口 +DEBUG=true # 开启 debug 模式 **请勿在生产环境开启** +SUPERUSERS=["123456789", "987654321"] # 配置 NoneBot 超级用户 +NICKNAME=["awesome", "bot"] # 配置机器人的昵称 +COMMAND_START=["/", ""] # 配置命令起始字符 +COMMAND_SEP=["."] # 配置命令分割字符 + +# Custom Configs +CUSTOM_CONFIG1="config in env file" +CUSTOM_CONFIG2= # 留空则从系统环境变量读取，如不存在则为空字符串 +``` + +详细的配置项可以参考 [配置项](#详细配置项) 。 + +### 系统环境变量 + +如果在系统环境变量中定义了配置，则一样会被读取。 + +### bot.py 文件 + +配置项也可以在 NoneBot 初始化时传入。此处可以传入任意合法 Python 变量。当然也可以在初始化完成后修改或新增。 + +示例： + +```python +# bot.py +import nonebot + +nonebot.init(custom_config3="config on init") + +config = nonebot.get_driver().config +config.custom_config3 = "changed after init" +config.custom_config4 = "new config after init" +``` + +## 配置优先级 + +`bot.py` 文件( `nonebot.init` ) > 系统环境变量 > `.env`, `.env.*` 文件 + +## 读取配置项 + +配置项可以通过三种类型的对象获取：`driver`, `adapter`, `bot`。 + +```python +import nonebot +# driver +nonebot.get_driver().config.custom_config +# bot +nonebot.get_bot().config.custom_config +# adapter +nonebot.get_driver()._adapters["adapter_name"].config.custom_config +``` + +## 详细配置项 + +配置项的 API 文档可以前往 [Class Config](../../api/config.md#class-config) 查看。 + +### Driver + +- **类型**: `str` +- **默认值**: `"~fastapi"` + +NoneBot 运行所使用的驱动器。主要分为 `ForwardDriver`, `ReverseDriver` 即客户端和服务端两类。 + +配置格式采用特殊语法：`[:][+[:]]*` + +其中 `` 为驱动器模块名，可以使用 `~` 作为 `nonebot.drivers.` 的简写；`` 为驱动器类名，默认为 `Driver`；`` 为驱动器混入的类名，默认为 `Mixin`。 + +NoneBot 内置了几个常用驱动器，包括了各类常用功能，常见驱动器配置如下： + +- `~fastapi` +- `~httpx+~websockets` +- `~fastapi+~httpx+~websockets` +- `~fastapi+~aiohttp` + +各驱动器的功能与区别请参考 [选择驱动器](./choose-driver.md) 。 + + diff --git a/website/docs/guide/tutorial/custom-logger.md b/website/docs/guide/tutorial/custom-logger.md new file mode 100644 index 00000000..e69de29b From 7ebae277d1be4f3f2ea3c9d286d8973ce234cea0 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sat, 25 Dec 2021 17:44:53 +0800 Subject: [PATCH 122/174] :fire: remove unused import --- nonebot/adapters/_bot.py | 2 +- nonebot/message.py | 12 +----------- nonebot/typing.py | 2 -- nonebot/utils.py | 2 -- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/nonebot/adapters/_bot.py b/nonebot/adapters/_bot.py index e72a0d26..058b9ec8 100644 --- a/nonebot/adapters/_bot.py +++ b/nonebot/adapters/_bot.py @@ -2,7 +2,7 @@ import abc import asyncio from functools import partial from typing_extensions import Protocol -from typing import TYPE_CHECKING, Any, Set, Tuple, Union, Optional +from typing import TYPE_CHECKING, Any, Set, Union, Optional from nonebot.log import logger from nonebot.config import Config diff --git a/nonebot/message.py b/nonebot/message.py index d09a64e0..a3b41a17 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -8,16 +8,7 @@ NoneBot 内部处理并按优先级分发事件给所有事件响应器，提供 import asyncio from datetime import datetime from contextlib import AsyncExitStack -from typing import ( - TYPE_CHECKING, - Any, - Set, - Dict, - List, - Type, - Optional, - Coroutine, -) +from typing import TYPE_CHECKING, Any, Set, Dict, Type, Optional, Coroutine from nonebot import params from nonebot.log import logger @@ -33,7 +24,6 @@ from nonebot.exception import ( ) from nonebot.typing import ( T_State, - T_Handler, T_DependencyCache, T_RunPreProcessor, T_RunPostProcessor, diff --git a/nonebot/typing.py b/nonebot/typing.py index 3e28a3ea..d4ff66b4 100644 --- a/nonebot/typing.py +++ b/nonebot/typing.py @@ -24,10 +24,8 @@ from typing import ( Union, TypeVar, Callable, - NoReturn, Optional, Awaitable, - ForwardRef, ) if TYPE_CHECKING: diff --git a/nonebot/utils.py b/nonebot/utils.py index 5bbcbee1..50044074 100644 --- a/nonebot/utils.py +++ b/nonebot/utils.py @@ -8,11 +8,9 @@ from contextlib import asynccontextmanager from typing_extensions import ParamSpec, get_args, get_origin from typing import ( Any, - Dict, Type, Tuple, Union, - Generic, TypeVar, Callable, Optional, From d773fea709066d7b968298647e9b3d19a7f7efa3 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sat, 25 Dec 2021 18:46:44 +0800 Subject: [PATCH 123/174] :bug: fix echo message error --- nonebot/plugins/echo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nonebot/plugins/echo.py b/nonebot/plugins/echo.py index 082cf420..8eb1968c 100644 --- a/nonebot/plugins/echo.py +++ b/nonebot/plugins/echo.py @@ -1,11 +1,11 @@ from nonebot.rule import to_me from nonebot.adapters import Message +from nonebot.params import CommandArg from nonebot.plugin import on_command -from nonebot.params import EventMessage echo = on_command("echo", to_me()) @echo.handle() -async def echo_escape(message: Message = EventMessage()): +async def echo_escape(message: Message = CommandArg()): await echo.send(message=message) From 00c2ee84907383da909d06a0aa8bdb8928d788ae Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sat, 25 Dec 2021 20:17:12 +0800 Subject: [PATCH 124/174] :bug: fix command rule type annotation error --- nonebot/rule.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nonebot/rule.py b/nonebot/rule.py index f127230c..b4cf827c 100644 --- a/nonebot/rule.py +++ b/nonebot/rule.py @@ -304,7 +304,7 @@ class CommandRule: def __init__(self, cmds: List[Tuple[str, ...]]): self.cmds = cmds - async def __call__(self, cmd: Tuple[str, ...] = Command()) -> bool: + async def __call__(self, cmd: Optional[Tuple[str, ...]] = Command()) -> bool: return cmd in self.cmds def __repr__(self): @@ -390,7 +390,7 @@ class ShellCommandRule: async def __call__( self, - cmd: Tuple[str, ...] = Command(), + cmd: Optional[Tuple[str, ...]] = Command(), msg: Message = EventMessage(), state: T_State = State(), ) -> bool: From 7b204d72e61cd2bfa75b195df3e1837391e4bfa5 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 26 Dec 2021 13:42:13 +0800 Subject: [PATCH 125/174] :wheelchair: change websocket client to context manager --- nonebot/drivers/__init__.py | 16 ++++++++++++++-- nonebot/drivers/aiohttp.py | 14 +++++++++----- nonebot/drivers/httpx.py | 9 +++++++-- nonebot/drivers/websockets.py | 10 +++++++--- 4 files changed, 37 insertions(+), 12 deletions(-) diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py index 079534ce..7c7bf3a9 100644 --- a/nonebot/drivers/__init__.py +++ b/nonebot/drivers/__init__.py @@ -8,7 +8,17 @@ import abc import asyncio from dataclasses import dataclass -from typing import TYPE_CHECKING, Any, Set, Dict, Type, Callable, Awaitable +from contextlib import asynccontextmanager +from typing import ( + TYPE_CHECKING, + Any, + Set, + Dict, + Type, + Callable, + Awaitable, + AsyncGenerator, +) from ._model import URL as URL from nonebot.log import logger @@ -215,8 +225,10 @@ class ForwardMixin(abc.ABC): raise NotImplementedError @abc.abstractmethod - async def websocket(self, setup: Request) -> WebSocket: + @asynccontextmanager + async def websocket(self, setup: Request) -> AsyncGenerator[WebSocket, None]: raise NotImplementedError + yield # used for static type checking's generator detection class ForwardDriver(Driver, ForwardMixin): diff --git a/nonebot/drivers/aiohttp.py b/nonebot/drivers/aiohttp.py index 264e78e8..080744cf 100644 --- a/nonebot/drivers/aiohttp.py +++ b/nonebot/drivers/aiohttp.py @@ -5,6 +5,9 @@ AIOHTTP 驱动适配 本驱动仅支持客户端连接 """ +from typing import AsyncGenerator +from contextlib import asynccontextmanager + from nonebot.typing import overrides from nonebot.drivers import Request, Response from nonebot.drivers._block_driver import BlockDriver @@ -59,7 +62,8 @@ class Mixin(ForwardMixin): return res @overrides(ForwardMixin) - async def websocket(self, setup: Request) -> "WebSocket": + @asynccontextmanager + async def websocket(self, setup: Request) -> AsyncGenerator["WebSocket", None]: if setup.version == HTTPVersion.H10: version = aiohttp.HttpVersion10 elif setup.version == HTTPVersion.H11: @@ -68,15 +72,15 @@ class Mixin(ForwardMixin): raise RuntimeError(f"Unsupported HTTP version: {setup.version}") session = aiohttp.ClientSession(version=version, trust_env=True) - ws = await session.ws_connect( + async with session.ws_connect( setup.url, method=setup.method, timeout=setup.timeout or 10, headers=setup.headers, proxy=setup.proxy, - ) - websocket = WebSocket(request=setup, session=session, websocket=ws) - return websocket + ) as ws: + websocket = WebSocket(request=setup, session=session, websocket=ws) + yield websocket class WebSocket(BaseWebSocket): diff --git a/nonebot/drivers/httpx.py b/nonebot/drivers/httpx.py index 742b6b6c..fe82e50d 100644 --- a/nonebot/drivers/httpx.py +++ b/nonebot/drivers/httpx.py @@ -1,3 +1,6 @@ +from typing import AsyncGenerator +from contextlib import asynccontextmanager + from nonebot.typing import overrides from nonebot.drivers._block_driver import BlockDriver from nonebot.drivers import ( @@ -48,8 +51,10 @@ class Mixin(ForwardMixin): ) @overrides(ForwardMixin) - async def websocket(self, setup: Request) -> WebSocket: - return await super(Mixin, self).websocket(setup) + @asynccontextmanager + async def websocket(self, setup: Request) -> AsyncGenerator[WebSocket, None]: + async with super(Mixin, self).websocket(setup) as ws: + yield ws Driver = combine_driver(BlockDriver, Mixin) diff --git a/nonebot/drivers/websockets.py b/nonebot/drivers/websockets.py index 81903698..0cc4827b 100644 --- a/nonebot/drivers/websockets.py +++ b/nonebot/drivers/websockets.py @@ -1,4 +1,6 @@ import logging +from typing import AsyncGenerator +from contextlib import asynccontextmanager from nonebot.typing import overrides from nonebot.log import LoguruHandler @@ -29,13 +31,15 @@ class Mixin(ForwardMixin): return await super(Mixin, self).request(setup) @overrides(ForwardMixin) - async def websocket(self, setup: Request) -> "WebSocket": - ws = await Connect( + @asynccontextmanager + async def websocket(self, setup: Request) -> AsyncGenerator["WebSocket", None]: + connection = Connect( str(setup.url), extra_headers=setup.headers.items(), open_timeout=setup.timeout, ) - return WebSocket(request=setup, websocket=ws) + async with connection as ws: + yield WebSocket(request=setup, websocket=ws) class WebSocket(BaseWebSocket): From e64f3993702bc2c735992e7162bd600ced55c076 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 26 Dec 2021 13:45:26 +0800 Subject: [PATCH 126/174] :wheelchair: change websocket client to context manager --- nonebot/adapters/_adapter.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nonebot/adapters/_adapter.py b/nonebot/adapters/_adapter.py index 992ee52a..4d2e22ff 100644 --- a/nonebot/adapters/_adapter.py +++ b/nonebot/adapters/_adapter.py @@ -1,5 +1,6 @@ import abc -from typing import Any, Dict +from contextlib import asynccontextmanager +from typing import Any, Dict, AsyncGenerator from ._bot import Bot from nonebot.config import Config @@ -52,10 +53,12 @@ class Adapter(abc.ABC): raise TypeError("Current driver does not support http client") return await self.driver.request(setup) - async def websocket(self, setup: Request) -> WebSocket: + @asynccontextmanager + async def websocket(self, setup: Request) -> AsyncGenerator[WebSocket, None]: if not isinstance(self.driver, ForwardDriver): raise TypeError("Current driver does not support websocket client") - return await self.driver.websocket(setup) + async with self.driver.websocket(setup) as ws: + yield ws @abc.abstractmethod async def _call_api(self, bot: Bot, api: str, **data) -> Any: From 8093c5d15489ea2d74681c4a75eabe48ef3dd3b7 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 26 Dec 2021 14:20:09 +0800 Subject: [PATCH 127/174] :wheelchair: add websocket close exception --- nonebot/drivers/aiohttp.py | 17 +++++++++++++++-- nonebot/drivers/websockets.py | 19 +++++++++++++++++++ nonebot/exception.py | 24 ++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/nonebot/drivers/aiohttp.py b/nonebot/drivers/aiohttp.py index 080744cf..c2e50481 100644 --- a/nonebot/drivers/aiohttp.py +++ b/nonebot/drivers/aiohttp.py @@ -10,6 +10,7 @@ from contextlib import asynccontextmanager from nonebot.typing import overrides from nonebot.drivers import Request, Response +from nonebot.exception import WebSocketClosed from nonebot.drivers._block_driver import BlockDriver from nonebot.drivers import WebSocket as BaseWebSocket from nonebot.drivers import HTTPVersion, ForwardMixin, combine_driver @@ -109,13 +110,25 @@ class WebSocket(BaseWebSocket): await self.websocket.close(code=code) await self.session.close() + async def _receive(self) -> aiohttp.WSMessage: + msg = await self.websocket.receive() + if msg.type in (aiohttp.WSMsgType.CLOSE, aiohttp.WSMsgType.CLOSING): + raise WebSocketClosed(self.websocket.close_code or 1006) + return msg + @overrides(BaseWebSocket) async def receive(self) -> str: - return await self.websocket.receive_str() + msg = await self._receive() + if msg.type != aiohttp.WSMsgType.TEXT: + raise TypeError(f"WebSocket received unexpected frame type: {msg.type}") + return msg.data @overrides(BaseWebSocket) async def receive_bytes(self) -> bytes: - return await self.websocket.receive_bytes() + msg = await self._receive() + if msg.type != aiohttp.WSMsgType.TEXT: + raise TypeError(f"WebSocket received unexpected frame type: {msg.type}") + return msg.data @overrides(BaseWebSocket) async def send(self, data: str) -> None: diff --git a/nonebot/drivers/websockets.py b/nonebot/drivers/websockets.py index 0cc4827b..b3f2d99c 100644 --- a/nonebot/drivers/websockets.py +++ b/nonebot/drivers/websockets.py @@ -1,15 +1,18 @@ import logging +from functools import wraps from typing import AsyncGenerator from contextlib import asynccontextmanager from nonebot.typing import overrides from nonebot.log import LoguruHandler from nonebot.drivers import Request, Response +from nonebot.exception import WebSocketClosed from nonebot.drivers._block_driver import BlockDriver from nonebot.drivers import WebSocket as BaseWebSocket from nonebot.drivers import ForwardMixin, combine_driver try: + from websockets.exceptions import ConnectionClosed from websockets.legacy.client import Connect, WebSocketClientProtocol except ImportError: raise ImportError( @@ -20,6 +23,20 @@ logger = logging.Logger("websockets.client", "INFO") logger.addHandler(LoguruHandler()) +def catch_closed(func): + @wraps(func) + async def decorator(*args, **kwargs): + try: + return await func(*args, **kwargs) + except ConnectionClosed as e: + if e.rcvd_then_sent: + raise WebSocketClosed(e.rcvd.code, e.rcvd.reason) + else: + raise WebSocketClosed(e.sent.code, e.sent.reason) + + return decorator + + class Mixin(ForwardMixin): @property @overrides(ForwardMixin) @@ -62,6 +79,7 @@ class WebSocket(BaseWebSocket): await self.websocket.close(code, reason) @overrides(BaseWebSocket) + @catch_closed async def receive(self) -> str: msg = await self.websocket.recv() if isinstance(msg, bytes): @@ -69,6 +87,7 @@ class WebSocket(BaseWebSocket): return msg @overrides(BaseWebSocket) + @catch_closed async def receive_bytes(self) -> bytes: msg = await self.websocket.recv() if isinstance(msg, str): diff --git a/nonebot/exception.py b/nonebot/exception.py index 44ac6a7e..ce2fb9e6 100644 --- a/nonebot/exception.py +++ b/nonebot/exception.py @@ -230,3 +230,27 @@ class ActionFailed(AdapterException): """ pass + + +# Driver Exceptions +class DriverException(NoneBotException): + """ + :说明: + + ``Driver`` 抛出的异常基类 + """ + + +class WebSocketClosed(DriverException): + """ + :说明: + + WebSocket 连接已关闭 + """ + + def __init__(self, code: int, reason: Optional[str] = None): + self.code = code + self.reason = reason + + def __repr__(self) -> str: + return f"" From fd9ec5e6fa0a46d1e1c1cc2fc3c4e76268448731 Mon Sep 17 00:00:00 2001 From: Jigsaw Date: Sun, 26 Dec 2021 18:46:54 +0800 Subject: [PATCH 128/174] :sparkles: Compatible with cross-platform superusers (#642) --- nonebot/permission.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nonebot/permission.py b/nonebot/permission.py index 79aa87aa..afb527cc 100644 --- a/nonebot/permission.py +++ b/nonebot/permission.py @@ -206,9 +206,10 @@ def USER(*users: str, perm: Optional[Permission] = None): class SuperUser: async def __call__(self, bot: Bot, event: Event) -> bool: - return ( - event.get_type() == "message" - and event.get_user_id() in bot.config.superusers + return event.get_type() == "message" and ( + f"{bot.adapter.get_name().split(maxsplit=1)[0].lower()}:{event.get_user_id()}" + in bot.config.superusers + or event.get_user_id() in bot.config.superusers # 兼容旧配置 ) From c1e06c2ec01890eb80ce1875f9eb3cee73e72b8a Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 27 Dec 2021 02:26:02 +0800 Subject: [PATCH 129/174] :bug: fix aiohttp config trierule bugs --- nonebot/config.py | 9 +++++++-- nonebot/drivers/aiohttp.py | 20 ++++++++++---------- nonebot/message.py | 7 ++++++- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/nonebot/config.py b/nonebot/config.py index c8d2cc19..818f7c36 100644 --- a/nonebot/config.py +++ b/nonebot/config.py @@ -29,6 +29,9 @@ from pydantic.env_settings import ( env_file_sentinel, ) +from nonebot.log import logger +from nonebot.utils import escape_tag + class CustomEnvSettings(EnvSettingsSource): def __call__(self, settings: BaseSettings) -> Dict[str, Any]: @@ -90,9 +93,11 @@ class CustomEnvSettings(EnvSettingsSource): env_val = env_vars[env_name] try: if env_val: - env_val = settings.__config__.json_loads(env_val) + env_val = settings.__config__.json_loads(env_val.strip()) except ValueError as e: - pass + logger.opt(colors=True, exception=e).trace( + f"Error while parsing JSON for {escape_tag(env_name)}. Assumed as string." + ) d[env_name] = env_val diff --git a/nonebot/drivers/aiohttp.py b/nonebot/drivers/aiohttp.py index c2e50481..243de63d 100644 --- a/nonebot/drivers/aiohttp.py +++ b/nonebot/drivers/aiohttp.py @@ -72,16 +72,16 @@ class Mixin(ForwardMixin): else: raise RuntimeError(f"Unsupported HTTP version: {setup.version}") - session = aiohttp.ClientSession(version=version, trust_env=True) - async with session.ws_connect( - setup.url, - method=setup.method, - timeout=setup.timeout or 10, - headers=setup.headers, - proxy=setup.proxy, - ) as ws: - websocket = WebSocket(request=setup, session=session, websocket=ws) - yield websocket + async with aiohttp.ClientSession(version=version, trust_env=True) as session: + async with session.ws_connect( + setup.url, + method=setup.method, + timeout=setup.timeout or 10, + headers=setup.headers, + proxy=setup.proxy, + ) as ws: + websocket = WebSocket(request=setup, session=session, websocket=ws) + yield websocket class WebSocket(BaseWebSocket): diff --git a/nonebot/message.py b/nonebot/message.py index a3b41a17..6611598b 100644 --- a/nonebot/message.py +++ b/nonebot/message.py @@ -303,7 +303,12 @@ async def handle_event(bot: "Bot", event: "Event") -> None: return # Trie Match - TrieRule.get_value(bot, event, state) + try: + TrieRule.get_value(bot, event, state) + except Exception as e: + logger.opt(colors=True, exception=e).warning( + "Error while parsing command for event" + ) break_flag = False for priority in sorted(matchers.keys()): From 2ec04e5a4c461a023716941e76483281eb44aaa5 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 27 Dec 2021 13:22:48 +0800 Subject: [PATCH 130/174] :fire: remove unused files --- README.md | 149 -- archive/2.0.0a13.post1/README.md | 15 - archive/2.0.0a13.post1/advanced/README.md | 177 -- .../advanced/export-and-require.md | 117 - .../advanced/overloaded-handlers.md | 1 - archive/2.0.0a13.post1/advanced/permission.md | 2 - .../2.0.0a13.post1/advanced/publish-plugin.md | 1 - .../2.0.0a13.post1/advanced/runtime-hook.md | 163 -- archive/2.0.0a13.post1/advanced/scheduler.md | 135 -- archive/2.0.0a13.post1/api/README.md | 61 - archive/2.0.0a13.post1/api/adapters/README.md | 481 ----- archive/2.0.0a13.post1/api/adapters/cqhttp.md | 581 ----- archive/2.0.0a13.post1/api/adapters/ding.md | 334 --- archive/2.0.0a13.post1/api/adapters/mirai.md | 1917 ----------------- archive/2.0.0a13.post1/api/config.md | 285 --- archive/2.0.0a13.post1/api/drivers/README.md | 318 --- archive/2.0.0a13.post1/api/drivers/fastapi.md | 135 -- archive/2.0.0a13.post1/api/drivers/quart.md | 62 - archive/2.0.0a13.post1/api/exception.md | 214 -- archive/2.0.0a13.post1/api/handler.md | 111 - archive/2.0.0a13.post1/api/log.md | 42 - archive/2.0.0a13.post1/api/matcher.md | 541 ----- archive/2.0.0a13.post1/api/message.md | 143 -- archive/2.0.0a13.post1/api/nonebot.md | 278 --- archive/2.0.0a13.post1/api/permission.md | 63 - archive/2.0.0a13.post1/api/plugin.md | 1480 ------------- archive/2.0.0a13.post1/api/rule.md | 266 --- archive/2.0.0a13.post1/api/typing.md | 278 --- archive/2.0.0a13.post1/api/utils.md | 84 - archive/2.0.0a13.post1/guide/README.md | 31 - .../guide/basic-configuration.md | 86 - archive/2.0.0a13.post1/guide/cqhttp-guide.md | 107 - .../guide/creating-a-handler.md | 197 -- .../guide/creating-a-matcher.md | 148 -- .../2.0.0a13.post1/guide/creating-a-plugin.md | 119 - .../guide/creating-a-project.md | 57 - archive/2.0.0a13.post1/guide/ding-guide.md | 181 -- archive/2.0.0a13.post1/guide/end-or-start.md | 8 - .../2.0.0a13.post1/guide/getting-started.md | 87 - .../guide/images/Handle-Event.png | Bin 126466 -> 0 bytes .../guide/images/ding/jiaqian.png | Bin 102378 -> 0 bytes .../guide/images/ding/test_webhook.png | Bin 76694 -> 0 bytes .../guide/images/ding/webhook.png | Bin 102603 -> 0 bytes archive/2.0.0a13.post1/guide/installation.md | 109 - .../2.0.0a13.post1/guide/loading-a-plugin.md | 125 -- archive/2.0.0a13.post1/guide/mirai-guide.md | 234 -- archive/2.0.0a13.post1/sidebar.config.json | 184 -- archive/2.0.0a15/README.md | 15 - archive/2.0.0a15/advanced/README.md | 177 -- .../2.0.0a15/advanced/export-and-require.md | 117 - .../2.0.0a15/advanced/overloaded-handlers.md | 64 - archive/2.0.0a15/advanced/permission.md | 90 - archive/2.0.0a15/advanced/publish-plugin.md | 1 - archive/2.0.0a15/advanced/runtime-hook.md | 163 -- archive/2.0.0a15/advanced/scheduler.md | 135 -- archive/2.0.0a15/api/README.md | 67 - archive/2.0.0a15/api/adapters/README.md | 501 ----- archive/2.0.0a15/api/adapters/cqhttp.md | 686 ------ archive/2.0.0a15/api/adapters/ding.md | 334 --- archive/2.0.0a15/api/adapters/feishu.md | 246 --- archive/2.0.0a15/api/adapters/mirai.md | 1877 ---------------- archive/2.0.0a15/api/config.md | 311 --- archive/2.0.0a15/api/drivers/README.md | 529 ----- archive/2.0.0a15/api/drivers/aiohttp.md | 101 - archive/2.0.0a15/api/drivers/fastapi.md | 174 -- archive/2.0.0a15/api/drivers/quart.md | 89 - archive/2.0.0a15/api/exception.md | 193 -- archive/2.0.0a15/api/handler.md | 111 - archive/2.0.0a15/api/log.md | 42 - archive/2.0.0a15/api/matcher.md | 586 ----- archive/2.0.0a15/api/message.md | 143 -- archive/2.0.0a15/api/nonebot.md | 324 --- archive/2.0.0a15/api/permission.md | 137 -- archive/2.0.0a15/api/plugin.md | 1492 ------------- archive/2.0.0a15/api/rule.md | 266 --- archive/2.0.0a15/api/typing.md | 278 --- archive/2.0.0a15/api/utils.md | 85 - archive/2.0.0a15/guide/README.md | 31 - archive/2.0.0a15/guide/basic-configuration.md | 86 - archive/2.0.0a15/guide/cqhttp-guide.md | 117 - archive/2.0.0a15/guide/creating-a-handler.md | 197 -- archive/2.0.0a15/guide/creating-a-matcher.md | 148 -- archive/2.0.0a15/guide/creating-a-plugin.md | 119 - archive/2.0.0a15/guide/creating-a-project.md | 58 - archive/2.0.0a15/guide/ding-guide.md | 181 -- archive/2.0.0a15/guide/end-or-start.md | 8 - archive/2.0.0a15/guide/feishu-guide.md | 57 - archive/2.0.0a15/guide/getting-started.md | 87 - .../2.0.0a15/guide/images/Handle-Event.png | Bin 126466 -> 0 bytes .../2.0.0a15/guide/images/ding/jiaqian.png | Bin 102378 -> 0 bytes .../guide/images/ding/test_webhook.png | Bin 76694 -> 0 bytes .../2.0.0a15/guide/images/ding/webhook.png | Bin 102603 -> 0 bytes archive/2.0.0a15/guide/installation.md | 115 - archive/2.0.0a15/guide/loading-a-plugin.md | 184 -- archive/2.0.0a15/guide/mirai-guide.md | 253 --- archive/2.0.0a15/sidebar.config.json | 193 -- archive/2.0.0a16/README.md | 15 - archive/2.0.0a16/advanced/README.md | 177 -- .../2.0.0a16/advanced/export-and-require.md | 117 - .../advanced/images/plugin_store_publish.png | Bin 94001 -> 0 bytes .../images/plugin_store_publish_2.png | Bin 35928 -> 0 bytes .../2.0.0a16/advanced/overloaded-handlers.md | 64 - archive/2.0.0a16/advanced/permission.md | 90 - archive/2.0.0a16/advanced/publish-plugin.md | 49 - archive/2.0.0a16/advanced/runtime-hook.md | 163 -- archive/2.0.0a16/advanced/scheduler.md | 135 -- archive/2.0.0a16/api/README.md | 67 - archive/2.0.0a16/api/adapters/README.md | 558 ----- archive/2.0.0a16/api/adapters/cqhttp.md | 686 ------ archive/2.0.0a16/api/adapters/ding.md | 334 --- archive/2.0.0a16/api/adapters/feishu.md | 249 --- archive/2.0.0a16/api/adapters/mirai.md | 1901 ---------------- archive/2.0.0a16/api/config.md | 311 --- archive/2.0.0a16/api/drivers/README.md | 529 ----- archive/2.0.0a16/api/drivers/aiohttp.md | 101 - archive/2.0.0a16/api/drivers/fastapi.md | 234 -- archive/2.0.0a16/api/drivers/quart.md | 149 -- archive/2.0.0a16/api/exception.md | 193 -- archive/2.0.0a16/api/handler.md | 111 - archive/2.0.0a16/api/log.md | 42 - archive/2.0.0a16/api/matcher.md | 586 ----- archive/2.0.0a16/api/message.md | 143 -- archive/2.0.0a16/api/nonebot.md | 324 --- archive/2.0.0a16/api/permission.md | 137 -- archive/2.0.0a16/api/plugin.md | 1492 ------------- archive/2.0.0a16/api/rule.md | 266 --- archive/2.0.0a16/api/typing.md | 278 --- archive/2.0.0a16/api/utils.md | 85 - archive/2.0.0a16/guide/README.md | 31 - archive/2.0.0a16/guide/basic-configuration.md | 86 - archive/2.0.0a16/guide/cqhttp-guide.md | 117 - archive/2.0.0a16/guide/creating-a-handler.md | 197 -- archive/2.0.0a16/guide/creating-a-matcher.md | 148 -- archive/2.0.0a16/guide/creating-a-plugin.md | 119 - archive/2.0.0a16/guide/creating-a-project.md | 58 - archive/2.0.0a16/guide/ding-guide.md | 181 -- archive/2.0.0a16/guide/end-or-start.md | 8 - archive/2.0.0a16/guide/feishu-guide.md | 102 - archive/2.0.0a16/guide/getting-started.md | 87 - .../2.0.0a16/guide/images/Handle-Event.png | Bin 126466 -> 0 bytes .../2.0.0a16/guide/images/ding/jiaqian.png | Bin 102378 -> 0 bytes .../guide/images/ding/test_webhook.png | Bin 76694 -> 0 bytes .../2.0.0a16/guide/images/ding/webhook.png | Bin 102603 -> 0 bytes archive/2.0.0a16/guide/installation.md | 115 - archive/2.0.0a16/guide/loading-a-plugin.md | 184 -- archive/2.0.0a16/guide/mirai-guide.md | 253 --- archive/2.0.0a16/sidebar.config.json | 193 -- website/docs/guide/cqhttp-guide.md | 117 - website/docs/guide/creating-a-handler.md | 206 -- website/docs/guide/creating-a-matcher.md | 157 -- website/docs/guide/creating-a-plugin.md | 128 -- website/docs/guide/ding-guide.md | 181 -- website/docs/guide/end-or-start.md | 12 - website/docs/guide/feishu-guide.md | 101 - website/docs/guide/getting-started.md | 96 - website/docs/guide/images/Handle-Event.png | Bin 126466 -> 0 bytes website/docs/guide/images/ding/jiaqian.png | Bin 102378 -> 0 bytes .../docs/guide/images/ding/test_webhook.png | Bin 76694 -> 0 bytes website/docs/guide/images/ding/webhook.png | Bin 102603 -> 0 bytes website/docs/guide/loading-a-plugin.md | 193 -- website/docs/guide/mirai-guide.md | 253 --- 161 files changed, 34184 deletions(-) delete mode 100644 README.md delete mode 100644 archive/2.0.0a13.post1/README.md delete mode 100644 archive/2.0.0a13.post1/advanced/README.md delete mode 100644 archive/2.0.0a13.post1/advanced/export-and-require.md delete mode 100644 archive/2.0.0a13.post1/advanced/overloaded-handlers.md delete mode 100644 archive/2.0.0a13.post1/advanced/permission.md delete mode 100644 archive/2.0.0a13.post1/advanced/publish-plugin.md delete mode 100644 archive/2.0.0a13.post1/advanced/runtime-hook.md delete mode 100644 archive/2.0.0a13.post1/advanced/scheduler.md delete mode 100644 archive/2.0.0a13.post1/api/README.md delete mode 100644 archive/2.0.0a13.post1/api/adapters/README.md delete mode 100644 archive/2.0.0a13.post1/api/adapters/cqhttp.md delete mode 100644 archive/2.0.0a13.post1/api/adapters/ding.md delete mode 100644 archive/2.0.0a13.post1/api/adapters/mirai.md delete mode 100644 archive/2.0.0a13.post1/api/config.md delete mode 100644 archive/2.0.0a13.post1/api/drivers/README.md delete mode 100644 archive/2.0.0a13.post1/api/drivers/fastapi.md delete mode 100644 archive/2.0.0a13.post1/api/drivers/quart.md delete mode 100644 archive/2.0.0a13.post1/api/exception.md delete mode 100644 archive/2.0.0a13.post1/api/handler.md delete mode 100644 archive/2.0.0a13.post1/api/log.md delete mode 100644 archive/2.0.0a13.post1/api/matcher.md delete mode 100644 archive/2.0.0a13.post1/api/message.md delete mode 100644 archive/2.0.0a13.post1/api/nonebot.md delete mode 100644 archive/2.0.0a13.post1/api/permission.md delete mode 100644 archive/2.0.0a13.post1/api/plugin.md delete mode 100644 archive/2.0.0a13.post1/api/rule.md delete mode 100644 archive/2.0.0a13.post1/api/typing.md delete mode 100644 archive/2.0.0a13.post1/api/utils.md delete mode 100644 archive/2.0.0a13.post1/guide/README.md delete mode 100644 archive/2.0.0a13.post1/guide/basic-configuration.md delete mode 100644 archive/2.0.0a13.post1/guide/cqhttp-guide.md delete mode 100644 archive/2.0.0a13.post1/guide/creating-a-handler.md delete mode 100644 archive/2.0.0a13.post1/guide/creating-a-matcher.md delete mode 100644 archive/2.0.0a13.post1/guide/creating-a-plugin.md delete mode 100644 archive/2.0.0a13.post1/guide/creating-a-project.md delete mode 100644 archive/2.0.0a13.post1/guide/ding-guide.md delete mode 100644 archive/2.0.0a13.post1/guide/end-or-start.md delete mode 100644 archive/2.0.0a13.post1/guide/getting-started.md delete mode 100644 archive/2.0.0a13.post1/guide/images/Handle-Event.png delete mode 100644 archive/2.0.0a13.post1/guide/images/ding/jiaqian.png delete mode 100644 archive/2.0.0a13.post1/guide/images/ding/test_webhook.png delete mode 100644 archive/2.0.0a13.post1/guide/images/ding/webhook.png delete mode 100644 archive/2.0.0a13.post1/guide/installation.md delete mode 100644 archive/2.0.0a13.post1/guide/loading-a-plugin.md delete mode 100644 archive/2.0.0a13.post1/guide/mirai-guide.md delete mode 100644 archive/2.0.0a13.post1/sidebar.config.json delete mode 100644 archive/2.0.0a15/README.md delete mode 100644 archive/2.0.0a15/advanced/README.md delete mode 100644 archive/2.0.0a15/advanced/export-and-require.md delete mode 100644 archive/2.0.0a15/advanced/overloaded-handlers.md delete mode 100644 archive/2.0.0a15/advanced/permission.md delete mode 100644 archive/2.0.0a15/advanced/publish-plugin.md delete mode 100644 archive/2.0.0a15/advanced/runtime-hook.md delete mode 100644 archive/2.0.0a15/advanced/scheduler.md delete mode 100644 archive/2.0.0a15/api/README.md delete mode 100644 archive/2.0.0a15/api/adapters/README.md delete mode 100644 archive/2.0.0a15/api/adapters/cqhttp.md delete mode 100644 archive/2.0.0a15/api/adapters/ding.md delete mode 100644 archive/2.0.0a15/api/adapters/feishu.md delete mode 100644 archive/2.0.0a15/api/adapters/mirai.md delete mode 100644 archive/2.0.0a15/api/config.md delete mode 100644 archive/2.0.0a15/api/drivers/README.md delete mode 100644 archive/2.0.0a15/api/drivers/aiohttp.md delete mode 100644 archive/2.0.0a15/api/drivers/fastapi.md delete mode 100644 archive/2.0.0a15/api/drivers/quart.md delete mode 100644 archive/2.0.0a15/api/exception.md delete mode 100644 archive/2.0.0a15/api/handler.md delete mode 100644 archive/2.0.0a15/api/log.md delete mode 100644 archive/2.0.0a15/api/matcher.md delete mode 100644 archive/2.0.0a15/api/message.md delete mode 100644 archive/2.0.0a15/api/nonebot.md delete mode 100644 archive/2.0.0a15/api/permission.md delete mode 100644 archive/2.0.0a15/api/plugin.md delete mode 100644 archive/2.0.0a15/api/rule.md delete mode 100644 archive/2.0.0a15/api/typing.md delete mode 100644 archive/2.0.0a15/api/utils.md delete mode 100644 archive/2.0.0a15/guide/README.md delete mode 100644 archive/2.0.0a15/guide/basic-configuration.md delete mode 100644 archive/2.0.0a15/guide/cqhttp-guide.md delete mode 100644 archive/2.0.0a15/guide/creating-a-handler.md delete mode 100644 archive/2.0.0a15/guide/creating-a-matcher.md delete mode 100644 archive/2.0.0a15/guide/creating-a-plugin.md delete mode 100644 archive/2.0.0a15/guide/creating-a-project.md delete mode 100644 archive/2.0.0a15/guide/ding-guide.md delete mode 100644 archive/2.0.0a15/guide/end-or-start.md delete mode 100644 archive/2.0.0a15/guide/feishu-guide.md delete mode 100644 archive/2.0.0a15/guide/getting-started.md delete mode 100644 archive/2.0.0a15/guide/images/Handle-Event.png delete mode 100644 archive/2.0.0a15/guide/images/ding/jiaqian.png delete mode 100644 archive/2.0.0a15/guide/images/ding/test_webhook.png delete mode 100644 archive/2.0.0a15/guide/images/ding/webhook.png delete mode 100644 archive/2.0.0a15/guide/installation.md delete mode 100644 archive/2.0.0a15/guide/loading-a-plugin.md delete mode 100644 archive/2.0.0a15/guide/mirai-guide.md delete mode 100644 archive/2.0.0a15/sidebar.config.json delete mode 100644 archive/2.0.0a16/README.md delete mode 100644 archive/2.0.0a16/advanced/README.md delete mode 100644 archive/2.0.0a16/advanced/export-and-require.md delete mode 100644 archive/2.0.0a16/advanced/images/plugin_store_publish.png delete mode 100644 archive/2.0.0a16/advanced/images/plugin_store_publish_2.png delete mode 100644 archive/2.0.0a16/advanced/overloaded-handlers.md delete mode 100644 archive/2.0.0a16/advanced/permission.md delete mode 100644 archive/2.0.0a16/advanced/publish-plugin.md delete mode 100644 archive/2.0.0a16/advanced/runtime-hook.md delete mode 100644 archive/2.0.0a16/advanced/scheduler.md delete mode 100644 archive/2.0.0a16/api/README.md delete mode 100644 archive/2.0.0a16/api/adapters/README.md delete mode 100644 archive/2.0.0a16/api/adapters/cqhttp.md delete mode 100644 archive/2.0.0a16/api/adapters/ding.md delete mode 100644 archive/2.0.0a16/api/adapters/feishu.md delete mode 100644 archive/2.0.0a16/api/adapters/mirai.md delete mode 100644 archive/2.0.0a16/api/config.md delete mode 100644 archive/2.0.0a16/api/drivers/README.md delete mode 100644 archive/2.0.0a16/api/drivers/aiohttp.md delete mode 100644 archive/2.0.0a16/api/drivers/fastapi.md delete mode 100644 archive/2.0.0a16/api/drivers/quart.md delete mode 100644 archive/2.0.0a16/api/exception.md delete mode 100644 archive/2.0.0a16/api/handler.md delete mode 100644 archive/2.0.0a16/api/log.md delete mode 100644 archive/2.0.0a16/api/matcher.md delete mode 100644 archive/2.0.0a16/api/message.md delete mode 100644 archive/2.0.0a16/api/nonebot.md delete mode 100644 archive/2.0.0a16/api/permission.md delete mode 100644 archive/2.0.0a16/api/plugin.md delete mode 100644 archive/2.0.0a16/api/rule.md delete mode 100644 archive/2.0.0a16/api/typing.md delete mode 100644 archive/2.0.0a16/api/utils.md delete mode 100644 archive/2.0.0a16/guide/README.md delete mode 100644 archive/2.0.0a16/guide/basic-configuration.md delete mode 100644 archive/2.0.0a16/guide/cqhttp-guide.md delete mode 100644 archive/2.0.0a16/guide/creating-a-handler.md delete mode 100644 archive/2.0.0a16/guide/creating-a-matcher.md delete mode 100644 archive/2.0.0a16/guide/creating-a-plugin.md delete mode 100644 archive/2.0.0a16/guide/creating-a-project.md delete mode 100644 archive/2.0.0a16/guide/ding-guide.md delete mode 100644 archive/2.0.0a16/guide/end-or-start.md delete mode 100644 archive/2.0.0a16/guide/feishu-guide.md delete mode 100644 archive/2.0.0a16/guide/getting-started.md delete mode 100644 archive/2.0.0a16/guide/images/Handle-Event.png delete mode 100644 archive/2.0.0a16/guide/images/ding/jiaqian.png delete mode 100644 archive/2.0.0a16/guide/images/ding/test_webhook.png delete mode 100644 archive/2.0.0a16/guide/images/ding/webhook.png delete mode 100644 archive/2.0.0a16/guide/installation.md delete mode 100644 archive/2.0.0a16/guide/loading-a-plugin.md delete mode 100644 archive/2.0.0a16/guide/mirai-guide.md delete mode 100644 archive/2.0.0a16/sidebar.config.json delete mode 100644 website/docs/guide/cqhttp-guide.md delete mode 100644 website/docs/guide/creating-a-handler.md delete mode 100644 website/docs/guide/creating-a-matcher.md delete mode 100644 website/docs/guide/creating-a-plugin.md delete mode 100644 website/docs/guide/ding-guide.md delete mode 100644 website/docs/guide/end-or-start.md delete mode 100644 website/docs/guide/feishu-guide.md delete mode 100644 website/docs/guide/getting-started.md delete mode 100644 website/docs/guide/images/Handle-Event.png delete mode 100644 website/docs/guide/images/ding/jiaqian.png delete mode 100644 website/docs/guide/images/ding/test_webhook.png delete mode 100644 website/docs/guide/images/ding/webhook.png delete mode 100644 website/docs/guide/loading-a-plugin.md delete mode 100644 website/docs/guide/mirai-guide.md diff --git a/README.md b/README.md deleted file mode 100644 index cb926003..00000000 --- a/README.md +++ /dev/null @@ -1,149 +0,0 @@ - -

- nonebot -

- -
- -# NoneBot - - - -_✨ 跨平台 Python 异步机器人框架 ✨_ - - -
- -

- - license - - - pypi - - python
- - cqhttp - - - - - - ding - - - - - - feishu - -
- - QQ Chat - - - Telegram Channel - - - Discord Server - -

- -

- 文档 - · - 安装 - · - 开始使用 - · - 文档打不开？ -

- -## 简介 - -NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人收到的事件进行解析和处理，并以插件化的形式，按优先级分发给事件所对应的事件响应器，来完成具体的功能。 - -除了起到解析事件的作用，NoneBot 还为插件提供了大量实用的预设操作和权限控制机制。对于命令处理，它更是提供了完善且易用的会话机制和内部调用机制，以分别适应命令的连续交互和插件内部功能复用等需求。 - -得益于 Python 的 [asyncio](https://docs.python.org/3/library/asyncio.html) 机制，NoneBot 处理事件的吞吐量有了很大的保障，再配合 WebSocket 通信方式（也是最建议的通信方式），NoneBot 的性能可以达到 HTTP 通信方式的两倍以上，相较于传统同步 I/O 的 HTTP 通信，更是有质的飞跃。 - -## 特色 - -NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义**，并且可以作为插件进行**替换/添加**！ - -目前 NoneBot2 内置的驱动框架： - -- [FastAPI](https://fastapi.tiangolo.com/) -- [Quart](https://pgjones.gitlab.io/quart/) (异步 Flask) - -目前 NoneBot2 官方维护的协议适配： - -- [OneBot 协议](https://onebot.dev/) (QQ 等) -- [Mirai-API-HTTP 协议](https://github.com/project-mirai/mirai-api-http) -- [钉钉](https://ding-doc.dingtalk.com/document#/org-dev-guide/elzz1p) -- [Telegram](https://core.telegram.org/bots/api) -- [飞书](https://open.feishu.cn/document/home/index) - -更多：[商店](https://v2.nonebot.dev/store.html) - -## 即刻开始 - -~~完整~~文档可以在 [这里](https://v2.nonebot.dev/) 查看。 - -懒得看文档？下面是快速安装指南： - -1. (可选)使用你喜欢的 Python 环境管理工具创建新的虚拟环境。 -2. 使用 `pip` (或其他) 安装 NoneBot 脚手架。 - - ```bash - pip install nb-cli - ``` - -3. 使用脚手架创建项目 - - ```bash - nb create - ``` - -## 社区资源 - -### 常见问题 - -- [常见问题解答(FAQ)](https://faq.nonebot.dev/) - -### 教程/实际项目/经验分享 - -- [awesome-nonebot](https://github.com/nonebot/awesome-nonebot) - -### 插件 - -此外，NoneBot2 还有丰富的官方以及第三方现成的插件供大家使用： - -- [NoneBot-Plugin-Docs](https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-plugin-docs)：离线文档至本地使用(别再说文档打不开了！) - - ```bash - nb plugin install nonebot_plugin_docs - ``` - - 或者尝试以下镜像： - - - [文档镜像(中国境内)](https://nb2.baka.icu) - - [文档镜像(Vercel)](https://nonebot2-vercel-mirror.vercel.app) - -- 其他插件请查看 [商店](https://v2.nonebot.dev/store.html) - -## 许可证 - -`NoneBot` 采用 `MIT` 协议开源，协议文件参考 [LICENSE](./LICENSE)。 - -## 贡献 - -如果你在使用过程中发现任何问题，可以 [提交 Issue](https://github.com/nonebot/nonebot2/issues/new) 或自行 Fork 修改后提交 Pull Request。 - -如果你要提交 Pull Request，请确保你的代码风格和项目已有的代码保持一致，遵循 [PEP 8](https://www.python.org/dev/peps/pep-0008/) 与 [PEP 484](https://www.python.org/dev/peps/pep-0484/)，变量命名清晰，有适当的注释，**并且请以 `dev` 分支作为 Pull Request 目标分支**。 - -感谢以下开发者对 NoneBot2 的贡献： - - - - diff --git a/archive/2.0.0a13.post1/README.md b/archive/2.0.0a13.post1/README.md deleted file mode 100644 index 891eb832..00000000 --- a/archive/2.0.0a13.post1/README.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -home: true -heroImage: /logo.png -tagline: 跨平台 Python 异步 QQ 机器人框架 -actionText: 开始使用 -actionLink: guide/ -features: - - title: 简洁 - details: 提供极其简洁易懂的 API，使你可以毫无压力地开始验证你的绝佳创意，只需编写最少量的代码，即可实现丰富的功能。 - - title: 易于扩展 - details: 精心设计的消息处理流程使得你可以很方便地将原型扩充为具有大量实用功能的完整聊天机器人，并持续保证扩展性。 - - title: 高性能 - details: 采用异步 I/O，利用 WebSocket 进行通信，以获得极高的性能；同时，支持使用多账号同时接入，减少业务宕机的可能。 -footer: MIT Licensed | Copyright © 2018 - 2020 NoneBot Team ---- diff --git a/archive/2.0.0a13.post1/advanced/README.md b/archive/2.0.0a13.post1/advanced/README.md deleted file mode 100644 index 6bdba844..00000000 --- a/archive/2.0.0a13.post1/advanced/README.md +++ /dev/null @@ -1,177 +0,0 @@ -# 深入 - -## 它如何工作？ - -如同[概览](../guide/README.md)所言: - -> NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人收到的事件进行解析和处理，并以插件化的形式，按优先级分发给事件所对应的事件响应器，来完成具体的功能。 - -`Nonebot2` 是一个可以对机器人上报的事件进行处理并完成具体功能的机器人框架，在这里，我们将简要讲述它的工作内容。 - -**便捷起见，以下内容对 `Nonebot2` 会被称为 `nonebot`，与 `Nonebot2` 交互的机器人实现会被称为 `协议端`**。 - -在实际应用中，`nonebot` 会充当一个高性能，轻量级的 Python 微服务框架。协议端可以通过 `http`, `websocket` 等方式与之通信，这个通信往往是双向的：一方面，协议端可以上报数据给 `nonebot`，`nonebot` 会处理数据并返回响应给协议端；另一方面，`nonebot` 可以主动推送数据给协议端。而 `nonebot` 便是围绕双向通信进行工作的。 - -在开始工作之前，`nonebot` 需要进行准备工作： - -1. **运行 `nonebot.init` 初始化函数**，它会读取配置文件，并初始化 `nonebot` 和后端驱动 `driver` 对象。 -2. **注册协议适配器 `adapter`** 。 -3. **加载插件**。 - -准备工作完成后，`nonebot` 会利用 `uvicorn` 启动，并运行 `on_startup` 钩子函数。 - -随后，倘若一个协议端与 `nonebot` 进行了连接，`nonebot` 的后端驱动 `driver` 就会将 `adapter` 实例化为 `bot`，`nonebot` 便会利用 `bot` 开始工作，它的工作内容分为两个方面： - -1. **事件处理**，`bot` 会将协议端上报的数据转化为 `事件`(`Event`)，之后 `nonebot` 会根据一套既定流程来处理 `事件`。 - -2. **调用 `API`**, 在**事件处理**的过程中，`nonebot` 可以通过 `bot` 调用协议端指定的 `API` 来获取更多数据，或者反馈响应给协议端; `nonebot` 也可以通过调用 `API` 向协议端主动请求数据或者主动推送数据。 - -在**指南**模块， 我们已经叙述了[如何配置 nonebot](../guide/basic-configuration.md), [如何注册协议适配器](../guide/getting-started.md)，[如何加载插件](../guide/loading-a-plugin.md), 在这里便不再赘述。 - -下面，我们将对**事件处理**， **调用 API**进行说明。 - -## 事件处理 - -我们可以先看事件处理的流程图： - -![handle-event](../guide/images/Handle-Event.png) - -在流程图里，我们可以看到，`nonebot` 会有三个阶段来处理事件： - -1. **driver 处理上报数据** -2. **adapter 处理原始数据** -3. **nonebot 处理 Event** - -我们将顺序说明这三个阶段。其中，会将第三个阶段拆分成**概念解释**，**处理 Event**，**特殊异常处理**三个部分来说明。 - -### driver 处理上报数据 - -1. 协议端会通过 `websocket` 或者 `http` 等方式与 `nonebot` 的后端驱动 `driver` 连接，`driver` 会根据之前注册的 `adapter` 和配置文件的内容来进行鉴权，从而获得这个连接的唯一识别 id `self-id`，随后 `adapter` 就会利用 `self-id` 实例化为 `bot` 对象。 - - ::: tip - 需要注意的是，如果协议端通过 `websocket` 与 `nonebot` 连接，这个步骤只会在建立连接时进行，并在之后运行 `on_bot_connect` 钩子函数；通过 `http` 方式连接时，会在协议端每次上报数据时都进行这个步骤。 - ::: - - ::: warning - 连接之前必须要注册 `adapter` - ::: - - ::: warning - `self-id` 是帐号的唯一识别 ID，这意味着不能出现相同的 `self-id`。 - ::: - -2. `driver` 会将接收到的数据转交给 `bot` 对象进一步处理。 - -### adapter 处理原始数据 - -1. `bot` 会利用事先定义好的 `Event Model` 对上报的数据进行分析处理，将数据转化为 `nonebot` 可以处理的 `Event` 对象。 - - ::: tip - `adapter` 在转换数据格式的同时可以进行一系列的特殊操作，例如 `CQHTTP` 会对 `reply` 信息进行提取。 - ::: - -2. `Event` 会传入 `nonebot` 做进一步处理。 - -### nonebot 处理 Event - -在讲述这个阶段之前，我们需要先对几个概念进行解释。 - -#### 概念解释 - -1. **hook**，或者说**钩子函数**，它们可以在 `nonebot` 处理 `Event` 的不同时刻进行拦截，修改或者扩展，在 `nonebot` 中，钩子函数分为 `事件预处理hook`，`运行预处理hook`，`运行后处理hook` 和 `事件后处理hook`。 - - ::: tip - 关于`hook`的更多信息，可以查阅[这里](./runtime-hook.md) - ::: - -2. **Matcher**与**matcher**，在**指南**中，我们讲述了[如何注册事件响应器](../guide/creating-a-matcher)，这里的事件响应器或者说 `Matcher` 并不是一个具体的实例 `instance`，而是一个具有特定属性的类 `class`。只有当 `Matcher` **响应事件**时，才会实例化为具体的 `instance`，也就是 `matcher`。`matcher` 可以认为是 `nonebot` 处理 `Event` 的基本单位，运行 `matcher` 是`nonebot`工作的主要内容。 - -3. **handler**，或者说**事件处理函数**, 它们可以认为是 `nonebot` 处理 `Event` 的最小单位。在不考虑 `hook` 的情况下，**运行 matcher 就是顺序运行 matcher.handlers**，这句话换种表达方式就是，`handler` 只有添加到 `matcher.handlers` 时，才可以参与到 `nonebot` 的工作中来。 - - ::: tip - 如何让 `handler` 添加到 `matcher.handlers`？ - - 一方面，我们可以参照[这里](../guide/creating-a-handler)利用装饰器来添加；另一方面，我们在用 `on()` 或者 `on_*()` 注册事件响应器时，可以添加 `handlers=[handler1, handler2, ...]` 这样的关键词参数来添加。 - ::: - -#### 处理 Event - -1. **执行事件预处理 hook**， `nonebot` 接收到 `Event` 后，会传入到 `事件预处理hook` 中进行处理。 - - ::: warning - 需要注意的是，执行多个 `事件预处理hook` 时并无顺序可言，它们是**并行运行**的。这个原则同样适用于其他的 `hook`。 - ::: - -2. **按优先级升序选出同一优先级的 Matcher**，`nonebot` 提供了一个全局字典 `matchers`，这个字典的 `key` 是优先级 `priority`，`value` 是一个 `list`，里面存放着同一优先级的 `Matcher`。在注册 `Matcher` 时，它和优先级 `priority` 会添加到里面。 - - 在执行 `事件预处理hook` 后，`nonebot` 会对 `matchers` 的 `key` 升序排序并选择出当前最小优先级的 `Matcher`。 - -3. **根据 Matcher 定义的 Rule, Permission 判断是否运行**，在选出 `Matcher` 后，`nonebot` 会将 `bot`，`Event` 传入到 `Matcher.check_rule` 和 `Matcher.check_perm` 两个函数中，两个函数分别对 Matcher 定义的 Rule, Permission 进行 check，当 check 通过后，这个 `Matcher` 就会响应事件。但是当同一个优先级的所有 `Matcher` 均没有响应时，`nonebot` 会返回到上一个步骤，选择出下一优先级的 `Matcher`。 - -4. **实例化 matcher 并执行运行预处理 hook**，当 `Matcher` 响应事件后，它便会实例化为 `matcher`，并执行 `运行预处理hook`。 - -5. **顺序运行 matcher 的所有 handlers**，`运行预处理hook` 执行完毕后，便会运行 `matcher`，也就是**顺序运行**它的 `handlers`。 - - ::: tip - `matcher` 运行 `handlers` 的顺序是: 先运行该 `matcher` 的类 `Matcher` 注册时添加的 `handlers`(如果有的话)，再按照装饰器装饰顺序运行装饰的 `handlers`。 - ::: - -6. **执行运行后处理 hook**，`matcher` 的 `handlers` 运行完毕后，会执行 `运行后处理hook`。 - -7. **判断是否停止事件传播**，`nonebot` 会根据当前优先级所有 `matcher` 的 `block` 参数或者 `StopPropagation` 异常判断是否停止传播 `Event`，如果事件没有停止传播，`nonebot` 便会返回到第 2 步， 选择出下一优先级的 `Matcher`。 - -8. **执行事件后处理 hook**，在 `Event` 停止传播或执行完所有响应的 `Matcher` 后，`nonebot` 会执行 `事件后处理hook`。 - - 当 `事件后处理hook` 执行完毕后，当前`Event`的处理周期就顺利结束了。 - -#### 特殊异常处理 - -在这个阶段，`nonebot` 规定了几个特殊的异常，当 `nonebot` 捕获到它们时，会用特定的行为来处理它们。 - -1. **IgnoredException** - - 这个异常可以在 `事件预处理hook` 和 `运行预处理hook` 抛出。 - - 当 `事件预处理hook` 抛出它时，`nonebot` 会忽略当前的 `Event`，不进行处理。 - - 当 `运行预处理hook` 抛出它时，`nonebot` 会忽略当前的 `matcher`，结束当前 `matcher` 的运行。 - - ::: warning - 当 `hook` 需要抛出这个异常时，要写明原因。 - ::: - -2. **PausedException** - - 这个异常可以在 `handler` 中由 `Matcher.pause` 抛出。 - - 当 `nonebot` 捕获到它时，会停止运行当前 `handler` 并结束当前 `matcher` 的运行，并将后续的 `handler` 交给一个临时 `Matcher` 来响应当前交互用户的下一个消息事件，当临时 `Matcher` 响应时，临时 `Matcher` 会运行后续的 handlers。 - -3. **RejectedException** - - 这个异常可以在 `handler` 中由 `Matcher.reject` 抛出。 - - 当 `nonebot` 捕获到它时，会停止运行当前 `handler` 并结束当前 `matcher` 的运行，并将当前 handler 和后续 `handler` 交给一个临时 `Matcher` 来响应当前交互用户的下一个消息事件，当临时 `Matcher` 响应时，临时 `Matcher` 会运行当前 `handler` 和后续的 `handler`。 - -4. **FinishedException** - - 这个异常可以在 `handler` 中由 `Matcher.finish` 抛出。 - - 当 `nonebot` 捕获到它时，会停止运行当前 `handler` 并结束当前 `matcher` 的运行。 - -5. **StopPropagation** - - 这个异常一般会在执行 `运行后处理hook` 后抛出。 - - 当 `nonebot` 捕获到它时， 会停止传播当前 `Event`，不再寻找下一优先级的 `Matcher`，直接执行 `事件后处理hook`。 - -## 调用 API - -`nonebot` 可以通过 `bot` 来调用 `API` ，`API` 可以向协议端发送数据，也可以向协议端请求更多的数据。 - -::: tip -不同 `adapter` 规定了不同的 API，对应的 API 列表请参照协议规范。 -::: - -一般来说，我们可以用 `bot.*` 来调用 `API`(\*是 `API` 的 `action` 或者 `endpoint`)。 - -对于发送消息而言，一方面可以调用既有的 API；另一方面 `nonebot` 实现了两个便捷方法，`bot.send(event, message, **kwargs)` 方法和可以在 `handler` 中使用的 `Matcher.send(message, **kwargs)` 方法，来向事件主体发送消息。 diff --git a/archive/2.0.0a13.post1/advanced/export-and-require.md b/archive/2.0.0a13.post1/advanced/export-and-require.md deleted file mode 100644 index eef88990..00000000 --- a/archive/2.0.0a13.post1/advanced/export-and-require.md +++ /dev/null @@ -1,117 +0,0 @@ -# 跨插件访问 - -由于 `nonebot2` 独特的插件加载机制，在使用 python 原有的 import 机制来进行插件之间的访问时，很可能会有奇怪的或者意料以外的情况发生。为了避免这种情况的发生，您可以有两种方法来实现跨插件访问： - -1. 将插件间的要使用的公共代码剥离出来，作为公共文件或者文件夹，提供给插件加以调用。 -2. 使用 `nonebot2` 提供的 `export` 和 `require` 机制，来实现插件间的互相调用。 - -第一种方法比较容易理解和实现，这里不再赘述，但需要注意的是，请不要将公共文件或者公共文件夹作为**插件**被 `nonebot2` 加载。 - -下面将介绍第二种方法—— `export` 和 `require` 机制： - -## 使用 export 和 require - -现在，假定有两个插件 `pluginA` 和 `pluginB`，需要在 `pluginB` 中调用 `pluginA` 中的一个变量 `varA` 和一个函数 `funcA`。 - -在上面的条件中涉及到了两种操作：一种是在 `pluginA` 的 `导出对象` 操作；而另一种是在 `pluginB` 的 `导入对象` 操作。在 `nonebot2` 中，`导出对象` 的操作用 `export` 机制来实现，`导入对象` 的操作用 `require` 机制来实现。下面，我们将逐一进行介绍。 - -:::warning 警告 - -使用这个方法进行跨插件访问时，**需要先加载`导出对象`的插件，再加载`导入对象`的插件。** - -::: - -### 使用 export - -在 `pluginA` 中，我们调用 `export` 机制 `导出对象`。 - -在 `export` 机制调用前，我们需要保证导出的对象已经被定义，比如： - -```python -varA = "varA" - - -def funcA(): - return "funcA" -``` - -在确保定义之后，我们可以从 `nonebot.plugin` 导入 `export()` 方法, `export()` 方法会返回一个特殊的字典 `export`： - -```python -from nonebot.plugin import export - -export=export() -``` - -这个字典可以用来装载导出的对象，它的 key 是对象导出后的命名，value 是对象本身，我们可以直接创建新的 `key` - `value` 对导出对象： - -```python -export.vA = varA -export.fA = funcA -``` - -除此之外，也支持 `嵌套` 导出对象： - -```python -export.sub.vA = varA -export.sub.fA = funcA -``` - -特别地，对于 `函数对象` 而言，`export` 支持用 `装饰器` 的方法来导出，因此，我们可以这样定义 `funcA`： - -```python -@export.sub -def funcA(): - return "funcA" -``` - -或者: - -```python -@export -def funcA(): - return "funcA" -``` - -通过 `装饰器` 的方法导出函数时，命名固定为函数的命名，也就是说，上面的两个例子等同于： - -```python -export.sub.funcA = funcA - -export.funcA = funcA -``` - -这样，我们就成功导出 `varA` 和 `funcA` 对象了。 - -下面我们将介绍如何在 `pluginB` 中导入这些对象。 - -### 使用 require - -在 `pluginB` 中，我们调用 `require` 机制 `导入对象`。 - -:::warning 警告 - -在导入来自其他插件的对象时, 请确保导出该对象的插件在引用该对象的插件之前加载。如果该插件并未被加载，则会尝试加载，加载失败则会返回 `None`。 - -::: - -我们可以从 `nonebot.plugin` 中导入 `require()` 方法： - -```python -from nonebot.plugin import require -``` - -`require()` 方法的参数是插件名, 它会返回在指定插件中，用 `export()` 方法创建的字典。 - -```python -require_A = require('pluginA') -``` - -在之前，这个字典已经存入了 `'vA'` - `varA`, `'fA'` - `funcA` 或 `'funcA'` - `funcA` 这样的 `key` - `value` 对。因此在这里我们直接用 `属性` 的方法来获取导入对象: - -```python -varA = require_A.vA -funcA = require_A.fA or require_A.funcA -``` - -这样，我们就在 `pluginB` 中成功导入了 `varA` 和 `funcA` 对象了。 diff --git a/archive/2.0.0a13.post1/advanced/overloaded-handlers.md b/archive/2.0.0a13.post1/advanced/overloaded-handlers.md deleted file mode 100644 index 97ff3116..00000000 --- a/archive/2.0.0a13.post1/advanced/overloaded-handlers.md +++ /dev/null @@ -1 +0,0 @@ -# 事件处理函数重载 diff --git a/archive/2.0.0a13.post1/advanced/permission.md b/archive/2.0.0a13.post1/advanced/permission.md deleted file mode 100644 index de198e6e..00000000 --- a/archive/2.0.0a13.post1/advanced/permission.md +++ /dev/null @@ -1,2 +0,0 @@ -# 权限控制 - diff --git a/archive/2.0.0a13.post1/advanced/publish-plugin.md b/archive/2.0.0a13.post1/advanced/publish-plugin.md deleted file mode 100644 index 68e2e6f9..00000000 --- a/archive/2.0.0a13.post1/advanced/publish-plugin.md +++ /dev/null @@ -1 +0,0 @@ -# 发布插件 diff --git a/archive/2.0.0a13.post1/advanced/runtime-hook.md b/archive/2.0.0a13.post1/advanced/runtime-hook.md deleted file mode 100644 index 5e98c22a..00000000 --- a/archive/2.0.0a13.post1/advanced/runtime-hook.md +++ /dev/null @@ -1,163 +0,0 @@ -# 钩子函数 - -[`钩子编程`](https://zh.wikipedia.org/wiki/%E9%92%A9%E5%AD%90%E7%BC%96%E7%A8%8B) - -> 钩子编程（hooking），也称作“挂钩”，是计算机程序设计术语，指通过拦截软件模块间的函数调用、消息传递、事件传递来修改或扩展操作系统、应用程序或其他软件组件的行为的各种技术。处理被拦截的函数调用、事件、消息的代码，被称为钩子（hook）。 - -在 `nonebot2` 中有一系列预定义的钩子函数，分为两类：`全局钩子函数` 和 `事件钩子函数` ，这些钩子函数可以用装饰器的形式来使用。 - -## 全局钩子函数 - -全局钩子函数是指 `nonebot2` 针对其本身运行过程的钩子函数。 - -这些钩子函数是由其后端驱动 `driver`来运行的，故需要先获得全局 `driver` 对象： - -```python -from nonebot import get_driver - - -driver=get_driver() -``` - -共分为六种函数： - -### 启动准备 - -这个钩子函数会在 `nonebot2` 启动时运行。 - -```python -@driver.on_startup -async def do_something(): - pass -``` - -### 终止处理 - -这个钩子函数会在 `nonebot2` 终止时运行。 - -```python -@driver.on_shutdown -async def do_something(): - pass -``` - -### bot 连接处理 - -这个钩子函数会在 `bot` 通过 `websocket` 连接到 `nonebot2` 时运行。 - -```python -@driver.on_bot_connect -async def do_something(bot: Bot): - pass -``` - -### bot 断开处理 - -这个钩子函数会在 `bot` 断开与 `nonebot2` 的 `websocket` 连接时运行。 - -```python -@driver.on_bot_disconnect -async def do_something(bot: Bot): - pass -``` - -### bot api 调用钩子 - -这个钩子函数会在 `Bot` 调用 API 时运行。 - -```python -from nonebot.adapters import Bot - -@Bot.on_calling_api -async def handle_api_call(bot: Bot, api: str, data: Dict[str, Any]): - pass -``` - -### bot api 调用后钩子 - -这个钩子函数会在 `Bot` 调用 API 后运行。 - -```python -from nonebot.adapters import Bot - -@Bot.on_called_api -async def handle_api_result(bot: Bot, exception: Optional[Exception], api: str, data: Dict[str, Any], result: Any): - pass -``` - -## 事件处理钩子 - -这些钩子函数指的是影响 `nonebot2` 进行 `事件处理` 的函数。 - -:::tip 提示 - -关于 `事件处理` 的流程，可以在[这里](./README)查阅。 - -::: - -:::warning 注意 - -1.在事件处理钩子函数中，与 `matcher` 运行状态相关的函数将不可用，如 `matcher.finish()` - -2.如果需要在事件处理钩子函数中打断整个对话的执行，请参考以下范例： - -```python -from nonebot.exception import IgnoredException - - -@event_preprocessor -async def do_something(bot: Bot, event: Event, state: T_State): - raise IgnoredException("reason") -``` - -::: - -共分为四种函数： - -### 事件预处理 - -这个钩子函数会在 `Event` 上报到 `nonebot2` 时运行 - -```python -from nonebot.message import event_preprocessor - -@event_preprocessor -async def do_something(bot: Bot, event: Event, state: T_State): - pass -``` - -### 事件后处理 - -这个钩子函数会在 `nonebot2` 处理 `Event` 后运行 - -```python -from nonebot.message import event_postprocessor - -@event_postprocessor -async def do_something(bot: Bot, event: Event, state: T_State): - pass -``` - -### 运行预处理 - -这个钩子函数会在 `nonebot2`运行 `matcher` 前运行。 - -```python -from nonebot.message import run_preprocessor - -@run_preprocessor -async def do_something(matcher: Matcher, bot: Bot, event: Event, state: T_State): - pass -``` - -### 运行后处理 - -这个钩子函数会在 `nonebot2`运行 `matcher` 后运行。 - -```python -from nonebot.message import run_postprocessor - -@run_postprocessor -async def do_something(matcher: Matcher, exception: Optional[Exception], bot: Bot, event: Event, state: T_State): - pass -``` diff --git a/archive/2.0.0a13.post1/advanced/scheduler.md b/archive/2.0.0a13.post1/advanced/scheduler.md deleted file mode 100644 index c17dbdf8..00000000 --- a/archive/2.0.0a13.post1/advanced/scheduler.md +++ /dev/null @@ -1,135 +0,0 @@ -# 定时任务 - -[`APScheduler`](https://apscheduler.readthedocs.io/en/latest/index.html) —— Advanced Python Scheduler - -> Advanced Python Scheduler (APScheduler) is a Python library that lets you schedule your Python code to be executed later, either just once or periodically. You can add new jobs or remove old ones on the fly as you please. If you store your jobs in a database, they will also survive scheduler restarts and maintain their state. When the scheduler is restarted, it will then run all the jobs it should have run while it was offline. - -## 从 NoneBot v1 迁移 - -`APScheduler` 作为 `nonebot` v1 的可选依赖，为众多 bot 提供了方便的定时任务功能。`nonebot2` 已将 `APScheduler` 独立为 `nonebot_plugin_apscheduler` 插件，你可以在 [插件广场](https://v2.nonebot.dev/store.html) 中找到它。 - -相比于 `nonebot` v1，`nonebot` v2 只需要安装插件并修改 `scheduler` 的导入方式即可完成迁移。 - -## 安装插件 - -### 通过 nb-cli - -如正在使用 `nb-cli` 构建项目，你可以从插件市场复制安装命令或手动输入以下命令以添加 `nonebot_plugin_apscheduler`。 - -```bash -nb plugin install nonebot_plugin_apscheduler -``` - -:::tip 提示 -`nb-cli` 默认通过 `pypi` 安装，你可以添加命令参数 `-i [mirror]` 或 `--index [mirror]` 以使用镜像源安装。 -::: - -### 通过 poetry - -执行以下命令以添加 `nonebot_plugin_apscheduler` - -```bash -poetry add nonebot-plugin-apscheduler -``` - -:::tip 提示 -由于稍后我们将使用 `nonebot.require()` 方法进行导入，所以无需额外的 `nonebot.load_plugin()` -::: - -## 快速上手 - -1. 在需要设置定时任务的插件中，通过 `nonebot.require` 从 `nonebot_plugin_apscheduler` 导入 `scheduler` 对象 - -2. 在该对象的基础上，根据 `APScheduler` 的使用方法进一步配置定时任务 - -将上述步骤归纳为最小实现的代码如下： - -```python -from nonebot import require - -scheduler = require('nonebot_plugin_apscheduler').scheduler - -@scheduler.scheduled_job('cron', hour='*/2', id='xxx', args=[1], kwargs={arg2: 2}) -async def run_every_2_hour(arg1, arg2): - pass - -scheduler.add_job(run_every_day_from_program_start, "interval", days=1, id="xxx") -``` - -## 分步进行 - -### 导入 scheduler 对象 - -为了使插件能够实现定时任务，需要先将 `scheduler` 对象导入插件。 - -`nonebot2` 提供了 `nonebot.require` 方法来实现导入其他插件的内容，此处我们使用这个方法来导入 `scheduler` 对象。 - -`nonebot` 使用的 `scheduler` 对象为 `AsyncScheduler` 。 - -> 使用该方法传入的插件本身也需要有对应实现，关于该方法的更多介绍可以参阅 [这里](./export-and-require.md) - -```python -from nonebot import require - -scheduler = require('nonebot_plugin_apscheduler').scheduler -``` - -### 编写定时任务 - -由于本部分为标准的通过 `APScheduler` 配置定时任务，有关指南请参阅 [APScheduler 官方文档](https://apscheduler.readthedocs.io/en/latest/userguide.html#adding-jobs)。 - -### 配置插件选项 - -根据项目的 `.env` 文件设置，向 `.env.*` 或 `bot.py` 文件添加 `nonebot_plugin_apscheduler` 的可选配置项 - -:::warning 注意 -`.env.*` 文件的编写应遵循 nonebot2 对 `.env.*` 文件的编写要求 -::: - -#### `apscheduler_autostart` - -类型：`bool` - -默认值：`True` - -是否自动启动 `APScheduler`。 - -对于大多数情况，我们需要在 `nonebot2` 项目被启动时启动定时任务，则此处设为 `true` - -##### 在 `.env` 中添加 - -```bash -APSCHEDULER_AUTOSTART=true -``` - -##### 在 `bot.py` 中添加 - -```python -nonebot.init(apscheduler_autostart=True) -``` - -#### `apscheduler_config` - -类型：`dict` - -默认值：`{"apscheduler.timezone": "Asia/Shanghai"}` - -`APScheduler` 相关配置。修改/增加其中配置项需要确保 `prefix: apscheduler`。 - -对于 `APScheduler` 的相关配置，请参阅 [scheduler-config](https://apscheduler.readthedocs.io/en/latest/userguide.html#scheduler-config) 和 [BaseScheduler](https://apscheduler.readthedocs.io/en/latest/modules/schedulers/base.html#apscheduler.schedulers.base.BaseScheduler) - -> 官方文档在绝大多数时候能提供最准确和最具时效性的指南 - -##### 在 `.env` 中添加 - -```bash -APSCHEDULER_CONFIG={"apscheduler.timezone": "Asia/Shanghai"} -``` - -##### 在 `bot.py` 中添加 - -```python -nonebot.init(apscheduler_config={ - "apscheduler.timezone": "Asia/Shanghai" -}) -``` diff --git a/archive/2.0.0a13.post1/api/README.md b/archive/2.0.0a13.post1/api/README.md deleted file mode 100644 index 3d5a6497..00000000 --- a/archive/2.0.0a13.post1/api/README.md +++ /dev/null @@ -1,61 +0,0 @@ -# NoneBot Api Reference - - -* **模块索引** - - - * [nonebot](nonebot.html) - - - * [nonebot.config](config.html) - - - * [nonebot.plugin](plugin.html) - - - * [nonebot.message](message.html) - - - * [nonebot.matcher](matcher.html) - - - * [nonebot.handler](handler.html) - - - * [nonebot.rule](rule.html) - - - * [nonebot.permission](permission.html) - - - * [nonebot.log](log.html) - - - * [nonebot.utils](utils.html) - - - * [nonebot.typing](typing.html) - - - * [nonebot.exception](exception.html) - - - * [nonebot.drivers](drivers/) - - - * [nonebot.drivers.fastapi](drivers/fastapi.html) - - - * [nonebot.drivers.quart](drivers/quart.html) - - - * [nonebot.adapters](adapters/) - - - * [nonebot.adapters.cqhttp](adapters/cqhttp.html) - - - * [nonebot.adapters.ding](adapters/ding.html) - - - * [nonebot.adapters.mirai](adapters/mirai.html) diff --git a/archive/2.0.0a13.post1/api/adapters/README.md b/archive/2.0.0a13.post1/api/adapters/README.md deleted file mode 100644 index fa3f597e..00000000 --- a/archive/2.0.0a13.post1/api/adapters/README.md +++ /dev/null @@ -1,481 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.adapters 模块 - -## 协议适配基类 - -各协议请继承以下基类，并使用 `driver.register_adapter` 注册适配器 - - -## _class_ `Bot` - -基类：`abc.ABC` - -Bot 基类。用于处理上报消息，并提供 API 调用接口。 - - -### `driver` - -Driver 对象 - - -### `config` - -Config 配置对象 - - -### `_calling_api_hook` - - -* **类型** - - `Set[T_CallingAPIHook]` - - - -* **说明** - - call_api 时执行的函数 - - - -### `_called_api_hook` - - -* **类型** - - `Set[T_CalledAPIHook]` - - - -* **说明** - - call_api 后执行的函数 - - - -### _abstract_ `__init__(connection_type, self_id, *, websocket=None)` - - -* **参数** - - - * `connection_type: str`: http 或者 websocket - - - * `self_id: str`: 机器人 ID - - - * `websocket: Optional[WebSocket]`: Websocket 连接对象 - - - -### `connection_type` - -连接类型 - - -### `self_id` - -机器人 ID - - -### `websocket` - -Websocket 连接对象 - - -### _abstract property_ `type` - -Adapter 类型 - - -### _classmethod_ `register(driver, config)` - - -* **说明** - - register 方法会在 driver.register_adapter 时被调用，用于初始化相关配置 - - - -### _abstract async classmethod_ `check_permission(driver, connection_type, headers, body)` - - -* **说明** - - 检查连接请求是否合法的函数，如果合法则返回当前连接 `唯一标识符`，通常为机器人 ID；如果不合法则抛出 `RequestDenied` 异常。 - - - -* **参数** - - - * `driver: Driver`: Driver 对象 - - - * `connection_type: str`: 连接类型 - - - * `headers: dict`: 请求头 - - - * `body: Optional[bytes]`: 请求数据，WebSocket 连接该部分为 None - - - -* **返回** - - - * `str`: 连接唯一标识符 - - - -* **异常** - - - * `RequestDenied`: 请求非法 - - - -### _abstract async_ `handle_message(message)` - - -* **说明** - - 处理上报消息的函数，转换为 `Event` 事件后调用 `nonebot.message.handle_event` 进一步处理事件。 - - - -* **参数** - - - * `message: dict`: 收到的上报消息 - - - -### _abstract async_ `_call_api(api, **data)` - - -* **说明** - - `adapter` 实际调用 api 的逻辑实现函数，实现该方法以调用 api。 - - - -* **参数** - - - * `api: str`: API 名称 - - - * `**data`: API 数据 - - - -### _async_ `call_api(api, **data)` - - -* **说明** - - 调用机器人 API 接口，可以通过该函数或直接通过 bot 属性进行调用 - - - -* **参数** - - - * `api: str`: API 名称 - - - * `self_id: Optional[str]`: 指定调用 API 的机器人 - - - * `**data`: API 数据 - - - -* **示例** - - -```python -await bot.call_api("send_msg", message="hello world") -await bot.send_msg(message="hello world") -``` - - -### _abstract async_ `send(event, message, **kwargs)` - - -* **说明** - - 调用机器人基础发送消息接口 - - - -* **参数** - - - * `event: Event`: 上报事件 - - - * `message: Union[str, Message, MessageSegment]`: 要发送的消息 - - - * `**kwargs` - - - -## _class_ `MessageSegment` - -基类：`abc.ABC`, `Mapping` - -消息段基类 - - -### `type` - - -* 类型: `str` - - -* 说明: 消息段类型 - - -### `data` - - -* 类型: `Dict[str, Union[str, list]]` - - -* 说明: 消息段数据 - - -## _class_ `Message` - -基类：`list`, `abc.ABC` - -消息数组 - - -### `__init__(message=None, *args, **kwargs)` - - -* **参数** - - - * `message: Union[str, list, dict, MessageSegment, Message, Any]`: 消息内容 - - - -### `append(obj)` - - -* **说明** - - 添加一个消息段到消息数组末尾 - - - -* **参数** - - - * `obj: Union[str, MessageSegment]`: 要添加的消息段 - - - -### `extend(obj)` - - -* **说明** - - 拼接一个消息数组或多个消息段到消息数组末尾 - - - -* **参数** - - - * `obj: Union[Message, Iterable[MessageSegment]]`: 要添加的消息数组 - - - -### `reduce()` - - -* **说明** - - 缩减消息数组，即按 MessageSegment 的实现拼接相邻消息段 - - - -### `extract_plain_text()` - - -* **说明** - - 提取消息内纯文本消息 - - - -## _class_ `Event` - -基类：`abc.ABC`, `pydantic.main.BaseModel` - -Event 基类。提供获取关键信息的方法，其余信息可直接获取。 - - -### _abstract_ `get_type()` - - -* **说明** - - 获取事件类型的方法，类型通常为 NoneBot 内置的四种类型。 - - - -* **返回** - - - * `Literal["message", "notice", "request", "meta_event"]` - - - * 其他自定义 `str` - - - -### _abstract_ `get_event_name()` - - -* **说明** - - 获取事件名称的方法。 - - - -* **返回** - - - * `str` - - - -### _abstract_ `get_event_description()` - - -* **说明** - - 获取事件描述的方法，通常为事件具体内容。 - - - -* **返回** - - - * `str` - - - -### `get_log_string()` - - -* **说明** - - 获取事件日志信息的方法，通常你不需要修改这个方法，只有当希望 NoneBot 隐藏该事件日志时，可以抛出 `NoLogException` 异常。 - - - -* **返回** - - - * `str` - - - -* **异常** - - - * `NoLogException` - - - -### _abstract_ `get_user_id()` - - -* **说明** - - 获取事件主体 id 的方法，通常是用户 id 。 - - - -* **返回** - - - * `str` - - - -### _abstract_ `get_session_id()` - - -* **说明** - - 获取会话 id 的方法，用于判断当前事件属于哪一个会话，通常是用户 id、群组 id 组合。 - - - -* **返回** - - - * `str` - - - -### _abstract_ `get_message()` - - -* **说明** - - 获取事件消息内容的方法。 - - - -* **返回** - - - * `Message` - - - -### `get_plaintext()` - - -* **说明** - - 获取消息纯文本的方法，通常不需要修改，默认通过 `get_message().extract_plain_text` 获取。 - - - -* **返回** - - - * `str` - - - -### _abstract_ `is_tome()` - - -* **说明** - - 获取事件是否与机器人有关的方法。 - - - -* **返回** - - - * `bool` diff --git a/archive/2.0.0a13.post1/api/adapters/cqhttp.md b/archive/2.0.0a13.post1/api/adapters/cqhttp.md deleted file mode 100644 index 6e6e938b..00000000 --- a/archive/2.0.0a13.post1/api/adapters/cqhttp.md +++ /dev/null @@ -1,581 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.adapters.cqhttp 模块 - -## CQHTTP (OneBot) v11 协议适配 - -协议详情请看: [CQHTTP](https://github.com/howmanybots/onebot/blob/master/README.md) | [OneBot](https://github.com/howmanybots/onebot/blob/master/README.md) - -# NoneBot.adapters.cqhttp.config 模块 - - -## _class_ `Config` - -CQHTTP 配置类 - - -* **配置项** - - - * `access_token` / `cqhttp_access_token`: CQHTTP 协议授权令牌 - - - * `secret` / `cqhttp_secret`: CQHTTP HTTP 上报数据签名口令 - - -# NoneBot.adapters.cqhttp.utils 模块 - - -## `escape(s, *, escape_comma=True)` - - -* **说明** - - 对字符串进行 CQ 码转义。 - - - -* **参数** - - - * `s: str`: 需要转义的字符串 - - - * `escape_comma: bool`: 是否转义逗号（`,`）。 - - - -## `unescape(s)` - - -* **说明** - - 对字符串进行 CQ 码去转义。 - - - -* **参数** - - - * `s: str`: 需要转义的字符串 - - -# NoneBot.adapters.cqhttp.exception 模块 - - -## _exception_ `ActionFailed` - -基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed), `nonebot.adapters.cqhttp.exception.CQHTTPAdapterException` - - -* **说明** - - API 请求返回错误信息。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - - -## _exception_ `NetworkError` - -基类：[`nonebot.exception.NetworkError`](../exception.md#nonebot.exception.NetworkError), `nonebot.adapters.cqhttp.exception.CQHTTPAdapterException` - - -* **说明** - - 网络错误。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - -# NoneBot.adapters.cqhttp.bot 模块 - - -## _async_ `_check_reply(bot, event)` - - -* **说明** - - 检查消息中存在的回复，去除并赋值 `event.reply`, `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_check_at_me(bot, event)` - - -* **说明** - - 检查消息开头或结尾是否存在 @机器人，去除并赋值 `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_check_nickname(bot, event)` - - -* **说明** - - 检查消息开头是否存在，去除并赋值 `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_handle_api_result(result)` - - -* **说明** - - 处理 API 请求返回值。 - - - -* **参数** - - - * `result: Optional[Dict[str, Any]]`: API 返回数据 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `ActionFailed`: API 调用失败 - - - -## _class_ `Bot` - -基类：[`nonebot.adapters._base.Bot`](README.md#nonebot.adapters._base.Bot) - -CQHTTP 协议 Bot 适配。继承属性参考 [BaseBot](./#class-basebot) 。 - - -### _property_ `type` - - -* 返回: `"cqhttp"` - - -### _async classmethod_ `check_permission(driver, connection_type, headers, body)` - - -* **说明** - - CQHTTP (OneBot) 协议鉴权。参考 [鉴权](https://github.com/howmanybots/onebot/blob/master/v11/specs/communication/authorization.md) - - - -### _async_ `handle_message(message)` - - -* **说明** - - 调用 [_check_reply](#async-check-reply-bot-event), [_check_at_me](#check-at-me-bot-event), [_check_nickname](#check-nickname-bot-event) 处理事件并转换为 [Event](#class-event) - - - -### _async_ `call_api(api, **data)` - - -* **说明** - - 调用 CQHTTP 协议 API - - - -* **参数** - - - * `api: str`: API 名称 - - - * `**data: Any`: API 参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - - -### _async_ `send(event, message, at_sender=False, **kwargs)` - - -* **说明** - - 根据 `event` 向触发事件的主体发送消息。 - - - -* **参数** - - - * `event: Event`: Event 对象 - - - * `message: Union[str, Message, MessageSegment]`: 要发送的消息 - - - * `at_sender: bool`: 是否 @ 事件主体 - - - * `**kwargs`: 覆盖默认参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `ValueError`: 缺少 `user_id`, `group_id` - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - -# NoneBot.adapters.cqhttp.message 模块 - - -## _class_ `MessageSegment` - -基类：`abc.ABC`, `Mapping` - -CQHTTP 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 - - -## _class_ `Message` - -基类：[`nonebot.adapters._base.Message`](README.md#nonebot.adapters._base.Message) - -CQHTTP 协议 Message 适配。 - -# NoneBot.adapters.cqhttp.permission 模块 - - -## `PRIVATE` - - -* **说明**: 匹配任意私聊消息类型事件 - - -## `PRIVATE_FRIEND` - - -* **说明**: 匹配任意好友私聊消息类型事件 - - -## `PRIVATE_GROUP` - - -* **说明**: 匹配任意群临时私聊消息类型事件 - - -## `PRIVATE_OTHER` - - -* **说明**: 匹配任意其他私聊消息类型事件 - - -## `GROUP` - - -* **说明**: 匹配任意群聊消息类型事件 - - -## `GROUP_MEMBER` - - -* **说明**: 匹配任意群员群聊消息类型事件 - -:::warning 警告 -该权限通过 event.sender 进行判断且不包含管理员以及群主！ -::: - - -## `GROUP_ADMIN` - - -* **说明**: 匹配任意群管理员群聊消息类型事件 - - -## `GROUP_OWNER` - - -* **说明**: 匹配任意群主群聊消息类型事件 - -# NoneBot.adapters.cqhttp.event 模块 - - -## _class_ `Event` - -基类：[`nonebot.adapters._base.Event`](README.md#nonebot.adapters._base.Event) - -CQHTTP 协议事件，字段与 CQHTTP 一致。各事件字段参考 [CQHTTP 文档](https://github.com/howmanybots/onebot/blob/master/README.md) - - -## _class_ `MessageEvent` - -基类：`nonebot.adapters.cqhttp.event.Event` - -消息事件 - - -### `to_me` - - -* **说明** - - 消息是否与机器人有关 - - - -* **类型** - - `bool` - - - -### `reply` - - -* **说明** - - 消息中提取的回复消息，内容为 `get_msg` API 返回结果 - - - -* **类型** - - `Optional[Reply]` - - - -## _class_ `PrivateMessageEvent` - -基类：`nonebot.adapters.cqhttp.event.MessageEvent` - -私聊消息 - - -## _class_ `GroupMessageEvent` - -基类：`nonebot.adapters.cqhttp.event.MessageEvent` - -群消息 - - -## _class_ `NoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.Event` - -通知事件 - - -## _class_ `GroupUploadNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群文件上传事件 - - -## _class_ `GroupAdminNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群管理员变动 - - -## _class_ `GroupDecreaseNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群成员减少事件 - - -## _class_ `GroupIncreaseNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群成员增加事件 - - -## _class_ `GroupBanNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群禁言事件 - - -## _class_ `FriendAddNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -好友添加事件 - - -## _class_ `GroupRecallNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群消息撤回事件 - - -## _class_ `FriendRecallNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -好友消息撤回事件 - - -## _class_ `NotifyEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -提醒事件 - - -## _class_ `PokeNotifyEvent` - -基类：`nonebot.adapters.cqhttp.event.NotifyEvent` - -戳一戳提醒事件 - - -## _class_ `LuckyKingNotifyEvent` - -基类：`nonebot.adapters.cqhttp.event.NotifyEvent` - -群红包运气王提醒事件 - - -## _class_ `HonorNotifyEvent` - -基类：`nonebot.adapters.cqhttp.event.NotifyEvent` - -群荣誉变更提醒事件 - - -## _class_ `RequestEvent` - -基类：`nonebot.adapters.cqhttp.event.Event` - -请求事件 - - -## _class_ `FriendRequestEvent` - -基类：`nonebot.adapters.cqhttp.event.RequestEvent` - -加好友请求事件 - - -## _class_ `GroupRequestEvent` - -基类：`nonebot.adapters.cqhttp.event.RequestEvent` - -加群请求/邀请事件 - - -## _class_ `MetaEvent` - -基类：`nonebot.adapters.cqhttp.event.Event` - -元事件 - - -## _class_ `LifecycleMetaEvent` - -基类：`nonebot.adapters.cqhttp.event.MetaEvent` - -生命周期元事件 - - -## _class_ `HeartbeatMetaEvent` - -基类：`nonebot.adapters.cqhttp.event.MetaEvent` - -心跳元事件 - - -## `get_event_model(event_name)` - - -* **说明** - - 根据事件名获取对应 `Event Model` 及 `FallBack Event Model` 列表 - - - -* **返回** - - - * `List[Type[Event]]` diff --git a/archive/2.0.0a13.post1/api/adapters/ding.md b/archive/2.0.0a13.post1/api/adapters/ding.md deleted file mode 100644 index 2c531a7b..00000000 --- a/archive/2.0.0a13.post1/api/adapters/ding.md +++ /dev/null @@ -1,334 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.adapters.ding 模块 - -## 钉钉群机器人 协议适配 - -协议详情请看: [钉钉文档](https://ding-doc.dingtalk.com/document#/org-dev-guide/elzz1p) - -# NoneBot.adapters.ding.config 模块 - - -## _class_ `Config` - -钉钉配置类 - - -* **配置项** - - - * `access_token` / `ding_access_token`: 钉钉令牌 - - - * `secret` / `ding_secret`: 钉钉 HTTP 上报数据签名口令 - - -# NoneBot.adapters.ding.exception 模块 - - -## _exception_ `DingAdapterException` - -基类：[`nonebot.exception.AdapterException`](../exception.md#nonebot.exception.AdapterException) - - -* **说明** - - 钉钉 Adapter 错误基类 - - - -## _exception_ `ActionFailed` - -基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed), `nonebot.adapters.ding.exception.DingAdapterException` - - -* **说明** - - API 请求返回错误信息。 - - - -* **参数** - - - * `errcode: Optional[int]`: 错误码 - - - * `errmsg: Optional[str]`: 错误信息 - - - -## _exception_ `NetworkError` - -基类：[`nonebot.exception.NetworkError`](../exception.md#nonebot.exception.NetworkError), `nonebot.adapters.ding.exception.DingAdapterException` - - -* **说明** - - 网络错误。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - - -## _exception_ `SessionExpired` - -基类：`nonebot.adapters.ding.exception.ApiNotAvailable`, `nonebot.adapters.ding.exception.DingAdapterException` - - -* **说明** - - 发消息的 session 已经过期。 - - -# NoneBot.adapters.ding.bot 模块 - - -## _class_ `Bot` - -基类：[`nonebot.adapters._base.Bot`](README.md#nonebot.adapters._base.Bot) - -钉钉 协议 Bot 适配。继承属性参考 [BaseBot](./#class-basebot) 。 - - -### _property_ `type` - - -* 返回: `"ding"` - - -### _async classmethod_ `check_permission(driver, connection_type, headers, body)` - - -* **说明** - - 钉钉协议鉴权。参考 [鉴权](https://ding-doc.dingtalk.com/doc#/serverapi2/elzz1p) - - - -### _async_ `call_api(api, event=None, **data)` - - -* **说明** - - 调用 钉钉 协议 API - - - -* **参数** - - - * `api: str`: API 名称 - - - * `event: Optional[MessageEvent]`: Event 对象 - - - * `**data: Any`: API 参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - - -### _async_ `send(event, message, at_sender=False, webhook=None, secret=None, **kwargs)` - - -* **说明** - - 根据 `event` 向触发事件的主体发送消息。 - - - -* **参数** - - - * `event: Event`: Event 对象 - - - * `message: Union[str, Message, MessageSegment]`: 要发送的消息 - - - * `at_sender: bool`: 是否 @ 事件主体 - - - * `webhook: Optional[str]`: 该条消息将调用的 webhook 地址。不传则将使用 sessionWebhook，若其也不存在，该条消息不发送，使用自定义 webhook 时注意你设置的安全方式，如加关键词，IP地址，加签等等。 - - - * `secret: Optional[str]`: 如果你使用自定义的 webhook 地址，推荐使用加签方式对消息进行验证，将 机器人安全设置页面，加签一栏下面显示的SEC开头的字符串 传入这个参数即可。 - - - * `**kwargs`: 覆盖默认参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `ValueError`: 缺少 `user_id`, `group_id` - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - -# NoneBot.adapters.ding.message 模块 - - -## _class_ `MessageSegment` - -基类：`abc.ABC`, `Mapping` - -钉钉 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 - - -### _static_ `atAll()` - -@全体 - - -### _static_ `atMobiles(*mobileNumber)` - -@指定手机号人员 - - -### _static_ `atDingtalkIds(*dingtalkIds)` - -@指定 id，@ 默认会在消息段末尾。 -所以你可以在消息中使用 @{senderId} 占位，发送出去之后 @ 就会出现在占位的位置： -``python -message = MessageSegment.text(f"@{event.senderId}，你好") -message += MessageSegment.atDingtalkIds(event.senderId) -`` - - -### _static_ `text(text)` - -发送 `text` 类型消息 - - -### _static_ `image(picURL)` - -发送 `image` 类型消息 - - -### _static_ `extension(dict_)` - -"标记 text 文本的 extension 属性，需要与 text 消息段相加。 - - -### _static_ `code(code_language, code)` - -"发送 code 消息段 - - -### _static_ `markdown(title, text)` - -发送 `markdown` 类型消息 - - -### _static_ `actionCardSingleBtn(title, text, singleTitle, singleURL)` - -发送 `actionCardSingleBtn` 类型消息 - - -### _static_ `actionCardMultiBtns(title, text, btns, hideAvatar=False, btnOrientation='1')` - -发送 `actionCardMultiBtn` 类型消息 - - -* **参数** - - - * `btnOrientation`: 0：按钮竖直排列 1：按钮横向排列 - - - * `btns`: [{ "title": title, "actionURL": actionURL }, ...] - - - -### _static_ `feedCard(links)` - -发送 `feedCard` 类型消息 - - -* **参数** - - - * `links`: [{ "title": xxx, "messageURL": xxx, "picURL": xxx }, ...] - - - -## _class_ `Message` - -基类：[`nonebot.adapters._base.Message`](README.md#nonebot.adapters._base.Message) - -钉钉 协议 Message 适配。 - -# NoneBot.adapters.ding.event 模块 - - -## _class_ `Event` - -基类：[`nonebot.adapters._base.Event`](README.md#nonebot.adapters._base.Event) - -钉钉协议事件。各事件字段参考 [钉钉文档](https://ding-doc.dingtalk.com/document#/org-dev-guide/elzz1p) - - -## _class_ `ConversationType` - -基类：`str`, `enum.Enum` - -An enumeration. - - -## _class_ `MessageEvent` - -基类：`nonebot.adapters.ding.event.Event` - -消息事件 - - -## _class_ `PrivateMessageEvent` - -基类：`nonebot.adapters.ding.event.MessageEvent` - -私聊消息事件 - - -## _class_ `GroupMessageEvent` - -基类：`nonebot.adapters.ding.event.MessageEvent` - -群消息事件 diff --git a/archive/2.0.0a13.post1/api/adapters/mirai.md b/archive/2.0.0a13.post1/api/adapters/mirai.md deleted file mode 100644 index 1851ed91..00000000 --- a/archive/2.0.0a13.post1/api/adapters/mirai.md +++ /dev/null @@ -1,1917 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.adapters.mirai 模块 - -## Mirai-API-HTTP 协议适配 - -协议详情请看: [mirai-api-http 文档](https://github.com/project-mirai/mirai-api-http/tree/master/docs) - -::: tip -该Adapter目前仍然处在早期实验性阶段, 并未经过充分测试 - -如果你在使用过程中遇到了任何问题, 请前往 [Issue页面](https://github.com/nonebot/nonebot2/issues) 为我们提供反馈 -::: - -::: danger -Mirai-API-HTTP 的适配器以 [AGPLv3许可](https://opensource.org/licenses/AGPL-3.0) 单独开源 - -这意味着在使用该适配器时需要 **以该许可开源您的完整程序代码** -::: - -# NoneBot.adapters.mirai.config 模块 - - -## _class_ `Config` - -Mirai 配置类 - - -* **必填** - - - * `auth_key` / `mirai_auth_key`: mirai-api-http 的 auth_key - - - * `mirai_host`: mirai-api-http 的地址 - - - * `mirai_port`: mirai-api-http 的端口 - - -# NoneBot.adapters.mirai.bot 模块 - - -## _class_ `SessionManager` - -基类：`object` - -Bot会话管理器, 提供API主动调用接口 - - -### _async_ `post(path, *, params=None)` - - -* **说明** - - 以POST方式主动提交API请求 - - - -* **参数** - - - * `path: str`: 对应API路径 - - - * `params: Optional[Dict[str, Any]]`: 请求参数 (无需sessionKey) - - - -* **返回** - - - * `Dict[str, Any]`: API 返回值 - - - -### _async_ `request(path, *, params=None)` - - -* **说明** - - 以GET方式主动提交API请求 - - - -* **参数** - - - * `path: str`: 对应API路径 - - - * `params: Optional[Dict[str, Any]]`: 请求参数 (无需sessionKey) - - - -### _async_ `upload(path, *, params)` - - -* **说明** - - 以表单(`multipart/form-data`)形式主动提交API请求 - - - -* **参数** - - - * `path: str`: 对应API路径 - - - * `params: Dict[str, Any]`: 请求参数 (无需sessionKey) - - - -## _class_ `Bot` - -基类：[`nonebot.adapters._base.Bot`](README.md#nonebot.adapters._base.Bot) - -mirai-api-http 协议 Bot 适配。 - -::: warning -API中为了使代码更加整洁, 我们采用了与PEP8相符的命名规则取代Mirai原有的驼峰命名 - -部分字段可能与文档在符号上不一致 -::: - - -### _property_ `api` - -返回该Bot对象的会话管理实例以提供API主动调用 - - -### _async_ `call_api(api, **data)` - -::: danger -由于Mirai的HTTP API特殊性, 该API暂时无法实现 -::: - -::: tip -你可以使用 `MiraiBot.api` 中提供的调用方法来代替 -::: - - -### `send(event, message, at_sender=False)` - - -* **说明** - - 根据 `event` 向触发事件的主体发送信息 - - - -* **参数** - - - * `event: Event`: Event对象 - - - * `message: Union[MessageChain, MessageSegment, str]`: 要发送的消息 - - - * `at_sender: bool`: 是否 @ 事件主体 - - - -### `send_friend_message(target, message_chain)` - - -* **说明** - - 使用此方法向指定好友发送消息 - - - -* **参数** - - - * `target: int`: 发送消息目标好友的 QQ 号 - - - * `message_chain: MessageChain`: 消息链，是一个消息对象构成的数组 - - - -### `send_temp_message(qq, group, message_chain)` - - -* **说明** - - 使用此方法向临时会话对象发送消息 - - - -* **参数** - - - * `qq: int`: 临时会话对象 QQ 号 - - - * `group: int`: 临时会话群号 - - - * `message_chain: MessageChain`: 消息链，是一个消息对象构成的数组 - - - -### `send_group_message(group, message_chain, quote=None)` - - -* **说明** - - 使用此方法向指定群发送消息 - - - -* **参数** - - - * `group: int`: 发送消息目标群的群号 - - - * `message_chain: MessageChain`: 消息链，是一个消息对象构成的数组 - - - * `quote: Optional[int]`: 引用一条消息的 message_id 进行回复 - - - -### `recall(target)` - - -* **说明** - - 使用此方法撤回指定消息。对于bot发送的消息，有2分钟时间限制。对于撤回群聊中群员的消息，需要有相应权限 - - - -* **参数** - - - * `target: int`: 需要撤回的消息的message_id - - - -### `send_image_message(target, qq, group, urls)` - - -* **说明** - - 使用此方法向指定对象（群或好友）发送图片消息 - 除非需要通过此手段获取image_id，否则不推荐使用该接口 - - > 当qq和group同时存在时，表示发送临时会话图片，qq为临时会话对象QQ号，group为临时会话发起的群号 - - - -* **参数** - - - * `target: int`: 发送对象的QQ号或群号，可能存在歧义 - - - * `qq: int`: 发送对象的QQ号 - - - * `group: int`: 发送对象的群号 - - - * `urls: List[str]`: 是一个url字符串构成的数组 - - - -* **返回** - - - * `List[str]`: 一个包含图片imageId的数组 - - - -### `upload_image(type, img)` - - -* **说明** - - 使用此方法上传图片文件至服务器并返回Image_id - - - -* **参数** - - - * `type: str`: "friend" 或 "group" 或 "temp" - - - * `img: BytesIO`: 图片的BytesIO对象 - - - -### `upload_voice(type, voice)` - - -* **说明** - - 使用此方法上传语音文件至服务器并返回voice_id - - - -* **参数** - - - * `type: str`: 当前仅支持 "group" - - - * `voice: BytesIO`: 语音的BytesIO对象 - - - -### `fetch_message(count=10)` - - -* **说明** - - 使用此方法获取bot接收到的最老消息和最老各类事件 - (会从MiraiApiHttp消息记录中删除) - - - -* **参数** - - - * `count: int`: 获取消息和事件的数量 - - - -### `fetch_latest_message(count=10)` - - -* **说明** - - 使用此方法获取bot接收到的最新消息和最新各类事件 - (会从MiraiApiHttp消息记录中删除) - - - -* **参数** - - - * `count: int`: 获取消息和事件的数量 - - - -### `peek_message(count=10)` - - -* **说明** - - 使用此方法获取bot接收到的最老消息和最老各类事件 - (不会从MiraiApiHttp消息记录中删除) - - - -* **参数** - - - * `count: int`: 获取消息和事件的数量 - - - -### `peek_latest_message(count=10)` - - -* **说明** - - 使用此方法获取bot接收到的最新消息和最新各类事件 - (不会从MiraiApiHttp消息记录中删除) - - - -* **参数** - - - * `count: int`: 获取消息和事件的数量 - - - -### `messsage_from_id(id)` - - -* **说明** - - 通过messageId获取一条被缓存的消息 - 使用此方法获取bot接收到的消息和各类事件 - - - -* **参数** - - - * `id: int`: 获取消息的message_id - - - -### `count_message()` - - -* **说明** - - 使用此方法获取bot接收并缓存的消息总数，注意不包含被删除的 - - - -### `friend_list()` - - -* **说明** - - 使用此方法获取bot的好友列表 - - - -* **返回** - - - * `List[Dict[str, Any]]`: 返回的好友列表数据 - - - -### `group_list()` - - -* **说明** - - 使用此方法获取bot的群列表 - - - -* **返回** - - - * `List[Dict[str, Any]]`: 返回的群列表数据 - - - -### `member_list(target)` - - -* **说明** - - 使用此方法获取bot指定群种的成员列表 - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - -* **返回** - - - * `List[Dict[str, Any]]`: 返回的群成员列表数据 - - - -### `mute(target, member_id, time)` - - -* **说明** - - 使用此方法指定群禁言指定群员（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `member_id: int`: 指定群员QQ号 - - - * `time: int`: 禁言时长，单位为秒，最多30天 - - - -### `unmute(target, member_id)` - - -* **说明** - - 使用此方法指定群解除群成员禁言（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `member_id: int`: 指定群员QQ号 - - - -### `kick(target, member_id, msg)` - - -* **说明** - - 使用此方法移除指定群成员（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `member_id: int`: 指定群员QQ号 - - - * `msg: str`: 信息 - - - -### `quit(target)` - - -* **说明** - - 使用此方法使Bot退出群聊 - - - -* **参数** - - - * `target: int`: 退出的群号 - - - -### `mute_all(target)` - - -* **说明** - - 使用此方法令指定群进行全体禁言（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - -### `unmute_all(target)` - - -* **说明** - - 使用此方法令指定群解除全体禁言（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - -### `group_config(target)` - - -* **说明** - - 使用此方法获取群设置 - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - -* **返回** - - -```json -{ - "name": "群名称", - "announcement": "群公告", - "confessTalk": true, - "allowMemberInvite": true, - "autoApprove": true, - "anonymousChat": true -} -``` - - -### `modify_group_config(target, config)` - - -* **说明** - - 使用此方法修改群设置（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `config: Dict[str, Any]`: 群设置, 格式见 `group_config` 的返回值 - - - -### `member_info(target, member_id)` - - -* **说明** - - 使用此方法获取群员资料 - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `member_id: int`: 群员QQ号 - - - -* **返回** - - -```json -{ - "name": "群名片", - "specialTitle": "群头衔" -} -``` - - -### `modify_member_info(target, member_id, info)` - - -* **说明** - - 使用此方法修改群员资料（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `member_id: int`: 群员QQ号 - - - * `info: Dict[str, Any]`: 群员资料, 格式见 `member_info` 的返回值 - - -# NoneBot.adapters.mirai.bot_ws 模块 - - -## _class_ `WebsocketBot` - -基类：`nonebot.adapters.mirai.bot.Bot` - -mirai-api-http 正向 Websocket 协议 Bot 适配。 - - -### _classmethod_ `register(driver, config, qq)` - - -* **说明** - - 注册该Adapter - - - -* **参数** - - - * `driver: Driver`: 程序所使用的\`\`Driver\`\` - - - * `config: Config`: 程序配置对象 - - - * `qq: int`: 要使用的Bot的QQ号 **注意: 在使用正向Websocket时必须指定该值!** - - -# NoneBot.adapters.mirai.message 模块 - - -## _class_ `MessageType` - -基类：`str`, `enum.Enum` - -消息类型枚举类 - - -## _class_ `MessageSegment` - -基类：`abc.ABC`, `Mapping` - -Mirai-API-HTTP 协议 MessageSegment 适配。具体方法参考 [mirai-api-http 消息类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/MessageType.md) - - -### `as_dict()` - -导出可以被正常json序列化的结构体 - - -### _classmethod_ `quote(id, group_id, sender_id, target_id, origin)` - - -* **说明** - - 生成回复引用消息段 - - - -* **参数** - - - * `id: int`: 被引用回复的原消息的message_id - - - * `group_id: int`: 被引用回复的原消息所接收的群号，当为好友消息时为0 - - - * `sender_id: int`: 被引用回复的原消息的发送者的QQ号 - - - * `target_id: int`: 被引用回复的原消息的接收者者的QQ号（或群号） - - - * `origin: MessageChain`: 被引用回复的原消息的消息链对象 - - - -### _classmethod_ `at(target)` - - -* **说明** - - @某个人 - - - -* **参数** - - - * `target: int`: 群员QQ号 - - - -### _classmethod_ `at_all()` - - -* **说明** - - @全体成员 - - - -### _classmethod_ `face(face_id=None, name=None)` - - -* **说明** - - 发送QQ表情 - - - -* **参数** - - - * `face_id: Optional[int]`: QQ表情编号，可选，优先高于name - - - * `name: Optional[str]`: QQ表情拼音，可选 - - - -### _classmethod_ `plain(text)` - - -* **说明** - - 纯文本消息 - - - -* **参数** - - - * `text: str`: 文字消息 - - - -### _classmethod_ `image(image_id=None, url=None, path=None)` - - -* **说明** - - 图片消息 - - - -* **参数** - - - * `image_id: Optional[str]`: 图片的image_id，群图片与好友图片格式不同。不为空时将忽略url属性 - - - * `url: Optional[str]`: 图片的URL，发送时可作网络图片的链接 - - - * `path: Optional[str]`: 图片的路径，发送本地图片 - - - -### _classmethod_ `flash_image(image_id=None, url=None, path=None)` - - -* **说明** - - 闪照消息 - - - -* **参数** - - 同 `image` - - - -### _classmethod_ `voice(voice_id=None, url=None, path=None)` - - -* **说明** - - 语音消息 - - - -* **参数** - - - * `voice_id: Optional[str]`: 语音的voice_id，不为空时将忽略url属性 - - - * `url: Optional[str]`: 语音的URL，发送时可作网络语音的链接 - - - * `path: Optional[str]`: 语音的路径，发送本地语音 - - - -### _classmethod_ `xml(xml)` - - -* **说明** - - XML消息 - - - -* **参数** - - - * `xml: str`: XML文本 - - - -### _classmethod_ `json(json)` - - -* **说明** - - Json消息 - - - -* **参数** - - - * `json: str`: Json文本 - - - -### _classmethod_ `app(content)` - - -* **说明** - - 应用程序消息 - - - -* **参数** - - - * `content: str`: 内容 - - - -### _classmethod_ `poke(name)` - - -* **说明** - - 戳一戳消息 - - - -* **参数** - - - * `name: str`: 戳一戳的类型 - - - * `Poke`: 戳一戳 - - - * `ShowLove`: 比心 - - - * `Like`: 点赞 - - - * `Heartbroken`: 心碎 - - - * `SixSixSix`: 666 - - - * `FangDaZhao`: 放大招 - - - -## _class_ `MessageChain` - -基类：[`nonebot.adapters._base.Message`](README.md#nonebot.adapters._base.Message) - -Mirai 协议 Message 适配 - -由于Mirai协议的Message实现较为特殊, 故使用MessageChain命名 - - -### `reduce()` - - -* **说明** - - 忽略为空的消息段, 合并相邻的纯文本消息段 - - - -### `export()` - -导出为可以被正常json序列化的数组 - - -### `extract_first(*type)` - - -* **说明** - - 弹出该消息链的第一个消息 - - - -* **参数** - - - * \*type: MessageType: 指定的消息类型, 当指定后如类型不匹配不弹出 - - -# NoneBot.adapters.mirai.utils 模块 - - -## _exception_ `ActionFailed` - -基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed) - - -* **说明** - - API 请求成功返回数据，但 API 操作失败。 - - - -## _exception_ `InvalidArgument` - -基类：[`nonebot.exception.AdapterException`](../exception.md#nonebot.exception.AdapterException) - - -* **说明** - - 调用API的参数出错 - - - -## `catch_network_error(function)` - - -* **说明** - - 捕捉函数抛出的httpx网络异常并释放 `NetworkError` 异常 - - 处理返回数据, 在code不为0时释放 `ActionFailed` 异常 - - -::: warning -此装饰器只支持使用了httpx的异步函数 -::: - - -## `argument_validation(function)` - - -* **说明** - - 通过函数签名中的类型注解来对传入参数进行运行时校验 - - 会在参数出错时释放 `InvalidArgument` 异常 - - -# NoneBot.adapters.mirai.event 模块 - -::: warning -事件中为了使代码更加整洁, 我们采用了与PEP8相符的命名规则取代Mirai原有的驼峰命名 - -部分字段可能与文档在符号上不一致 -::: - - -## _class_ `Event` - -基类：[`nonebot.adapters._base.Event`](README.md#nonebot.adapters._base.Event) - -mirai-api-http 协议事件，字段与 mirai-api-http 一致。各事件字段参考 [mirai-api-http 事件类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/EventType.md) - - -### _classmethod_ `new(data)` - -此事件类的工厂函数, 能够通过事件数据选择合适的子类进行序列化 - - -### `normalize_dict(**kwargs)` - -返回可以被json正常反序列化的结构体 - - -## _class_ `UserPermission` - -基类：`str`, `enum.Enum` - - -* **说明** - - -用户权限枚举类 - -> -> * `OWNER`: 群主 - - -> * `ADMINISTRATOR`: 群管理 - - -> * `MEMBER`: 普通群成员 - - -## _class_ `MessageEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -消息事件基类 - - -## _class_ `GroupMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -群消息事件 - - -## _class_ `FriendMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -好友消息事件 - - -## _class_ `TempMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -临时会话消息事件 - - -## _class_ `NoticeEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -通知事件基类 - - -## _class_ `MuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -禁言类事件基类 - - -## _class_ `BotMuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -Bot被禁言 - - -## _class_ `BotUnmuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -Bot被取消禁言 - - -## _class_ `MemberMuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -群成员被禁言事件（该成员不是Bot） - - -## _class_ `MemberUnmuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -群成员被取消禁言事件（该成员不是Bot） - - -## _class_ `BotJoinGroupEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -Bot加入了一个新群 - - -## _class_ `BotLeaveEventActive` - -基类：`nonebot.adapters.mirai.event.notice.BotJoinGroupEvent` - -Bot主动退出一个群 - - -## _class_ `BotLeaveEventKick` - -基类：`nonebot.adapters.mirai.event.notice.BotJoinGroupEvent` - -Bot被踢出一个群 - - -## _class_ `MemberJoinEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -新人入群的事件 - - -## _class_ `MemberLeaveEventKick` - -基类：`nonebot.adapters.mirai.event.notice.MemberJoinEvent` - -成员被踢出群（该成员不是Bot） - - -## _class_ `MemberLeaveEventQuit` - -基类：`nonebot.adapters.mirai.event.notice.MemberJoinEvent` - -成员主动离群（该成员不是Bot） - - -## _class_ `FriendRecallEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -好友消息撤回 - - -## _class_ `GroupRecallEvent` - -基类：`nonebot.adapters.mirai.event.notice.FriendRecallEvent` - -群消息撤回 - - -## _class_ `GroupStateChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -群变化事件基类 - - -## _class_ `GroupNameChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -某个群名改变 - - -## _class_ `GroupEntranceAnnouncementChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -某群入群公告改变 - - -## _class_ `GroupMuteAllEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -全员禁言 - - -## _class_ `GroupAllowAnonymousChatEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -匿名聊天 - - -## _class_ `GroupAllowConfessTalkEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -坦白说 - - -## _class_ `GroupAllowMemberInviteEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -允许群员邀请好友加群 - - -## _class_ `MemberStateChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -群成员变化事件基类 - - -## _class_ `MemberCardChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -群名片改动 - - -## _class_ `MemberSpecialTitleChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -群头衔改动（只有群主有操作限权） - - -## _class_ `BotGroupPermissionChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -Bot在群里的权限被改变 - - -## _class_ `MemberPermissionChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -成员权限改变的事件（该成员不是Bot） - - -## _class_ `RequestEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -请求事件基类 - - -## _class_ `NewFriendRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -添加好友申请 - - -### _async_ `approve(bot)` - - -* **说明** - - 通过此人的好友申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, operate=1, message='')` - - -* **说明** - - 拒绝此人的好友申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `operate: Literal[1, 2]`: 响应的操作类型 - - - * `1`: 拒绝添加好友 - - - * `2`: 拒绝添加好友并添加黑名单，不再接收该用户的好友申请 - - - * `message: str`: 回复的信息 - - - -## _class_ `MemberJoinRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -用户入群申请（Bot需要有管理员权限） - - -### _async_ `approve(bot)` - - -* **说明** - - 通过此人的加群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, operate=1, message='')` - - -* **说明** - - 拒绝(忽略)此人的加群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `operate: Literal[1, 2, 3, 4]`: 响应的操作类型 - - - * `1`: 拒绝入群 - - - * `2`: 忽略请求 - - - * `3`: 拒绝入群并添加黑名单，不再接收该用户的入群申请 - - - * `4`: 忽略入群并添加黑名单，不再接收该用户的入群申请 - - - * `message: str`: 回复的信息 - - - -## _class_ `BotInvitedJoinGroupRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -Bot被邀请入群申请 - - -### _async_ `approve(bot)` - - -* **说明** - - 通过这份被邀请入群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, message='')` - - -* **说明** - - 拒绝这份被邀请入群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `message: str`: 邀请消息 - - -# NoneBot.adapters.mirai.event.base 模块 - - -## _class_ `UserPermission` - -基类：`str`, `enum.Enum` - - -* **说明** - - -用户权限枚举类 - -> -> * `OWNER`: 群主 - - -> * `ADMINISTRATOR`: 群管理 - - -> * `MEMBER`: 普通群成员 - - -## _class_ `Event` - -基类：[`nonebot.adapters._base.Event`](README.md#nonebot.adapters._base.Event) - -mirai-api-http 协议事件，字段与 mirai-api-http 一致。各事件字段参考 [mirai-api-http 事件类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/EventType.md) - - -### _classmethod_ `new(data)` - -此事件类的工厂函数, 能够通过事件数据选择合适的子类进行序列化 - - -### `normalize_dict(**kwargs)` - -返回可以被json正常反序列化的结构体 - -# NoneBot.adapters.mirai.event.meta 模块 - - -## _class_ `MetaEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -元事件基类 - - -## _class_ `BotOnlineEvent` - -基类：`nonebot.adapters.mirai.event.meta.MetaEvent` - -Bot登录成功 - - -## _class_ `BotOfflineEventActive` - -基类：`nonebot.adapters.mirai.event.meta.MetaEvent` - -Bot主动离线 - - -## _class_ `BotOfflineEventForce` - -基类：`nonebot.adapters.mirai.event.meta.MetaEvent` - -Bot被挤下线 - - -## _class_ `BotOfflineEventDropped` - -基类：`nonebot.adapters.mirai.event.meta.MetaEvent` - -Bot被服务器断开或因网络问题而掉线 - - -## _class_ `BotReloginEvent` - -基类：`nonebot.adapters.mirai.event.meta.MetaEvent` - -Bot主动重新登录 - -# NoneBot.adapters.mirai.event.message 模块 - - -## _class_ `MessageEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -消息事件基类 - - -## _class_ `GroupMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -群消息事件 - - -## _class_ `FriendMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -好友消息事件 - - -## _class_ `TempMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -临时会话消息事件 - -# NoneBot.adapters.mirai.event.notice 模块 - - -## _class_ `NoticeEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -通知事件基类 - - -## _class_ `MuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -禁言类事件基类 - - -## _class_ `BotMuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -Bot被禁言 - - -## _class_ `BotUnmuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -Bot被取消禁言 - - -## _class_ `MemberMuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -群成员被禁言事件（该成员不是Bot） - - -## _class_ `MemberUnmuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -群成员被取消禁言事件（该成员不是Bot） - - -## _class_ `BotJoinGroupEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -Bot加入了一个新群 - - -## _class_ `BotLeaveEventActive` - -基类：`nonebot.adapters.mirai.event.notice.BotJoinGroupEvent` - -Bot主动退出一个群 - - -## _class_ `BotLeaveEventKick` - -基类：`nonebot.adapters.mirai.event.notice.BotJoinGroupEvent` - -Bot被踢出一个群 - - -## _class_ `MemberJoinEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -新人入群的事件 - - -## _class_ `MemberLeaveEventKick` - -基类：`nonebot.adapters.mirai.event.notice.MemberJoinEvent` - -成员被踢出群（该成员不是Bot） - - -## _class_ `MemberLeaveEventQuit` - -基类：`nonebot.adapters.mirai.event.notice.MemberJoinEvent` - -成员主动离群（该成员不是Bot） - - -## _class_ `FriendRecallEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -好友消息撤回 - - -## _class_ `GroupRecallEvent` - -基类：`nonebot.adapters.mirai.event.notice.FriendRecallEvent` - -群消息撤回 - - -## _class_ `GroupStateChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -群变化事件基类 - - -## _class_ `GroupNameChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -某个群名改变 - - -## _class_ `GroupEntranceAnnouncementChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -某群入群公告改变 - - -## _class_ `GroupMuteAllEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -全员禁言 - - -## _class_ `GroupAllowAnonymousChatEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -匿名聊天 - - -## _class_ `GroupAllowConfessTalkEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -坦白说 - - -## _class_ `GroupAllowMemberInviteEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -允许群员邀请好友加群 - - -## _class_ `MemberStateChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -群成员变化事件基类 - - -## _class_ `MemberCardChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -群名片改动 - - -## _class_ `MemberSpecialTitleChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -群头衔改动（只有群主有操作限权） - - -## _class_ `BotGroupPermissionChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -Bot在群里的权限被改变 - - -## _class_ `MemberPermissionChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -成员权限改变的事件（该成员不是Bot） - -# NoneBot.adapters.mirai.event.request 模块 - - -## _class_ `RequestEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -请求事件基类 - - -## _class_ `NewFriendRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -添加好友申请 - - -### _async_ `approve(bot)` - - -* **说明** - - 通过此人的好友申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, operate=1, message='')` - - -* **说明** - - 拒绝此人的好友申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `operate: Literal[1, 2]`: 响应的操作类型 - - - * `1`: 拒绝添加好友 - - - * `2`: 拒绝添加好友并添加黑名单，不再接收该用户的好友申请 - - - * `message: str`: 回复的信息 - - - -## _class_ `MemberJoinRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -用户入群申请（Bot需要有管理员权限） - - -### _async_ `approve(bot)` - - -* **说明** - - 通过此人的加群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, operate=1, message='')` - - -* **说明** - - 拒绝(忽略)此人的加群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `operate: Literal[1, 2, 3, 4]`: 响应的操作类型 - - - * `1`: 拒绝入群 - - - * `2`: 忽略请求 - - - * `3`: 拒绝入群并添加黑名单，不再接收该用户的入群申请 - - - * `4`: 忽略入群并添加黑名单，不再接收该用户的入群申请 - - - * `message: str`: 回复的信息 - - - -## _class_ `BotInvitedJoinGroupRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -Bot被邀请入群申请 - - -### _async_ `approve(bot)` - - -* **说明** - - 通过这份被邀请入群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, message='')` - - -* **说明** - - 拒绝这份被邀请入群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `message: str`: 邀请消息 diff --git a/archive/2.0.0a13.post1/api/config.md b/archive/2.0.0a13.post1/api/config.md deleted file mode 100644 index 654ea628..00000000 --- a/archive/2.0.0a13.post1/api/config.md +++ /dev/null @@ -1,285 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.config 模块 - -## 配置 - -NoneBot 使用 [pydantic](https://pydantic-docs.helpmanual.io/) 以及 [python-dotenv](https://saurabh-kumar.com/python-dotenv/) 来读取配置。 - -配置项需符合特殊格式或 json 序列化格式。详情见 [pydantic Field Type](https://pydantic-docs.helpmanual.io/usage/types/) 文档。 - - -## _class_ `Env` - -基类：`nonebot.config.BaseConfig` - -运行环境配置。大小写不敏感。 - -将会从 `nonebot.init 参数` > `环境变量` > `.env 环境配置文件` 的优先级读取配置。 - - -### `environment` - - -* **类型**: `str` - - -* **默认值**: `"prod"` - - -* **说明** - - 当前环境名。 NoneBot 将从 `.env.{environment}` 文件中加载配置。 - - - -## _class_ `Config` - -基类：`nonebot.config.BaseConfig` - -NoneBot 主要配置。大小写不敏感。 - -除了 NoneBot 的配置项外，还可以自行添加配置项到 `.env.{environment}` 文件中。 -这些配置将会在 json 反序列化后一起带入 `Config` 类中。 - - -### `driver` - - -* **类型**: `str` - - -* **默认值**: `"nonebot.drivers.fastapi"` - - -* **说明** - - NoneBot 运行所使用的 `Driver` 。继承自 `nonebot.driver.BaseDriver` 。 - - - -### `host` - - -* **类型**: `IPvAnyAddress` - - -* **默认值**: `127.0.0.1` - - -* **说明** - - NoneBot 的 HTTP 和 WebSocket 服务端监听的 IP/主机名。 - - - -### `port` - - -* **类型**: `int` - - -* **默认值**: `8080` - - -* **说明** - - NoneBot 的 HTTP 和 WebSocket 服务端监听的端口。 - - - -### `debug` - - -* **类型**: `bool` - - -* **默认值**: `False` - - -* **说明** - - 是否以调试模式运行 NoneBot。 - - - -### `api_root` - - -* **类型**: `Dict[str, str]` - - -* **默认值**: `{}` - - -* **说明** - - 以机器人 ID 为键，上报地址为值的字典，环境变量或文件中应使用 json 序列化。 - - - -* **示例** - - -```default -API_ROOT={"123456": "http://127.0.0.1:5700"} -``` - - -### `api_timeout` - - -* **类型**: `Optional[float]` - - -* **默认值**: `30.` - - -* **说明** - - API 请求超时时间，单位: 秒。 - - - -### `access_token` - - -* **类型**: `Optional[str]` - - -* **默认值**: `None` - - -* **说明** - - API 请求以及上报所需密钥，在请求头中携带。 - - - -* **示例** - - -```http -POST /cqhttp/ HTTP/1.1 -Authorization: Bearer kSLuTF2GC2Q4q4ugm3 -``` - - -### `secret` - - -* **类型**: `Optional[str]` - - -* **默认值**: `None` - - -* **说明** - - HTTP POST 形式上报所需签名，在请求头中携带。 - - - -* **示例** - - -```http -POST /cqhttp/ HTTP/1.1 -X-Signature: sha1=f9ddd4863ace61e64f462d41ca311e3d2c1176e2 -``` - - -### `superusers` - - -* **类型**: `Set[str]` - - -* **默认值**: `set()` - - -* **说明** - - 机器人超级用户。 - - - -* **示例** - - -```default -SUPERUSERS=["12345789"] -``` - - -### `nickname` - - -* **类型**: `Set[str]` - - -* **默认值**: `set()` - - -* **说明** - - 机器人昵称。 - - - -### `command_start` - - -* **类型**: `Set[str]` - - -* **默认值**: `{"/"}` - - -* **说明** - - 命令的起始标记，用于判断一条消息是不是命令。 - - - -### `command_sep` - - -* **类型**: `Set[str]` - - -* **默认值**: `{"."}` - - -* **说明** - - 命令的分隔标记，用于将文本形式的命令切分为元组（实际的命令名）。 - - - -### `session_expire_timeout` - - -* **类型**: `timedelta` - - -* **默认值**: `timedelta(minutes=2)` - - -* **说明** - - 等待用户回复的超时时间。 - - - -* **示例** - - -```default -SESSION_EXPIRE_TIMEOUT=120 # 单位: 秒 -SESSION_EXPIRE_TIMEOUT=[DD ][HH:MM]SS[.ffffff] -SESSION_EXPIRE_TIMEOUT=P[DD]DT[HH]H[MM]M[SS]S # ISO 8601 -``` diff --git a/archive/2.0.0a13.post1/api/drivers/README.md b/archive/2.0.0a13.post1/api/drivers/README.md deleted file mode 100644 index 673697b4..00000000 --- a/archive/2.0.0a13.post1/api/drivers/README.md +++ /dev/null @@ -1,318 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.drivers 模块 - -## 后端驱动适配基类 - -各驱动请继承以下基类 - - -## _class_ `Driver` - -基类：`abc.ABC` - -Driver 基类。将后端框架封装，以满足适配器使用。 - - -### `_adapters` - - -* **类型** - - `Dict[str, Type[Bot]]` - - - -* **说明** - - 已注册的适配器列表 - - - -### `_ws_connection_hook` - - -* **类型** - - `Set[T_WebSocketConnectionHook]` - - - -* **说明** - - WebSocket 连接建立时执行的函数 - - - -### `_ws_disconnection_hook` - - -* **类型** - - `Set[T_WebSocketDisconnectionHook]` - - - -* **说明** - - WebSocket 连接断开时执行的函数 - - - -### _abstract_ `__init__(env, config)` - - -* **参数** - - - * `env: Env`: 包含环境信息的 Env 对象 - - - * `config: Config`: 包含配置信息的 Config 对象 - - - -### `env` - - -* **类型** - - `str` - - - -* **说明** - - 环境名称 - - - -### `config` - - -* **类型** - - `Config` - - - -* **说明** - - 配置对象 - - - -### `_clients` - - -* **类型** - - `Dict[str, Bot]` - - - -* **说明** - - 已连接的 Bot - - - -### `register_adapter(name, adapter, **kwargs)` - - -* **说明** - - 注册一个协议适配器 - - - -* **参数** - - - * `name: str`: 适配器名称，用于在连接时进行识别 - - - * `adapter: Type[Bot]`: 适配器 Class - - - -### _abstract property_ `type` - -驱动类型名称 - - -### _abstract property_ `server_app` - -驱动 APP 对象 - - -### _abstract property_ `asgi` - -驱动 ASGI 对象 - - -### _abstract property_ `logger` - -驱动专属 logger 日志记录器 - - -### _property_ `bots` - - -* **类型** - - `Dict[str, Bot]` - - - -* **说明** - - 获取当前所有已连接的 Bot - - - -### _abstract_ `on_startup(func)` - -注册一个在驱动启动时运行的函数 - - -### _abstract_ `on_shutdown(func)` - -注册一个在驱动停止时运行的函数 - - -### `on_bot_connect(func)` - - -* **说明** - - 装饰一个函数使他在 bot 通过 WebSocket 连接成功时执行。 - - - -* **函数参数** - - - * `bot: Bot`: 当前连接上的 Bot 对象 - - - -### `on_bot_disconnect(func)` - - -* **说明** - - 装饰一个函数使他在 bot 通过 WebSocket 连接断开时执行。 - - - -* **函数参数** - - - * `bot: Bot`: 当前连接上的 Bot 对象 - - - -### `_bot_connect(bot)` - -在 WebSocket 连接成功后，调用该函数来注册 bot 对象 - - -### `_bot_disconnect(bot)` - -在 WebSocket 连接断开后，调用该函数来注销 bot 对象 - - -### _abstract_ `run(host=None, port=None, *args, **kwargs)` - - -* **说明** - - 启动驱动框架 - - - -* **参数** - - - * `host: Optional[str]`: 驱动绑定 IP - - - * `post: Optional[int]`: 驱动绑定端口 - - - * `*args` - - - * `**kwargs` - - - -### _abstract async_ `_handle_http()` - -用于处理 HTTP 类型请求的函数 - - -### _abstract async_ `_handle_ws_reverse()` - -用于处理 WebSocket 类型请求的函数 - - -## _class_ `WebSocket` - -基类：`object` - -WebSocket 连接封装，统一接口方便外部调用。 - - -### _abstract_ `__init__(websocket)` - - -* **参数** - - - * `websocket: Any`: WebSocket 连接对象 - - - -### _property_ `websocket` - -WebSocket 连接对象 - - -### _abstract property_ `closed` - - -* **类型** - - `bool` - - - -* **说明** - - 连接是否已经关闭 - - - -### _abstract async_ `accept()` - -接受 WebSocket 连接请求 - - -### _abstract async_ `close(code)` - -关闭 WebSocket 连接请求 - - -### _abstract async_ `receive()` - -接收一条 WebSocket 信息 - - -### _abstract async_ `send(data)` - -发送一条 WebSocket 信息 diff --git a/archive/2.0.0a13.post1/api/drivers/fastapi.md b/archive/2.0.0a13.post1/api/drivers/fastapi.md deleted file mode 100644 index 3b2f4f23..00000000 --- a/archive/2.0.0a13.post1/api/drivers/fastapi.md +++ /dev/null @@ -1,135 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.drivers.fastapi 模块 - -## FastAPI 驱动适配 - -后端使用方法请参考: [FastAPI 文档](https://fastapi.tiangolo.com/) - - -## _class_ `Config` - -基类：`pydantic.env_settings.BaseSettings` - -FastAPI 驱动框架设置，详情参考 FastAPI 文档 - - -### `fastapi_openapi_url` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - `openapi.json` 地址，默认为 `None` 即关闭 - - - -### `fastapi_docs_url` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - `swagger` 地址，默认为 `None` 即关闭 - - - -### `fastapi_redoc_url` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - `redoc` 地址，默认为 `None` 即关闭 - - - -### `fastapi_reload_dirs` - - -* **类型** - - `List[str]` - - - -* **说明** - - `debug` 模式下重载监控文件夹列表，默认为 uvicorn 默认值 - - - -## _class_ `Driver` - -基类：[`nonebot.drivers.Driver`](README.md#nonebot.drivers.Driver) - -FastAPI 驱动框架 - - -* **上报地址** - - - * `/{adapter name}/`: HTTP POST 上报 - - - * `/{adapter name}/http/`: HTTP POST 上报 - - - * `/{adapter name}/ws`: WebSocket 上报 - - - * `/{adapter name}/ws/`: WebSocket 上报 - - - -### _property_ `type` - -驱动名称: `fastapi` - - -### _property_ `server_app` - -`FastAPI APP` 对象 - - -### _property_ `asgi` - -`FastAPI APP` 对象 - - -### _property_ `logger` - -fastapi 使用的 logger - - -### `on_startup(func)` - -参考文档: [Events](https://fastapi.tiangolo.com/advanced/events/#startup-event) - - -### `on_shutdown(func)` - -参考文档: [Events](https://fastapi.tiangolo.com/advanced/events/#startup-event) - - -### `run(host=None, port=None, *, app=None, **kwargs)` - -使用 `uvicorn` 启动 FastAPI diff --git a/archive/2.0.0a13.post1/api/drivers/quart.md b/archive/2.0.0a13.post1/api/drivers/quart.md deleted file mode 100644 index 068769e0..00000000 --- a/archive/2.0.0a13.post1/api/drivers/quart.md +++ /dev/null @@ -1,62 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.drivers.quart 模块 - -## Quart 驱动适配 - -后端使用方法请参考: [Quart 文档](https://pgjones.gitlab.io/quart/index.html) - - -## _class_ `Driver` - -基类：[`nonebot.drivers.Driver`](README.md#nonebot.drivers.Driver) - -Quart 驱动框架 - - -* **上报地址** - - - * `/{adapter name}/http`: HTTP POST 上报 - - - * `/{adapter name}/ws`: WebSocket 上报 - - - -### _property_ `type` - -驱动名称: `quart` - - -### _property_ `server_app` - -`Quart` 对象 - - -### _property_ `asgi` - -`Quart` 对象 - - -### _property_ `logger` - -fastapi 使用的 logger - - -### `on_startup(func)` - -参考文档: [Startup and Shutdown](https://pgjones.gitlab.io/quart/how_to_guides/startup_shutdown.html) - - -### `on_shutdown(func)` - -参考文档: [Startup and Shutdown](https://pgjones.gitlab.io/quart/how_to_guides/startup_shutdown.html) - - -### `run(host=None, port=None, *, app=None, **kwargs)` - -使用 `uvicorn` 启动 Quart diff --git a/archive/2.0.0a13.post1/api/exception.md b/archive/2.0.0a13.post1/api/exception.md deleted file mode 100644 index 817c02a9..00000000 --- a/archive/2.0.0a13.post1/api/exception.md +++ /dev/null @@ -1,214 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.exception 模块 - -## 异常 - -下列文档中的异常是所有 NoneBot 运行时可能会抛出的。 -这些异常并非所有需要用户处理，在 NoneBot 内部运行时被捕获，并进行对应操作。 - - -## _exception_ `NoneBotException` - -基类：`Exception` - - -* **说明** - - 所有 NoneBot 发生的异常基类。 - - - -## _exception_ `IgnoredException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 应该忽略该事件。可由 PreProcessor 抛出。 - - - -* **参数** - - - * `reason`: 忽略事件的原因 - - - -## _exception_ `ParserExit` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - `shell command` 处理消息失败时返回的异常 - - - -* **参数** - - - * `status` - - - * `message` - - - -## _exception_ `PausedException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 结束当前 `Handler` 并等待下一条消息后继续下一个 `Handler`。 - 可用于用户输入新信息。 - - - -* **用法** - - 可以在 `Handler` 中通过 `Matcher.pause()` 抛出。 - - - -## _exception_ `RejectedException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 结束当前 `Handler` 并等待下一条消息后重新运行当前 `Handler`。 - 可用于用户重新输入。 - - - -* **用法** - - 可以在 `Handler` 中通过 `Matcher.reject()` 抛出。 - - - -## _exception_ `FinishedException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 结束当前 `Handler` 且后续 `Handler` 不再被运行。 - 可用于结束用户会话。 - - - -* **用法** - - 可以在 `Handler` 中通过 `Matcher.finish()` 抛出。 - - - -## _exception_ `StopPropagation` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 终止事件向下层传播。 - - - -* **用法** - - 在 `Matcher.block == True` 时抛出。 - - - -## _exception_ `RequestDenied` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - Bot 连接请求不合法。 - - - -* **参数** - - - * `status_code: int`: HTTP 状态码 - - - * `reason: str`: 拒绝原因 - - - -## _exception_ `AdapterException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 代表 `Adapter` 抛出的异常，所有的 `Adapter` 都要在内部继承自这个 `Exception` - - - -* **参数** - - - * `adapter_name: str`: 标识 adapter - - - -## _exception_ `NoLogException` - -基类：`Exception` - - -* **说明** - - 指示 NoneBot 对当前 `Event` 进行处理但不显示 Log 信息，可在 `get_log_string` 时抛出 - - - -## _exception_ `ApiNotAvailable` - -基类：`nonebot.exception.AdapterException` - - -* **说明** - - 在 API 连接不可用时抛出。 - - - -## _exception_ `NetworkError` - -基类：`nonebot.exception.AdapterException` - - -* **说明** - - 在网络出现问题时抛出，如: API 请求地址不正确, API 请求无返回或返回状态非正常等。 - - - -## _exception_ `ActionFailed` - -基类：`nonebot.exception.AdapterException` - - -* **说明** - - API 请求成功返回数据，但 API 操作失败。 diff --git a/archive/2.0.0a13.post1/api/handler.md b/archive/2.0.0a13.post1/api/handler.md deleted file mode 100644 index dc2ab74f..00000000 --- a/archive/2.0.0a13.post1/api/handler.md +++ /dev/null @@ -1,111 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.handler 模块 - -## 事件处理函数 - -该模块实现事件处理函数的封装，以实现动态参数等功能。 - - -## _class_ `Handler` - -基类：`object` - -事件处理函数类 - - -### `__init__(func)` - -装饰事件处理函数以便根据动态参数运行 - - -### `func` - - -* **类型** - - `T_Handler` - - - -* **说明** - - 事件处理函数 - - - -### `signature` - - -* **类型** - - `inspect.Signature` - - - -* **说明** - - 事件处理函数签名 - - - -### _property_ `bot_type` - - -* **类型** - - `Union[Type["Bot"], inspect.Parameter.empty]` - - - -* **说明** - - 事件处理函数接受的 Bot 对象类型 - - - -### _property_ `event_type` - - -* **类型** - - `Optional[Union[Type[Event], inspect.Parameter.empty]]` - - - -* **说明** - - 事件处理函数接受的 event 类型 / 不需要 event 参数 - - - -### _property_ `state_type` - - -* **类型** - - `Optional[Union[T_State, inspect.Parameter.empty]]` - - - -* **说明** - - 事件处理函数是否接受 state 参数 - - - -### _property_ `matcher_type` - - -* **类型** - - `Optional[Union[Type["Matcher"], inspect.Parameter.empty]]` - - - -* **说明** - - 事件处理函数是否接受 matcher 参数 diff --git a/archive/2.0.0a13.post1/api/log.md b/archive/2.0.0a13.post1/api/log.md deleted file mode 100644 index e6096cff..00000000 --- a/archive/2.0.0a13.post1/api/log.md +++ /dev/null @@ -1,42 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.log 模块 - -## 日志 - -NoneBot 使用 [loguru](https://github.com/Delgan/loguru) 来记录日志信息。 - -自定义 logger 请参考 [loguru](https://github.com/Delgan/loguru) 文档。 - - -## `logger` - - -* **说明** - - NoneBot 日志记录器对象。 - - - -* **默认信息** - - - * 格式: `[%(asctime)s %(name)s] %(levelname)s: %(message)s` - - - * 等级: `DEBUG` / `INFO` ，根据 config 配置改变 - - - * 输出: 输出至 stdout - - - -* **用法** - - -```python -from nonebot.log import logger -``` diff --git a/archive/2.0.0a13.post1/api/matcher.md b/archive/2.0.0a13.post1/api/matcher.md deleted file mode 100644 index 0683c8f9..00000000 --- a/archive/2.0.0a13.post1/api/matcher.md +++ /dev/null @@ -1,541 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.matcher 模块 - -## 事件响应器 - -该模块实现事件响应器的创建与运行，并提供一些快捷方法来帮助用户更好的与机器人进行对话 。 - - -## `matchers` - - -* **类型** - - `Dict[int, List[Type[Matcher]]]` - - - -* **说明** - - 用于存储当前所有的事件响应器 - - - -## _class_ `Matcher` - -基类：`object` - -事件响应器类 - - -### `module` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - 事件响应器所在模块名称 - - - -### `type` - - -* **类型** - - `str` - - - -* **说明** - - 事件响应器类型 - - - -### `rule` - - -* **类型** - - `Rule` - - - -* **说明** - - 事件响应器匹配规则 - - - -### `permission` - - -* **类型** - - `Permission` - - - -* **说明** - - 事件响应器触发权限 - - - -### `priority` - - -* **类型** - - `int` - - - -* **说明** - - 事件响应器优先级 - - - -### `block` - - -* **类型** - - `bool` - - - -* **说明** - - 事件响应器是否阻止事件传播 - - - -### `temp` - - -* **类型** - - `bool` - - - -* **说明** - - 事件响应器是否为临时 - - - -### `expire_time` - - -* **类型** - - `Optional[datetime]` - - - -* **说明** - - 事件响应器过期时间点 - - - -### `_default_state` - - -* **类型** - - `T_State` - - - -* **说明** - - 事件响应器默认状态 - - - -### `_default_state_factory` - - -* **类型** - - `Optional[T_State]` - - - -* **说明** - - 事件响应器默认工厂函数 - - - -### `_default_parser` - - -* **类型** - - `Optional[T_ArgsParser]` - - - -* **说明** - - 事件响应器默认参数解析函数 - - - -### `_default_type_updater` - - -* **类型** - - `Optional[T_TypeUpdater]` - - - -* **说明** - - 事件响应器类型更新函数 - - - -### `_default_permission_updater` - - -* **类型** - - `Optional[T_PermissionUpdater]` - - - -* **说明** - - 事件响应器权限更新函数 - - - -### `__init__()` - -实例化 Matcher 以便运行 - - -### `handlers` - - -* **类型** - - `List[Handler]` - - - -* **说明** - - 事件响应器拥有的事件处理函数列表 - - - -### _classmethod_ `new(type_='', rule=None, permission=None, handlers=None, temp=False, priority=1, block=False, *, module=None, default_state=None, default_state_factory=None, expire_time=None)` - - -* **说明** - - 创建一个新的事件响应器，并存储至 [matchers](#matchers) - - - -* **参数** - - - * `type_: str`: 事件响应器类型，与 `event.get_type()` 一致时触发，空字符串表示任意 - - - * `rule: Optional[Rule]`: 匹配规则 - - - * `permission: Optional[Permission]`: 权限 - - - * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器，即触发一次后删除 - - - * `priority: int`: 响应优先级 - - - * `block: bool`: 是否阻止事件向更低优先级的响应器传播 - - - * `module: Optional[str]`: 事件响应器所在模块名称 - - - * `default_state: Optional[T_State]`: 默认状态 `state` - - - * `default_state_factory: Optional[T_StateFactory]`: 默认状态 `state` 的工厂函数 - - - * `expire_time: Optional[datetime]`: 事件响应器最终有效时间点，过时即被删除 - - - -* **返回** - - - * `Type[Matcher]`: 新的事件响应器类 - - - -### _async classmethod_ `check_perm(bot, event)` - - -* **说明** - - 检查是否满足触发权限 - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: 上报事件 - - - -* **返回** - - - * `bool`: 是否满足权限 - - - -### _async classmethod_ `check_rule(bot, event, state)` - - -* **说明** - - 检查是否满足匹配规则 - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: 上报事件 - - - * `state: T_State`: 当前状态 - - - -* **返回** - - - * `bool`: 是否满足匹配规则 - - - -### _classmethod_ `args_parser(func)` - - -* **说明** - - 装饰一个函数来更改当前事件响应器的默认参数解析函数 - - - -* **参数** - - - * `func: T_ArgsParser`: 参数解析函数 - - - -### _classmethod_ `type_updater(func)` - - -* **说明** - - 装饰一个函数来更改当前事件响应器的默认响应事件类型更新函数 - - - -* **参数** - - - * `func: T_TypeUpdater`: 响应事件类型更新函数 - - - -### _classmethod_ `permission_updater(func)` - - -* **说明** - - 装饰一个函数来更改当前事件响应器的默认会话权限更新函数 - - - -* **参数** - - - * `func: T_PermissionUpdater`: 会话权限更新函数 - - - -### _classmethod_ `handle()` - - -* **说明** - - 装饰一个函数来向事件响应器直接添加一个处理函数 - - - -* **参数** - - - * 无 - - - -### _classmethod_ `receive()` - - -* **说明** - - 装饰一个函数来指示 NoneBot 在接收用户新的一条消息后继续运行该函数 - - - -* **参数** - - - * 无 - - - -### _classmethod_ `got(key, prompt=None, args_parser=None)` - - -* **说明** - - 装饰一个函数来指示 NoneBot 当要获取的 `key` 不存在时接收用户新的一条消息并经过 `ArgsParser` 处理后再运行该函数，如果 `key` 已存在则直接继续运行 - - - -* **参数** - - - * `key: str`: 参数名 - - - * `prompt: Optional[Union[str, Message, MessageSegment]]`: 在参数不存在时向用户发送的消息 - - - * `args_parser: Optional[T_ArgsParser]`: 可选参数解析函数，空则使用默认解析函数 - - - -### _async classmethod_ `send(message, **kwargs)` - - -* **说明** - - 发送一条消息给当前交互用户 - - - -* **参数** - - - * `message: Union[str, Message, MessageSegment]`: 消息内容 - - - * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api - - - -### _async classmethod_ `finish(message=None, **kwargs)` - - -* **说明** - - 发送一条消息给当前交互用户并结束当前事件响应器 - - - -* **参数** - - - * `message: Union[str, Message, MessageSegment]`: 消息内容 - - - * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api - - - -### _async classmethod_ `pause(prompt=None, **kwargs)` - - -* **说明** - - 发送一条消息给当前交互用户并暂停事件响应器，在接收用户新的一条消息后继续下一个处理函数 - - - -* **参数** - - - * `prompt: Union[str, Message, MessageSegment]`: 消息内容 - - - * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api - - - -### _async classmethod_ `reject(prompt=None, **kwargs)` - - -* **说明** - - 发送一条消息给当前交互用户并暂停事件响应器，在接收用户新的一条消息后重新运行当前处理函数 - - - -* **参数** - - - * `prompt: Union[str, Message, MessageSegment]`: 消息内容 - - - * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api - - - -### `stop_propagation()` - - -* **说明** - - 阻止事件传播 diff --git a/archive/2.0.0a13.post1/api/message.md b/archive/2.0.0a13.post1/api/message.md deleted file mode 100644 index 5bd6c332..00000000 --- a/archive/2.0.0a13.post1/api/message.md +++ /dev/null @@ -1,143 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.message 模块 - -## 事件处理 - -NoneBot 内部处理并按优先级分发事件给所有事件响应器，提供了多个插槽以进行事件的预处理等。 - - -## `event_preprocessor(func)` - - -* **说明** - - 事件预处理。装饰一个函数，使它在每次接收到事件并分发给各响应器之前执行。 - - - -* **参数** - - 事件预处理函数接收三个参数。 - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前 State - - - -## `event_postprocessor(func)` - - -* **说明** - - 事件后处理。装饰一个函数，使它在每次接收到事件并分发给各响应器之后执行。 - - - -* **参数** - - 事件后处理函数接收三个参数。 - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前事件运行前 State - - - -## `run_preprocessor(func)` - - -* **说明** - - 运行预处理。装饰一个函数，使它在每次事件响应器运行前执行。 - - - -* **参数** - - 运行预处理函数接收四个参数。 - - - * `matcher: Matcher`: 当前要运行的事件响应器 - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前 State - - - -## `run_postprocessor(func)` - - -* **说明** - - 运行后处理。装饰一个函数，使它在每次事件响应器运行后执行。 - - - -* **参数** - - 运行后处理函数接收五个参数。 - - - * `matcher: Matcher`: 运行完毕的事件响应器 - - - * `exception: Optional[Exception]`: 事件响应器运行错误（如果存在） - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前 State - - - -## _async_ `handle_event(bot, event)` - - -* **说明** - - 处理一个事件。调用该函数以实现分发事件。 - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -* **示例** - - -```python -import asyncio -asyncio.create_task(handle_event(bot, event)) -``` diff --git a/archive/2.0.0a13.post1/api/nonebot.md b/archive/2.0.0a13.post1/api/nonebot.md deleted file mode 100644 index 6ecd5e9d..00000000 --- a/archive/2.0.0a13.post1/api/nonebot.md +++ /dev/null @@ -1,278 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot 模块 - -## 快捷导入 - -为方便使用，`nonebot` 模块从子模块导入了部分内容 - - -* `on_message` => `nonebot.plugin.on_message` - - -* `on_notice` => `nonebot.plugin.on_notice` - - -* `on_request` => `nonebot.plugin.on_request` - - -* `on_metaevent` => `nonebot.plugin.on_metaevent` - - -* `on_startswith` => `nonebot.plugin.on_startswith` - - -* `on_endswith` => `nonebot.plugin.on_endswith` - - -* `on_keyword` => `nonebot.plugin.on_keyword` - - -* `on_command` => `nonebot.plugin.on_command` - - -* `on_shell_command` => `nonebot.plugin.on_shell_command` - - -* `on_regex` => `nonebot.plugin.on_regex` - - -* `CommandGroup` => `nonebot.plugin.CommandGroup` - - -* `Matchergroup` => `nonebot.plugin.MatcherGroup` - - -* `load_plugin` => `nonebot.plugin.load_plugin` - - -* `load_plugins` => `nonebot.plugin.load_plugins` - - -* `load_all_plugins` => `nonebot.plugin.load_all_plugins` - - -* `load_from_json` => `nonebot.plugin.load_from_json` - - -* `load_from_toml` => `nonebot.plugin.load_from_toml` - - -* `load_builtin_plugins` => `nonebot.plugin.load_builtin_plugins` - - -* `get_plugin` => `nonebot.plugin.get_plugin` - - -* `get_loaded_plugins` => `nonebot.plugin.get_loaded_plugins` - - -* `export` => `nonebot.plugin.export` - - -* `require` => `nonebot.plugin.require` - - -## `get_driver()` - - -* **说明** - - 获取全局 Driver 对象。可用于在计划任务的回调中获取当前 Driver 对象。 - - - -* **返回** - - - * `Driver`: 全局 Driver 对象 - - - -* **异常** - - - * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) - - - -* **用法** - - -```python -driver = nonebot.get_driver() -``` - - -## `get_app()` - - -* **说明** - - 获取全局 Driver 对应 Server App 对象。 - - - -* **返回** - - - * `Any`: Server App 对象 - - - -* **异常** - - - * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) - - - -* **用法** - - -```python -app = nonebot.get_app() -``` - - -## `get_asgi()` - - -* **说明** - - 获取全局 Driver 对应 Asgi 对象。 - - - -* **返回** - - - * `Any`: Asgi 对象 - - - -* **异常** - - - * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) - - - -* **用法** - - -```python -asgi = nonebot.get_asgi() -``` - - -## `get_bots()` - - -* **说明** - - 获取所有通过 ws 连接 NoneBot 的 Bot 对象。 - - - -* **返回** - - - * `Dict[str, Bot]`: 一个以字符串 ID 为键，Bot 对象为值的字典 - - - -* **异常** - - - * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) - - - -* **用法** - - -```python -bots = nonebot.get_bots() -``` - - -## `init(*, _env_file=None, **kwargs)` - - -* **说明** - - 初始化 NoneBot 以及 全局 Driver 对象。 - - NoneBot 将会从 .env 文件中读取环境信息，并使用相应的 env 文件配置。 - - 你也可以传入自定义的 _env_file 来指定 NoneBot 从该文件读取配置。 - - - -* **参数** - - - * `_env_file: Optional[str]`: 配置文件名，默认从 .env.{env_name} 中读取配置 - - - * `**kwargs`: 任意变量，将会存储到 Config 对象里 - - - -* **返回** - - - * `None` - - - -* **用法** - - -```python -nonebot.init(database=Database(...)) -``` - - -## `run(host=None, port=None, *args, **kwargs)` - - -* **说明** - - 启动 NoneBot，即运行全局 Driver 对象。 - - - -* **参数** - - - * `host: Optional[str]`: 主机名／IP，若不传入则使用配置文件中指定的值 - - - * `port: Optional[int]`: 端口，若不传入则使用配置文件中指定的值 - - - * `*args`: 传入 Driver.run 的位置参数 - - - * `**kwargs`: 传入 Driver.run 的命名参数 - - - -* **返回** - - - * `None` - - - -* **用法** - - -```python -nonebot.run(host="127.0.0.1", port=8080) -``` diff --git a/archive/2.0.0a13.post1/api/permission.md b/archive/2.0.0a13.post1/api/permission.md deleted file mode 100644 index 1c42b2c8..00000000 --- a/archive/2.0.0a13.post1/api/permission.md +++ /dev/null @@ -1,63 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.permission 模块 - -## 权限 - -每个 `Matcher` 拥有一个 `Permission` ，其中是 **异步** `PermissionChecker` 的集合，只要有一个 `PermissionChecker` 检查结果为 `True` 时就会继续运行。 - -:::tip 提示 -`PermissionChecker` 既可以是 async function 也可以是 sync function -::: - - -## `MESSAGE` - - -* **说明**: 匹配任意 `message` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 message type 的 Matcher。 - - -## `NOTICE` - - -* **说明**: 匹配任意 `notice` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 notice type 的 Matcher。 - - -## `REQUEST` - - -* **说明**: 匹配任意 `request` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 request type 的 Matcher。 - - -## `METAEVENT` - - -* **说明**: 匹配任意 `meta_event` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 meta_event type 的 Matcher。 - - -## `USER(*user, perm=)` - - -* **说明** - - 在白名单内且满足 perm - - - -* **参数** - - - * `*user: str`: 白名单 - - - * `perm: Permission`: 需要同时满足的权限 - - - -## `SUPERUSER` - - -* **说明**: 匹配任意超级用户消息类型事件 diff --git a/archive/2.0.0a13.post1/api/plugin.md b/archive/2.0.0a13.post1/api/plugin.md deleted file mode 100644 index ca0827ce..00000000 --- a/archive/2.0.0a13.post1/api/plugin.md +++ /dev/null @@ -1,1480 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.plugin 模块 - -## 插件 - -为 NoneBot 插件开发提供便携的定义函数。 - - -## `plugins` - - -* **类型** - - `Dict[str, Plugin]` - - - -* **说明** - - 已加载的插件 - - - -## _class_ `Plugin` - -基类：`object` - -存储插件信息 - - -### `name` - - -* **类型**: `str` - - -* **说明**: 插件名称，使用 文件/文件夹 名称作为插件名 - - -### `module` - - -* **类型**: `ModuleType` - - -* **说明**: 插件模块对象 - - -### `export` - - -* **类型**: `Export` - - -* **说明**: 插件内定义的导出内容 - - -### _property_ `matcher` - - -* **类型**: `Set[Type[Matcher]]` - - -* **说明**: 插件内定义的 `Matcher` - - -## `on(type='', rule=None, permission=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` - - -* **说明** - - 注册一个基础事件响应器，可自定义类型。 - - - -* **参数** - - - * `type: str`: 事件响应器类型 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_metaevent(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` - - -* **说明** - - 注册一个元事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_message(rule=None, permission=None, *, handlers=None, temp=False, priority=1, block=True, state=None, state_factory=None)` - - -* **说明** - - 注册一个消息事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_notice(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` - - -* **说明** - - 注册一个通知事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_request(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` - - -* **说明** - - 注册一个请求事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_startswith(msg, rule=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容开头时响应。 - - - -* **参数** - - - * `msg: str`: 指定消息开头内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_endswith(msg, rule=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容结尾时响应。 - - - -* **参数** - - - * `msg: str`: 指定消息结尾内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_keyword(keywords, rule=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息纯文本部分包含关键词时响应。 - - - -* **参数** - - - * `keywords: Set[str]`: 关键词列表 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_command(cmd, rule=None, aliases=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息以指定命令开头时响应。 - - 命令匹配规则参考: [命令形式匹配](rule.html#command-command) - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_shell_command(cmd, rule=None, aliases=None, parser=None, **kwargs)` - - -* **说明** - - 注册一个支持 `shell_like` 解析参数的命令消息事件响应器。 - - 与普通的 `on_command` 不同的是，在添加 `parser` 参数时, 响应器会自动处理消息。 - - 并将用户输入的原始参数列表保存在 `state["argv"]`, `parser` 处理的参数保存在 `state["args"]` 中 - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 - - - * `parser: Optional[ArgumentParser]`: `nonebot.rule.ArgumentParser` 对象 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_regex(pattern, flags=0, rule=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息匹配正则表达式时响应。 - - 命令匹配规则参考: [正则匹配](rule.html#regex-regex-flags-0) - - - -* **参数** - - - * `pattern: str`: 正则表达式 - - - * `flags: Union[int, re.RegexFlag]`: 正则匹配标志 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## _class_ `CommandGroup` - -基类：`object` - -命令组，用于声明一组有相同名称前缀的命令。 - - -### `__init__(cmd, **kwargs)` - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 - - - * `**kwargs`: 其他传递给 `on_command` 的参数默认值，参考 [on_command](#on-command-cmd-rule-none-aliases-none-kwargs) - - - -### `basecmd` - - -* **类型**: `Tuple[str, ...]` - - -* **说明**: 命令前缀 - - -### `base_kwargs` - - -* **类型**: `Dict[str, Any]` - - -* **说明**: 其他传递给 `on_command` 的参数默认值 - - -### `command(cmd, **kwargs)` - - -* **说明** - - 注册一个新的命令。 - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 - - - * `**kwargs`: 其他传递给 `on_command` 的参数，将会覆盖命令组默认值 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `shell_command(cmd, **kwargs)` - - -* **说明** - - 注册一个新的命令。 - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 - - - * `**kwargs`: 其他传递给 `on_command` 的参数，将会覆盖命令组默认值 - - - -* **返回** - - - * `Type[Matcher]` - - - -## _class_ `MatcherGroup` - -基类：`object` - -事件响应器组合，统一管理。为 `Matcher` 创建提供默认属性。 - - -### `__init__(**kwargs)` - - -* **说明** - - 创建一个事件响应器组合，参数为默认值，与 `on` 一致 - - - -### `matchers` - - -* **类型** - - `List[Type[Matcher]]` - - - -* **说明** - - 组内事件响应器列表 - - - -### `base_kwargs` - - -* **类型**: `Dict[str, Any]` - - -* **说明**: 其他传递给 `on` 的参数默认值 - - -### `on(**kwargs)` - - -* **说明** - - 注册一个基础事件响应器，可自定义类型。 - - - -* **参数** - - - * `type: str`: 事件响应器类型 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_metaevent(**kwargs)` - - -* **说明** - - 注册一个元事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_message(**kwargs)` - - -* **说明** - - 注册一个消息事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_notice(**kwargs)` - - -* **说明** - - 注册一个通知事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_request(**kwargs)` - - -* **说明** - - 注册一个请求事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_startswith(msg, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容开头时响应。 - - - -* **参数** - - - * `msg: str`: 指定消息开头内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_endswith(msg, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容结尾时响应。 - - - -* **参数** - - - * `msg: str`: 指定消息结尾内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_keyword(keywords, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息纯文本部分包含关键词时响应。 - - - -* **参数** - - - * `keywords: Set[str]`: 关键词列表 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_command(cmd, aliases=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息以指定命令开头时响应。 - - 命令匹配规则参考: [命令形式匹配](rule.html#command-command) - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 - - - * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_shell_command(cmd, aliases=None, parser=None, **kwargs)` - - -* **说明** - - 注册一个支持 `shell_like` 解析参数的命令消息事件响应器。 - - 与普通的 `on_command` 不同的是，在添加 `parser` 参数时, 响应器会自动处理消息。 - - 并将用户输入的原始参数列表保存在 `state["argv"]`, `parser` 处理的参数保存在 `state["args"]` 中 - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 - - - * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 - - - * `parser: Optional[ArgumentParser]`: `nonebot.rule.ArgumentParser` 对象 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_regex(pattern, flags=0, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息匹配正则表达式时响应。 - - 命令匹配规则参考: [正则匹配](rule.html#regex-regex-flags-0) - - - -* **参数** - - - * `pattern: str`: 正则表达式 - - - * `flags: Union[int, re.RegexFlag]`: 正则匹配标志 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `load_plugin(module_path)` - - -* **说明** - - 使用 `PluginManager` 加载单个插件，可以是本地插件或是通过 `pip` 安装的插件。 - - - -* **参数** - - - * `module_path: str`: 插件名称 `path.to.your.plugin` - - - -* **返回** - - - * `Optional[Plugin]` - - - -## `load_plugins(*plugin_dir)` - - -* **说明** - - 导入目录下多个插件，以 `_` 开头的插件不会被导入！ - - - -* **参数** - - - * `*plugin_dir: str`: 插件路径 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `load_all_plugins(module_path, plugin_dir)` - - -* **说明** - - 导入指定列表中的插件以及指定目录下多个插件，以 `_` 开头的插件不会被导入！ - - - -* **参数** - - - * `module_path: Set[str]`: 指定插件集合 - - - * `plugin_dir: Set[str]`: 指定插件路径集合 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `load_from_json(file_path, encoding='utf-8')` - - -* **说明** - - 导入指定 json 文件中的 `plugins` 以及 `plugin_dirs` 下多个插件，以 `_` 开头的插件不会被导入！ - - - -* **参数** - - - * `file_path: str`: 指定 json 文件路径 - - - * `encoding: str`: 指定 json 文件编码 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `load_from_toml(file_path, encoding='utf-8')` - - -* **说明** - - 导入指定 toml 文件 `[nonebot.plugins]` 中的 `plugins` 以及 `plugin_dirs` 下多个插件， - 以 `_` 开头的插件不会被导入！ - - - -* **参数** - - - * `file_path: str`: 指定 toml 文件路径 - - - * `encoding: str`: 指定 toml 文件编码 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `load_builtin_plugins(name='echo')` - - -* **说明** - - 导入 NoneBot 内置插件 - - - -* **返回** - - - * `Plugin` - - - -## `get_plugin(name)` - - -* **说明** - - 获取当前导入的某个插件。 - - - -* **参数** - - - * `name: str`: 插件名，与 `load_plugin` 参数一致。如果为 `load_plugins` 导入的插件，则为文件(夹)名。 - - - -* **返回** - - - * `Optional[Plugin]` - - - -## `get_loaded_plugins()` - - -* **说明** - - 获取当前已导入的所有插件。 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `require(name)` - - -* **说明** - - 获取一个插件的导出内容 - - - -* **参数** - - - * `name: str`: 插件名，与 `load_plugin` 参数一致。如果为 `load_plugins` 导入的插件，则为文件(夹)名。 - - - -* **返回** - - - * `Optional[Export]` - - - -## _class_ `Export` - -基类：`dict` - - -* **说明** - - 插件导出内容以使得其他插件可以获得。 - - - -* **示例** - - -```python -nonebot.export().default = "bar" - -@nonebot.export() -def some_function(): - pass - -# this doesn't work before python 3.9 -# use -# export = nonebot.export(); @export.sub -# instead -# See also PEP-614: https://www.python.org/dev/peps/pep-0614/ -@nonebot.export().sub -def something_else(): - pass -``` - - -## `export()` - - -* **说明** - - 获取插件的导出内容对象 - - - -* **返回** - - - * `Export` diff --git a/archive/2.0.0a13.post1/api/rule.md b/archive/2.0.0a13.post1/api/rule.md deleted file mode 100644 index 5c3dfbed..00000000 --- a/archive/2.0.0a13.post1/api/rule.md +++ /dev/null @@ -1,266 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.rule 模块 - -## 规则 - -每个事件响应器 `Matcher` 拥有一个匹配规则 `Rule` ，其中是 **异步** `RuleChecker` 的集合，只有当所有 `RuleChecker` 检查结果为 `True` 时继续运行。 - -:::tip 提示 -`RuleChecker` 既可以是 async function 也可以是 sync function，但在最终会被 `nonebot.utils.run_sync` 转换为 async function -::: - - -## _class_ `Rule` - -基类：`object` - - -* **说明** - - `Matcher` 规则类，当事件传递时，在 `Matcher` 运行前进行检查。 - - - -* **示例** - - -```python -Rule(async_function) & sync_function -# 等价于 -from nonebot.utils import run_sync -Rule(async_function, run_sync(sync_function)) -``` - - -### `__init__(*checkers)` - - -* **参数** - - - * `*checkers: Callable[[Bot, Event, T_State], Awaitable[bool]]`: **异步** RuleChecker - - - -### `checkers` - - -* **说明** - - 存储 `RuleChecker` - - - -* **类型** - - - * `Set[Callable[[Bot, Event, T_State], Awaitable[bool]]]` - - - -### _async_ `__call__(bot, event, state)` - - -* **说明** - - 检查是否符合所有规则 - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前 State - - - -* **返回** - - - * `bool` - - - -## `startswith(msg)` - - -* **说明** - - 匹配消息开头 - - - -* **参数** - - - * `msg: str`: 消息开头字符串 - - - -## `endswith(msg)` - - -* **说明** - - 匹配消息结尾 - - - -* **参数** - - - * `msg: str`: 消息结尾字符串 - - - -## `keyword(*keywords)` - - -* **说明** - - 匹配消息关键词 - - - -* **参数** - - - * `*keywords: str`: 关键词 - - - -## `command(*cmds)` - - -* **说明** - - 命令形式匹配，根据配置里提供的 `command_start`, `command_sep` 判断消息是否为命令。 - - 可以通过 `state["_prefix"]["command"]` 获取匹配成功的命令（例：`("test",)`），通过 `state["_prefix"]["raw_command"]` 获取匹配成功的原始命令文本（例：`"/test"`）。 - - - -* **参数** - - - * `*cmds: Union[str, Tuple[str, ...]]`: 命令内容 - - - -* **示例** - - 使用默认 `command_start`, `command_sep` 配置 - - 命令 `("test",)` 可以匹配：`/test` 开头的消息 - 命令 `("test", "sub")` 可以匹配”`/test.sub` 开头的消息 - - -:::tip 提示 -命令内容与后续消息间无需空格！ -::: - - -## _class_ `ArgumentParser` - -基类：`argparse.ArgumentParser` - - -* **说明** - - `shell_like` 命令参数解析器，解析出错时不会退出程序。 - - - -## `shell_command(*cmds, parser=None)` - - -* **说明** - - 支持 `shell_like` 解析参数的命令形式匹配，根据配置里提供的 `command_start`, `command_sep` 判断消息是否为命令。 - - 可以通过 `state["_prefix"]["command"]` 获取匹配成功的命令（例：`("test",)`），通过 `state["_prefix"]["raw_command"]` 获取匹配成功的原始命令文本（例：`"/test"`）。 - - 可以通过 `state["argv"]` 获取用户输入的原始参数列表 - - 添加 `parser` 参数后, 可以自动处理消息并将结果保存在 `state["args"]` 中。 - - - -* **参数** - - - * `*cmds: Union[str, Tuple[str, ...]]`: 命令内容 - - - * `parser: Optional[ArgumentParser]`: `nonebot.rule.ArgumentParser` 对象 - - - -* **示例** - - 使用默认 `command_start`, `command_sep` 配置，更多示例参考 `argparse` 标准库文档。 - - -```python -from nonebot.rule import ArgumentParser - -parser = ArgumentParser() -parser.add_argument("-a", action="store_true") - -rule = shell_command("ls", parser=parser) -``` - -:::tip 提示 -命令内容与后续消息间无需空格！ -::: - - -## `regex(regex, flags=0)` - - -* **说明** - - 根据正则表达式进行匹配。 - - 可以通过 `state["_matched"]` `state["_matched_groups"]` `state["_matched_dict"]` - 获取正则表达式匹配成功的文本。 - - - -* **参数** - - - * `regex: str`: 正则表达式 - - - * `flags: Union[int, re.RegexFlag]`: 正则标志 - - -:::tip 提示 -正则表达式匹配使用 search 而非 match，如需从头匹配请使用 `r"^xxx"` 来确保匹配开头 -::: - - -## `to_me()` - - -* **说明** - - 通过 `event.is_tome()` 判断事件是否与机器人有关 - - - -* **参数** - - - * 无 diff --git a/archive/2.0.0a13.post1/api/typing.md b/archive/2.0.0a13.post1/api/typing.md deleted file mode 100644 index 756ef946..00000000 --- a/archive/2.0.0a13.post1/api/typing.md +++ /dev/null @@ -1,278 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.typing 模块 - -## 类型 - -下面的文档中，「类型」部分使用 Python 的 Type Hint 语法，见 [PEP 484](https://www.python.org/dev/peps/pep-0484/)、[PEP 526](https://www.python.org/dev/peps/pep-0526/) 和 [typing](https://docs.python.org/3/library/typing.html)。 - -除了 Python 内置的类型，下面还出现了如下 NoneBot 自定类型，实际上它们是 Python 内置类型的别名。 - -以下类型均可从 nonebot.typing 模块导入。 - - -## `T_State` - - -* **类型** - - `Dict[Any, Any]` - - - -* **说明** - - 事件处理状态 State 类型 - - - - -## `T_StateFactory` - - -* **类型** - - `Callable[[Bot, Event], Awaitable[T_State]]` - - - -* **说明** - - 事件处理状态 State 类工厂函数 - - - - -## `T_WebSocketConnectionHook` - - -* **类型** - - `Callable[[Bot], Awaitable[None]]` - - - -* **说明** - - WebSocket 连接建立时执行的函数 - - - - -## `T_WebSocketDisconnectionHook` - - -* **类型** - - `Callable[[Bot], Awaitable[None]]` - - - -* **说明** - - WebSocket 连接断开时执行的函数 - - - - -## `T_CallingAPIHook` - - -* **类型** - - `Callable[[Bot, str, Dict[str, Any]], Awaitable[None]]` - - - -* **说明** - - `bot.call_api` 时执行的函数 - - - - -## `T_CalledAPIHook` - - -* **类型** - - `Callable[[Bot, Optional[Exception], str, Dict[str, Any], Any], Awaitable[None]]` - - - -* **说明** - - `bot.call_api` 后执行的函数，参数分别为 bot, exception, api, data, result - - - - -## `T_EventPreProcessor` - - -* **类型** - - `Callable[[Bot, Event, T_State], Awaitable[None]]` - - - -* **说明** - - 事件预处理函数 EventPreProcessor 类型 - - - - -## `T_EventPostProcessor` - - -* **类型** - - `Callable[[Bot, Event, T_State], Awaitable[None]]` - - - -* **说明** - - 事件预处理函数 EventPostProcessor 类型 - - - - -## `T_RunPreProcessor` - - -* **类型** - - `Callable[[Matcher, Bot, Event, T_State], Awaitable[None]]` - - - -* **说明** - - 事件响应器运行前预处理函数 RunPreProcessor 类型 - - - - -## `T_RunPostProcessor` - - -* **类型** - - `Callable[[Matcher, Optional[Exception], Bot, Event, T_State], Awaitable[None]]` - - - -* **说明** - - 事件响应器运行前预处理函数 RunPostProcessor 类型，第二个参数为运行时产生的错误（如果存在） - - - - -## `T_RuleChecker` - - -* **类型** - - `Callable[[Bot, Event, T_State], Union[bool, Awaitable[bool]]]` - - - -* **说明** - - RuleChecker 即判断是否响应事件的处理函数。 - - - - -## `T_PermissionChecker` - - -* **类型** - - `Callable[[Bot, Event], Union[bool, Awaitable[bool]]]` - - - -* **说明** - - RuleChecker 即判断是否响应消息的处理函数。 - - - - -## `T_Handler` - - -* **类型** - - - * `Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - * `Callable[[Bot, Event], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - * `Callable[[Bot, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - * `Callable[[Bot], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - -* **说明** - - Handler 即事件的处理函数。 - - - - -## `T_ArgsParser` - - -* **类型** - - `Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - -* **说明** - - ArgsParser 即消息参数解析函数，在 Matcher.got 获取参数时被运行。 - - - - -## `T_TypeUpdater` - - -* **类型** - - `Callable[[Bot, Event, T_State, str], Awaitable[str]]` - - - -* **说明** - - TypeUpdater 在 Matcher.pause, Matcher.reject 时被运行，用于更新响应的事件类型。默认会更新为 `message`。 - - - - -## `T_PermissionUpdater` - - -* **类型** - - `Callable[[Bot, Event, T_State, Permission], Awaitable[Permission]]` - - - -* **说明** - - PermissionUpdater 在 Matcher.pause, Matcher.reject 时被运行，用于更新会话对象权限。默认会更新为当前事件的触发对象。 diff --git a/archive/2.0.0a13.post1/api/utils.md b/archive/2.0.0a13.post1/api/utils.md deleted file mode 100644 index ab3ea0c2..00000000 --- a/archive/2.0.0a13.post1/api/utils.md +++ /dev/null @@ -1,84 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.utils 模块 - - -## `escape_tag(s)` - - -* **说明** - - 用于记录带颜色日志时转义 `` 类型特殊标签 - - - -* **参数** - - - * `s: str`: 需要转义的字符串 - - - -* **返回** - - - * `str` - - - -## `run_sync(func)` - - -* **说明** - - 一个用于包装 sync function 为 async function 的装饰器 - - - -* **参数** - - - * `func: Callable[..., Any]`: 被装饰的同步函数 - - - -* **返回** - - - * `Callable[..., Awaitable[Any]]` - - - -## `logger_wrapper` - - -* **说明** - - -用于打印 adapter 的日志。 - - -* **Log 参数** - - - -* `level: Literal['WARNING', 'DEBUG', 'INFO']`: 日志等级 - - -* `message: str`: 日志信息 - - -* `exception: Optional[Exception]`: 异常信息 - - -## _class_ `DataclassEncoder` - -基类：`json.encoder.JSONEncoder` - - -* **说明** - - 在JSON序列化 `Message` (List[Dataclass]) 时使用的 `JSONEncoder` diff --git a/archive/2.0.0a13.post1/guide/README.md b/archive/2.0.0a13.post1/guide/README.md deleted file mode 100644 index 8aa8d271..00000000 --- a/archive/2.0.0a13.post1/guide/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# 概览 - - - -:::tip 提示 -初次使用时可能会觉得这里的概览过于枯燥，可以先简单略读之后直接前往 [安装](./installation.md) 查看安装方法，并进行后续的基础使用教程。 -::: - -NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人收到的事件进行解析和处理，并以插件化的形式，按优先级分发给事件所对应的事件响应器，来完成具体的功能。 - -除了起到解析事件的作用，NoneBot 还为插件提供了大量实用的预设操作和权限控制机制。对于命令处理，它更是提供了完善且易用的会话机制和内部调用机制，以分别适应命令的连续交互和插件内部功能复用等需求。 - -得益于 Python 的 [asyncio](https://docs.python.org/3/library/asyncio.html) 机制，NoneBot 处理事件的吞吐量有了很大的保障，再配合 WebSocket 通信方式（也是最建议的通信方式），NoneBot 的性能可以达到 HTTP 通信方式的两倍以上，相较于传统同步 I/O 的 HTTP 通信，更是有质的飞跃。 - -需要注意的是，NoneBot 仅支持 **Python 3.7+** - -## 特色 - -NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义**，并且可以作为插件进行**替换/添加**！ - -- 提供使用简易的脚手架 -- 提供丰富的官方插件 -- 提供可添加/替换的驱动以及协议选项 -- 基于异步 I/O -- 同时支持 HTTP 和反向 WebSocket 通信方式 -- 支持多个机器人账号负载均衡 -- 提供直观的交互式会话接口 -- 提供可自定义的权限控制机制 -- 多种方式渲染要发送的消息内容，使对话足够自然 diff --git a/archive/2.0.0a13.post1/guide/basic-configuration.md b/archive/2.0.0a13.post1/guide/basic-configuration.md deleted file mode 100644 index 4bb33f4f..00000000 --- a/archive/2.0.0a13.post1/guide/basic-configuration.md +++ /dev/null @@ -1,86 +0,0 @@ -# 基本配置 - -到目前为止我们还在使用 NoneBot 的默认行为，在开始编写自己的插件之前，我们先尝试在配置文件上动动手脚，让 NoneBot 表现出不同的行为。 - -在上一章节中，我们创建了默认的项目结构，其中 `.env` 和 `.env.*` 均为项目的配置文件，下面将介绍几种 NoneBot 配置方式。 - -:::danger 警告 -请勿将敏感信息写入配置文件并提交至开源仓库！ -::: - -## .env 文件 - -NoneBot 在启动时将会从系统环境变量或者 `.env` 文件中寻找变量 `ENVIRONMENT` (大小写不敏感)，默认值为 `prod`。 -这将引导 NoneBot 从系统环境变量或者 `.env.{ENVIRONMENT}` 文件中进一步加载具体配置。 - -`.env` 文件是基础环境配置文件，该文件中的配置项在不同环境下都会被加载，但会被 `.env.{ENVIRONMENT}` 文件中的配置所覆盖。 - -现在，我们在 `.env` 文件中写入当前环境信息： - -```bash -# .env -ENVIRONMENT=dev -CUSTOM_CONFIG=common config # 这个配置项在任何环境中都会被加载 -``` - -如你所想，之后 NoneBot 就会从 `.env.dev` 文件中加载环境变量。 - -## .env.\* 文件 - -NoneBot 使用 [pydantic](https://pydantic-docs.helpmanual.io/) 进行配置管理，会从 `.env.{ENVIRONMENT}` 文件中获悉环境配置。 - -可以在 NoneBot 初始化时指定加载某个环境配置文件: `nonebot.init(_env_file=".env.dev")`，这将忽略你在 `.env` 中设置的 `ENVIRONMENT` 。 - -:::warning 提示 -由于 `pydantic` 使用 JSON 解析配置项，请确保配置项值为 JSON 格式的数据。如： - -```bash -list=["123456789", "987654321", 1] -test={"hello": "world"} -``` - -如果配置项值解析失败将作为字符串处理。 -::: - -示例及说明： - -```bash -HOST=0.0.0.0 # 配置 NoneBot 监听的 IP/主机名 -PORT=8080 # 配置 NoneBot 监听的端口 -DEBUG=true # 开启 debug 模式 **请勿在生产环境开启** -SUPERUSERS=["123456789", "987654321"] # 配置 NoneBot 超级用户 -NICKNAME=["awesome", "bot"] # 配置机器人的昵称 -COMMAND_START=["/", ""] # 配置命令起始字符 -COMMAND_SEP=["."] # 配置命令分割字符 - -# Custom Configs -CUSTOM_CONFIG1="config in env file" -CUSTOM_CONFIG2= # 留空则从系统环境变量读取，如不存在则为空字符串 -``` - -详细的配置项参考 [Config Reference](../api/config.md) 。 - -## 系统环境变量 - -如果在系统环境变量中定义了配置，则一样会被读取。 - -## bot.py 文件 - -配置项也可以在 NoneBot 初始化时传入。此处可以传入任意合法 Python 变量。当然也可以在初始化完成后修改或新增。 - -示例： - -```python -# bot.py -import nonebot - -nonebot.init(custom_config3="config on init") - -config = nonebot.get_driver().config -config.custom_config3 = "changed after init" -config.custom_config4 = "new config after init" -``` - -## 优先级 - -`bot.py` 文件( `nonebot.init` ) > 系统环境变量 > `.env` `.env.*` 文件 diff --git a/archive/2.0.0a13.post1/guide/cqhttp-guide.md b/archive/2.0.0a13.post1/guide/cqhttp-guide.md deleted file mode 100644 index 867eb56f..00000000 --- a/archive/2.0.0a13.post1/guide/cqhttp-guide.md +++ /dev/null @@ -1,107 +0,0 @@ -# CQHTTP 协议使用指南 - -## 安装 NoneBot CQHTTP 适配器 - -```bash -pip install nonebot-adapter-cqhttp -``` - -## 配置 CQHTTP 协议端（以 QQ 为例） - -单纯运行 NoneBot 实例并不会产生任何效果，因为此刻 QQ 这边还不知道 NoneBot 的存在，也就无法把消息发送给它，因此现在需要使用一个无头 QQ 来把消息等事件上报给 NoneBot。 - -QQ 协议端举例: - -- [go-cqhttp](https://github.com/Mrs4s/go-cqhttp) (基于 [MiraiGo](https://github.com/Mrs4s/MiraiGo)) -- [cqhttp-mirai-embedded](https://github.com/yyuueexxiinngg/cqhttp-mirai/tree/embedded) -- [Mirai](https://github.com/mamoe/mirai) + [cqhttp-mirai](https://github.com/yyuueexxiinngg/cqhttp-mirai) -- [Mirai](https://github.com/mamoe/mirai) + [Mirai Native](https://github.com/iTXTech/mirai-native) + [CQHTTP](https://github.com/richardchien/coolq-http-api) -- [OICQ-http-api](https://github.com/takayama-lily/onebot) (基于 [OICQ](https://github.com/takayama-lily/oicq)) - -这里以 [go-cqhttp](https://github.com/Mrs4s/go-cqhttp) 为例 - -1. 下载 go-cqhttp 对应平台的 release 文件，[点此前往](https://github.com/Mrs4s/go-cqhttp/releases) -2. 运行 exe 文件或者使用 `./go-cqhttp` 启动 -3. 生成默认配置文件并修改默认配置 - -```hjson{2,3,35-36,42} -{ - uin: 机器人QQ号 - password: 机器人密码 - encrypt_password: false - password_encrypted: "" - enable_db: true - access_token: "" - relogin: { - enabled: true - relogin_delay: 3 - max_relogin_times: 0 - } - _rate_limit: { - enabled: false - frequency: 1 - bucket_size: 1 - } - ignore_invalid_cqcode: false - force_fragmented: false - heartbeat_interval: 0 - http_config: { - enabled: false - host: "0.0.0.0" - port: 5700 - timeout: 0 - post_urls: {} - } - ws_config: { - enabled: false - host: "0.0.0.0" - port: 6700 - } - ws_reverse_servers: [ - { - enabled: true - reverse_url: ws://127.0.0.1:8080/cqhttp/ws - reverse_api_url: ws://you_websocket_api.server - reverse_event_url: ws://you_websocket_event.server - reverse_reconnect_interval: 3000 - } - ] - post_message_format: array - use_sso_address: false - debug: false - log_level: "" - web_ui: { - enabled: false - host: 127.0.0.1 - web_ui_port: 9999 - web_input: false - } -} -``` - -其中 `ws://127.0.0.1:8080/cqhttp/ws` 中的 `127.0.0.1` 和 `8080` 应分别对应 nonebot 配置的 HOST 和 PORT。 - -`cqhttp` 是前述 `register_adapter` 时传入的第一个参数，代表设置的 `CQHTTPBot` 适配器的路径，你可以对不同的适配器设置不同路径以作区别。 - -## 历史性的第一次对话 - -一旦新的配置文件正确生效之后，NoneBot 所在的控制台（如果正在运行的话）应该会输出类似下面的内容（两条访问日志）： - -```default -09-14 21:31:16 [INFO] uvicorn | ('127.0.0.1', 12345) - "WebSocket /cqhttp/ws" [accepted] -09-14 21:31:16 [INFO] nonebot | WebSocket Connection from CQHTTP Bot 你的QQ号 Accepted! -``` - -这表示 CQHTTP 协议端已经成功地使用 CQHTTP 协议连接上了 NoneBot。 - -现在，尝试向你的机器人账号发送如下内容： - -```default -/echo 你好，世界 -``` - -到这里如果一切 OK，你应该会收到机器人给你回复了 `你好，世界`。这一历史性的对话标志着你已经成功地运行了一个 NoneBot 的最小实例，开始了编写更强大的 QQ 机器人的创意之旅！ - - - - diff --git a/archive/2.0.0a13.post1/guide/creating-a-handler.md b/archive/2.0.0a13.post1/guide/creating-a-handler.md deleted file mode 100644 index 723aeeff..00000000 --- a/archive/2.0.0a13.post1/guide/creating-a-handler.md +++ /dev/null @@ -1,197 +0,0 @@ -# 事件处理 - -在上一章中，我们已经注册了事件响应器，现在我们可以正式编写事件处理逻辑了！ - -## [事件处理函数](../api/typing.md#handler) - -```python{1,2,8,9} -@weather.handle() -async def handle_first_receive(bot: Bot, event: Event, state: T_State): - args = str(event.get_message()).strip() # 首次发送命令时跟随的参数，例：/天气 上海，则args为上海 - if args: - state["city"] = args # 如果用户发送了参数则直接赋值 - - -@weather.got("city", prompt="你想查询哪个城市的天气呢？") -async def handle_city(bot: Bot, event: Event, state: T_State): - city = state["city"] - if city not in ["上海", "北京"]: - await weather.reject("你想查询的城市暂不支持，请重新输入！") - city_weather = await get_weather(city) - await weather.finish(city_weather) -``` - -在之前的样例中，我们定义了两个函数 `handle_first_receive`, `handle_city`，他们被事件响应器的装饰器装饰从而成为事件响应器的事件处理函数。 - -:::tip 提示 -在事件响应器中，事件处理函数是**顺序**执行的！ -::: - -### 添加一个事件处理函数 - -事件响应器提供了三种装饰事件处理函数的装饰器，分别是： - -1. [handle()](../api/matcher.md#classmethod-handle) -2. [receive()](../api/matcher.md#classmethod-receive) -3. [got(key, prompt, args_parser)](../api/matcher.md#classmethod-got-key-prompt-none-args-parser-none) - -#### handle() - -简单的为事件响应器添加一个事件处理函数，这个函数将会在上一个处理函数正常返回执行完毕后立即执行。 - -#### receive() - -指示 NoneBot 接收一条新的用户消息后继续执行该处理函数。此时函数将会接收到新的消息而非前一条消息，之前相关信息可以存储在 state 中。 - -特别的，当装饰的函数前没有其他事件处理函数，那么 `receive()` 不会接收一条新的消息而是直接使用第一条接收到的消息。 - -#### got(key, prompt, args_parser) - -指示 NoneBot 当 `state` 中不存在 `key` 时向用户发送 `prompt` 等待用户回复并赋值给 `state[key]`。 - -`prompt` 可以为 `str`, `Message`, `MessageSegment`，若为空则不会向用户发送，若不为空则会在 format 之后发送，即 `prompt.format(**state)`，注意对 `{}` 进行转义。示例： - -```python -@matcher.receive() -async def handle(bot: Bot, event: Event, state: T_State): - state["key"] = "hello" - - -@matcher.got("key2", prompt="{key}!") -async def handle2(bot: Bot, event: Event, state: T_State): - pass -``` - -`args_parser` 为参数处理函数，在这里传入一个新的函数以覆盖默认的参数处理。详情参照 [args_parser](#参数处理函数-args-parser) - -特别的，这些装饰器都可以套娃使用： - -```python -@matcher.got("key1") -@matcher.got("key2") -async def handle(bot: Bot, event: Event, state: T_State): - pass -``` - -### 事件处理函数参数 - -事件处理函数类型为： - -- `Callable[[Bot, Event, T_State, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, Event, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, T_State, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, Event], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot], Union[Awaitable[None], Awaitable[NoReturn]]]` - -简单说就是：除了 `bot` 参数，其他都是可选的。 - -以下函数都是合法的事件处理函数（仅列举常用的）： - -```python -async def handle(bot: Bot, event: Event, state: T_State): - pass - -async def handle(bot: Bot, event: Event, state: T_State, matcher: Matcher): - pass - -async def handle(bot: Bot, event: Event): - pass - -async def handle(bot: Bot, state: T_State): - pass - -async def handle(bot: Bot): - pass -``` - -:::danger 警告 -函数的参数名固定不能修改！ -::: - -参数分别为： - -1. [nonebot.adapters.Bot](../api/adapters/#class-bot): 即事件上报连接对应的 Bot 对象，为 BaseBot 的子类。特别注意，此处的类型注释可以替换为指定的 Bot 类型，例如：`nonebot.adapters.cqhttp.Bot`，只有在上报事件的 Bot 类型与类型注释相符时才会执行该处理函数！可用于多平台进行不同的处理。 -2. [nonebot.adapters.Event](../api/adapters/#class-event): 即上报事件对象，可以获取到上报的所有信息。 -3. [state](../api/typing.md#t-state): 状态字典，可以存储任意的信息，其中还包含一些特殊的值以获取 NoneBot 内部处理时的一些信息，如： - -- `state["_current_key"]`: 存储当前 `got` 获取的参数名 -- `state["_prefix"]`, `state["_suffix"]`: 存储当前 TRIE 匹配的前缀/后缀，可以通过该值获取用户命令的原始命令 - -:::tip 提示 -NoneBot 会对不同类型的参数进行不同的操作，详情查看 [事件处理函数重载](../advanced/overloaded-handlers.md) -::: - -### 参数处理函数 args_parser - -在使用 `got` 获取用户输入参数时，需要对用户的消息进行处理以转换为我们所需要的信息。在默认情况下，NoneBot 会把用户的消息字符串原封不动的赋值给 `state[key]` 。可以通过以下两种方式修改默认处理逻辑： - -- `@matcher.args_parser` 装饰器：直接装饰一个函数作为参数处理器 -- `got(key, prompt, args_parser)`：直接把函数作为参数传入 - -参数处理函数类型为：`Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]`，即： - -```python -async def parser(bot: Bot, event: Event, state: T_State): - state[state["_current_key"]] = str(event.get_message()) -``` - -特别的，`state["_current_key"]` 中存储了当前获取的参数名 - -### 逻辑控制 - -NoneBot 也为事件处理函数提供了一些便捷的逻辑控制函数： - -#### `matcher.send` - -这个函数用于发送一条消息给当前交互的用户。~~其实这并不是一个逻辑控制函数，只是不知道放在哪里……~~ - -#### `matcher.pause` - -这个函数用于结束当前事件处理函数，强制接收一条新的消息再运行**下一个消息处理函数**。 - -#### `matcher.reject` - -这个函数用于结束当前事件处理函数，强制接收一条新的消息再**再次运行当前消息处理函数**。常用于用户输入信息不符合预期。 - -#### `matcher.finish` - -这个函数用于直接结束当前事件处理。 - -以上三个函数都拥有一个参数 `message` / `prompt`，用于向用户发送一条消息。以及 `**kwargs` 直接传递给 `bot.send` 的额外参数。 - -## 常用事件处理结构 - -```python -matcher = on_command("test") - -# 修改默认参数处理 -@matcher.args_parser -async def parse(bot: Bot, event: Event, state: T_State): - print(state["_current_key"], ":", str(event.get_message())) - state[state["_current_key"]] = str(event.get_message()) - -@matcher.handle() -async def first_receive(bot: Bot, event: Event, state: T_State): - # 获取用户原始命令，如：/test - print(state["_prefix"]["raw_command"]) - # 处理用户输入参数，如：/test arg1 arg2 - raw_args = str(event.get_message()).strip() - if raw_args: - arg_list = raw_args.split() - # 将参数存入state以阻止后续再向用户询问参数 - state["arg1"] = arg_list[0] - - -@matcher.got("arg1", prompt="参数？") -async def arg_handle(bot: Bot, event: Event, state: T_State): - # 在这里对参数进行验证 - if state["arg1"] not in ["allow", "list"]: - await matcher.reject("参数不正确！请重新输入") - # 发送一些信息 - await bot.send(event, "message") - await matcher.send("message") - await matcher.finish("message") -``` diff --git a/archive/2.0.0a13.post1/guide/creating-a-matcher.md b/archive/2.0.0a13.post1/guide/creating-a-matcher.md deleted file mode 100644 index 61a5143d..00000000 --- a/archive/2.0.0a13.post1/guide/creating-a-matcher.md +++ /dev/null @@ -1,148 +0,0 @@ -# 注册事件响应器 - -好了，现在插件已经创建完毕，我们可以开始编写实际代码了，下面将以一个简易单文件天气查询插件为例。 - -在插件目录下 `weather.py` 中添加如下代码： - -```python -from nonebot import on_command -from nonebot.rule import to_me -from nonebot.typing import T_State -from nonebot.adapters import Bot, Event - -weather = on_command("天气", rule=to_me(), priority=5) - - -@weather.handle() -async def handle_first_receive(bot: Bot, event: Event, state: T_State): - args = str(event.get_message()).strip() # 首次发送命令时跟随的参数，例：/天气 上海，则args为上海 - if args: - state["city"] = args # 如果用户发送了参数则直接赋值 - - -@weather.got("city", prompt="你想查询哪个城市的天气呢？") -async def handle_city(bot: Bot, event: Event, state: T_State): - city = state["city"] - if city not in ["上海", "北京"]: - await weather.reject("你想查询的城市暂不支持，请重新输入！") - city_weather = await get_weather(city) - await weather.finish(city_weather) - - -async def get_weather(city: str): - return f"{city}的天气是..." -``` - -为了简单起见，我们在这里的例子中没有接入真实的天气数据，但要接入也非常简单，你可以使用中国天气网、和风天气等网站提供的 API。 - -接下来我们来说明这段代码是如何工作的。 - -:::tip 提示 -从这里开始，你需要对 Python 的 asyncio 编程有所了解，因为 NoneBot 是完全基于 asyncio 的，具体可以参考 [廖雪峰的 Python 教程](https://www.liaoxuefeng.com/wiki/1016959663602400/1017959540289152) -::: - -## [事件响应器](../api/matcher.md) - -```python{5} -from nonebot import on_command -from nonebot.rule import to_me -from nonebot.permission import Permission - -weather = on_command("天气", rule=to_me(), permission=Permission(), priority=5) -``` - -在上方代码中，我们注册了一个事件响应器 `Matcher`，它由几个部分组成： - -1. `on_command` 注册一个消息类型的命令处理器 -2. `"天气"` 指定 command 参数 - 命令名 -3. `rule` 补充事件响应器的匹配规则 -4. `priority` 事件响应器优先级 -5. `block` 是否阻止事件传递 - -其他详细配置可以参考 API 文档，下面我们详细说明各个部分： - -### 事件响应器类型 type - -事件响应器类型其实就是对应事件的类型 `Event.get_type()` ，NoneBot 提供了一个基础类型事件响应器 `on()` 以及一些其他内置的事件响应器。 - -以下所有类型的事件响应器都是由 `on(type, rule)` 的形式进行了简化封装。 - -- `on("事件类型")`: 基础事件响应器，第一个参数为事件类型，空字符串表示不限 -- `on_metaevent()` ~ `on("meta_event")`: 元事件响应器 -- `on_message()` ~ `on("message")`: 消息事件响应器 -- `on_request()` ~ `on("request")`: 请求事件响应器 -- `on_notice()` ~ `on("notice")`: 通知事件响应器 -- `on_startswith(str)` ~ `on("message", startswith(str))`: 消息开头匹配响应器，参考 [startswith](../api/rule.md#startswith-msg) -- `on_endswith(str)` ~ `on("message", endswith(str))`: 消息结尾匹配响应器，参考 [endswith](../api/rule.md#endswith-msg) -- `on_keyword(set)` ~ `on("message", keyword(str))`: 消息关键词匹配响应器，参考 [keyword](../api/rule.md#keyword-keywords) -- `on_command(str|tuple)` ~ `on("message", command(str|tuple))`: 命令响应器，参考 [command](../api/rule.md#command-cmds) -- `on_regex(pattern_str)` ~ `on("message", regex(pattern_str))`: 正则匹配处理器，参考 [regex](../api/rule.md#regex-regex-flags-0) - -### 匹配规则 rule - -事件响应器的匹配规则即 `Rule`，详细内容在下方介绍。[直达](#自定义-rule) - -### 优先级 priority - -事件响应器的优先级代表事件响应器的执行顺序，同一优先级的事件响应器会 **同时执行！**，优先级数字**越小**越先响应！优先级请从 `1` 开始排序！ - -:::tip 提示 -使用 `nonebot-plugin-test` 可以在网页端查看当前所有事件响应器的执行流程，有助理解事件响应流程！ - -```bash -nb plugin install nonebot_plugin_test -``` - -::: - -### 阻断 block - -当有任意事件响应器发出了阻止事件传递信号时，该事件将不再会传递给下一优先级，直接结束处理。 - -NoneBot 内置的事件响应器中，所有 `message` 类的事件响应器默认会阻断事件传递，其他则不会。 - -在部分情况中，可以使用 `matcher.stop_propagation()` 方法动态阻止事件传播，该方法需要 `handler` 在参数中获取 `matcher` 实例后调用方法。 - -## 自定义 rule - -rule 的出现使得 nonebot 对事件的响应可以非常自由，nonebot 内置了一些规则： - -- [startswith(msg)](../api/rule.md#startswith-msg) -- [endswith(msg)](../api/rule.md#endswith-msg) -- [keyword(\*keywords)](../api/rule.md#keyword-keywords) -- [command(\*cmds)](../api/rule.md#command-cmds) -- [regex(regex, flag)](../api/rule.md#regex-regex-flags-0) - -以上规则都是返回类型为 `Rule` 的函数，`Rule` 由非负个 `RuleChecker` 组成，当所有 `RuleChecker` 返回 `True` 时匹配成功。这些 `Rule`, `RuleChecker` 的形式如下： - -```python -from nonebot.rule import Rule -from nonebot.typing import T_State - -async def async_checker(bot: Bot, event: Event, state: T_State) -> bool: - return True - -def sync_checker(bot: Bot, event: Event, state: T_State) -> bool: - return True - -def check(arg1, arg2): - - async def _checker(bot: Bot, event: Event, state: T_State) -> bool: - return bool(arg1 + arg2) - - return Rule(_checker) -``` - -`Rule` 和 `RuleChecker` 之间可以使用 `与 &` 互相组合： - -```python -from nonebot.rule import Rule - -Rule(async_checker1) & sync_checker & async_checker2 -``` - -**_请勿将事件处理的逻辑写入 `rule` 中，这会使得事件处理返回奇怪的响应。_** - -:::danger 警告 -`Rule(*checkers)` 只接受 async function，或使用 `nonebot.utils.run_sync` 自行包裹 sync function。在使用 `与 &` 时，NoneBot 会自动包裹 sync function -::: diff --git a/archive/2.0.0a13.post1/guide/creating-a-plugin.md b/archive/2.0.0a13.post1/guide/creating-a-plugin.md deleted file mode 100644 index 5ce12a28..00000000 --- a/archive/2.0.0a13.post1/guide/creating-a-plugin.md +++ /dev/null @@ -1,119 +0,0 @@ -# 创建插件 - -如果之前使用 `nb-cli` 生成了项目结构，那我们已经有了一个空的插件目录 `Awesome-Bot/awesome_bot/plugins`，并且它已在 `bot.py` 中被加载，我们现在可以开始创建插件了！ - -使用 `nb-cli` 创建包形式插件，或自行创建文件(夹) - -```bash -nb plugin new -``` - -插件通常有两种形式，下面分别介绍 - -## 单文件形式 - -在插件目录下创建名为 `foo.py` 的 Python 文件，暂时留空，此时目录结构如下： - - -:::vue -AweSome-Bot -├── awesome_bot -│ └── plugins -│ └── `foo.py` -├── .env -├── .env.dev -├── .env.prod -├── .gitignore -├── bot.py -├── docker-compose.yml -├── Dockerfile -├── pyproject.toml -└── README.md -::: - - -这个时候它已经可以被称为一个插件了，尽管它还什么都没做。 - -## 包形式(推荐) - -在插件目录下创建文件夹 `foo`，并在该文件夹下创建文件 `__init__.py`，此时目录结构如下： - - -:::vue -AweSome-Bot -├── awesome_bot -│ └── plugins -│ └── `foo` -│ └── `__init__.py` -├── .env -├── .env.dev -├── .env.prod -├── .gitignore -├── bot.py -├── docker-compose.yml -├── Dockerfile -├── pyproject.toml -└── README.md -::: - - -这个时候 `foo` 就是一个合法的 Python 包了，同时也是合法的 NoneBot 插件，插件内容可以在 `__init__.py` 中编写。 - -### 推荐结构(仅供参考) - - -:::vue -foo -├── `__init__.py` -├── `config.py` -├── `data_source.py` -└── `model.py` -::: - - -#### \_\_init\_\_.py - -在该文件中编写各类事件响应及处理逻辑。 - -#### config.py - -在该文件中使用 `pydantic` 定义插件所需要的配置项以及类型。 - -示例： - -```python -from pydantic import BaseSettings - - -class Config(BaseSettings): - - # plugin custom config - plugin_setting: str = "default" - - class Config: - extra = "ignore" -``` - -并在 `__init__.py` 文件中添加以下行 - -```python -import nonebot -from .config import Config - -global_config = nonebot.get_driver().config -plugin_config = Config(**global_config.dict()) -``` - -此时就可以通过 `plugin_config.plugin_setting` 获取到插件所需要的配置项了。 - -#### data_source.py - -在该文件中编写数据获取函数。 - -:::warning 警告 -数据获取应尽量使用**异步**处理！例如使用 [httpx](https://www.python-httpx.org/) 而非 [requests](https://requests.readthedocs.io/en/master/) -::: - -#### model.py - -在该文件中编写数据库模型。 diff --git a/archive/2.0.0a13.post1/guide/creating-a-project.md b/archive/2.0.0a13.post1/guide/creating-a-project.md deleted file mode 100644 index 6fbf114b..00000000 --- a/archive/2.0.0a13.post1/guide/creating-a-project.md +++ /dev/null @@ -1,57 +0,0 @@ -# 创建一个完整的项目 - -上一章中我们已经运行了一个简单的 NoneBot 实例，在这一章，我们将从零开始一个完整的项目。 - -## 目录结构 - -可以使用 `nb-cli` 或者自行创建完整的项目目录： - -```bash -nb create -``` - - -:::vue -AweSome-Bot -├── `awesome_bot` _(**或是 src**)_ -│ └── `plugins` -├── `.env` _(**可选的**)_ -├── `.env.dev` _(**可选的**)_ -├── `.env.prod` _(**可选的**)_ -├── .gitignore -├── `bot.py` -├── docker-compose.yml -├── Dockerfile -├── `pyproject.toml` -└── README.md -::: - - -- `awesome_bot/plugins` 或 `src/plugins`: 用于存放编写的 bot 插件 -- `.env`, `.env.dev`, `.env.prod`: 各环境配置文件 -- `bot.py`: bot 入口文件 -- `pyproject.toml`: 项目依赖管理文件，默认使用 [poetry](https://python-poetry.org/) - -## 启动 Bot - -:::warning 提示 -如果您使用如 `VSCode` / `PyCharm` 等 IDE 启动 nonebot，请检查 IDE 当前工作空间目录是否与当前侧边栏打开目录一致。 - -* 在二者不一致的环境下可能导致 nonebot 读取配置文件和插件等不符合预期 -::: - -通过 `nb-cli` - -```bash -nb run [--file=bot.py] [--app=app] -``` - -或 - -```bash -python bot.py -``` - -:::tip 提示 -如果在 bot 入口文件内定义了 asgi server， `nb-cli` 将会为你启动**冷重载模式**（当文件发生变动时自动重启 NoneBot 实例） -::: diff --git a/archive/2.0.0a13.post1/guide/ding-guide.md b/archive/2.0.0a13.post1/guide/ding-guide.md deleted file mode 100644 index cb710d26..00000000 --- a/archive/2.0.0a13.post1/guide/ding-guide.md +++ /dev/null @@ -1,181 +0,0 @@ -# 钉钉机器人使用指南 - -基于企业机器人的 outgoing（回调）机制，用户@机器人之后，钉钉会将消息内容 POST 到开发者的消息接收地址。开发者解析出消息内容、发送者身份，根据企业的业务逻辑，组装响应的消息内容返回，钉钉会将响应内容发送到群里。 - -::: warning 只有企业内部机器人支持接收消息 -普通的机器人尚不支持应答机制，该机制指的是群里成员在聊天@机器人的时候，钉钉回调指定的服务地址，即 Outgoing 机器人。 -::: - -首先你需要有钉钉机器人的相关概念，请参阅相关文档： - -- [群机器人概述](https://developers.dingtalk.com/document/app/overview-of-group-robots) -- [开发企业内部机器人](https://developers.dingtalk.com/document/app/develop-enterprise-internal-robots) - -钉钉官方机器人教程（Java）： - -- [开发一个钉钉机器人](https://developers.dingtalk.com/document/tutorial/create-a-robot) - -## 安装 NoneBot 钉钉 适配器 - -```bash -pip install nonebot-adapter-ding -``` - -## 关于 DingAdapter 的说明 - -你需要显式的注册 ding 这个适配器： - -```python{2,6} -import nonebot -from nonebot.adapters.ding import Bot as DingBot - -nonebot.init() -driver = nonebot.get_driver() -driver.register_adapter("ding", DingBot) -nonebot.load_builtin_plugins() - -if __name__ == "__main__": - nonebot.run() -``` - -注册适配器的目的是将 `/ding` 这个路径挂载到程序上，并且和 DingBot 适配器关联起来。之后钉钉把收到的消息回调到 `http://xx.xxx.xxx.xxx:{port}/ding` 时，Nonebot 才知道要用什么适配器去处理该消息。 - -## 第一个命令 - -因为 Nonebot 可以根据你的命令处理函数的类型注解来选择使用什么 Adapter 进行处理，所以你如果需要使用钉钉相关的功能，你的 handler 中 `bot` 类型的注解需要是 DingBot 及其父类。 - -对于 Event 来说也是如此，Event 也可以根据标注来判断，比如一个 handler 的 event 标注位 `PrivateMessageEvent`，那这个 handler 只会处理私聊消息。 - -举个栗子： - -```python -test = on_command("test", to_me()) - - -@test.handle() -async def test_handler1(bot: DingBot, event: PrivateMessageEvent): - await test.finish("PrivateMessageEvent") - - -@test.handle() -async def test_handler2(bot: DingBot, event: GroupMessageEvent): - await test.finish("GroupMessageEvent") -``` - -这样 Nonebot 就会根据不同的类型注解使用不同的 handler 来处理消息。 - -可以查看 Nonebot 官方的这个例子：，更详细的了解一个 Bot 的结构。 - -## 多种消息格式 - -发送 markdown 消息： - -```python -@markdown.handle() -async def markdown_handler(bot: DingBot): - message = MessageSegment.markdown( - "Hello, This is NoneBot", - "#### NoneBot \n> Nonebot 是一款高性能的 Python 机器人框架\n> ![screenshot](https://v2.nonebot.dev/logo.png)\n> [GitHub 仓库地址](https://github.com/nonebot/nonebot2) \n" - ) - await markdown.finish(message) -``` - -可以按自己的需要发送原生的格式消息（需要使用 `MessageSegment` 包裹，可以很方便的实现 @ 等操作）： - -```python -@raw.handle() -async def raw_handler(bot: DingBot, event: MessageEvent): - message = MessageSegment.raw({ - "msgtype": "text", - "text": { - "content": f"@{event.senderId}，你好" - }, - }) - message += MessageSegment.atDingtalkIds(event.senderId) - await raw.send(message) -``` - -其他消息格式请查看 [钉钉适配器的 MessageSegment](https://github.com/nonebot/nonebot2/blob/dev/nonebot/adapters/ding/message.py#L8)，里面封装了很多有关消息的方法，比如 `code`、`image`、`feedCard` 等。 - -## 发送到特定群聊 - -钉钉也支持通过 Webhook 的方式直接将消息推送到某个群聊([参考链接](https://developers.dingtalk.com/document/app/custom-robot-access/title-zob-eyu-qse))，你可以在机器人的设置中看到当前群的 Webhook 地址。 - -![机器人所在群的 Webhook 地址](./images/ding/webhook.png) - -获取到Webhook地址后，用户可以向这个地址发起HTTP POST 请求，即可实现给该钉钉群发送消息。 - -对于这种通过 Webhook 推送的消息，钉钉需要开发者进行安全方面的设置（目前有3种安全设置方式，请根据需要选择一种），如下： - -1. **自定义关键词：** 最多可以设置10个关键词，消息中至少包含其中1个关键词才可以发送成功。 - 例如添加了一个自定义关键词：监控报警，则这个机器人所发送的消息，必须包含监控报警这个词，才能发送成功。 -2. **加签：** 发送请求时带上验签的值，可以在机器人设置里看到密钥。 - ![加签密钥](./images/ding/jiaqian.png) -3. **IP地址（段）：** 设定后，只有来自IP地址范围内的请求才会被正常处理。支持两种设置方式：IP地址和IP地址段，暂不支持IPv6地址白名单。 - -如果你选择 1/3 两种安全设置，你需要自己确认当前网络和发送的消息能被钉钉接受，然后使用 `bot.send` 的时候将 webhook 地址传入 webhook 参数即可。 - -如我设置了 `打卡` 为关键词： - -```python -message = MessageSegment.text("打卡成功：XXXXXX") -await hello.send( - message, - webhook= - "https://oapi.dingtalk.com/robot/send?access_token=XXXXXXXXXXXXXX", -) -``` - -对于第二种加签方式，你可以在 `bot.send` 的时候把 `secret` 参数传进去，Nonebot 内部会自动帮你计算发送该消息的签名并发送，如： - -这里的 `secret` 参数就是加签选项给出的那个密钥。 - -```python -message = MessageSegment.raw({ - "msgtype": "text", - "text": { - "content": 'hello from webhook,一定要注意安全方式的鉴权哦，否则可能发送失败的' - }, -}) -message += MessageSegment.atDingtalkIds(event.senderId) -await hello.send( - message, - webhook="https://oapi.dingtalk.com/robot/send?access_token=XXXXXXXXXXXXXX", - secret="SECXXXXXXXXXXXXXXXXXXXXXXXXX", -) -``` - -然后就可以发送成功了。 - -![测试 Webhook 发送](images/ding/test_webhook.png) - -## 创建机器人并连接 - -在钉钉官方文档 [「开发企业内部机器人 -> 步骤一：创建机器人应用」](https://developers.dingtalk.com/document/app/develop-enterprise-internal-robots/title-ufs-4gh-poh) 中有详细介绍，这里就省去创建的步骤，介绍一下如何连接上程序。 - -### 本地开发机器人 - -在本地开发机器人的时候可能没有公网 IP，钉钉官方给我们提供一个 [内网穿透工具](https://developers.dingtalk.com/document/resourcedownload/http-intranet-penetration?pnamespace=app)，方便开发测试。 - -::: tip -究其根源这是一个魔改版的 ngrok，钉钉提供了一个服务器。 - -本工具不保证稳定性，仅适用于开发测试阶段，禁止当作公网域名使用。如线上应用使用本工具造成稳定性问题，后果由自己承担。如使用本工具传播违法不良信息，钉钉将追究法律责任。 -::: - -官方文档里已经讲了如何使用。我们再以 Windows（终端使用 Powershell） 为例，来演示一下。 - -1. 将仓库 clone 到本地，打开 `windows_64` 文件夹。 -2. 执行 `.\ding.exe -config="./ding.cfg" -subdomain=rcnb 8080` 就可以将 8080 端口暴露到公网中。 - 你访问 都会映射到 。 - -假设我们的机器人监听的端口是 `2333`，并且已经注册了钉钉适配器。那我们就执行 `.\ding.exe -config="./ding.cfg" -subdomain=rcnb 2333`，然后在机器人的后台设置 POST 的地址：`http://rcnb.vaiwan.com/ding`。 -这样钉钉接收到消息之后就会 POST 消息到 `http://rcnb.vaiwan.com/ding` 上，然后这个服务会把消息再转发到我们本地的开发服务器上。 - -### 生产模式 - -生产模式你的机器需要有一个公网 IP，然后到机器人的后台设置 POST 的地址就好了。 - -## 示例 - -关于钉钉机器人能做啥，你可以查看 `https://github.com/nonebot/nonebot2/blob/dev/tests/test_plugins/test_ding.py`，里面有一些例子。 diff --git a/archive/2.0.0a13.post1/guide/end-or-start.md b/archive/2.0.0a13.post1/guide/end-or-start.md deleted file mode 100644 index aa072c3d..00000000 --- a/archive/2.0.0a13.post1/guide/end-or-start.md +++ /dev/null @@ -1,8 +0,0 @@ -# 结语 - -至此，相信你已经能够写出一个基础的插件了。这里给出几个小提示： - -- 请千万注意事件处理器的优先级设定 -- 在匹配规则中请勿使用耗时极长的函数 - -如果「指南」还不能满足你，前往 [进阶](../advanced/README.md) 查看更多的功能信息。 diff --git a/archive/2.0.0a13.post1/guide/getting-started.md b/archive/2.0.0a13.post1/guide/getting-started.md deleted file mode 100644 index f5e61215..00000000 --- a/archive/2.0.0a13.post1/guide/getting-started.md +++ /dev/null @@ -1,87 +0,0 @@ -# 开始使用 - -一切都安装成功后，你就已经做好了进行简单配置以运行一个最小的 NoneBot 实例的准备工作。 - -## 最小实例 - -如果你已经按照推荐方式安装了 `nb-cli`，使用它创建一个空项目： - -```bash -nb create -``` - -根据引导进行项目配置，完成后会在当前目录下创建一个项目目录，项目目录内包含 `bot.py`。 - -如果未安装 `nb-cli`，使用你最熟悉的编辑器或 IDE，创建一个名为 `bot.py` 的文件，内容如下（这里以 CQHTTP 适配器为例）： - -```python{4,6,7,10} -import nonebot -from nonebot.adapters.cqhttp import Bot as CQHTTPBot - -nonebot.init() -driver = nonebot.get_driver() -driver.register_adapter("cqhttp", CQHTTPBot) -nonebot.load_builtin_plugins() - -if __name__ == "__main__": - nonebot.run() -``` - -## 解读 - -在上方 `bot.py` 中，这几行高亮代码将依次： - -1. 使用默认配置初始化 NoneBot -2. 加载 NoneBot 内置的 CQHTTP 协议适配组件 - `register_adapter` 的第一个参数我们传入了一个字符串，该字符串将会在后文 [配置 CQHTTP 协议端](#配置-cqhttp-协议端-以-qq-为例) 时使用。 -3. 加载 NoneBot 内置的插件 -4. 在地址 `127.0.0.1:8080` 运行 NoneBot - -在命令行使用如下命令即可运行这个 NoneBot 实例： - -```bash -# nb-cli -nb run -# 其他 -python bot.py -``` - -运行后会产生如下日志： - -```plain -09-14 21:02:00 [INFO] nonebot | Succeeded to import "nonebot.plugins.base" -09-14 21:02:00 [INFO] nonebot | Running NoneBot... -09-14 21:02:00 [INFO] uvicorn | Started server process [1234] -09-14 21:02:00 [INFO] uvicorn | Waiting for application startup. -09-14 21:02:00 [INFO] uvicorn | Application startup complete. -09-14 21:02:00 [INFO] uvicorn | Uvicorn running on http://127.0.0.1:8080 (Press CTRL+C to quit) -``` - -## 配置协议端上报 - -在 `bot.py` 文件中使用 `register_adapter` 注册协议适配之后即可配置协议端来完成与 NoneBot 的通信，详细配置方法参考： - -- [配置 CQHTTP](./cqhttp-guide.md) -- [配置钉钉](./ding-guide.md) -- [配置 mirai-api-http](./mirai-guide.md) - -NoneBot 接受的上报地址与 `Driver` 有关，默认使用的 `FastAPI Driver` 所接受的上报地址有： - -- `/{adapter name}/`: HTTP POST 上报 -- `/{adapter name}/http/`: HTTP POST 上报 -- `/{adapter name}/ws`: WebSocket 上报 -- `/{adapter name}/ws/`: WebSocket 上报 - -:::warning 注意 -如果到这一步你没有在 NoneBot 看到连接成功日志，比较常见的出错点包括： - -- NoneBot 监听 `0.0.0.0`，然后在协议端上报配置中填了 `ws://0.0.0.0:8080/***/ws` -- 在 Docker 容器内运行协议端，并通过 `127.0.0.1` 访问宿主机上的 NoneBot -- 想从公网访问，但没有修改云服务商的安全组策略或系统防火墙 -- NoneBot 所监听的端口存在冲突，已被其它程序占用 -- 弄混了 NoneBot 的 `host`、`port` 参数与协议端上报配置中的 `host`、`port` 参数 -- `ws://` 错填为 `http://` -- 协议端或 NoneBot 启动时遭到外星武器干扰 - -请尝试重启协议端 NoneBot、更换端口、修改防火墙、重启系统、仔细阅读前面的文档及提示、更新协议端 和 NoneBot 到最新版本等方式来解决。 -::: diff --git a/archive/2.0.0a13.post1/guide/images/Handle-Event.png b/archive/2.0.0a13.post1/guide/images/Handle-Event.png deleted file mode 100644 index 6546632c62c9dfee7d4f8e0ad5d2a7a082929542..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126466 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 z zHuSyaZaZg}!X+LOdpdDN1$Z}?6&M}49`qn#(3rlv@b%lwihqvI-~aemLjCpZ&D+2ZIHJa223EOs;i^^ZDOwjQv#&s+;z1{>NxD6k zelzS3FqMxVGt6j1>>e&U8=;_{^1EZg6rgRJP2*|WT=oG!i0)lX<1aFNy$4p}L0btE zE!Z)A;D;QIOBlfOVkt&%XrZy+D>xqs0n=s(# zGuY~rH$UX$C})DEv~SZte!O+)___Dbn-9};0tf(r$bp9Mp(^fW)ry(+j~8}e^xl(`K$8C~ z8$5d%Xj0gZdL|aY5nTJg5fTODf%T9qX!XY?X8pi_&sELeQwal8VK-o>bwU`8*i*H< zIZ?0wYru!{faU$Hjea%Sq;2~LT9bL&zZ_^Qp`*S2-|P=4p6wq$@%*n`fPc{$|1Apt zEeiiba{uKN{p*ka<0Lq5e;{7ORG8MO7Y{mSBYJfW3$9hu`VOzm=fPVmX3_*wWjsme z{EI!DzKk7W6SaJc2Y)Q=4_Im8bs?1Xx6&Gzf%@a^?Bm^d_!=|9|h|KRKp@Y zFakvPnUqX#&-kQxjR)Vg;FHKJEZGJ&P0`?wRa%$z1unAUi;CU+5_B{O06ZcMSTK5n z$y^F=ll`r?I`Vg4 z9;CnXdK*;6f6BT84tl3Je73eJbiJ3>8sM~w{kym|FXb;LuFDOq@V&EdFNOayU;9vdIb&$v(!(*047j$2w(?gRCQt!}mI= z*L!?!zuWhByM6!t{DtG3^L&i!aXqf^348D3Ba{fDVi?D(zo ze$s&fC=Sa0dGJFWTu^U)&2l}XGhw}-LDln$GJbt)^%=9@Km;K(*>CXlV?bqE+>5^| z&g0iRs^mux?+Djyh73bx{e`b1JEgUW42q|y1@Yk{k6ejX9*YND2E*?X_sg+Jkwmv+ zZL6wXVuqi8Z2ySy!!NvbTiV^8mhL~9*f%{d_n33K%YCtI8j7JVpmM?f+}(DkJ}`wz zqGqVGz(^H2`k(An_}nHGuKc)8w>jo%g9M9R#X{-9)S89Tp$X`!UGN0+4QpE##)mYi^enXd_#;qv zq(+ZIBP$+}U%m@?g!1kVfhvb+`+eT+JDzfPWr^|9U;FtC@n)d-z5Tt7)v8c00OJ@v zHKS!mrGeUy#+L?dcc#iwt?w{{-IwaB+)r`BXrcm&9~g}g3;eTtjCY}^%7em8fXUM6 zAT9>=&RN22;p)lj>G;k{!y8}&86i{-ZmD_49-Iw;Mpc3WJ_fIL;-s$3Y?fmkBlXYTVXzEG1f)4pP>6tif87>@CHT= zr+EvgihK}Udvou7J`RiNWRR%M*j!I;X{8TGj=lD?+dj%4=TOQ6RoiEc`ad=tg}0*dX)1Ry}9%ADqe-%jf%keUFh{%0c%_ z3;Qf4gu2i6z41QT)&Go~a5{f6W&DKaw4P_lH>;oDKiPiUV8ah@|2}qMr0|&INSVVl zjUxN;8e&T|yMD64>#Q;!{apw1y+v9~f;&T@o3kH&2vhEtRhlTk#I|ZU?MOcmPwkjh zVCxm;C31=S;?`4Ryxfbd5ov6}mz+?i*$!6*=BmE=l;8{F!XjUYdmnZi9`qS>8YgTY&iym!GDK5lm% z|Gg|X!T!t-X4LyP173z@8BX`t%;)?5&C+DK0hnWrfP?XWSZiOwOr=deM*Gh8b*k+-6fa#4ozI}!<4^Q_umA*gmjI&a%!e8H{md|lthU+tJ9v% zD031kL~-%0KEe+=9d)JguQRxv$U1>!E^Vku#keQEkMH4 znfrHbWc*+hn@vJ&Pi3ayw>UM<1H>b}FW?~zd;fuVqA*D@*b *}eYX-4FxSv>JU5 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

*N@WS@+EN$Q;{@LQ)Z!7WSW2|_;9z|pPtZ1U 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 VK6&fZIU5*&z|+;wWt~$(698!sxRL+> diff --git a/archive/2.0.0a13.post1/guide/images/ding/jiaqian.png b/archive/2.0.0a13.post1/guide/images/ding/jiaqian.png deleted file mode 100644 index 8895d6c6d866cd6049642da40dccebdfb94429bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102378 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 mCp24mDwTf*(Y3iRAG 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 diff --git a/archive/2.0.0a13.post1/guide/images/ding/webhook.png b/archive/2.0.0a13.post1/guide/images/ding/webhook.png deleted file mode 100644 index c957e72f925e1490afdfabf2af7b0aecfaeb3252..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102603 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%0DQ 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 diff --git a/archive/2.0.0a13.post1/guide/installation.md b/archive/2.0.0a13.post1/guide/installation.md deleted file mode 100644 index 04e5e7af..00000000 --- a/archive/2.0.0a13.post1/guide/installation.md +++ /dev/null @@ -1,109 +0,0 @@ -# 安装 - -## 安装 NoneBot - -:::warning 注意 -请确保你的 Python 版本 >= 3.7。 -::: - -:::warning 注意 -请在安装 NoneBot v2 之前卸载 NoneBot v1 - -```bash -pip uninstall nonebot -``` - -::: - -### (推荐安装方式)通过脚手架安装 - -1. (推荐)使用你喜欢的 Python 环境管理工具(如 `poetry`)创建新的虚拟环境 -2. 使用 `pip` 或 其他包管理工具 安装 `nb-cli`，`nonebot2` 会作为其依赖被一起安装 - - ```bash - pip install nb-cli - ``` - -3. 点个 star 吧 - - nonebot2: [![nonebot2](https://img.shields.io/github/stars/nonebot/nonebot2?style=social)](https://github.com/nonebot/nonebot2) - - nb-cli: [![nb-cli](https://img.shields.io/github/stars/nonebot/nb-cli?style=social)](https://github.com/nonebot/nb-cli) - -4. 如果有疑问，可以加群交流(点击链接直达) - - [![QQ Chat](https://img.shields.io/badge/QQ%E7%BE%A4-768887710-orange?style=social)](https://jq.qq.com/?_wv=1027&k=5OFifDh) - - [![Telegram Chat](https://img.shields.io/badge/telegram-cqhttp-blue?style=social)](https://t.me/cqhttp) - -### (纯净安装)不使用脚手架 - -```bash -pip install nonebot2 -# 也可以通过 poetry 安装 -poetry add nonebot2 -``` - -如果你需要使用最新的（可能**尚未发布**的）特性，可以直接从 GitHub 仓库安装： - -:::warning 注意 -直接从 Github 仓库中安装意味着你将使用最新提交的代码，它们并没有进行充分的稳定性测试 -在任何情况下请不要将其应用于生产环境! -::: - -```bash -# master分支 -poetry add git+https://github.com/nonebot/nonebot2.git#master -# dev分支 -poetry add git+https://github.com/nonebot/nonebot2.git#dev -``` - -或者在克隆 Git 仓库后手动安装： - -```bash -git clone https://github.com/nonebot/nonebot2.git -cd nonebot2 -poetry install --no-dev # 推荐 -pip install . # 不推荐 -``` - -## 安装适配器 - -适配器可以通过 `nb-cli` 在创建项目时根据你的选择自动安装，也可以自行使用 `pip` 安装 - -```bash -pip install nonebot-adapter- -``` - -```bash -# 列出所有的适配器 -nb adapter list -``` - -## 安装插件 - -插件可以通过 `nb-cli` 进行安装，也可以自行安装并加载插件。 - -```bash -# 列出所有的插件 -nb plugin list -# 搜索插件 -nb plugin search xxx -# 安装插件 -nb plugin install xxx -``` - -如果急于上线 Bot 或想要使用现成的插件，以下插件可作为参考： - -### 官方插件 - -- [NoneBot-Plugin-Docs](https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-plugin-docs) 离线文档插件 -- [NoneBot-Plugin-Test](https://github.com/nonebot/plugin-test) 本地机器人测试前端插件 -- [NoneBot-Plugin-APScheduler](https://github.com/nonebot/plugin-apscheduler) 定时任务插件 -- [NoneBot-Plugin-LocalStore](https://github.com/nonebot/plugin-localstore) 本地数据文件存储插件 -- [NoneBot-Plugin-Sentry](https://github.com/cscs181/QQ-GitHub-Bot/tree/master/src/plugins/nonebot_plugin_sentry) Sentry 在线日志分析插件 -- [NoneBot-Plugin-Status](https://github.com/cscs181/QQ-GitHub-Bot/tree/master/src/plugins/nonebot_plugin_status) 服务器状态查看插件 - -### 其他插件 - -还有更多的插件在 [这里](/plugin-store.md) 等着你发现～ diff --git a/archive/2.0.0a13.post1/guide/loading-a-plugin.md b/archive/2.0.0a13.post1/guide/loading-a-plugin.md deleted file mode 100644 index e3c7af2f..00000000 --- a/archive/2.0.0a13.post1/guide/loading-a-plugin.md +++ /dev/null @@ -1,125 +0,0 @@ -# 加载插件 - -在 [创建一个完整的项目](creating-a-project) 一章节中，我们已经创建了插件目录 `awesome_bot/plugins`，现在我们在机器人入口文件中加载它。当然，你也可以单独加载一个插件。 - -## 加载内置插件 - -在 `bot.py` 文件中添加以下行： - -```python{8} -import nonebot -from nonebot.adapters.cqhttp import Bot - -nonebot.init() - -driver = nonebot.get_driver() -driver.register_adapter("cqhttp", Bot) # 注册 CQHTTP 的 Adapter -nonebot.load_builtin_plugins() # 加载 nonebot 内置插件 - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -::: warning -目前, 内建插件仅支持 CQHTTP 的 Adapter - -如果您使用的是其他 Adapter, 请移步该 Adapter 相应的文档 -::: - -这将会加载 nonebot 内置的插件，它包含： - -- 命令 `say`：可由**superuser**使用，可以将消息内容由特殊纯文本转为富文本 -- 命令 `echo`：可由任何人使用，将消息原样返回 - -以上命令均需要指定机器人，即私聊、群聊内@机器人、群聊内称呼机器人昵称。参考 [Rule: to_me](../api/rule.md#to-me) - -## 加载插件目录 - -在 `bot.py` 文件中添加以下行： - -```python{5} -import nonebot - -nonebot.init() -# 加载插件目录，该目录下为各插件，以下划线开头的插件将不会被加载 -nonebot.load_plugins("awesome_bot/plugins") - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -:::tip 提示 -加载插件目录时，目录下以 `_` 下划线开头的插件将不会被加载！ -::: - -:::warning 提示 -**不能存在相同名称的插件！** -::: - -:::danger 警告 -插件间不应该存在过多的耦合，如果确实需要导入某个插件内的数据，可以参考 [进阶-跨插件访问](../advanced/export-and-require.md) -::: - -## 加载单个插件 - -在 `bot.py` 文件中添加以下行： - -```python{5,7} -import nonebot - -nonebot.init() -# 加载一个 pip 安装的插件 -nonebot.load_plugin("nonebot_plugin_status") -# 加载本地的单独插件 -nonebot.load_plugin("awesome_bot.plugins.xxx") - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -## 子插件(嵌套插件) - -在插件中同样可以加载子插件，例如如下插件目录结构： - - -:::vue -foo_plugin -├── `plugins` -│ ├── `sub_plugin1` -│ │ └── \_\_init\_\_.py -│ └── `sub_plugin2.py` -├── `__init__.py` -└── config.py -::: - - -在插件目录下的 `__init__.py` 中添加如下代码： - -```python -from pathlib import Path - -import nonebot - -# store all subplugins -_sub_plugins = set() -# load sub plugins -_sub_plugins |= nonebot.load_plugins( - str((Path(__file__).parent / "plugins").resolve())) -``` - -插件将会被加载并存储于 `_sub_plugins` 中。 - -## 运行结果 - -尝试运行 `nb run` 或者 `python bot.py`，可以看到日志输出了类似如下内容： - -```plain -09-19 21:51:59 [INFO] nonebot | Succeeded to import "nonebot.plugins.base" -09-19 21:51:59 [INFO] nonebot | Succeeded to import "plugin_in_folder" -``` diff --git a/archive/2.0.0a13.post1/guide/mirai-guide.md b/archive/2.0.0a13.post1/guide/mirai-guide.md deleted file mode 100644 index 71003e64..00000000 --- a/archive/2.0.0a13.post1/guide/mirai-guide.md +++ /dev/null @@ -1,234 +0,0 @@ -# Mirai-API-HTTP 协议使用指南 - -::: warning - -Mirai-API-HTTP 的适配现在仍然处于早期阶段, 可能没有进行过充分的测试 - -在生产环境中请谨慎使用 - -::: - -::: tip - -为了你的使用之旅更加顺畅, 我们建议您在配置之前具有以下的前置知识 - -- 对服务端/客户端(C/S)模型的基本了解 -- 对 Web 服务配置基础的认知 -- 对`YAML`语法的一点点了解 - -::: - -::: danger - -Mirai-API-HTTP 的适配器以 [AGPLv3 许可](https://opensource.org/licenses/AGPL-3.0) 单独开源 - -这意味着在使用该适配器时需要 **以该许可开源您的完整程序代码** - -::: - -**为了便捷起见, 以下内容均以缩写 `MAH` 代替 `mirai-api-http`** - -## 安装 NoneBot Mirai 适配器 - -```bash -pip install nonebot-adapter-mirai -``` - -## 配置 MAH 客户端 - -正如你可能刚刚在[CQHTTP 协议使用指南](./cqhttp-guide.md)中所读到的: - -> 单纯运行 NoneBot 实例并不会产生任何效果，因为此刻 QQ 这边还不知道 NoneBot 的存在，也就无法把消息发送给它，因此现在需要使用一个无头 QQ 来把消息等事件上报给 NoneBot。 - -这次, 我们将采用在实现上有别于 OneBot（CQHTTP）协议的另外一种无头 QQ API 协议, 即 MAH - -为了配置 MAH 端, 我们现在需要移步到[MAH 的项目地址](https://github.com/project-mirai/mirai-api-http), 来看看它是如何配置的 - -根据[项目提供的 README](https://github.com/project-mirai/mirai-api-http/blob/056beedba31d6ad06426997a1d3fde861a7f8ba3/README.md),配置 MAH 大概需要以下几步 - -1. 下载并安装 Java 运行环境, 你可以有以下几种选择: - - - [由 Oracle 提供的 Java 运行环境](https://java.com/zh-CN/download/manual.jsp) **在没有特殊需求的情况下推荐** - - [由 Zulu 编译的 OpenJRE 环境](https://www.azul.com/downloads/zulu-community/?version=java-8-lts&architecture=x86-64-bit&package=jre) - -2. 下载[Mirai Console Loader](https://github.com/iTXTech/mirai-console-loader) - - - 请按照文档 README 中的步骤下载并安装 - -3. 安装 MAH: - - - 在 Mirai Console Loader 目录下执行该指令 - - - ```shell - ./mcl --update-package net.mamoe:mirai-api-http --channel stable --type plugin - ``` - - 注意: 该指令的前缀`./mcl`可能根据操作系统以及使用 java 环境的不同而变化 - -4. 修改配置文件 - - ::: tip - - 在此之前, 你可能需要了解我们为 MAH 设计的两种通信方式 - - - 正向 Websocket - - NoneBot 作为纯粹的客户端,通过 websocket 监听事件下发 - - 优势 - 1. 网络配置简单, 特别是在使用 Docker 等网络隔离的容器时 - 2. 在初步测试中连接性较好 - - 劣势 - 1. 与 NoneBot 本身的架构不同, 可能稳定性较差 - 2. 需要在注册 adapter 时显式指定 qq, 对于需要开源的程序来讲不利 - - POST 消息上报 - - NoneBot 在接受消息上报时作为服务端, 发送消息时作为客户端 - - 优势 - 1. 与 NoneBot 本身架构相符, 性能和稳定性较强 - 2. 无需在任何地方指定 QQ, 即插即用 - - 劣势 - 1. 由于同时作为客户端和服务端, 配置较为复杂 - 2. 在测试中网络连接性较差 (未确认原因) - - ::: - - - 这是当使用正向 Websocket 时的配置举例 - - - MAH 的`setting.yml`文件 - - - ```yaml - # 省略了部分无需修改的部分 - - host: "0.0.0.0" # 监听地址 - port: 8080 # 监听端口 - authKey: 1234567890 # 访问密钥, 最少八位 - enableWebsocket: true # 必须为true - ``` - - - `.env`文件 - - - ```shell - MIRAI_AUTH_KEY=1234567890 - MIRAI_HOST=127.0.0.1 # 当MAH运行在本机时 - MIRAI_PORT=8080 # MAH的监听端口 - ``` - - - `bot.py`文件 - - - ```python - import nonebot - from nonebot.adapters.mirai import WebsocketBot - - nonebot.init() - nonebot.get_driver().register_adapter('mirai-ws', WebsocketBot, qq=12345678) # qq参数需要填在mah中登录的qq - nonebot.load_builtin_plugins() # 加载 nonebot 内置插件 - nonebot.run() - ``` - - - 这是当使用 POST 消息上报时的配置文件 - - - MAH 的`setting.yml`文件 - - - ```yaml - # 省略了部分无需修改的部分 - - host: '0.0.0.0' # 监听地址 - port: 8080 # 监听端口 - authKey: 1234567890 # 访问密钥, 最少八位 - - ## 消息上报 - report: - enable: true # 必须为true - groupMessage: - report: true # 群消息上报 - friendMessage: - report: true # 好友消息上报 - tempMessage: - report: true # 临时会话上报 - eventMessage: - report: true # 事件上报 - destinations: - - 'http://127.0.0.1:2333/mirai/http' #上报地址, 请按照实际情况修改 - # 上报时的额外Header - extraHeaders: {} - ``` - - - `.env`文件 - - - ```shell - HOST=127.0.0.1 # 当MAH运行在本机时 - PORT=2333 - - MIRAI_AUTH_KEY=1234567890 - MIRAI_HOST=127.0.0.1 # 当MAH运行在本机时 - MIRAI_PORT=8080 # MAH的监听端口 - ``` - - - `bot.py`文件 - - - ```python - import nonebot - from nonebot.adapters.mirai import Bot - - nonebot.init() - nonebot.get_driver().register_adapter('mirai', Bot) - nonebot.load_builtin_plugins() # 加载 nonebot 内置插件 - nonebot.run() - ``` - -## 历史性的第一次对话 - -现在, 先启动 NoneBot, 再启动 MAH - -如果你的配置文件一切正常, 你将在控制台看到类似于下列的日志 - -```log -02-01 18:25:12 [INFO] nonebot | NoneBot is initializing... -02-01 18:25:12 [INFO] nonebot | Current Env: prod -02-01 18:25:12 [DEBUG] nonebot | Loaded Config: {'driver': 'nonebot.drivers.fastapi', 'host': IPv4Address('127.0.0.1'), 'port': 8080, 'debug': True, 'api_root': {}, 'api_timeout': 30.0, 'access_token': None, 'secret': None, 'superusers': set(), 'nickname': set(), 'command_start': {'/'}, 'command_sep': {'.'}, 'session_expire_timeout': datetime.timedelta(seconds=120), 'mirai_port': 8080, 'environment': 'prod', 'mirai_auth_key': 12345678, 'mirai_host': '127.0.0.1'} -02-01 18:25:12 [DEBUG] nonebot | Succeeded to load adapter "mirai" -02-01 18:25:12 [INFO] nonebot | Succeeded to import "nonebot.plugins.echo" -02-01 18:25:12 [INFO] nonebot | Running NoneBot... -02-01 18:25:12 [DEBUG] nonebot | Loaded adapters: mirai -02-01 18:25:12 [INFO] uvicorn | Started server process [183155] -02-01 18:25:12 [INFO] uvicorn | Waiting for application startup. -02-01 18:25:12 [INFO] uvicorn | Application startup complete. -02-01 18:25:12 [INFO] uvicorn | Uvicorn running on http://127.0.0.1:2333 (Press CTRL+C to quit) -02-01 18:25:14 [INFO] uvicorn | 127.0.0.1:37794 - "POST /mirai/http HTTP/1.1" 204 -02-01 18:25:14 [DEBUG] nonebot | MIRAI | received message {'type': 'BotOnlineEvent', 'qq': 1234567} -02-01 18:25:14 [INFO] nonebot | MIRAI 1234567 | [BotOnlineEvent]: {'self_id': 1234567, 'type': 'BotOnlineEvent', 'qq': 1234567} -02-01 18:25:14 [DEBUG] nonebot | Checking for matchers in priority 1... -``` - -恭喜你, 你的配置已经成功! - -现在, 我们可以写一个简单的插件来测试一下 - -```python -from nonebot.plugin import on_keyword, on_command -from nonebot.rule import to_me -from nonebot.adapters.mirai import Bot, MessageEvent - -message_test = on_keyword({'reply'}, rule=to_me()) - - -@message_test.handle() -async def _message(bot: Bot, event: MessageEvent): - text = event.get_plaintext() - await bot.send(event, text, at_sender=True) - - -command_test = on_command('miecho') - - -@command_test.handle() -async def _echo(bot: Bot, event: MessageEvent): - text = event.get_plaintext() - await bot.send(event, text, at_sender=True) -``` - -它具有两种行为 - -- 在指定机器人，即私聊、群聊内@机器人、群聊内称呼机器人昵称的情况下 (即 [Rule: to_me](../api/rule.md#to-me)), 如果消息内包含 `reply` 字段, 则该消息会被机器人重复一次 - -- 在执行指令`miecho xxx`时, 机器人会发送回参数`xxx` - -至此, 你已经初步掌握了如何使用 Mirai Adapter diff --git a/archive/2.0.0a13.post1/sidebar.config.json b/archive/2.0.0a13.post1/sidebar.config.json deleted file mode 100644 index 97e82f74..00000000 --- a/archive/2.0.0a13.post1/sidebar.config.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "sidebar": {}, - "locales": { - "/": { - "label": "简体中文", - "selectText": "Languages", - "editLinkText": "在 GitHub 上编辑此页", - "lastUpdated": "上次更新", - "nav": [ - { - "text": "主页", - "link": "/" - }, - { - "text": "指南", - "link": "/guide/" - }, - { - "text": "进阶", - "link": "/advanced/" - }, - { - "text": "API", - "link": "/api/" - }, - { - "text": "商店", - "link": "/store" - }, - { - "text": "更新日志", - "link": "/changelog" - } - ], - "sidebarDepth": 2, - "sidebar": { - "/guide/": [ - { - "title": "开始", - "collapsable": false, - "sidebar": "auto", - "children": [ - "", - "installation", - "getting-started", - "creating-a-project", - "basic-configuration" - ] - }, - { - "title": "编写插件", - "collapsable": false, - "sidebar": "auto", - "children": [ - "loading-a-plugin", - "creating-a-plugin", - "creating-a-matcher", - "creating-a-handler", - "end-or-start" - ] - }, - { - "title": "协议适配", - "collapsable": false, - "sidebar": "auto", - "children": [ - "cqhttp-guide", - "ding-guide", - "mirai-guide" - ] - } - ], - "/advanced/": [ - { - "title": "进阶", - "collapsable": false, - "sidebar": "auto", - "children": [ - "", - "scheduler", - "permission", - "runtime-hook", - "export-and-require", - "overloaded-handlers" - ] - }, - { - "title": "发布", - "collapsable": false, - "sidebar": "auto", - "children": [ - "publish-plugin" - ] - } - ], - "/api/": [ - { - "title": "NoneBot Api Reference", - "path": "", - "collapsable": false, - "children": [ - { - "title": "nonebot 模块", - "path": "nonebot" - }, - { - "title": "nonebot.config 模块", - "path": "config" - }, - { - "title": "nonebot.plugin 模块", - "path": "plugin" - }, - { - "title": "nonebot.message 模块", - "path": "message" - }, - { - "title": "nonebot.matcher 模块", - "path": "matcher" - }, - { - "title": "nonebot.handler 模块", - "path": "handler" - }, - { - "title": "nonebot.rule 模块", - "path": "rule" - }, - { - "title": "nonebot.permission 模块", - "path": "permission" - }, - { - "title": "nonebot.log 模块", - "path": "log" - }, - { - "title": "nonebot.utils 模块", - "path": "utils" - }, - { - "title": "nonebot.typing 模块", - "path": "typing" - }, - { - "title": "nonebot.exception 模块", - "path": "exception" - }, - { - "title": "nonebot.drivers 模块", - "path": "drivers/" - }, - { - "title": "nonebot.drivers.fastapi 模块", - "path": "drivers/fastapi" - }, - { - "title": "nonebot.drivers.quart 模块", - "path": "drivers/quart" - }, - { - "title": "nonebot.adapters 模块", - "path": "adapters/" - }, - { - "title": "nonebot.adapters.cqhttp 模块", - "path": "adapters/cqhttp" - }, - { - "title": "nonebot.adapters.ding 模块", - "path": "adapters/ding" - }, - { - "title": "nonebot.adapters.mirai 模块", - "path": "adapters/mirai" - } - ] - } - ] - } - } - } -} \ No newline at end of file diff --git a/archive/2.0.0a15/README.md b/archive/2.0.0a15/README.md deleted file mode 100644 index 1ee526fb..00000000 --- a/archive/2.0.0a15/README.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -home: true -heroImage: /logo.png -tagline: 跨平台 Python 异步机器人框架 -actionText: 开始使用 -actionLink: guide/ -features: - - title: 简洁 - details: 提供极其简洁易懂的 API，使你可以毫无压力地开始验证你的绝佳创意，只需编写最少量的代码，即可实现丰富的功能。 - - title: 易于扩展 - details: 精心设计的消息处理流程使得你可以很方便地将原型扩充为具有大量实用功能的完整聊天机器人，并持续保证扩展性。 - - title: 高性能 - details: 采用异步 I/O，利用 WebSocket 进行通信，以获得极高的性能；同时，支持使用多账号同时接入，减少业务宕机的可能。 -footer: MIT Licensed | Copyright © 2018 - 2021 NoneBot Team ---- diff --git a/archive/2.0.0a15/advanced/README.md b/archive/2.0.0a15/advanced/README.md deleted file mode 100644 index 6bdba844..00000000 --- a/archive/2.0.0a15/advanced/README.md +++ /dev/null @@ -1,177 +0,0 @@ -# 深入 - -## 它如何工作？ - -如同[概览](../guide/README.md)所言: - -> NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人收到的事件进行解析和处理，并以插件化的形式，按优先级分发给事件所对应的事件响应器，来完成具体的功能。 - -`Nonebot2` 是一个可以对机器人上报的事件进行处理并完成具体功能的机器人框架，在这里，我们将简要讲述它的工作内容。 - -**便捷起见，以下内容对 `Nonebot2` 会被称为 `nonebot`，与 `Nonebot2` 交互的机器人实现会被称为 `协议端`**。 - -在实际应用中，`nonebot` 会充当一个高性能，轻量级的 Python 微服务框架。协议端可以通过 `http`, `websocket` 等方式与之通信，这个通信往往是双向的：一方面，协议端可以上报数据给 `nonebot`，`nonebot` 会处理数据并返回响应给协议端；另一方面，`nonebot` 可以主动推送数据给协议端。而 `nonebot` 便是围绕双向通信进行工作的。 - -在开始工作之前，`nonebot` 需要进行准备工作： - -1. **运行 `nonebot.init` 初始化函数**，它会读取配置文件，并初始化 `nonebot` 和后端驱动 `driver` 对象。 -2. **注册协议适配器 `adapter`** 。 -3. **加载插件**。 - -准备工作完成后，`nonebot` 会利用 `uvicorn` 启动，并运行 `on_startup` 钩子函数。 - -随后，倘若一个协议端与 `nonebot` 进行了连接，`nonebot` 的后端驱动 `driver` 就会将 `adapter` 实例化为 `bot`，`nonebot` 便会利用 `bot` 开始工作，它的工作内容分为两个方面： - -1. **事件处理**，`bot` 会将协议端上报的数据转化为 `事件`(`Event`)，之后 `nonebot` 会根据一套既定流程来处理 `事件`。 - -2. **调用 `API`**, 在**事件处理**的过程中，`nonebot` 可以通过 `bot` 调用协议端指定的 `API` 来获取更多数据，或者反馈响应给协议端; `nonebot` 也可以通过调用 `API` 向协议端主动请求数据或者主动推送数据。 - -在**指南**模块， 我们已经叙述了[如何配置 nonebot](../guide/basic-configuration.md), [如何注册协议适配器](../guide/getting-started.md)，[如何加载插件](../guide/loading-a-plugin.md), 在这里便不再赘述。 - -下面，我们将对**事件处理**， **调用 API**进行说明。 - -## 事件处理 - -我们可以先看事件处理的流程图： - -![handle-event](../guide/images/Handle-Event.png) - -在流程图里，我们可以看到，`nonebot` 会有三个阶段来处理事件： - -1. **driver 处理上报数据** -2. **adapter 处理原始数据** -3. **nonebot 处理 Event** - -我们将顺序说明这三个阶段。其中，会将第三个阶段拆分成**概念解释**，**处理 Event**，**特殊异常处理**三个部分来说明。 - -### driver 处理上报数据 - -1. 协议端会通过 `websocket` 或者 `http` 等方式与 `nonebot` 的后端驱动 `driver` 连接，`driver` 会根据之前注册的 `adapter` 和配置文件的内容来进行鉴权，从而获得这个连接的唯一识别 id `self-id`，随后 `adapter` 就会利用 `self-id` 实例化为 `bot` 对象。 - - ::: tip - 需要注意的是，如果协议端通过 `websocket` 与 `nonebot` 连接，这个步骤只会在建立连接时进行，并在之后运行 `on_bot_connect` 钩子函数；通过 `http` 方式连接时，会在协议端每次上报数据时都进行这个步骤。 - ::: - - ::: warning - 连接之前必须要注册 `adapter` - ::: - - ::: warning - `self-id` 是帐号的唯一识别 ID，这意味着不能出现相同的 `self-id`。 - ::: - -2. `driver` 会将接收到的数据转交给 `bot` 对象进一步处理。 - -### adapter 处理原始数据 - -1. `bot` 会利用事先定义好的 `Event Model` 对上报的数据进行分析处理，将数据转化为 `nonebot` 可以处理的 `Event` 对象。 - - ::: tip - `adapter` 在转换数据格式的同时可以进行一系列的特殊操作，例如 `CQHTTP` 会对 `reply` 信息进行提取。 - ::: - -2. `Event` 会传入 `nonebot` 做进一步处理。 - -### nonebot 处理 Event - -在讲述这个阶段之前，我们需要先对几个概念进行解释。 - -#### 概念解释 - -1. **hook**，或者说**钩子函数**，它们可以在 `nonebot` 处理 `Event` 的不同时刻进行拦截，修改或者扩展，在 `nonebot` 中，钩子函数分为 `事件预处理hook`，`运行预处理hook`，`运行后处理hook` 和 `事件后处理hook`。 - - ::: tip - 关于`hook`的更多信息，可以查阅[这里](./runtime-hook.md) - ::: - -2. **Matcher**与**matcher**，在**指南**中，我们讲述了[如何注册事件响应器](../guide/creating-a-matcher)，这里的事件响应器或者说 `Matcher` 并不是一个具体的实例 `instance`，而是一个具有特定属性的类 `class`。只有当 `Matcher` **响应事件**时，才会实例化为具体的 `instance`，也就是 `matcher`。`matcher` 可以认为是 `nonebot` 处理 `Event` 的基本单位，运行 `matcher` 是`nonebot`工作的主要内容。 - -3. **handler**，或者说**事件处理函数**, 它们可以认为是 `nonebot` 处理 `Event` 的最小单位。在不考虑 `hook` 的情况下，**运行 matcher 就是顺序运行 matcher.handlers**，这句话换种表达方式就是，`handler` 只有添加到 `matcher.handlers` 时，才可以参与到 `nonebot` 的工作中来。 - - ::: tip - 如何让 `handler` 添加到 `matcher.handlers`？ - - 一方面，我们可以参照[这里](../guide/creating-a-handler)利用装饰器来添加；另一方面，我们在用 `on()` 或者 `on_*()` 注册事件响应器时，可以添加 `handlers=[handler1, handler2, ...]` 这样的关键词参数来添加。 - ::: - -#### 处理 Event - -1. **执行事件预处理 hook**， `nonebot` 接收到 `Event` 后，会传入到 `事件预处理hook` 中进行处理。 - - ::: warning - 需要注意的是，执行多个 `事件预处理hook` 时并无顺序可言，它们是**并行运行**的。这个原则同样适用于其他的 `hook`。 - ::: - -2. **按优先级升序选出同一优先级的 Matcher**，`nonebot` 提供了一个全局字典 `matchers`，这个字典的 `key` 是优先级 `priority`，`value` 是一个 `list`，里面存放着同一优先级的 `Matcher`。在注册 `Matcher` 时，它和优先级 `priority` 会添加到里面。 - - 在执行 `事件预处理hook` 后，`nonebot` 会对 `matchers` 的 `key` 升序排序并选择出当前最小优先级的 `Matcher`。 - -3. **根据 Matcher 定义的 Rule, Permission 判断是否运行**，在选出 `Matcher` 后，`nonebot` 会将 `bot`，`Event` 传入到 `Matcher.check_rule` 和 `Matcher.check_perm` 两个函数中，两个函数分别对 Matcher 定义的 Rule, Permission 进行 check，当 check 通过后，这个 `Matcher` 就会响应事件。但是当同一个优先级的所有 `Matcher` 均没有响应时，`nonebot` 会返回到上一个步骤，选择出下一优先级的 `Matcher`。 - -4. **实例化 matcher 并执行运行预处理 hook**，当 `Matcher` 响应事件后，它便会实例化为 `matcher`，并执行 `运行预处理hook`。 - -5. **顺序运行 matcher 的所有 handlers**，`运行预处理hook` 执行完毕后，便会运行 `matcher`，也就是**顺序运行**它的 `handlers`。 - - ::: tip - `matcher` 运行 `handlers` 的顺序是: 先运行该 `matcher` 的类 `Matcher` 注册时添加的 `handlers`(如果有的话)，再按照装饰器装饰顺序运行装饰的 `handlers`。 - ::: - -6. **执行运行后处理 hook**，`matcher` 的 `handlers` 运行完毕后，会执行 `运行后处理hook`。 - -7. **判断是否停止事件传播**，`nonebot` 会根据当前优先级所有 `matcher` 的 `block` 参数或者 `StopPropagation` 异常判断是否停止传播 `Event`，如果事件没有停止传播，`nonebot` 便会返回到第 2 步， 选择出下一优先级的 `Matcher`。 - -8. **执行事件后处理 hook**，在 `Event` 停止传播或执行完所有响应的 `Matcher` 后，`nonebot` 会执行 `事件后处理hook`。 - - 当 `事件后处理hook` 执行完毕后，当前`Event`的处理周期就顺利结束了。 - -#### 特殊异常处理 - -在这个阶段，`nonebot` 规定了几个特殊的异常，当 `nonebot` 捕获到它们时，会用特定的行为来处理它们。 - -1. **IgnoredException** - - 这个异常可以在 `事件预处理hook` 和 `运行预处理hook` 抛出。 - - 当 `事件预处理hook` 抛出它时，`nonebot` 会忽略当前的 `Event`，不进行处理。 - - 当 `运行预处理hook` 抛出它时，`nonebot` 会忽略当前的 `matcher`，结束当前 `matcher` 的运行。 - - ::: warning - 当 `hook` 需要抛出这个异常时，要写明原因。 - ::: - -2. **PausedException** - - 这个异常可以在 `handler` 中由 `Matcher.pause` 抛出。 - - 当 `nonebot` 捕获到它时，会停止运行当前 `handler` 并结束当前 `matcher` 的运行，并将后续的 `handler` 交给一个临时 `Matcher` 来响应当前交互用户的下一个消息事件，当临时 `Matcher` 响应时，临时 `Matcher` 会运行后续的 handlers。 - -3. **RejectedException** - - 这个异常可以在 `handler` 中由 `Matcher.reject` 抛出。 - - 当 `nonebot` 捕获到它时，会停止运行当前 `handler` 并结束当前 `matcher` 的运行，并将当前 handler 和后续 `handler` 交给一个临时 `Matcher` 来响应当前交互用户的下一个消息事件，当临时 `Matcher` 响应时，临时 `Matcher` 会运行当前 `handler` 和后续的 `handler`。 - -4. **FinishedException** - - 这个异常可以在 `handler` 中由 `Matcher.finish` 抛出。 - - 当 `nonebot` 捕获到它时，会停止运行当前 `handler` 并结束当前 `matcher` 的运行。 - -5. **StopPropagation** - - 这个异常一般会在执行 `运行后处理hook` 后抛出。 - - 当 `nonebot` 捕获到它时， 会停止传播当前 `Event`，不再寻找下一优先级的 `Matcher`，直接执行 `事件后处理hook`。 - -## 调用 API - -`nonebot` 可以通过 `bot` 来调用 `API` ，`API` 可以向协议端发送数据，也可以向协议端请求更多的数据。 - -::: tip -不同 `adapter` 规定了不同的 API，对应的 API 列表请参照协议规范。 -::: - -一般来说，我们可以用 `bot.*` 来调用 `API`(\*是 `API` 的 `action` 或者 `endpoint`)。 - -对于发送消息而言，一方面可以调用既有的 API；另一方面 `nonebot` 实现了两个便捷方法，`bot.send(event, message, **kwargs)` 方法和可以在 `handler` 中使用的 `Matcher.send(message, **kwargs)` 方法，来向事件主体发送消息。 diff --git a/archive/2.0.0a15/advanced/export-and-require.md b/archive/2.0.0a15/advanced/export-and-require.md deleted file mode 100644 index eef88990..00000000 --- a/archive/2.0.0a15/advanced/export-and-require.md +++ /dev/null @@ -1,117 +0,0 @@ -# 跨插件访问 - -由于 `nonebot2` 独特的插件加载机制，在使用 python 原有的 import 机制来进行插件之间的访问时，很可能会有奇怪的或者意料以外的情况发生。为了避免这种情况的发生，您可以有两种方法来实现跨插件访问： - -1. 将插件间的要使用的公共代码剥离出来，作为公共文件或者文件夹，提供给插件加以调用。 -2. 使用 `nonebot2` 提供的 `export` 和 `require` 机制，来实现插件间的互相调用。 - -第一种方法比较容易理解和实现，这里不再赘述，但需要注意的是，请不要将公共文件或者公共文件夹作为**插件**被 `nonebot2` 加载。 - -下面将介绍第二种方法—— `export` 和 `require` 机制： - -## 使用 export 和 require - -现在，假定有两个插件 `pluginA` 和 `pluginB`，需要在 `pluginB` 中调用 `pluginA` 中的一个变量 `varA` 和一个函数 `funcA`。 - -在上面的条件中涉及到了两种操作：一种是在 `pluginA` 的 `导出对象` 操作；而另一种是在 `pluginB` 的 `导入对象` 操作。在 `nonebot2` 中，`导出对象` 的操作用 `export` 机制来实现，`导入对象` 的操作用 `require` 机制来实现。下面，我们将逐一进行介绍。 - -:::warning 警告 - -使用这个方法进行跨插件访问时，**需要先加载`导出对象`的插件，再加载`导入对象`的插件。** - -::: - -### 使用 export - -在 `pluginA` 中，我们调用 `export` 机制 `导出对象`。 - -在 `export` 机制调用前，我们需要保证导出的对象已经被定义，比如： - -```python -varA = "varA" - - -def funcA(): - return "funcA" -``` - -在确保定义之后，我们可以从 `nonebot.plugin` 导入 `export()` 方法, `export()` 方法会返回一个特殊的字典 `export`： - -```python -from nonebot.plugin import export - -export=export() -``` - -这个字典可以用来装载导出的对象，它的 key 是对象导出后的命名，value 是对象本身，我们可以直接创建新的 `key` - `value` 对导出对象： - -```python -export.vA = varA -export.fA = funcA -``` - -除此之外，也支持 `嵌套` 导出对象： - -```python -export.sub.vA = varA -export.sub.fA = funcA -``` - -特别地，对于 `函数对象` 而言，`export` 支持用 `装饰器` 的方法来导出，因此，我们可以这样定义 `funcA`： - -```python -@export.sub -def funcA(): - return "funcA" -``` - -或者: - -```python -@export -def funcA(): - return "funcA" -``` - -通过 `装饰器` 的方法导出函数时，命名固定为函数的命名，也就是说，上面的两个例子等同于： - -```python -export.sub.funcA = funcA - -export.funcA = funcA -``` - -这样，我们就成功导出 `varA` 和 `funcA` 对象了。 - -下面我们将介绍如何在 `pluginB` 中导入这些对象。 - -### 使用 require - -在 `pluginB` 中，我们调用 `require` 机制 `导入对象`。 - -:::warning 警告 - -在导入来自其他插件的对象时, 请确保导出该对象的插件在引用该对象的插件之前加载。如果该插件并未被加载，则会尝试加载，加载失败则会返回 `None`。 - -::: - -我们可以从 `nonebot.plugin` 中导入 `require()` 方法： - -```python -from nonebot.plugin import require -``` - -`require()` 方法的参数是插件名, 它会返回在指定插件中，用 `export()` 方法创建的字典。 - -```python -require_A = require('pluginA') -``` - -在之前，这个字典已经存入了 `'vA'` - `varA`, `'fA'` - `funcA` 或 `'funcA'` - `funcA` 这样的 `key` - `value` 对。因此在这里我们直接用 `属性` 的方法来获取导入对象: - -```python -varA = require_A.vA -funcA = require_A.fA or require_A.funcA -``` - -这样，我们就在 `pluginB` 中成功导入了 `varA` 和 `funcA` 对象了。 diff --git a/archive/2.0.0a15/advanced/overloaded-handlers.md b/archive/2.0.0a15/advanced/overloaded-handlers.md deleted file mode 100644 index 47fea384..00000000 --- a/archive/2.0.0a15/advanced/overloaded-handlers.md +++ /dev/null @@ -1,64 +0,0 @@ -# 事件处理函数重载 - -当我们在编写 `nonebot2` 应用时，常常会遇到这样一个问题：该怎么让同一类型的不同事件执行不同的响应逻辑？又或者如何让不同的 `adapter` 针对同一类型的事件作出不同响应？ - -针对这个问题， `nonebot2` 提供一个便捷而高效的解决方案：事件处理函数重载机制。简单地说，`handler` (事件处理函数) 会根据其参数的 `type hints` ([PEP484 类型标注](https://www.python.org/dev/peps/pep-0484/)) 来对相对应的 `adapter` 和 `Event` 进行响应，并且会忽略不符合其参数类型标注的情况。 - -必须要注意的是，该机制利用了 `inspect` 标准库获取到了事件处理函数的 `singnature` (签名) ，进一步获取到参数名称和类型标注。故而，我们在编写 `handler` 时，参数的名称和类型标注必须要符合 `T_Handler` 规定，详情可以参看 **指南** 中的[事件处理](../guide/creating-a-handler)。 - -::: tip 提示 - -如果想了解更多关于 `inspect` 标准库的信息，可以查看[官方文档](https://docs.python.org/zh-cn/3.9/library/inspect.html)。 - -::: - -下面，我们会以 `CQHTTP` 中的 `群聊消息事件` 和 `私聊消息事件` 为例，对该机制的应用进行简单的介绍。 - -## 一个例子 - -首先，我们需要导入需要的方法、类型。 - -```python -from nonebot import on_command -from nonebot.adapters.cqhttp import Bot, GroupMessageEvent, PrivateMessageEvent -``` - -之后，我们可以注册一个 `Matcher` 来响应 `消息事件` 。 - -```python -matcher = on_command("testoverload") -``` - -最后, 我们编写不同的 `handler` 并编写不同的类型标注来实现事件处理函数重载： - -```python -@matcher.handle() -async def _(bot: Bot, event: GroupMessageEvent): - await matcher.send("群聊消息事件响应成功！") - - -@matcher.handle() -async def _(bot: Bot, event: PrivateMessageEvent): - await matcher.send("私聊消息事件响应成功！") -``` - -此时，我们可以在群聊或私聊中对我们的机器人发送 `testoverload` ，它会在不同的场景做出不同的应答。 - -这样一个简单的事件处理函数重载就完成了。 - -## 进阶 - -事件处理函数重载机制同样支持被 `matcher.got` 等装饰器装饰的函数。 例如： - -```python -@matcher.got("key1", prompt="群事件提问") -async def _(bot: Bot, event: GroupMessageEvent): - await matcher.send("群聊消息事件响应成功！") - - -@matcher.got("key2", prompt="私聊事件提问") -async def _(bot: Bot, event: PrivateMessageEvent): - await matcher.send("私聊消息事件响应成功！") -``` - -只有触发事件符合的函数才会触发装饰器。 diff --git a/archive/2.0.0a15/advanced/permission.md b/archive/2.0.0a15/advanced/permission.md deleted file mode 100644 index 63c84535..00000000 --- a/archive/2.0.0a15/advanced/permission.md +++ /dev/null @@ -1,90 +0,0 @@ -# 权限控制 - -**权限控制**是机器人在实际应用中需要解决的重点问题之一，`Nonebot` 提供了十分完善且灵活的权限控制机制—— `Permission` 机制。接下来我们将对这个机制进行简单的说明。 - -## 应用 - -如同 `Rule` 一样, `Permission` 可以在[注册事件响应器](../guide/creating-a-matcher)时添加 `permission` 参数来加以应用，这样 `Nonebot` 会在事件响应时检测事件主体的权限。下面我们以 `SUPERUSER` 为例，对该机制的应用做一下介绍。 - -```python -from nonebot.permission import SUPERUSER -from nonebot.adapters import Bot -from nonebot import on_command - -matcher = on_command("测试超管", permission=SUPERUSER) - - -@matcher.handle() -async def _(bot: Bot): - await matcher.send("超管命令测试成功") - - -@matcher.got("key1", "超管提问") -async def _(bot: Bot, event: Event): - await matcher.send("超管命令got成功") -``` - -在这段代码中，我们事件响应器指定了 `SUPERUSER` 这样一个权限，那么机器人只会响应超级管理员的 `测试超管` 命令，并且会响应该超级管理员的连续对话。 - -::: tip 提示 - -在这里需要强调的是，`Permission` 与 `Rule` 的表现并不相同， `Rule` 只会在初次响应时生效，在余下的对话中并没有限制事件；但是 `Permission` 会持续生效，在连续对话中会一直对事件主体加以限制。 - -::: - -## 进阶 - -`Permission` 除了可以在注册事件响应器时加以应用，还可以在编写事件处理函数 `handler` 时主动调用，我们可以利用这个特性在一个 `handler` 里对不同权限的事件主体进行区别响应，下面我们以 `CQHTTP` 中的 `GROUP_ADMIN` (普通管理员非群主)和 `GROUP_OWNER` 为例，说明下怎么进行主动调用。 - -```python -from nonebot import on_command -from nonebot.adapters.cqhttp import Bot -from nonebot.adapters.cqhttp import GroupMessageEvent -from nonebot.adapters.cqhttp import GROUP_ADMIN, GROUP_OWNER - -matcher = on_command("测试权限") - -@matcher.handle() -async def _(bot: Bot, event: GroupMessageEvent): - if await GROUP_ADMIN(bot, event): - await matcher.send("管理员测试成功") - elif await GROUP_OWNER(bot, event): - await matcher.send("群主测试成功") - else: - await matcher.send("群员测试成功") - -``` - -在这段代码里，我们并没有对命令的权限指定，这个命令会响应所有在群聊中的 `测试权限` 命令，但是在 `handler` 里，我们对两个 `Permission` 进行主动调用，从而可以对不同的角色进行不同的响应。 - -## 自定义 - -如同 `Rule` 一样, `Permission` 也是由非负数个 `PermissionChecker` 组成的，但只需其中一个返回 `True` 时就会匹配成功。下面则是 `PermissionChecker` 和 `Permission` 示例： - -```python -from nonebot.adapters import Bot, Event -from nonebot.permission import Permission - -async def async_checker(bot: Bot, event: Event) -> bool: - return True - -def sync_checker(bot: Bot, event: Event) -> bool: - return True - -def check(arg1, arg2): - - async def _checker(bot: Bot, event: Event) -> bool: - return bool(arg1 + arg2) - - return Permission(_checker) -``` - -`Permission` 和 `PermissionChecker` 之间可以使用 `或 |` 互相组合： - -```python -from nonebot.permission import Permission - -Permission(async_checker1) | sync_checker | async_checker2 -``` - -同样地，如果想用 `Permission(*checkers)` 包裹构造 `Permission` ，函数必须是异步的；但是在利用 `或 |` 符号连接构造时， `Nonebot` 会自动包裹同步函数为异步函数。 diff --git a/archive/2.0.0a15/advanced/publish-plugin.md b/archive/2.0.0a15/advanced/publish-plugin.md deleted file mode 100644 index 68e2e6f9..00000000 --- a/archive/2.0.0a15/advanced/publish-plugin.md +++ /dev/null @@ -1 +0,0 @@ -# 发布插件 diff --git a/archive/2.0.0a15/advanced/runtime-hook.md b/archive/2.0.0a15/advanced/runtime-hook.md deleted file mode 100644 index 5e98c22a..00000000 --- a/archive/2.0.0a15/advanced/runtime-hook.md +++ /dev/null @@ -1,163 +0,0 @@ -# 钩子函数 - -[`钩子编程`](https://zh.wikipedia.org/wiki/%E9%92%A9%E5%AD%90%E7%BC%96%E7%A8%8B) - -> 钩子编程（hooking），也称作“挂钩”，是计算机程序设计术语，指通过拦截软件模块间的函数调用、消息传递、事件传递来修改或扩展操作系统、应用程序或其他软件组件的行为的各种技术。处理被拦截的函数调用、事件、消息的代码，被称为钩子（hook）。 - -在 `nonebot2` 中有一系列预定义的钩子函数，分为两类：`全局钩子函数` 和 `事件钩子函数` ，这些钩子函数可以用装饰器的形式来使用。 - -## 全局钩子函数 - -全局钩子函数是指 `nonebot2` 针对其本身运行过程的钩子函数。 - -这些钩子函数是由其后端驱动 `driver`来运行的，故需要先获得全局 `driver` 对象： - -```python -from nonebot import get_driver - - -driver=get_driver() -``` - -共分为六种函数： - -### 启动准备 - -这个钩子函数会在 `nonebot2` 启动时运行。 - -```python -@driver.on_startup -async def do_something(): - pass -``` - -### 终止处理 - -这个钩子函数会在 `nonebot2` 终止时运行。 - -```python -@driver.on_shutdown -async def do_something(): - pass -``` - -### bot 连接处理 - -这个钩子函数会在 `bot` 通过 `websocket` 连接到 `nonebot2` 时运行。 - -```python -@driver.on_bot_connect -async def do_something(bot: Bot): - pass -``` - -### bot 断开处理 - -这个钩子函数会在 `bot` 断开与 `nonebot2` 的 `websocket` 连接时运行。 - -```python -@driver.on_bot_disconnect -async def do_something(bot: Bot): - pass -``` - -### bot api 调用钩子 - -这个钩子函数会在 `Bot` 调用 API 时运行。 - -```python -from nonebot.adapters import Bot - -@Bot.on_calling_api -async def handle_api_call(bot: Bot, api: str, data: Dict[str, Any]): - pass -``` - -### bot api 调用后钩子 - -这个钩子函数会在 `Bot` 调用 API 后运行。 - -```python -from nonebot.adapters import Bot - -@Bot.on_called_api -async def handle_api_result(bot: Bot, exception: Optional[Exception], api: str, data: Dict[str, Any], result: Any): - pass -``` - -## 事件处理钩子 - -这些钩子函数指的是影响 `nonebot2` 进行 `事件处理` 的函数。 - -:::tip 提示 - -关于 `事件处理` 的流程，可以在[这里](./README)查阅。 - -::: - -:::warning 注意 - -1.在事件处理钩子函数中，与 `matcher` 运行状态相关的函数将不可用，如 `matcher.finish()` - -2.如果需要在事件处理钩子函数中打断整个对话的执行，请参考以下范例： - -```python -from nonebot.exception import IgnoredException - - -@event_preprocessor -async def do_something(bot: Bot, event: Event, state: T_State): - raise IgnoredException("reason") -``` - -::: - -共分为四种函数： - -### 事件预处理 - -这个钩子函数会在 `Event` 上报到 `nonebot2` 时运行 - -```python -from nonebot.message import event_preprocessor - -@event_preprocessor -async def do_something(bot: Bot, event: Event, state: T_State): - pass -``` - -### 事件后处理 - -这个钩子函数会在 `nonebot2` 处理 `Event` 后运行 - -```python -from nonebot.message import event_postprocessor - -@event_postprocessor -async def do_something(bot: Bot, event: Event, state: T_State): - pass -``` - -### 运行预处理 - -这个钩子函数会在 `nonebot2`运行 `matcher` 前运行。 - -```python -from nonebot.message import run_preprocessor - -@run_preprocessor -async def do_something(matcher: Matcher, bot: Bot, event: Event, state: T_State): - pass -``` - -### 运行后处理 - -这个钩子函数会在 `nonebot2`运行 `matcher` 后运行。 - -```python -from nonebot.message import run_postprocessor - -@run_postprocessor -async def do_something(matcher: Matcher, exception: Optional[Exception], bot: Bot, event: Event, state: T_State): - pass -``` diff --git a/archive/2.0.0a15/advanced/scheduler.md b/archive/2.0.0a15/advanced/scheduler.md deleted file mode 100644 index abab298e..00000000 --- a/archive/2.0.0a15/advanced/scheduler.md +++ /dev/null @@ -1,135 +0,0 @@ -# 定时任务 - -[`APScheduler`](https://apscheduler.readthedocs.io/en/latest/index.html) —— Advanced Python Scheduler - -> Advanced Python Scheduler (APScheduler) is a Python library that lets you schedule your Python code to be executed later, either just once or periodically. You can add new jobs or remove old ones on the fly as you please. If you store your jobs in a database, they will also survive scheduler restarts and maintain their state. When the scheduler is restarted, it will then run all the jobs it should have run while it was offline. - -## 从 NoneBot v1 迁移 - -`APScheduler` 作为 `nonebot` v1 的可选依赖，为众多 bot 提供了方便的定时任务功能。`nonebot2` 已将 `APScheduler` 独立为 `nonebot_plugin_apscheduler` 插件，你可以在 [商店](https://v2.nonebot.dev/store.html) 中找到它。 - -相比于 `nonebot` v1，`nonebot` v2 只需要安装插件并修改 `scheduler` 的导入方式即可完成迁移。 - -## 安装插件 - -### 通过 nb-cli - -如正在使用 `nb-cli` 构建项目，你可以从插件市场复制安装命令或手动输入以下命令以添加 `nonebot_plugin_apscheduler`。 - -```bash -nb plugin install nonebot_plugin_apscheduler -``` - -:::tip 提示 -`nb-cli` 默认通过 `pypi` 安装，你可以添加命令参数 `-i [mirror]` 或 `--index [mirror]` 以使用镜像源安装。 -::: - -### 通过 poetry - -执行以下命令以添加 `nonebot_plugin_apscheduler` - -```bash -poetry add nonebot-plugin-apscheduler -``` - -:::tip 提示 -由于稍后我们将使用 `nonebot.require()` 方法进行导入，所以无需额外的 `nonebot.load_plugin()` -::: - -## 快速上手 - -1. 在需要设置定时任务的插件中，通过 `nonebot.require` 从 `nonebot_plugin_apscheduler` 导入 `scheduler` 对象 - -2. 在该对象的基础上，根据 `APScheduler` 的使用方法进一步配置定时任务 - -将上述步骤归纳为最小实现的代码如下： - -```python -from nonebot import require - -scheduler = require("nonebot_plugin_apscheduler").scheduler - -@scheduler.scheduled_job("cron", hour="*/2", id="xxx", args=[1], kwargs={"arg2": 2}) -async def run_every_2_hour(arg1, arg2): - pass - -scheduler.add_job(run_every_day_from_program_start, "interval", days=1, id="xxx") -``` - -## 分步进行 - -### 导入 scheduler 对象 - -为了使插件能够实现定时任务，需要先将 `scheduler` 对象导入插件。 - -`nonebot2` 提供了 `nonebot.require` 方法来实现导入其他插件的内容，此处我们使用这个方法来导入 `scheduler` 对象。 - -`nonebot` 使用的 `scheduler` 对象为 `AsyncScheduler` 。 - -> 使用该方法传入的插件本身也需要有对应实现，关于该方法的更多介绍可以参阅 [这里](./export-and-require.md) - -```python -from nonebot import require - -scheduler = require("nonebot_plugin_apscheduler").scheduler -``` - -### 编写定时任务 - -由于本部分为标准的通过 `APScheduler` 配置定时任务，有关指南请参阅 [APScheduler 官方文档](https://apscheduler.readthedocs.io/en/latest/userguide.html#adding-jobs)。 - -### 配置插件选项 - -根据项目的 `.env` 文件设置，向 `.env.*` 或 `bot.py` 文件添加 `nonebot_plugin_apscheduler` 的可选配置项 - -:::warning 注意 -`.env.*` 文件的编写应遵循 nonebot2 对 `.env.*` 文件的编写要求 -::: - -#### `apscheduler_autostart` - -类型：`bool` - -默认值：`True` - -是否自动启动 `APScheduler`。 - -对于大多数情况，我们需要在 `nonebot2` 项目被启动时启动定时任务，则此处设为 `true` - -##### 在 `.env` 中添加 - -```bash -APSCHEDULER_AUTOSTART=true -``` - -##### 在 `bot.py` 中添加 - -```python -nonebot.init(apscheduler_autostart=True) -``` - -#### `apscheduler_config` - -类型：`dict` - -默认值：`{"apscheduler.timezone": "Asia/Shanghai"}` - -`APScheduler` 相关配置。修改/增加其中配置项需要确保 `prefix: apscheduler`。 - -对于 `APScheduler` 的相关配置，请参阅 [scheduler-config](https://apscheduler.readthedocs.io/en/latest/userguide.html#scheduler-config) 和 [BaseScheduler](https://apscheduler.readthedocs.io/en/latest/modules/schedulers/base.html#apscheduler.schedulers.base.BaseScheduler) - -> 官方文档在绝大多数时候能提供最准确和最具时效性的指南 - -##### 在 `.env` 中添加 - -```bash -APSCHEDULER_CONFIG={"apscheduler.timezone": "Asia/Shanghai"} -``` - -##### 在 `bot.py` 中添加 - -```python -nonebot.init(apscheduler_config={ - "apscheduler.timezone": "Asia/Shanghai" -}) -``` diff --git a/archive/2.0.0a15/api/README.md b/archive/2.0.0a15/api/README.md deleted file mode 100644 index 38fac915..00000000 --- a/archive/2.0.0a15/api/README.md +++ /dev/null @@ -1,67 +0,0 @@ -# NoneBot Api Reference - - -* **模块索引** - - - * [nonebot](nonebot.html) - - - * [nonebot.config](config.html) - - - * [nonebot.plugin](plugin.html) - - - * [nonebot.message](message.html) - - - * [nonebot.matcher](matcher.html) - - - * [nonebot.handler](handler.html) - - - * [nonebot.rule](rule.html) - - - * [nonebot.permission](permission.html) - - - * [nonebot.log](log.html) - - - * [nonebot.utils](utils.html) - - - * [nonebot.typing](typing.html) - - - * [nonebot.exception](exception.html) - - - * [nonebot.drivers](drivers/) - - - * [nonebot.drivers.fastapi](drivers/fastapi.html) - - - * [nonebot.drivers.quart](drivers/quart.html) - - - * [nonebot.drivers.aiohttp](drivers/aiohttp.html) - - - * [nonebot.adapters](adapters/) - - - * [nonebot.adapters.cqhttp](adapters/cqhttp.html) - - - * [nonebot.adapters.ding](adapters/ding.html) - - - * [nonebot.adapters.mirai](adapters/mirai.html) - - - * [nonebot.adapters.feishu](adapters/feishu.html) diff --git a/archive/2.0.0a15/api/adapters/README.md b/archive/2.0.0a15/api/adapters/README.md deleted file mode 100644 index d1431b1f..00000000 --- a/archive/2.0.0a15/api/adapters/README.md +++ /dev/null @@ -1,501 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.adapters 模块 - -## 协议适配基类 - -各协议请继承以下基类，并使用 `driver.register_adapter` 注册适配器 - - -## _class_ `Bot` - -基类：`abc.ABC` - -Bot 基类。用于处理上报消息，并提供 API 调用接口。 - - -### `driver` - -Driver 对象 - - -### `config` - -Config 配置对象 - - -### `_calling_api_hook` - - -* **类型** - - `Set[T_CallingAPIHook]` - - - -* **说明** - - call_api 时执行的函数 - - - -### `_called_api_hook` - - -* **类型** - - `Set[T_CalledAPIHook]` - - - -* **说明** - - call_api 后执行的函数 - - - -### `__init__(self_id, request)` - - -* **参数** - - - * `self_id: str`: 机器人 ID - - - * `request: HTTPConnection`: request 连接对象 - - - -### `self_id` - -机器人 ID - - -### `request` - -连接信息 - - -### _abstract property_ `type` - -Adapter 类型 - - -### _classmethod_ `register(driver, config, **kwargs)` - - -* **说明** - - `register` 方法会在 `driver.register_adapter` 时被调用，用于初始化相关配置 - - - -### _abstract async classmethod_ `check_permission(driver, request)` - - -* **说明** - - 检查连接请求是否合法的函数，如果合法则返回当前连接 `唯一标识符`，通常为机器人 ID；如果不合法则抛出 `RequestDenied` 异常。 - - - -* **参数** - - - * `driver: Driver`: Driver 对象 - - - * `request: HTTPConnection`: request 请求详情 - - - -* **返回** - - - * `Optional[str]`: 连接唯一标识符，`None` 代表连接不合法 - - - * `Optional[HTTPResponse]`: HTTP 上报响应 - - - -### _abstract async_ `handle_message(message)` - - -* **说明** - - 处理上报消息的函数，转换为 `Event` 事件后调用 `nonebot.message.handle_event` 进一步处理事件。 - - - -* **参数** - - - * `message: bytes`: 收到的上报消息 - - - -### _abstract async_ `_call_api(api, **data)` - - -* **说明** - - `adapter` 实际调用 api 的逻辑实现函数，实现该方法以调用 api。 - - - -* **参数** - - - * `api: str`: API 名称 - - - * `**data`: API 数据 - - - -### _async_ `call_api(api, **data)` - - -* **说明** - - 调用机器人 API 接口，可以通过该函数或直接通过 bot 属性进行调用 - - - -* **参数** - - - * `api: str`: API 名称 - - - * `**data`: API 数据 - - - -* **示例** - - -```python -await bot.call_api("send_msg", message="hello world") -await bot.send_msg(message="hello world") -``` - - -### _abstract async_ `send(event, message, **kwargs)` - - -* **说明** - - 调用机器人基础发送消息接口 - - - -* **参数** - - - * `event: Event`: 上报事件 - - - * `message: Union[str, Message, MessageSegment]`: 要发送的消息 - - - * `**kwargs` - - - -### _classmethod_ `on_calling_api(func)` - - -* **说明** - - 调用 api 预处理。 - - - -* **参数** - - - * `bot: Bot`: 当前 bot 对象 - - - * `api: str`: 调用的 api 名称 - - - * `data: Dict[str, Any]`: api 调用的参数字典 - - - -### _classmethod_ `on_called_api(func)` - - -* **说明** - - 调用 api 后处理。 - - - -* **参数** - - - * `bot: Bot`: 当前 bot 对象 - - - * `exception: Optional[Exception]`: 调用 api 时发生的错误 - - - * `api: str`: 调用的 api 名称 - - - * `data: Dict[str, Any]`: api 调用的参数字典 - - - * `result: Any`: api 调用的返回 - - - -## _class_ `MessageSegment` - -基类：`Mapping`, `abc.ABC`, `Generic`[`nonebot.adapters._base.TM`] - -消息段基类 - - -### `type` - - -* 类型: `str` - - -* 说明: 消息段类型 - - -### `data` - - -* 类型: `Dict[str, Union[str, list]]` - - -* 说明: 消息段数据 - - -## _class_ `Message` - -基类：`List`[`nonebot.adapters._base.TMS`], `abc.ABC` - -消息数组 - - -### `__init__(message=None, *args, **kwargs)` - - -* **参数** - - - * `message: Union[str, list, dict, MessageSegment, Message, Any]`: 消息内容 - - - -### `append(obj)` - - -* **说明** - - 添加一个消息段到消息数组末尾 - - - -* **参数** - - - * `obj: Union[str, MessageSegment]`: 要添加的消息段 - - - -### `extend(obj)` - - -* **说明** - - 拼接一个消息数组或多个消息段到消息数组末尾 - - - -* **参数** - - - * `obj: Union[Message, Iterable[MessageSegment]]`: 要添加的消息数组 - - - -### `extract_plain_text()` - - -* **说明** - - 提取消息内纯文本消息 - - - -## _class_ `Event` - -基类：`abc.ABC`, `pydantic.main.BaseModel` - -Event 基类。提供获取关键信息的方法，其余信息可直接获取。 - - -### _abstract_ `get_type()` - - -* **说明** - - 获取事件类型的方法，类型通常为 NoneBot 内置的四种类型。 - - - -* **返回** - - - * `Literal["message", "notice", "request", "meta_event"]` - - - * 其他自定义 `str` - - - -### _abstract_ `get_event_name()` - - -* **说明** - - 获取事件名称的方法。 - - - -* **返回** - - - * `str` - - - -### _abstract_ `get_event_description()` - - -* **说明** - - 获取事件描述的方法，通常为事件具体内容。 - - - -* **返回** - - - * `str` - - - -### `get_log_string()` - - -* **说明** - - 获取事件日志信息的方法，通常你不需要修改这个方法，只有当希望 NoneBot 隐藏该事件日志时，可以抛出 `NoLogException` 异常。 - - - -* **返回** - - - * `str` - - - -* **异常** - - - * `NoLogException` - - - -### _abstract_ `get_user_id()` - - -* **说明** - - 获取事件主体 id 的方法，通常是用户 id 。 - - - -* **返回** - - - * `str` - - - -### _abstract_ `get_session_id()` - - -* **说明** - - 获取会话 id 的方法，用于判断当前事件属于哪一个会话，通常是用户 id、群组 id 组合。 - - - -* **返回** - - - * `str` - - - -### _abstract_ `get_message()` - - -* **说明** - - 获取事件消息内容的方法。 - - - -* **返回** - - - * `Message` - - - -### `get_plaintext()` - - -* **说明** - - 获取消息纯文本的方法，通常不需要修改，默认通过 `get_message().extract_plain_text` 获取。 - - - -* **返回** - - - * `str` - - - -### _abstract_ `is_tome()` - - -* **说明** - - 获取事件是否与机器人有关的方法。 - - - -* **返回** - - - * `bool` diff --git a/archive/2.0.0a15/api/adapters/cqhttp.md b/archive/2.0.0a15/api/adapters/cqhttp.md deleted file mode 100644 index 1147a2cd..00000000 --- a/archive/2.0.0a15/api/adapters/cqhttp.md +++ /dev/null @@ -1,686 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.adapters.cqhttp 模块 - -## CQHTTP (OneBot) v11 协议适配 - -协议详情请看: [CQHTTP](https://github.com/howmanybots/onebot/blob/master/README.md) | [OneBot](https://github.com/howmanybots/onebot/blob/master/README.md) - -# NoneBot.adapters.cqhttp.config 模块 - - -## _class_ `Config` - -CQHTTP 配置类 - - -* **配置项** - - - * `access_token` / `cqhttp_access_token`: CQHTTP 协议授权令牌 - - - * `secret` / `cqhttp_secret`: CQHTTP HTTP 上报数据签名口令 - - - * `ws_urls` / `cqhttp_ws_urls`: CQHTTP 正向 Websocket 连接 Bot ID、目标 URL 字典 - - -# NoneBot.adapters.cqhttp.utils 模块 - - -## `escape(s, *, escape_comma=True)` - - -* **说明** - - 对字符串进行 CQ 码转义。 - - - -* **参数** - - - * `s: str`: 需要转义的字符串 - - - * `escape_comma: bool`: 是否转义逗号（`,`）。 - - - -## `unescape(s)` - - -* **说明** - - 对字符串进行 CQ 码去转义。 - - - -* **参数** - - - * `s: str`: 需要转义的字符串 - - -# NoneBot.adapters.cqhttp.exception 模块 - - -## _exception_ `ActionFailed` - -基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed), `nonebot.adapters.cqhttp.exception.CQHTTPAdapterException` - - -* **说明** - - API 请求返回错误信息。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - - -## _exception_ `NetworkError` - -基类：[`nonebot.exception.NetworkError`](../exception.md#nonebot.exception.NetworkError), `nonebot.adapters.cqhttp.exception.CQHTTPAdapterException` - - -* **说明** - - 网络错误。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - -# NoneBot.adapters.cqhttp.bot 模块 - - -## _async_ `_check_reply(bot, event)` - - -* **说明** - - 检查消息中存在的回复，去除并赋值 `event.reply`, `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_check_at_me(bot, event)` - - -* **说明** - - 检查消息开头或结尾是否存在 @机器人，去除并赋值 `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_check_nickname(bot, event)` - - -* **说明** - - 检查消息开头是否存在昵称，去除并赋值 `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_handle_api_result(result)` - - -* **说明** - - 处理 API 请求返回值。 - - - -* **参数** - - - * `result: Optional[Dict[str, Any]]`: API 返回数据 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `ActionFailed`: API 调用失败 - - - -## _class_ `Bot` - -基类：[`nonebot.adapters._base.Bot`](README.md#nonebot.adapters._base.Bot) - -CQHTTP 协议 Bot 适配。继承属性参考 [BaseBot](./#class-basebot) 。 - - -### _property_ `type` - - -* 返回: `"cqhttp"` - - -### _async classmethod_ `check_permission(driver, request)` - - -* **说明** - - CQHTTP (OneBot) 协议鉴权。参考 [鉴权](https://github.com/howmanybots/onebot/blob/master/v11/specs/communication/authorization.md) - - - -### _async_ `handle_message(message)` - - -* **说明** - - 调用 [_check_reply](#async-check-reply-bot-event), [_check_at_me](#check-at-me-bot-event), [_check_nickname](#check-nickname-bot-event) 处理事件并转换为 [Event](#class-event) - - - -### _async_ `call_api(api, **data)` - - -* **说明** - - 调用 CQHTTP 协议 API - - - -* **参数** - - - * `api: str`: API 名称 - - - * `**data: Any`: API 参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - - -### _async_ `send(event, message, at_sender=False, **kwargs)` - - -* **说明** - - 根据 `event` 向触发事件的主体发送消息。 - - - -* **参数** - - - * `event: Event`: Event 对象 - - - * `message: Union[str, Message, MessageSegment]`: 要发送的消息 - - - * `at_sender: bool`: 是否 @ 事件主体 - - - * `**kwargs`: 覆盖默认参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `ValueError`: 缺少 `user_id`, `group_id` - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - -# NoneBot.adapters.cqhttp.message 模块 - - -## _class_ `MessageSegment` - -基类：[`nonebot.adapters._base.MessageSegment`](README.md#nonebot.adapters._base.MessageSegment)[`Message`] - -CQHTTP 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 - - -### _classmethod_ `get_message_class()` - - -### `is_text()` - - -### _static_ `anonymous(ignore_failure=None)` - - -### _static_ `at(user_id)` - - -### _static_ `contact(type_, id)` - - -### _static_ `contact_group(group_id)` - - -### _static_ `contact_user(user_id)` - - -### _static_ `dice()` - - -### _static_ `face(id_)` - - -### _static_ `forward(id_)` - - -### _static_ `image(file, type_=None, cache=True, proxy=True, timeout=None)` - - -### _static_ `json(data)` - - -### _static_ `location(latitude, longitude, title=None, content=None)` - - -### _static_ `music(type_, id_)` - - -### _static_ `music_custom(url, audio, title, content=None, img_url=None)` - - -### _static_ `node(id_)` - - -### _static_ `node_custom(user_id, nickname, content)` - - -### _static_ `poke(type_, id_)` - - -### _static_ `record(file, magic=None, cache=None, proxy=None, timeout=None)` - - -### _static_ `reply(id_)` - - -### _static_ `rps()` - - -### _static_ `shake()` - - -### _static_ `share(url='', title='', content=None, image=None)` - - -### _static_ `text(text)` - - -### _static_ `video(file, cache=None, proxy=None, timeout=None)` - - -### _static_ `xml(data)` - - -### `type` - - -* 类型: `str` - - -* 说明: 消息段类型 - - -### `data` - - -* 类型: `Dict[str, Union[str, list]]` - - -* 说明: 消息段数据 - - -## _class_ `Message` - -基类：[`nonebot.adapters._base.Message`](README.md#nonebot.adapters._base.Message)[`nonebot.adapters.cqhttp.message.MessageSegment`] - -CQHTTP 协议 Message 适配。 - - -### _classmethod_ `get_segment_class()` - - -### `extract_plain_text()` - -# NoneBot.adapters.cqhttp.permission 模块 - - -## `PRIVATE` - - -* **说明**: 匹配任意私聊消息类型事件 - - -## `PRIVATE_FRIEND` - - -* **说明**: 匹配任意好友私聊消息类型事件 - - -## `PRIVATE_GROUP` - - -* **说明**: 匹配任意群临时私聊消息类型事件 - - -## `PRIVATE_OTHER` - - -* **说明**: 匹配任意其他私聊消息类型事件 - - -## `GROUP` - - -* **说明**: 匹配任意群聊消息类型事件 - - -## `GROUP_MEMBER` - - -* **说明**: 匹配任意群员群聊消息类型事件 - -:::warning 警告 -该权限通过 event.sender 进行判断且不包含管理员以及群主！ -::: - - -## `GROUP_ADMIN` - - -* **说明**: 匹配任意群管理员群聊消息类型事件 - - -## `GROUP_OWNER` - - -* **说明**: 匹配任意群主群聊消息类型事件 - -# NoneBot.adapters.cqhttp.event 模块 - - -## _class_ `Event` - -基类：[`nonebot.adapters._base.Event`](README.md#nonebot.adapters._base.Event) - -CQHTTP 协议事件，字段与 CQHTTP 一致。各事件字段参考 [CQHTTP 文档](https://github.com/howmanybots/onebot/blob/master/README.md) - - -## _class_ `MessageEvent` - -基类：`nonebot.adapters.cqhttp.event.Event` - -消息事件 - - -### `to_me` - - -* **说明** - - 消息是否与机器人有关 - - - -* **类型** - - `bool` - - - -### `reply` - - -* **说明** - - 消息中提取的回复消息，内容为 `get_msg` API 返回结果 - - - -* **类型** - - `Optional[Reply]` - - - -## _class_ `PrivateMessageEvent` - -基类：`nonebot.adapters.cqhttp.event.MessageEvent` - -私聊消息 - - -## _class_ `GroupMessageEvent` - -基类：`nonebot.adapters.cqhttp.event.MessageEvent` - -群消息 - - -## _class_ `NoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.Event` - -通知事件 - - -## _class_ `GroupUploadNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群文件上传事件 - - -## _class_ `GroupAdminNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群管理员变动 - - -## _class_ `GroupDecreaseNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群成员减少事件 - - -## _class_ `GroupIncreaseNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群成员增加事件 - - -## _class_ `GroupBanNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群禁言事件 - - -## _class_ `FriendAddNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -好友添加事件 - - -## _class_ `GroupRecallNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群消息撤回事件 - - -## _class_ `FriendRecallNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -好友消息撤回事件 - - -## _class_ `NotifyEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -提醒事件 - - -## _class_ `PokeNotifyEvent` - -基类：`nonebot.adapters.cqhttp.event.NotifyEvent` - -戳一戳提醒事件 - - -## _class_ `LuckyKingNotifyEvent` - -基类：`nonebot.adapters.cqhttp.event.NotifyEvent` - -群红包运气王提醒事件 - - -## _class_ `HonorNotifyEvent` - -基类：`nonebot.adapters.cqhttp.event.NotifyEvent` - -群荣誉变更提醒事件 - - -## _class_ `RequestEvent` - -基类：`nonebot.adapters.cqhttp.event.Event` - -请求事件 - - -## _class_ `FriendRequestEvent` - -基类：`nonebot.adapters.cqhttp.event.RequestEvent` - -加好友请求事件 - - -## _class_ `GroupRequestEvent` - -基类：`nonebot.adapters.cqhttp.event.RequestEvent` - -加群请求/邀请事件 - - -## _class_ `MetaEvent` - -基类：`nonebot.adapters.cqhttp.event.Event` - -元事件 - - -## _class_ `LifecycleMetaEvent` - -基类：`nonebot.adapters.cqhttp.event.MetaEvent` - -生命周期元事件 - - -## _class_ `HeartbeatMetaEvent` - -基类：`nonebot.adapters.cqhttp.event.MetaEvent` - -心跳元事件 - - -## `get_event_model(event_name)` - - -* **说明** - - 根据事件名获取对应 `Event Model` 及 `FallBack Event Model` 列表 - - - -* **返回** - - - * `List[Type[Event]]` diff --git a/archive/2.0.0a15/api/adapters/ding.md b/archive/2.0.0a15/api/adapters/ding.md deleted file mode 100644 index 556102a8..00000000 --- a/archive/2.0.0a15/api/adapters/ding.md +++ /dev/null @@ -1,334 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.adapters.ding 模块 - -## 钉钉群机器人 协议适配 - -协议详情请看: [钉钉文档](https://ding-doc.dingtalk.com/document#/org-dev-guide/elzz1p) - -# NoneBot.adapters.ding.config 模块 - - -## _class_ `Config` - -钉钉配置类 - - -* **配置项** - - - * `access_token` / `ding_access_token`: 钉钉令牌 - - - * `secret` / `ding_secret`: 钉钉 HTTP 上报数据签名口令 - - -# NoneBot.adapters.ding.exception 模块 - - -## _exception_ `DingAdapterException` - -基类：[`nonebot.exception.AdapterException`](../exception.md#nonebot.exception.AdapterException) - - -* **说明** - - 钉钉 Adapter 错误基类 - - - -## _exception_ `ActionFailed` - -基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed), `nonebot.adapters.ding.exception.DingAdapterException` - - -* **说明** - - API 请求返回错误信息。 - - - -* **参数** - - - * `errcode: Optional[int]`: 错误码 - - - * `errmsg: Optional[str]`: 错误信息 - - - -## _exception_ `NetworkError` - -基类：[`nonebot.exception.NetworkError`](../exception.md#nonebot.exception.NetworkError), `nonebot.adapters.ding.exception.DingAdapterException` - - -* **说明** - - 网络错误。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - - -## _exception_ `SessionExpired` - -基类：`nonebot.adapters.ding.exception.ApiNotAvailable`, `nonebot.adapters.ding.exception.DingAdapterException` - - -* **说明** - - 发消息的 session 已经过期。 - - -# NoneBot.adapters.ding.bot 模块 - - -## _class_ `Bot` - -基类：[`nonebot.adapters._base.Bot`](README.md#nonebot.adapters._base.Bot) - -钉钉 协议 Bot 适配。继承属性参考 [BaseBot](./#class-basebot) 。 - - -### _property_ `type` - - -* 返回: `"ding"` - - -### _async classmethod_ `check_permission(driver, request)` - - -* **说明** - - 钉钉协议鉴权。参考 [鉴权](https://ding-doc.dingtalk.com/doc#/serverapi2/elzz1p) - - - -### _async_ `call_api(api, event=None, **data)` - - -* **说明** - - 调用 钉钉 协议 API - - - -* **参数** - - - * `api: str`: API 名称 - - - * `event: Optional[MessageEvent]`: Event 对象 - - - * `**data: Any`: API 参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - - -### _async_ `send(event, message, at_sender=False, webhook=None, secret=None, **kwargs)` - - -* **说明** - - 根据 `event` 向触发事件的主体发送消息。 - - - -* **参数** - - - * `event: Event`: Event 对象 - - - * `message: Union[str, Message, MessageSegment]`: 要发送的消息 - - - * `at_sender: bool`: 是否 @ 事件主体 - - - * `webhook: Optional[str]`: 该条消息将调用的 webhook 地址。不传则将使用 sessionWebhook，若其也不存在，该条消息不发送，使用自定义 webhook 时注意你设置的安全方式，如加关键词，IP地址，加签等等。 - - - * `secret: Optional[str]`: 如果你使用自定义的 webhook 地址，推荐使用加签方式对消息进行验证，将 机器人安全设置页面，加签一栏下面显示的SEC开头的字符串 传入这个参数即可。 - - - * `**kwargs`: 覆盖默认参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `ValueError`: 缺少 `user_id`, `group_id` - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - -# NoneBot.adapters.ding.message 模块 - - -## _class_ `MessageSegment` - -基类：[`nonebot.adapters._base.MessageSegment`](README.md#nonebot.adapters._base.MessageSegment)[`Message`] - -钉钉 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 - - -### _static_ `atAll()` - -@全体 - - -### _static_ `atMobiles(*mobileNumber)` - -@指定手机号人员 - - -### _static_ `atDingtalkIds(*dingtalkIds)` - -@指定 id，@ 默认会在消息段末尾。 -所以你可以在消息中使用 @{senderId} 占位，发送出去之后 @ 就会出现在占位的位置： -``python -message = MessageSegment.text(f"@{event.senderId}，你好") -message += MessageSegment.atDingtalkIds(event.senderId) -`` - - -### _static_ `text(text)` - -发送 `text` 类型消息 - - -### _static_ `image(picURL)` - -发送 `image` 类型消息 - - -### _static_ `extension(dict_)` - -标记 text 文本的 extension 属性，需要与 text 消息段相加。 - - -### _static_ `code(code_language, code)` - -发送 code 消息段 - - -### _static_ `markdown(title, text)` - -发送 `markdown` 类型消息 - - -### _static_ `actionCardSingleBtn(title, text, singleTitle, singleURL)` - -发送 `actionCardSingleBtn` 类型消息 - - -### _static_ `actionCardMultiBtns(title, text, btns, hideAvatar=False, btnOrientation='1')` - -发送 `actionCardMultiBtn` 类型消息 - - -* **参数** - - - * `btnOrientation`: 0：按钮竖直排列 1：按钮横向排列 - - - * `btns`: `[{ "title": title, "actionURL": actionURL }, ...]` - - - -### _static_ `feedCard(links)` - -发送 `feedCard` 类型消息 - - -* **参数** - - - * `links`: `[{ "title": xxx, "messageURL": xxx, "picURL": xxx }, ...]` - - - -## _class_ `Message` - -基类：[`nonebot.adapters._base.Message`](README.md#nonebot.adapters._base.Message)[`nonebot.adapters.ding.message.MessageSegment`] - -钉钉 协议 Message 适配。 - -# NoneBot.adapters.ding.event 模块 - - -## _class_ `Event` - -基类：[`nonebot.adapters._base.Event`](README.md#nonebot.adapters._base.Event) - -钉钉协议事件。各事件字段参考 [钉钉文档](https://ding-doc.dingtalk.com/document#/org-dev-guide/elzz1p) - - -## _class_ `ConversationType` - -基类：`str`, `enum.Enum` - -An enumeration. - - -## _class_ `MessageEvent` - -基类：`nonebot.adapters.ding.event.Event` - -消息事件 - - -## _class_ `PrivateMessageEvent` - -基类：`nonebot.adapters.ding.event.MessageEvent` - -私聊消息事件 - - -## _class_ `GroupMessageEvent` - -基类：`nonebot.adapters.ding.event.MessageEvent` - -群消息事件 diff --git a/archive/2.0.0a15/api/adapters/feishu.md b/archive/2.0.0a15/api/adapters/feishu.md deleted file mode 100644 index 0da2dc15..00000000 --- a/archive/2.0.0a15/api/adapters/feishu.md +++ /dev/null @@ -1,246 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.adapters.feishu 模块 - -# NoneBot.adapters.feishu.config 模块 - - -## _class_ `Config` - -钉钉配置类 - - -* **配置项** - - - * `app_id` / `feishu_app_id`: 飞书开放平台后台“凭证与基础信息”处给出的 App ID - - - * `app_secret` / `feishu_app_secret`: 飞书开放平台后台“凭证与基础信息”处给出的 App Secret - - - * `encrypt_key` / `feishu_encrypt_key`: 飞书开放平台后台“事件订阅”处设置的 Encrypt Key - - - * `verification_token` / `feishu_verification_token`: 飞书开放平台后台“事件订阅”处设置的 Verification Token - - - * `tenant_access_token` / `feishu_tenant_access_token`: 请求飞书 API 后返回的租户密钥 - - -# NoneBot.adapters.feishu.exception 模块 - - -## _exception_ `ActionFailed` - -基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed), `nonebot.adapters.feishu.exception.FeishuAdapterException` - - -* **说明** - - API 请求返回错误信息。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - - -## _exception_ `NetworkError` - -基类：[`nonebot.exception.NetworkError`](../exception.md#nonebot.exception.NetworkError), `nonebot.adapters.feishu.exception.FeishuAdapterException` - - -* **说明** - - 网络错误。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - -# NoneBot.adapters.feishu.bot 模块 - - -## `_check_at_me(bot, event)` - - -* **说明** - - 检查消息开头或结尾是否存在 @机器人，去除并赋值 `event.reply`, `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_check_nickname(bot, event)` - - -* **说明** - - 检查消息开头是否存在昵称，去除并赋值 `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_handle_api_result(result)` - - -* **说明** - - 处理 API 请求返回值。 - - - -* **参数** - - - * `result: Optional[Dict[str, Any]]`: API 返回数据 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `ActionFailed`: API 调用失败 - - - -## _class_ `Bot` - -基类：[`nonebot.adapters._base.Bot`](README.md#nonebot.adapters._base.Bot) - -飞书 协议 Bot 适配。继承属性参考 [BaseBot](./#class-basebot) 。 - - -### _async_ `handle_message(message)` - - -* **说明** - - 处理事件并转换为 [Event](#class-event) - - - -### _async_ `call_api(api, **data)` - - -* **说明** - - 调用 飞书 协议 API - - - -* **参数** - - - * `api: str`: API 名称 - - - * `**data: Any`: API 参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - -# NoneBot.adapters.feishu.message 模块 - - -## _class_ `MessageSegment` - -基类：[`nonebot.adapters._base.MessageSegment`](README.md#nonebot.adapters._base.MessageSegment)[`Message`] - -飞书 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 - - -## _class_ `Message` - -基类：[`nonebot.adapters._base.Message`](README.md#nonebot.adapters._base.Message)[`nonebot.adapters.feishu.message.MessageSegment`] - -飞书 协议 Message 适配。 - - -## _class_ `MessageSerializer` - -基类：`object` - -飞书 协议 Message 序列化器。 - - -## _class_ `MessageDeserializer` - -基类：`object` - -飞书 协议 Message 反序列化器。 - -# NoneBot.adapters.feishu.event 模块 - - -## _class_ `Event` - -基类：[`nonebot.adapters._base.Event`](README.md#nonebot.adapters._base.Event) - -飞书协议事件。各事件字段参考 [飞书文档](https://open.feishu.cn/document/ukTMukTMukTM/uYDNxYjL2QTM24iN0EjN/event-list) - - -## `get_event_model(event_name)` - - -* **说明** - - 根据事件名获取对应 `Event Model` 及 `FallBack Event Model` 列表 - - - -* **返回** - - - * `List[Type[Event]]` diff --git a/archive/2.0.0a15/api/adapters/mirai.md b/archive/2.0.0a15/api/adapters/mirai.md deleted file mode 100644 index 25347a77..00000000 --- a/archive/2.0.0a15/api/adapters/mirai.md +++ /dev/null @@ -1,1877 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.adapters.mirai 模块 - -## Mirai-API-HTTP 协议适配 - -协议详情请看: [mirai-api-http 文档](https://github.com/project-mirai/mirai-api-http/tree/master/docs) - -::: tip -该Adapter目前仍然处在早期实验性阶段, 并未经过充分测试 - -如果你在使用过程中遇到了任何问题, 请前往 [Issue页面](https://github.com/nonebot/nonebot2/issues) 为我们提供反馈 -::: - -::: danger -Mirai-API-HTTP 的适配器以 [AGPLv3许可](https://opensource.org/licenses/AGPL-3.0) 单独开源 - -这意味着在使用该适配器时需要 **以该许可开源您的完整程序代码** -::: - -# NoneBot.adapters.mirai.config 模块 - - -## _class_ `Config` - -Mirai 配置类 - - -* **必填** - - - * `auth_key` / `mirai_auth_key`: mirai-api-http 的 auth_key - - - * `mirai_host`: mirai-api-http 的地址 - - - * `mirai_port`: mirai-api-http 的端口 - - -# NoneBot.adapters.mirai.bot 模块 - - -## _class_ `SessionManager` - -基类：`object` - -Bot会话管理器, 提供API主动调用接口 - - -### _async_ `post(path, *, params=None)` - - -* **说明** - - 以POST方式主动提交API请求 - - - -* **参数** - - - * `path: str`: 对应API路径 - - - * `params: Optional[Dict[str, Any]]`: 请求参数 (无需sessionKey) - - - -* **返回** - - - * `Dict[str, Any]`: API 返回值 - - - -### _async_ `request(path, *, params=None)` - - -* **说明** - - 以GET方式主动提交API请求 - - - -* **参数** - - - * `path: str`: 对应API路径 - - - * `params: Optional[Dict[str, Any]]`: 请求参数 (无需sessionKey) - - - -### _async_ `upload(path, *, params)` - - -* **说明** - - 以表单(`multipart/form-data`)形式主动提交API请求 - - - -* **参数** - - - * `path: str`: 对应API路径 - - - * `params: Dict[str, Any]`: 请求参数 (无需sessionKey) - - - -## _class_ `Bot` - -基类：[`nonebot.adapters._base.Bot`](README.md#nonebot.adapters._base.Bot) - -mirai-api-http 协议 Bot 适配。 - -::: warning -API中为了使代码更加整洁, 我们采用了与PEP8相符的命名规则取代Mirai原有的驼峰命名 - -部分字段可能与文档在符号上不一致 -::: - - -### _property_ `api` - -返回该Bot对象的会话管理实例以提供API主动调用 - - -### _async_ `call_api(api, **data)` - -::: danger -由于Mirai的HTTP API特殊性, 该API暂时无法实现 -::: - -::: tip -你可以使用 `MiraiBot.api` 中提供的调用方法来代替 -::: - - -### `send(event, message, at_sender=False)` - - -* **说明** - - 根据 `event` 向触发事件的主体发送信息 - - - -* **参数** - - - * `event: Event`: Event对象 - - - * `message: Union[MessageChain, MessageSegment, str]`: 要发送的消息 - - - * `at_sender: bool`: 是否 @ 事件主体 - - - -### `send_friend_message(target, message_chain)` - - -* **说明** - - 使用此方法向指定好友发送消息 - - - -* **参数** - - - * `target: int`: 发送消息目标好友的 QQ 号 - - - * `message_chain: MessageChain`: 消息链，是一个消息对象构成的数组 - - - -### `send_temp_message(qq, group, message_chain)` - - -* **说明** - - 使用此方法向临时会话对象发送消息 - - - -* **参数** - - - * `qq: int`: 临时会话对象 QQ 号 - - - * `group: int`: 临时会话群号 - - - * `message_chain: MessageChain`: 消息链，是一个消息对象构成的数组 - - - -### `send_group_message(group, message_chain, quote=None)` - - -* **说明** - - 使用此方法向指定群发送消息 - - - -* **参数** - - - * `group: int`: 发送消息目标群的群号 - - - * `message_chain: MessageChain`: 消息链，是一个消息对象构成的数组 - - - * `quote: Optional[int]`: 引用一条消息的 message_id 进行回复 - - - -### `recall(target)` - - -* **说明** - - 使用此方法撤回指定消息。对于bot发送的消息，有2分钟时间限制。对于撤回群聊中群员的消息，需要有相应权限 - - - -* **参数** - - - * `target: int`: 需要撤回的消息的message_id - - - -### `send_image_message(target, qq, group, urls)` - - -* **说明** - - 使用此方法向指定对象（群或好友）发送图片消息 - 除非需要通过此手段获取image_id，否则不推荐使用该接口 - - > 当qq和group同时存在时，表示发送临时会话图片，qq为临时会话对象QQ号，group为临时会话发起的群号 - - - -* **参数** - - - * `target: int`: 发送对象的QQ号或群号，可能存在歧义 - - - * `qq: int`: 发送对象的QQ号 - - - * `group: int`: 发送对象的群号 - - - * `urls: List[str]`: 是一个url字符串构成的数组 - - - -* **返回** - - - * `List[str]`: 一个包含图片imageId的数组 - - - -### `upload_image(type, img)` - - -* **说明** - - 使用此方法上传图片文件至服务器并返回Image_id - - - -* **参数** - - - * `type: str`: “friend” 或 “group” 或 “temp” - - - * `img: BytesIO`: 图片的BytesIO对象 - - - -### `upload_voice(type, voice)` - - -* **说明** - - 使用此方法上传语音文件至服务器并返回voice_id - - - -* **参数** - - - * `type: str`: 当前仅支持 “group” - - - * `voice: BytesIO`: 语音的BytesIO对象 - - - -### `fetch_message(count=10)` - - -* **说明** - - 使用此方法获取bot接收到的最老消息和最老各类事件 - (会从MiraiApiHttp消息记录中删除) - - - -* **参数** - - - * `count: int`: 获取消息和事件的数量 - - - -### `fetch_latest_message(count=10)` - - -* **说明** - - 使用此方法获取bot接收到的最新消息和最新各类事件 - (会从MiraiApiHttp消息记录中删除) - - - -* **参数** - - - * `count: int`: 获取消息和事件的数量 - - - -### `peek_message(count=10)` - - -* **说明** - - 使用此方法获取bot接收到的最老消息和最老各类事件 - (不会从MiraiApiHttp消息记录中删除) - - - -* **参数** - - - * `count: int`: 获取消息和事件的数量 - - - -### `peek_latest_message(count=10)` - - -* **说明** - - 使用此方法获取bot接收到的最新消息和最新各类事件 - (不会从MiraiApiHttp消息记录中删除) - - - -* **参数** - - - * `count: int`: 获取消息和事件的数量 - - - -### `messsage_from_id(id)` - - -* **说明** - - 通过messageId获取一条被缓存的消息 - 使用此方法获取bot接收到的消息和各类事件 - - - -* **参数** - - - * `id: int`: 获取消息的message_id - - - -### `count_message()` - - -* **说明** - - 使用此方法获取bot接收并缓存的消息总数，注意不包含被删除的 - - - -### `friend_list()` - - -* **说明** - - 使用此方法获取bot的好友列表 - - - -* **返回** - - - * `List[Dict[str, Any]]`: 返回的好友列表数据 - - - -### `group_list()` - - -* **说明** - - 使用此方法获取bot的群列表 - - - -* **返回** - - - * `List[Dict[str, Any]]`: 返回的群列表数据 - - - -### `member_list(target)` - - -* **说明** - - 使用此方法获取bot指定群种的成员列表 - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - -* **返回** - - - * `List[Dict[str, Any]]`: 返回的群成员列表数据 - - - -### `mute(target, member_id, time)` - - -* **说明** - - 使用此方法指定群禁言指定群员（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `member_id: int`: 指定群员QQ号 - - - * `time: int`: 禁言时长，单位为秒，最多30天 - - - -### `unmute(target, member_id)` - - -* **说明** - - 使用此方法指定群解除群成员禁言（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `member_id: int`: 指定群员QQ号 - - - -### `kick(target, member_id, msg)` - - -* **说明** - - 使用此方法移除指定群成员（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `member_id: int`: 指定群员QQ号 - - - * `msg: str`: 信息 - - - -### `quit(target)` - - -* **说明** - - 使用此方法使Bot退出群聊 - - - -* **参数** - - - * `target: int`: 退出的群号 - - - -### `mute_all(target)` - - -* **说明** - - 使用此方法令指定群进行全体禁言（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - -### `unmute_all(target)` - - -* **说明** - - 使用此方法令指定群解除全体禁言（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - -### `group_config(target)` - - -* **说明** - - 使用此方法获取群设置 - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - -* **返回** - - -```json -{ - "name": "群名称", - "announcement": "群公告", - "confessTalk": true, - "allowMemberInvite": true, - "autoApprove": true, - "anonymousChat": true -} -``` - - -### `modify_group_config(target, config)` - - -* **说明** - - 使用此方法修改群设置（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `config: Dict[str, Any]`: 群设置, 格式见 `group_config` 的返回值 - - - -### `member_info(target, member_id)` - - -* **说明** - - 使用此方法获取群员资料 - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `member_id: int`: 群员QQ号 - - - -* **返回** - - -```json -{ - "name": "群名片", - "specialTitle": "群头衔" -} -``` - - -### `modify_member_info(target, member_id, info)` - - -* **说明** - - 使用此方法修改群员资料（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `member_id: int`: 群员QQ号 - - - * `info: Dict[str, Any]`: 群员资料, 格式见 `member_info` 的返回值 - - -# NoneBot.adapters.mirai.message 模块 - - -## _class_ `MessageType` - -基类：`str`, `enum.Enum` - -消息类型枚举类 - - -## _class_ `MessageSegment` - -基类：[`nonebot.adapters._base.MessageSegment`](README.md#nonebot.adapters._base.MessageSegment)[`MessageChain`] - -Mirai-API-HTTP 协议 MessageSegment 适配。具体方法参考 [mirai-api-http 消息类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/MessageType.md) - - -### `as_dict()` - -导出可以被正常json序列化的结构体 - - -### _classmethod_ `quote(id, group_id, sender_id, target_id, origin)` - - -* **说明** - - 生成回复引用消息段 - - - -* **参数** - - - * `id: int`: 被引用回复的原消息的message_id - - - * `group_id: int`: 被引用回复的原消息所接收的群号，当为好友消息时为0 - - - * `sender_id: int`: 被引用回复的原消息的发送者的QQ号 - - - * `target_id: int`: 被引用回复的原消息的接收者者的QQ号（或群号） - - - * `origin: MessageChain`: 被引用回复的原消息的消息链对象 - - - -### _classmethod_ `at(target)` - - -* **说明** - - @某个人 - - - -* **参数** - - - * `target: int`: 群员QQ号 - - - -### _classmethod_ `at_all()` - - -* **说明** - - @全体成员 - - - -### _classmethod_ `face(face_id=None, name=None)` - - -* **说明** - - 发送QQ表情 - - - -* **参数** - - - * `face_id: Optional[int]`: QQ表情编号，可选，优先高于name - - - * `name: Optional[str]`: QQ表情拼音，可选 - - - -### _classmethod_ `plain(text)` - - -* **说明** - - 纯文本消息 - - - -* **参数** - - - * `text: str`: 文字消息 - - - -### _classmethod_ `image(image_id=None, url=None, path=None)` - - -* **说明** - - 图片消息 - - - -* **参数** - - - * `image_id: Optional[str]`: 图片的image_id，群图片与好友图片格式不同。不为空时将忽略url属性 - - - * `url: Optional[str]`: 图片的URL，发送时可作网络图片的链接 - - - * `path: Optional[str]`: 图片的路径，发送本地图片 - - - -### _classmethod_ `flash_image(image_id=None, url=None, path=None)` - - -* **说明** - - 闪照消息 - - - -* **参数** - - 同 `image` - - - -### _classmethod_ `voice(voice_id=None, url=None, path=None)` - - -* **说明** - - 语音消息 - - - -* **参数** - - - * `voice_id: Optional[str]`: 语音的voice_id，不为空时将忽略url属性 - - - * `url: Optional[str]`: 语音的URL，发送时可作网络语音的链接 - - - * `path: Optional[str]`: 语音的路径，发送本地语音 - - - -### _classmethod_ `xml(xml)` - - -* **说明** - - XML消息 - - - -* **参数** - - - * `xml: str`: XML文本 - - - -### _classmethod_ `json(json)` - - -* **说明** - - Json消息 - - - -* **参数** - - - * `json: str`: Json文本 - - - -### _classmethod_ `app(content)` - - -* **说明** - - 应用程序消息 - - - -* **参数** - - - * `content: str`: 内容 - - - -### _classmethod_ `poke(name)` - - -* **说明** - - 戳一戳消息 - - - -* **参数** - - - * `name: str`: 戳一戳的类型 - - - * `Poke`: 戳一戳 - - - * `ShowLove`: 比心 - - - * `Like`: 点赞 - - - * `Heartbroken`: 心碎 - - - * `SixSixSix`: 666 - - - * `FangDaZhao`: 放大招 - - - -## _class_ `MessageChain` - -基类：[`nonebot.adapters._base.Message`](README.md#nonebot.adapters._base.Message)[`nonebot.adapters.mirai.message.MessageSegment`] - -Mirai 协议 Message 适配 - -由于Mirai协议的Message实现较为特殊, 故使用MessageChain命名 - - -### `export()` - -导出为可以被正常json序列化的数组 - - -### `extract_first(*type)` - - -* **说明** - - 弹出该消息链的第一个消息 - - - -* **参数** - - - * \*type: MessageType: 指定的消息类型, 当指定后如类型不匹配不弹出 - - -# NoneBot.adapters.mirai.utils 模块 - - -## _exception_ `ActionFailed` - -基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed) - - -* **说明** - - API 请求成功返回数据，但 API 操作失败。 - - - -## _exception_ `InvalidArgument` - -基类：[`nonebot.exception.AdapterException`](../exception.md#nonebot.exception.AdapterException) - - -* **说明** - - 调用API的参数出错 - - - -## `catch_network_error(function)` - - -* **说明** - - 捕捉函数抛出的httpx网络异常并释放 `NetworkError` 异常 - - 处理返回数据, 在code不为0时释放 `ActionFailed` 异常 - - -::: warning -此装饰器只支持使用了httpx的异步函数 -::: - - -## `argument_validation(function)` - - -* **说明** - - 通过函数签名中的类型注解来对传入参数进行运行时校验 - - 会在参数出错时释放 `InvalidArgument` 异常 - - -# NoneBot.adapters.mirai.event 模块 - -::: warning -事件中为了使代码更加整洁, 我们采用了与PEP8相符的命名规则取代Mirai原有的驼峰命名 - -部分字段可能与文档在符号上不一致 -::: - - -## _class_ `Event` - -基类：[`nonebot.adapters._base.Event`](README.md#nonebot.adapters._base.Event) - -mirai-api-http 协议事件，字段与 mirai-api-http 一致。各事件字段参考 [mirai-api-http 事件类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/EventType.md) - - -### _classmethod_ `new(data)` - -此事件类的工厂函数, 能够通过事件数据选择合适的子类进行序列化 - - -### `normalize_dict(**kwargs)` - -返回可以被json正常反序列化的结构体 - - -## _class_ `UserPermission` - -基类：`str`, `enum.Enum` - - -* **说明** - - 用户权限枚举类 - - > - > * `OWNER`: 群主 - - - > * `ADMINISTRATOR`: 群管理 - - - > * `MEMBER`: 普通群成员 - - - -## _class_ `MessageEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -消息事件基类 - - -## _class_ `GroupMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -群消息事件 - - -## _class_ `FriendMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -好友消息事件 - - -## _class_ `TempMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -临时会话消息事件 - - -## _class_ `NoticeEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -通知事件基类 - - -## _class_ `MuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -禁言类事件基类 - - -## _class_ `BotMuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -Bot被禁言 - - -## _class_ `BotUnmuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -Bot被取消禁言 - - -## _class_ `MemberMuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -群成员被禁言事件（该成员不是Bot） - - -## _class_ `MemberUnmuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -群成员被取消禁言事件（该成员不是Bot） - - -## _class_ `BotJoinGroupEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -Bot加入了一个新群 - - -## _class_ `BotLeaveEventActive` - -基类：`nonebot.adapters.mirai.event.notice.BotJoinGroupEvent` - -Bot主动退出一个群 - - -## _class_ `BotLeaveEventKick` - -基类：`nonebot.adapters.mirai.event.notice.BotJoinGroupEvent` - -Bot被踢出一个群 - - -## _class_ `MemberJoinEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -新人入群的事件 - - -## _class_ `MemberLeaveEventKick` - -基类：`nonebot.adapters.mirai.event.notice.MemberJoinEvent` - -成员被踢出群（该成员不是Bot） - - -## _class_ `MemberLeaveEventQuit` - -基类：`nonebot.adapters.mirai.event.notice.MemberJoinEvent` - -成员主动离群（该成员不是Bot） - - -## _class_ `FriendRecallEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -好友消息撤回 - - -## _class_ `GroupRecallEvent` - -基类：`nonebot.adapters.mirai.event.notice.FriendRecallEvent` - -群消息撤回 - - -## _class_ `GroupStateChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -群变化事件基类 - - -## _class_ `GroupNameChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -某个群名改变 - - -## _class_ `GroupEntranceAnnouncementChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -某群入群公告改变 - - -## _class_ `GroupMuteAllEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -全员禁言 - - -## _class_ `GroupAllowAnonymousChatEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -匿名聊天 - - -## _class_ `GroupAllowConfessTalkEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -坦白说 - - -## _class_ `GroupAllowMemberInviteEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -允许群员邀请好友加群 - - -## _class_ `MemberStateChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -群成员变化事件基类 - - -## _class_ `MemberCardChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -群名片改动 - - -## _class_ `MemberSpecialTitleChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -群头衔改动（只有群主有操作限权） - - -## _class_ `BotGroupPermissionChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -Bot在群里的权限被改变 - - -## _class_ `MemberPermissionChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -成员权限改变的事件（该成员不是Bot） - - -## _class_ `RequestEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -请求事件基类 - - -## _class_ `NewFriendRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -添加好友申请 - - -### _async_ `approve(bot)` - - -* **说明** - - 通过此人的好友申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, operate=1, message='')` - - -* **说明** - - 拒绝此人的好友申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `operate: Literal[1, 2]`: 响应的操作类型 - - - * `1`: 拒绝添加好友 - - - * `2`: 拒绝添加好友并添加黑名单，不再接收该用户的好友申请 - - - * `message: str`: 回复的信息 - - - -## _class_ `MemberJoinRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -用户入群申请（Bot需要有管理员权限） - - -### _async_ `approve(bot)` - - -* **说明** - - 通过此人的加群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, operate=1, message='')` - - -* **说明** - - 拒绝(忽略)此人的加群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `operate: Literal[1, 2, 3, 4]`: 响应的操作类型 - - - * `1`: 拒绝入群 - - - * `2`: 忽略请求 - - - * `3`: 拒绝入群并添加黑名单，不再接收该用户的入群申请 - - - * `4`: 忽略入群并添加黑名单，不再接收该用户的入群申请 - - - * `message: str`: 回复的信息 - - - -## _class_ `BotInvitedJoinGroupRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -Bot被邀请入群申请 - - -### _async_ `approve(bot)` - - -* **说明** - - 通过这份被邀请入群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, message='')` - - -* **说明** - - 拒绝这份被邀请入群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `message: str`: 邀请消息 - - -# NoneBot.adapters.mirai.event.base 模块 - - -## _class_ `UserPermission` - -基类：`str`, `enum.Enum` - - -* **说明** - - 用户权限枚举类 - - > - > * `OWNER`: 群主 - - - > * `ADMINISTRATOR`: 群管理 - - - > * `MEMBER`: 普通群成员 - - - -## _class_ `Event` - -基类：[`nonebot.adapters._base.Event`](README.md#nonebot.adapters._base.Event) - -mirai-api-http 协议事件，字段与 mirai-api-http 一致。各事件字段参考 [mirai-api-http 事件类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/EventType.md) - - -### _classmethod_ `new(data)` - -此事件类的工厂函数, 能够通过事件数据选择合适的子类进行序列化 - - -### `normalize_dict(**kwargs)` - -返回可以被json正常反序列化的结构体 - -# NoneBot.adapters.mirai.event.meta 模块 - - -## _class_ `MetaEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -元事件基类 - - -## _class_ `BotOnlineEvent` - -基类：`nonebot.adapters.mirai.event.meta.MetaEvent` - -Bot登录成功 - - -## _class_ `BotOfflineEventActive` - -基类：`nonebot.adapters.mirai.event.meta.MetaEvent` - -Bot主动离线 - - -## _class_ `BotOfflineEventForce` - -基类：`nonebot.adapters.mirai.event.meta.MetaEvent` - -Bot被挤下线 - - -## _class_ `BotOfflineEventDropped` - -基类：`nonebot.adapters.mirai.event.meta.MetaEvent` - -Bot被服务器断开或因网络问题而掉线 - - -## _class_ `BotReloginEvent` - -基类：`nonebot.adapters.mirai.event.meta.MetaEvent` - -Bot主动重新登录 - -# NoneBot.adapters.mirai.event.message 模块 - - -## _class_ `MessageEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -消息事件基类 - - -## _class_ `GroupMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -群消息事件 - - -## _class_ `FriendMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -好友消息事件 - - -## _class_ `TempMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -临时会话消息事件 - -# NoneBot.adapters.mirai.event.notice 模块 - - -## _class_ `NoticeEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -通知事件基类 - - -## _class_ `MuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -禁言类事件基类 - - -## _class_ `BotMuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -Bot被禁言 - - -## _class_ `BotUnmuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -Bot被取消禁言 - - -## _class_ `MemberMuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -群成员被禁言事件（该成员不是Bot） - - -## _class_ `MemberUnmuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -群成员被取消禁言事件（该成员不是Bot） - - -## _class_ `BotJoinGroupEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -Bot加入了一个新群 - - -## _class_ `BotLeaveEventActive` - -基类：`nonebot.adapters.mirai.event.notice.BotJoinGroupEvent` - -Bot主动退出一个群 - - -## _class_ `BotLeaveEventKick` - -基类：`nonebot.adapters.mirai.event.notice.BotJoinGroupEvent` - -Bot被踢出一个群 - - -## _class_ `MemberJoinEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -新人入群的事件 - - -## _class_ `MemberLeaveEventKick` - -基类：`nonebot.adapters.mirai.event.notice.MemberJoinEvent` - -成员被踢出群（该成员不是Bot） - - -## _class_ `MemberLeaveEventQuit` - -基类：`nonebot.adapters.mirai.event.notice.MemberJoinEvent` - -成员主动离群（该成员不是Bot） - - -## _class_ `FriendRecallEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -好友消息撤回 - - -## _class_ `GroupRecallEvent` - -基类：`nonebot.adapters.mirai.event.notice.FriendRecallEvent` - -群消息撤回 - - -## _class_ `GroupStateChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -群变化事件基类 - - -## _class_ `GroupNameChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -某个群名改变 - - -## _class_ `GroupEntranceAnnouncementChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -某群入群公告改变 - - -## _class_ `GroupMuteAllEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -全员禁言 - - -## _class_ `GroupAllowAnonymousChatEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -匿名聊天 - - -## _class_ `GroupAllowConfessTalkEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -坦白说 - - -## _class_ `GroupAllowMemberInviteEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -允许群员邀请好友加群 - - -## _class_ `MemberStateChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -群成员变化事件基类 - - -## _class_ `MemberCardChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -群名片改动 - - -## _class_ `MemberSpecialTitleChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -群头衔改动（只有群主有操作限权） - - -## _class_ `BotGroupPermissionChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -Bot在群里的权限被改变 - - -## _class_ `MemberPermissionChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -成员权限改变的事件（该成员不是Bot） - -# NoneBot.adapters.mirai.event.request 模块 - - -## _class_ `RequestEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -请求事件基类 - - -## _class_ `NewFriendRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -添加好友申请 - - -### _async_ `approve(bot)` - - -* **说明** - - 通过此人的好友申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, operate=1, message='')` - - -* **说明** - - 拒绝此人的好友申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `operate: Literal[1, 2]`: 响应的操作类型 - - - * `1`: 拒绝添加好友 - - - * `2`: 拒绝添加好友并添加黑名单，不再接收该用户的好友申请 - - - * `message: str`: 回复的信息 - - - -## _class_ `MemberJoinRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -用户入群申请（Bot需要有管理员权限） - - -### _async_ `approve(bot)` - - -* **说明** - - 通过此人的加群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, operate=1, message='')` - - -* **说明** - - 拒绝(忽略)此人的加群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `operate: Literal[1, 2, 3, 4]`: 响应的操作类型 - - - * `1`: 拒绝入群 - - - * `2`: 忽略请求 - - - * `3`: 拒绝入群并添加黑名单，不再接收该用户的入群申请 - - - * `4`: 忽略入群并添加黑名单，不再接收该用户的入群申请 - - - * `message: str`: 回复的信息 - - - -## _class_ `BotInvitedJoinGroupRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -Bot被邀请入群申请 - - -### _async_ `approve(bot)` - - -* **说明** - - 通过这份被邀请入群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, message='')` - - -* **说明** - - 拒绝这份被邀请入群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `message: str`: 邀请消息 diff --git a/archive/2.0.0a15/api/config.md b/archive/2.0.0a15/api/config.md deleted file mode 100644 index cf7ef369..00000000 --- a/archive/2.0.0a15/api/config.md +++ /dev/null @@ -1,311 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.config 模块 - -## 配置 - -NoneBot 使用 [pydantic](https://pydantic-docs.helpmanual.io/) 以及 [python-dotenv](https://saurabh-kumar.com/python-dotenv/) 来读取配置。 - -配置项需符合特殊格式或 json 序列化格式。详情见 [pydantic Field Type](https://pydantic-docs.helpmanual.io/usage/types/) 文档。 - - -## _class_ `Env` - -基类：`nonebot.config.BaseConfig` - -运行环境配置。大小写不敏感。 - -将会从 `nonebot.init 参数` > `环境变量` > `.env 环境配置文件` 的优先级读取配置。 - - -### `environment` - - -* **类型**: `str` - - -* **默认值**: `"prod"` - - -* **说明** - - 当前环境名。 NoneBot 将从 `.env.{environment}` 文件中加载配置。 - - - -## _class_ `Config` - -基类：`nonebot.config.BaseConfig` - -NoneBot 主要配置。大小写不敏感。 - -除了 NoneBot 的配置项外，还可以自行添加配置项到 `.env.{environment}` 文件中。 -这些配置将会在 json 反序列化后一起带入 `Config` 类中。 - - -### `driver` - - -* **类型**: `str` - - -* **默认值**: `"nonebot.drivers.fastapi"` - - -* **说明** - - NoneBot 运行所使用的 `Driver` 。继承自 `nonebot.driver.BaseDriver` 。 - - 配置格式为 `[:]`，默认类名为 `Driver`。 - - - -### `host` - - -* **类型**: `IPvAnyAddress` - - -* **默认值**: `127.0.0.1` - - -* **说明** - - NoneBot 的 HTTP 和 WebSocket 服务端监听的 IP/主机名。 - - - -### `port` - - -* **类型**: `int` - - -* **默认值**: `8080` - - -* **说明** - - NoneBot 的 HTTP 和 WebSocket 服务端监听的端口。 - - - -### `debug` - - -* **类型**: `bool` - - -* **默认值**: `False` - - -* **说明** - - 是否以调试模式运行 NoneBot。 - - - -### `log_level` - - -* **类型**: `Union[int, str]` - - -* **默认值**: `None` - - -* **说明** - - 配置 NoneBot 日志输出等级，可以为 `int` 类型等级或等级名称，参考 [loguru 日志等级](https://loguru.readthedocs.io/en/stable/api/logger.html#levels)。 - - - -* **示例** - - -```default -LOG_LEVEL=25 -LOG_LEVEL=INFO -``` - - -### `api_root` - - -* **类型**: `Dict[str, str]` - - -* **默认值**: `{}` - - -* **说明** - - 以机器人 ID 为键，上报地址为值的字典，环境变量或文件中应使用 json 序列化。 - - - -* **示例** - - -```default -API_ROOT={"123456": "http://127.0.0.1:5700"} -``` - - -### `api_timeout` - - -* **类型**: `Optional[float]` - - -* **默认值**: `30.` - - -* **说明** - - API 请求超时时间，单位: 秒。 - - - -### `access_token` - - -* **类型**: `Optional[str]` - - -* **默认值**: `None` - - -* **说明** - - API 请求以及上报所需密钥，在请求头中携带。 - - - -* **示例** - - -```http -POST /cqhttp/ HTTP/1.1 -Authorization: Bearer kSLuTF2GC2Q4q4ugm3 -``` - - -### `secret` - - -* **类型**: `Optional[str]` - - -* **默认值**: `None` - - -* **说明** - - HTTP POST 形式上报所需签名，在请求头中携带。 - - - -* **示例** - - -```http -POST /cqhttp/ HTTP/1.1 -X-Signature: sha1=f9ddd4863ace61e64f462d41ca311e3d2c1176e2 -``` - - -### `superusers` - - -* **类型**: `Set[str]` - - -* **默认值**: `set()` - - -* **说明** - - 机器人超级用户。 - - - -* **示例** - - -```default -SUPERUSERS=["12345789"] -``` - - -### `nickname` - - -* **类型**: `Set[str]` - - -* **默认值**: `set()` - - -* **说明** - - 机器人昵称。 - - - -### `command_start` - - -* **类型**: `Set[str]` - - -* **默认值**: `{"/"}` - - -* **说明** - - 命令的起始标记，用于判断一条消息是不是命令。 - - - -### `command_sep` - - -* **类型**: `Set[str]` - - -* **默认值**: `{"."}` - - -* **说明** - - 命令的分隔标记，用于将文本形式的命令切分为元组（实际的命令名）。 - - - -### `session_expire_timeout` - - -* **类型**: `timedelta` - - -* **默认值**: `timedelta(minutes=2)` - - -* **说明** - - 等待用户回复的超时时间。 - - - -* **示例** - - -```default -SESSION_EXPIRE_TIMEOUT=120 # 单位: 秒 -SESSION_EXPIRE_TIMEOUT=[DD ][HH:MM]SS[.ffffff] -SESSION_EXPIRE_TIMEOUT=P[DD]DT[HH]H[MM]M[SS]S # ISO 8601 -``` diff --git a/archive/2.0.0a15/api/drivers/README.md b/archive/2.0.0a15/api/drivers/README.md deleted file mode 100644 index 9f8ee3ee..00000000 --- a/archive/2.0.0a15/api/drivers/README.md +++ /dev/null @@ -1,529 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.drivers 模块 - -## 后端驱动适配基类 - -各驱动请继承以下基类 - - -## _class_ `Driver` - -基类：`abc.ABC` - -Driver 基类。 - - -### `_adapters` - - -* **类型** - - `Dict[str, Type[Bot]]` - - - -* **说明** - - 已注册的适配器列表 - - - -### `_bot_connection_hook` - - -* **类型** - - `Set[T_BotConnectionHook]` - - - -* **说明** - - Bot 连接建立时执行的函数 - - - -### `_bot_disconnection_hook` - - -* **类型** - - `Set[T_BotDisconnectionHook]` - - - -* **说明** - - Bot 连接断开时执行的函数 - - - -### `__init__(env, config)` - - -* **参数** - - - * `env: Env`: 包含环境信息的 Env 对象 - - - * `config: Config`: 包含配置信息的 Config 对象 - - - -### `env` - - -* **类型** - - `str` - - - -* **说明** - - 环境名称 - - - -### `config` - - -* **类型** - - `Config` - - - -* **说明** - - 配置对象 - - - -### `_clients` - - -* **类型** - - `Dict[str, Bot]` - - - -* **说明** - - 已连接的 Bot - - - -### _property_ `bots` - - -* **类型** - - `Dict[str, Bot]` - - - -* **说明** - - 获取当前所有已连接的 Bot - - - -### `register_adapter(name, adapter, **kwargs)` - - -* **说明** - - 注册一个协议适配器 - - - -* **参数** - - - * `name: str`: 适配器名称，用于在连接时进行识别 - - - * `adapter: Type[Bot]`: 适配器 Class - - - * `**kwargs`: 其他传递给适配器的参数 - - - -### _abstract property_ `type` - -驱动类型名称 - - -### _abstract property_ `logger` - -驱动专属 logger 日志记录器 - - -### _abstract_ `run(*args, **kwargs)` - - -* **说明** - - 启动驱动框架 - - - -* **参数** - - - * `*args` - - - * `**kwargs` - - - -### _abstract_ `on_startup(func)` - -注册一个在驱动启动时运行的函数 - - -### _abstract_ `on_shutdown(func)` - -注册一个在驱动停止时运行的函数 - - -### `on_bot_connect(func)` - - -* **说明** - - 装饰一个函数使他在 bot 通过 WebSocket 连接成功时执行。 - - - -* **函数参数** - - - * `bot: Bot`: 当前连接上的 Bot 对象 - - - -### `on_bot_disconnect(func)` - - -* **说明** - - 装饰一个函数使他在 bot 通过 WebSocket 连接断开时执行。 - - - -* **函数参数** - - - * `bot: Bot`: 当前连接上的 Bot 对象 - - - -### `_bot_connect(bot)` - -在 WebSocket 连接成功后，调用该函数来注册 bot 对象 - - -### `_bot_disconnect(bot)` - -在 WebSocket 连接断开后，调用该函数来注销 bot 对象 - - -## _class_ `ForwardDriver` - -基类：`nonebot.drivers.Driver` - -Forward Driver 基类。将客户端框架封装，以满足适配器使用。 - - -### _abstract_ `setup_http_polling(setup)` - - -* **说明** - - 注册一个 HTTP 轮询连接，如果传入一个函数，则该函数会在每次连接时被调用 - - - -* **参数** - - - * `setup: Union[HTTPPollingSetup, Callable[[], Awaitable[HTTPPollingSetup]]]` - - - -### _abstract_ `setup_websocket(setup)` - - -* **说明** - - 注册一个 WebSocket 连接，如果传入一个函数，则该函数会在每次重连时被调用 - - - -* **参数** - - - * `setup: Union[WebSocketSetup, Callable[[], Awaitable[WebSocketSetup]]]` - - - -## _class_ `ReverseDriver` - -基类：`nonebot.drivers.Driver` - -Reverse Driver 基类。将后端框架封装，以满足适配器使用。 - - -### _abstract property_ `server_app` - -驱动 APP 对象 - - -### _abstract property_ `asgi` - -驱动 ASGI 对象 - - -## _class_ `HTTPConnection` - -基类：`abc.ABC` - - -### `http_version` - -One of `"1.0"`, `"1.1"` or `"2"`. - - -### `scheme` - -URL scheme portion (likely `"http"` or `"https"`). - - -### `path` - -HTTP request target excluding any query string, -with percent-encoded sequences and UTF-8 byte sequences -decoded into characters. - - -### `query_string` - -URL portion after the `?`, percent-encoded. - - -### `headers` - -A dict of name-value pairs, -where name is the header name, and value is the header value. - -Order of header values must be preserved from the original HTTP request; -order of header names is not important. - -Header names must be lowercased. - - -### _abstract property_ `type` - -Connection type. - - -## _class_ `HTTPRequest` - -基类：`nonebot.drivers.HTTPConnection` - -HTTP 请求封装。参考 [asgi http scope](https://asgi.readthedocs.io/en/latest/specs/www.html#http-connection-scope)。 - - -### `method` - -The HTTP method name, uppercased. - - -### `body` - -Body of the request. - -Optional; if missing defaults to `b""`. - - -### _property_ `type` - -Always `http` - - -## _class_ `HTTPResponse` - -基类：`object` - -HTTP 响应封装。参考 [asgi http scope](https://asgi.readthedocs.io/en/latest/specs/www.html#http-connection-scope)。 - - -### `status` - -HTTP status code. - - -### `body` - -HTTP body content. - -Optional; if missing defaults to `None`. - - -### `headers` - -A dict of name-value pairs, -where name is the header name, and value is the header value. - -Order must be preserved in the HTTP response. - -Header names must be lowercased. - -Optional; if missing defaults to an empty dict. - - -### _property_ `type` - -Always `http` - - -## _class_ `WebSocket` - -基类：`nonebot.drivers.HTTPConnection`, `abc.ABC` - -WebSocket 连接封装。参考 [asgi websocket scope](https://asgi.readthedocs.io/en/latest/specs/www.html#websocket-connection-scope)。 - - -### _property_ `type` - -Always `websocket` - - -### _abstract property_ `closed` - - -* **类型** - - `bool` - - - -* **说明** - - 连接是否已经关闭 - - - -### _abstract async_ `accept()` - -接受 WebSocket 连接请求 - - -### _abstract async_ `close(code)` - -关闭 WebSocket 连接请求 - - -### _abstract async_ `receive()` - -接收一条 WebSocket text 信息 - - -### _abstract async_ `receive_bytes()` - -接收一条 WebSocket binary 信息 - - -### _abstract async_ `send(data)` - -发送一条 WebSocket text 信息 - - -### _abstract async_ `send_bytes(data)` - -发送一条 WebSocket binary 信息 - - -## _class_ `HTTPPollingSetup` - -基类：`object` - - -### `adapter` - -协议适配器名称 - - -### `self_id` - -机器人 ID - - -### `url` - -URL - - -### `method` - -HTTP method - - -### `body` - -HTTP body - - -### `headers` - -HTTP headers - - -### `http_version` - -HTTP version - - -### `poll_interval` - -HTTP 轮询间隔 - - -## _class_ `WebSocketSetup` - -基类：`object` - - -### `adapter` - -协议适配器名称 - - -### `self_id` - -机器人 ID - - -### `url` - -URL - - -### `headers` - -HTTP headers - - -### `reconnect_interval` - -WebSocket 重连间隔 diff --git a/archive/2.0.0a15/api/drivers/aiohttp.md b/archive/2.0.0a15/api/drivers/aiohttp.md deleted file mode 100644 index 4159d44e..00000000 --- a/archive/2.0.0a15/api/drivers/aiohttp.md +++ /dev/null @@ -1,101 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.drivers.aiohttp 模块 - -## AIOHTTP 驱动适配 - -本驱动仅支持客户端连接 - - -## _class_ `Driver` - -基类：[`nonebot.drivers.ForwardDriver`](README.md#nonebot.drivers.ForwardDriver) - -AIOHTTP 驱动框架 - - -### _property_ `type` - -驱动名称: `aiohttp` - - -### _property_ `logger` - -aiohttp driver 使用的 logger - - -### `on_startup(func)` - - -* **说明** - - 注册一个启动时执行的函数 - - - -* **参数** - - - * `func: Callable[[], Awaitable[None]]` - - - -### `on_shutdown(func)` - - -* **说明** - - 注册一个停止时执行的函数 - - - -* **参数** - - - * `func: Callable[[], Awaitable[None]]` - - - -### `setup_http_polling(setup)` - - -* **说明** - - 注册一个 HTTP 轮询连接，如果传入一个函数，则该函数会在每次连接时被调用 - - - -* **参数** - - - * `setup: Union[HTTPPollingSetup, Callable[[], Awaitable[HTTPPollingSetup]]]` - - - -### `setup_websocket(setup)` - - -* **说明** - - 注册一个 WebSocket 连接，如果传入一个函数，则该函数会在每次重连时被调用 - - - -* **参数** - - - * `setup: Union[WebSocketSetup, Callable[[], Awaitable[WebSocketSetup]]]` - - - -### `run(*args, **kwargs)` - -启动 aiohttp driver - - -## _class_ `WebSocket` - -基类：[`nonebot.drivers.WebSocket`](README.md#nonebot.drivers.WebSocket) diff --git a/archive/2.0.0a15/api/drivers/fastapi.md b/archive/2.0.0a15/api/drivers/fastapi.md deleted file mode 100644 index 2c02c8d6..00000000 --- a/archive/2.0.0a15/api/drivers/fastapi.md +++ /dev/null @@ -1,174 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.drivers.fastapi 模块 - -## FastAPI 驱动适配 - -本驱动同时支持服务端以及客户端连接 - -后端使用方法请参考: [FastAPI 文档](https://fastapi.tiangolo.com/) - - -## _class_ `Config` - -基类：`pydantic.env_settings.BaseSettings` - -FastAPI 驱动框架设置，详情参考 FastAPI 文档 - - -### `fastapi_openapi_url` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - `openapi.json` 地址，默认为 `None` 即关闭 - - - -### `fastapi_docs_url` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - `swagger` 地址，默认为 `None` 即关闭 - - - -### `fastapi_redoc_url` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - `redoc` 地址，默认为 `None` 即关闭 - - - -### `fastapi_reload_dirs` - - -* **类型** - - `List[str]` - - - -* **说明** - - `debug` 模式下重载监控文件夹列表，默认为 uvicorn 默认值 - - - -## _class_ `Driver` - -基类：[`nonebot.drivers.ReverseDriver`](README.md#nonebot.drivers.ReverseDriver), [`nonebot.drivers.ForwardDriver`](README.md#nonebot.drivers.ForwardDriver) - -FastAPI 驱动框架 - - -* **上报地址** - - - * `/{adapter name}/`: HTTP POST 上报 - - - * `/{adapter name}/http/`: HTTP POST 上报 - - - * `/{adapter name}/ws`: WebSocket 上报 - - - * `/{adapter name}/ws/`: WebSocket 上报 - - - -### _property_ `type` - -驱动名称: `fastapi` - - -### _property_ `server_app` - -`FastAPI APP` 对象 - - -### _property_ `asgi` - -`FastAPI APP` 对象 - - -### _property_ `logger` - -fastapi 使用的 logger - - -### `on_startup(func)` - -参考文档: [Events](https://fastapi.tiangolo.com/advanced/events/#startup-event) - - -### `on_shutdown(func)` - -参考文档: [Events](https://fastapi.tiangolo.com/advanced/events/#startup-event) - - -### `setup_http_polling(setup)` - - -* **说明** - - 注册一个 HTTP 轮询连接，如果传入一个函数，则该函数会在每次连接时被调用 - - - -* **参数** - - - * `setup: Union[HTTPPollingSetup, Callable[[], Awaitable[HTTPPollingSetup]]]` - - - -### `setup_websocket(setup)` - - -* **说明** - - 注册一个 WebSocket 连接，如果传入一个函数，则该函数会在每次重连时被调用 - - - -* **参数** - - - * `setup: Union[WebSocketSetup, Callable[[], Awaitable[WebSocketSetup]]]` - - - -### `run(host=None, port=None, *, app=None, **kwargs)` - -使用 `uvicorn` 启动 FastAPI - - -## _class_ `WebSocket` - -基类：[`nonebot.drivers.WebSocket`](README.md#nonebot.drivers.WebSocket) diff --git a/archive/2.0.0a15/api/drivers/quart.md b/archive/2.0.0a15/api/drivers/quart.md deleted file mode 100644 index 7b3c0f24..00000000 --- a/archive/2.0.0a15/api/drivers/quart.md +++ /dev/null @@ -1,89 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.drivers.quart 模块 - -## Quart 驱动适配 - -后端使用方法请参考: [Quart 文档](https://pgjones.gitlab.io/quart/index.html) - - -## _class_ `Config` - -基类：`pydantic.env_settings.BaseSettings` - -Quart 驱动框架设置 - - -### `quart_reload_dirs` - - -* **类型** - - `List[str]` - - - -* **说明** - - `debug` 模式下重载监控文件夹列表，默认为 uvicorn 默认值 - - - -## _class_ `Driver` - -基类：[`nonebot.drivers.ReverseDriver`](README.md#nonebot.drivers.ReverseDriver) - -Quart 驱动框架 - - -* **上报地址** - - - * `/{adapter name}/http`: HTTP POST 上报 - - - * `/{adapter name}/ws`: WebSocket 上报 - - - -### _property_ `type` - -驱动名称: `quart` - - -### _property_ `server_app` - -`Quart` 对象 - - -### _property_ `asgi` - -`Quart` 对象 - - -### _property_ `logger` - -Quart 使用的 logger - - -### `on_startup(func)` - -参考文档: [Startup and Shutdown](https://pgjones.gitlab.io/quart/how_to_guides/startup_shutdown.html) - - -### `on_shutdown(func)` - -参考文档: [Startup and Shutdown](https://pgjones.gitlab.io/quart/how_to_guides/startup_shutdown.html) - - -### `run(host=None, port=None, *, app=None, **kwargs)` - -使用 `uvicorn` 启动 Quart - - -## _class_ `WebSocket` - -基类：[`nonebot.drivers.WebSocket`](README.md#nonebot.drivers.WebSocket) diff --git a/archive/2.0.0a15/api/exception.md b/archive/2.0.0a15/api/exception.md deleted file mode 100644 index f48a493b..00000000 --- a/archive/2.0.0a15/api/exception.md +++ /dev/null @@ -1,193 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.exception 模块 - -## 异常 - -下列文档中的异常是所有 NoneBot 运行时可能会抛出的。 -这些异常并非所有需要用户处理，在 NoneBot 内部运行时被捕获，并进行对应操作。 - - -## _exception_ `NoneBotException` - -基类：`Exception` - - -* **说明** - - 所有 NoneBot 发生的异常基类。 - - - -## _exception_ `IgnoredException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 应该忽略该事件。可由 PreProcessor 抛出。 - - - -* **参数** - - - * `reason`: 忽略事件的原因 - - - -## _exception_ `ParserExit` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - `shell command` 处理消息失败时返回的异常 - - - -* **参数** - - - * `status` - - - * `message` - - - -## _exception_ `PausedException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 结束当前 `Handler` 并等待下一条消息后继续下一个 `Handler`。 - 可用于用户输入新信息。 - - - -* **用法** - - 可以在 `Handler` 中通过 `Matcher.pause()` 抛出。 - - - -## _exception_ `RejectedException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 结束当前 `Handler` 并等待下一条消息后重新运行当前 `Handler`。 - 可用于用户重新输入。 - - - -* **用法** - - 可以在 `Handler` 中通过 `Matcher.reject()` 抛出。 - - - -## _exception_ `FinishedException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 结束当前 `Handler` 且后续 `Handler` 不再被运行。 - 可用于结束用户会话。 - - - -* **用法** - - 可以在 `Handler` 中通过 `Matcher.finish()` 抛出。 - - - -## _exception_ `StopPropagation` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 终止事件向下层传播。 - - - -* **用法** - - 在 `Matcher.block == True` 时抛出。 - - - -## _exception_ `AdapterException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 代表 `Adapter` 抛出的异常，所有的 `Adapter` 都要在内部继承自这个 `Exception` - - - -* **参数** - - - * `adapter_name: str`: 标识 adapter - - - -## _exception_ `NoLogException` - -基类：`Exception` - - -* **说明** - - 指示 NoneBot 对当前 `Event` 进行处理但不显示 Log 信息，可在 `get_log_string` 时抛出 - - - -## _exception_ `ApiNotAvailable` - -基类：`nonebot.exception.AdapterException` - - -* **说明** - - 在 API 连接不可用时抛出。 - - - -## _exception_ `NetworkError` - -基类：`nonebot.exception.AdapterException` - - -* **说明** - - 在网络出现问题时抛出，如: API 请求地址不正确, API 请求无返回或返回状态非正常等。 - - - -## _exception_ `ActionFailed` - -基类：`nonebot.exception.AdapterException` - - -* **说明** - - API 请求成功返回数据，但 API 操作失败。 diff --git a/archive/2.0.0a15/api/handler.md b/archive/2.0.0a15/api/handler.md deleted file mode 100644 index dc2ab74f..00000000 --- a/archive/2.0.0a15/api/handler.md +++ /dev/null @@ -1,111 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.handler 模块 - -## 事件处理函数 - -该模块实现事件处理函数的封装，以实现动态参数等功能。 - - -## _class_ `Handler` - -基类：`object` - -事件处理函数类 - - -### `__init__(func)` - -装饰事件处理函数以便根据动态参数运行 - - -### `func` - - -* **类型** - - `T_Handler` - - - -* **说明** - - 事件处理函数 - - - -### `signature` - - -* **类型** - - `inspect.Signature` - - - -* **说明** - - 事件处理函数签名 - - - -### _property_ `bot_type` - - -* **类型** - - `Union[Type["Bot"], inspect.Parameter.empty]` - - - -* **说明** - - 事件处理函数接受的 Bot 对象类型 - - - -### _property_ `event_type` - - -* **类型** - - `Optional[Union[Type[Event], inspect.Parameter.empty]]` - - - -* **说明** - - 事件处理函数接受的 event 类型 / 不需要 event 参数 - - - -### _property_ `state_type` - - -* **类型** - - `Optional[Union[T_State, inspect.Parameter.empty]]` - - - -* **说明** - - 事件处理函数是否接受 state 参数 - - - -### _property_ `matcher_type` - - -* **类型** - - `Optional[Union[Type["Matcher"], inspect.Parameter.empty]]` - - - -* **说明** - - 事件处理函数是否接受 matcher 参数 diff --git a/archive/2.0.0a15/api/log.md b/archive/2.0.0a15/api/log.md deleted file mode 100644 index e6096cff..00000000 --- a/archive/2.0.0a15/api/log.md +++ /dev/null @@ -1,42 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.log 模块 - -## 日志 - -NoneBot 使用 [loguru](https://github.com/Delgan/loguru) 来记录日志信息。 - -自定义 logger 请参考 [loguru](https://github.com/Delgan/loguru) 文档。 - - -## `logger` - - -* **说明** - - NoneBot 日志记录器对象。 - - - -* **默认信息** - - - * 格式: `[%(asctime)s %(name)s] %(levelname)s: %(message)s` - - - * 等级: `DEBUG` / `INFO` ，根据 config 配置改变 - - - * 输出: 输出至 stdout - - - -* **用法** - - -```python -from nonebot.log import logger -``` diff --git a/archive/2.0.0a15/api/matcher.md b/archive/2.0.0a15/api/matcher.md deleted file mode 100644 index 28e4cbe4..00000000 --- a/archive/2.0.0a15/api/matcher.md +++ /dev/null @@ -1,586 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.matcher 模块 - -## 事件响应器 - -该模块实现事件响应器的创建与运行，并提供一些快捷方法来帮助用户更好的与机器人进行对话 。 - - -## `matchers` - - -* **类型** - - `Dict[int, List[Type[Matcher]]]` - - - -* **说明** - - 用于存储当前所有的事件响应器 - - - -## _class_ `Matcher` - -基类：`object` - -事件响应器类 - - -### `module` - - -* **类型** - - `Optional[ModuleType]` - - - -* **说明** - - 事件响应器所在模块 - - - -### `plugin_name` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - 事件响应器所在插件名 - - - -### `module_name` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - 事件响应器所在模块名 - - - -### `module_prefix` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - 事件响应器所在模块前缀 - - - -### `type` - - -* **类型** - - `str` - - - -* **说明** - - 事件响应器类型 - - - -### `rule` - - -* **类型** - - `Rule` - - - -* **说明** - - 事件响应器匹配规则 - - - -### `permission` - - -* **类型** - - `Permission` - - - -* **说明** - - 事件响应器触发权限 - - - -### `priority` - - -* **类型** - - `int` - - - -* **说明** - - 事件响应器优先级 - - - -### `block` - - -* **类型** - - `bool` - - - -* **说明** - - 事件响应器是否阻止事件传播 - - - -### `temp` - - -* **类型** - - `bool` - - - -* **说明** - - 事件响应器是否为临时 - - - -### `expire_time` - - -* **类型** - - `Optional[datetime]` - - - -* **说明** - - 事件响应器过期时间点 - - - -### `_default_state` - - -* **类型** - - `T_State` - - - -* **说明** - - 事件响应器默认状态 - - - -### `_default_state_factory` - - -* **类型** - - `Optional[T_State]` - - - -* **说明** - - 事件响应器默认工厂函数 - - - -### `_default_parser` - - -* **类型** - - `Optional[T_ArgsParser]` - - - -* **说明** - - 事件响应器默认参数解析函数 - - - -### `_default_type_updater` - - -* **类型** - - `Optional[T_TypeUpdater]` - - - -* **说明** - - 事件响应器类型更新函数 - - - -### `_default_permission_updater` - - -* **类型** - - `Optional[T_PermissionUpdater]` - - - -* **说明** - - 事件响应器权限更新函数 - - - -### `__init__()` - -实例化 Matcher 以便运行 - - -### `handlers` - - -* **类型** - - `List[Handler]` - - - -* **说明** - - 事件响应器拥有的事件处理函数列表 - - - -### _classmethod_ `new(type_='', rule=None, permission=None, handlers=None, temp=False, priority=1, block=False, *, module=None, expire_time=None, default_state=None, default_state_factory=None, default_parser=None, default_type_updater=None, default_permission_updater=None)` - - -* **说明** - - 创建一个新的事件响应器，并存储至 [matchers](#matchers) - - - -* **参数** - - - * `type_: str`: 事件响应器类型，与 `event.get_type()` 一致时触发，空字符串表示任意 - - - * `rule: Optional[Rule]`: 匹配规则 - - - * `permission: Optional[Permission]`: 权限 - - - * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器，即触发一次后删除 - - - * `priority: int`: 响应优先级 - - - * `block: bool`: 是否阻止事件向更低优先级的响应器传播 - - - * `module: Optional[str]`: 事件响应器所在模块名称 - - - * `default_state: Optional[T_State]`: 默认状态 `state` - - - * `default_state_factory: Optional[T_StateFactory]`: 默认状态 `state` 的工厂函数 - - - * `expire_time: Optional[datetime]`: 事件响应器最终有效时间点，过时即被删除 - - - -* **返回** - - - * `Type[Matcher]`: 新的事件响应器类 - - - -### _async classmethod_ `check_perm(bot, event)` - - -* **说明** - - 检查是否满足触发权限 - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: 上报事件 - - - -* **返回** - - - * `bool`: 是否满足权限 - - - -### _async classmethod_ `check_rule(bot, event, state)` - - -* **说明** - - 检查是否满足匹配规则 - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: 上报事件 - - - * `state: T_State`: 当前状态 - - - -* **返回** - - - * `bool`: 是否满足匹配规则 - - - -### _classmethod_ `args_parser(func)` - - -* **说明** - - 装饰一个函数来更改当前事件响应器的默认参数解析函数 - - - -* **参数** - - - * `func: T_ArgsParser`: 参数解析函数 - - - -### _classmethod_ `type_updater(func)` - - -* **说明** - - 装饰一个函数来更改当前事件响应器的默认响应事件类型更新函数 - - - -* **参数** - - - * `func: T_TypeUpdater`: 响应事件类型更新函数 - - - -### _classmethod_ `permission_updater(func)` - - -* **说明** - - 装饰一个函数来更改当前事件响应器的默认会话权限更新函数 - - - -* **参数** - - - * `func: T_PermissionUpdater`: 会话权限更新函数 - - - -### _classmethod_ `handle()` - - -* **说明** - - 装饰一个函数来向事件响应器直接添加一个处理函数 - - - -* **参数** - - - * 无 - - - -### _classmethod_ `receive()` - - -* **说明** - - 装饰一个函数来指示 NoneBot 在接收用户新的一条消息后继续运行该函数 - - - -* **参数** - - - * 无 - - - -### _classmethod_ `got(key, prompt=None, args_parser=None)` - - -* **说明** - - 装饰一个函数来指示 NoneBot 当要获取的 `key` 不存在时接收用户新的一条消息并经过 `ArgsParser` 处理后再运行该函数，如果 `key` 已存在则直接继续运行 - - - -* **参数** - - - * `key: str`: 参数名 - - - * `prompt: Optional[Union[str, Message, MessageSegment]]`: 在参数不存在时向用户发送的消息 - - - * `args_parser: Optional[T_ArgsParser]`: 可选参数解析函数，空则使用默认解析函数 - - - -### _async classmethod_ `send(message, **kwargs)` - - -* **说明** - - 发送一条消息给当前交互用户 - - - -* **参数** - - - * `message: Union[str, Message, MessageSegment]`: 消息内容 - - - * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api - - - -### _async classmethod_ `finish(message=None, **kwargs)` - - -* **说明** - - 发送一条消息给当前交互用户并结束当前事件响应器 - - - -* **参数** - - - * `message: Union[str, Message, MessageSegment]`: 消息内容 - - - * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api - - - -### _async classmethod_ `pause(prompt=None, **kwargs)` - - -* **说明** - - 发送一条消息给当前交互用户并暂停事件响应器，在接收用户新的一条消息后继续下一个处理函数 - - - -* **参数** - - - * `prompt: Union[str, Message, MessageSegment]`: 消息内容 - - - * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api - - - -### _async classmethod_ `reject(prompt=None, **kwargs)` - - -* **说明** - - 发送一条消息给当前交互用户并暂停事件响应器，在接收用户新的一条消息后重新运行当前处理函数 - - - -* **参数** - - - * `prompt: Union[str, Message, MessageSegment]`: 消息内容 - - - * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api - - - -### `stop_propagation()` - - -* **说明** - - 阻止事件传播 diff --git a/archive/2.0.0a15/api/message.md b/archive/2.0.0a15/api/message.md deleted file mode 100644 index 5bd6c332..00000000 --- a/archive/2.0.0a15/api/message.md +++ /dev/null @@ -1,143 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.message 模块 - -## 事件处理 - -NoneBot 内部处理并按优先级分发事件给所有事件响应器，提供了多个插槽以进行事件的预处理等。 - - -## `event_preprocessor(func)` - - -* **说明** - - 事件预处理。装饰一个函数，使它在每次接收到事件并分发给各响应器之前执行。 - - - -* **参数** - - 事件预处理函数接收三个参数。 - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前 State - - - -## `event_postprocessor(func)` - - -* **说明** - - 事件后处理。装饰一个函数，使它在每次接收到事件并分发给各响应器之后执行。 - - - -* **参数** - - 事件后处理函数接收三个参数。 - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前事件运行前 State - - - -## `run_preprocessor(func)` - - -* **说明** - - 运行预处理。装饰一个函数，使它在每次事件响应器运行前执行。 - - - -* **参数** - - 运行预处理函数接收四个参数。 - - - * `matcher: Matcher`: 当前要运行的事件响应器 - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前 State - - - -## `run_postprocessor(func)` - - -* **说明** - - 运行后处理。装饰一个函数，使它在每次事件响应器运行后执行。 - - - -* **参数** - - 运行后处理函数接收五个参数。 - - - * `matcher: Matcher`: 运行完毕的事件响应器 - - - * `exception: Optional[Exception]`: 事件响应器运行错误（如果存在） - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前 State - - - -## _async_ `handle_event(bot, event)` - - -* **说明** - - 处理一个事件。调用该函数以实现分发事件。 - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -* **示例** - - -```python -import asyncio -asyncio.create_task(handle_event(bot, event)) -``` diff --git a/archive/2.0.0a15/api/nonebot.md b/archive/2.0.0a15/api/nonebot.md deleted file mode 100644 index b7384bf6..00000000 --- a/archive/2.0.0a15/api/nonebot.md +++ /dev/null @@ -1,324 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot 模块 - -## 快捷导入 - -为方便使用，`nonebot` 模块从子模块导入了部分内容 - - -* `on_message` => `nonebot.plugin.on_message` - - -* `on_notice` => `nonebot.plugin.on_notice` - - -* `on_request` => `nonebot.plugin.on_request` - - -* `on_metaevent` => `nonebot.plugin.on_metaevent` - - -* `on_startswith` => `nonebot.plugin.on_startswith` - - -* `on_endswith` => `nonebot.plugin.on_endswith` - - -* `on_keyword` => `nonebot.plugin.on_keyword` - - -* `on_command` => `nonebot.plugin.on_command` - - -* `on_shell_command` => `nonebot.plugin.on_shell_command` - - -* `on_regex` => `nonebot.plugin.on_regex` - - -* `CommandGroup` => `nonebot.plugin.CommandGroup` - - -* `Matchergroup` => `nonebot.plugin.MatcherGroup` - - -* `load_plugin` => `nonebot.plugin.load_plugin` - - -* `load_plugins` => `nonebot.plugin.load_plugins` - - -* `load_all_plugins` => `nonebot.plugin.load_all_plugins` - - -* `load_from_json` => `nonebot.plugin.load_from_json` - - -* `load_from_toml` => `nonebot.plugin.load_from_toml` - - -* `load_builtin_plugins` => `nonebot.plugin.load_builtin_plugins` - - -* `get_plugin` => `nonebot.plugin.get_plugin` - - -* `get_loaded_plugins` => `nonebot.plugin.get_loaded_plugins` - - -* `export` => `nonebot.plugin.export` - - -* `require` => `nonebot.plugin.require` - - -## `get_driver()` - - -* **说明** - - 获取全局 Driver 对象。可用于在计划任务的回调中获取当前 Driver 对象。 - - - -* **返回** - - - * `Driver`: 全局 Driver 对象 - - - -* **异常** - - - * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) - - - -* **用法** - - -```python -driver = nonebot.get_driver() -``` - - -## `get_app()` - - -* **说明** - - 获取全局 Driver 对应 Server App 对象。 - - - -* **返回** - - - * `Any`: Server App 对象 - - - -* **异常** - - - * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) - - - -* **用法** - - -```python -app = nonebot.get_app() -``` - - -## `get_asgi()` - - -* **说明** - - 获取全局 Driver 对应 Asgi 对象。 - - - -* **返回** - - - * `Any`: Asgi 对象 - - - -* **异常** - - - * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) - - - -* **用法** - - -```python -asgi = nonebot.get_asgi() -``` - - -## `get_bot(self_id=None)` - - -* **说明** - - 当提供 self_id 时，此函数是 get_bots()[self_id] 的简写；当不提供时，返回一个 Bot。 - - - -* **参数** - - - * `self_id: Optional[str]`: 用来识别 Bot 的 ID - - - -* **返回** - - - * `Bot`: Bot 对象 - - - -* **异常** - - - * `KeyError`: 对应 ID 的 Bot 不存在 - - - * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) - - - * `ValueError`: 没有传入 ID 且没有 Bot 可用 - - - -* **用法** - - -```python -assert nonebot.get_bot('12345') == nonebot.get_bots()['12345'] - -another_unspecified_bot = nonebot.get_bot() -``` - - -## `get_bots()` - - -* **说明** - - 获取所有通过 ws 连接 NoneBot 的 Bot 对象。 - - - -* **返回** - - - * `Dict[str, Bot]`: 一个以字符串 ID 为键，Bot 对象为值的字典 - - - -* **异常** - - - * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) - - - -* **用法** - - -```python -bots = nonebot.get_bots() -``` - - -## `init(*, _env_file=None, **kwargs)` - - -* **说明** - - 初始化 NoneBot 以及 全局 Driver 对象。 - - NoneBot 将会从 .env 文件中读取环境信息，并使用相应的 env 文件配置。 - - 你也可以传入自定义的 _env_file 来指定 NoneBot 从该文件读取配置。 - - - -* **参数** - - - * `_env_file: Optional[str]`: 配置文件名，默认从 .env.{env_name} 中读取配置 - - - * `**kwargs`: 任意变量，将会存储到 Config 对象里 - - - -* **返回** - - - * `None` - - - -* **用法** - - -```python -nonebot.init(database=Database(...)) -``` - - -## `run(host=None, port=None, *args, **kwargs)` - - -* **说明** - - 启动 NoneBot，即运行全局 Driver 对象。 - - - -* **参数** - - - * `host: Optional[str]`: 主机名／IP，若不传入则使用配置文件中指定的值 - - - * `port: Optional[int]`: 端口，若不传入则使用配置文件中指定的值 - - - * `*args`: 传入 Driver.run 的位置参数 - - - * `**kwargs`: 传入 Driver.run 的命名参数 - - - -* **返回** - - - * `None` - - - -* **用法** - - -```python -nonebot.run(host="127.0.0.1", port=8080) -``` diff --git a/archive/2.0.0a15/api/permission.md b/archive/2.0.0a15/api/permission.md deleted file mode 100644 index e99b7e8b..00000000 --- a/archive/2.0.0a15/api/permission.md +++ /dev/null @@ -1,137 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.permission 模块 - -## 权限 - -每个 `Matcher` 拥有一个 `Permission` ，其中是 **异步** `PermissionChecker` 的集合，只要有一个 `PermissionChecker` 检查结果为 `True` 时就会继续运行。 - -:::tip 提示 -`PermissionChecker` 既可以是 async function 也可以是 sync function -::: - - -## _class_ `Permission` - -基类：`object` - - -* **说明** - - `Matcher` 规则类，当事件传递时，在 `Matcher` 运行前进行检查。 - - - -* **示例** - - -```python -Permission(async_function) | sync_function -# 等价于 -from nonebot.utils import run_sync -Permission(async_function, run_sync(sync_function)) -``` - - -### `__init__(*checkers)` - - -* **参数** - - - * `*checkers: Callable[[Bot, Event], Awaitable[bool]]`: **异步** PermissionChecker - - - -### `checkers` - - -* **说明** - - 存储 `PermissionChecker` - - - -* **类型** - - - * `Set[Callable[[Bot, Event], Awaitable[bool]]]` - - - -### _async_ `__call__(bot, event)` - - -* **说明** - - 检查是否满足某个权限 - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -* **返回** - - - * `bool` - - - -## `MESSAGE` - - -* **说明**: 匹配任意 `message` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 message type 的 Matcher。 - - -## `NOTICE` - - -* **说明**: 匹配任意 `notice` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 notice type 的 Matcher。 - - -## `REQUEST` - - -* **说明**: 匹配任意 `request` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 request type 的 Matcher。 - - -## `METAEVENT` - - -* **说明**: 匹配任意 `meta_event` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 meta_event type 的 Matcher。 - - -## `USER(*user, perm=None)` - - -* **说明** - - `event` 的 `session_id` 在白名单内且满足 perm - - - -* **参数** - - - * `*user: str`: 白名单 - - - * `perm: Optional[Permission]`: 需要同时满足的权限 - - - -## `SUPERUSER` - - -* **说明**: 匹配任意超级用户消息类型事件 diff --git a/archive/2.0.0a15/api/plugin.md b/archive/2.0.0a15/api/plugin.md deleted file mode 100644 index c51c93b2..00000000 --- a/archive/2.0.0a15/api/plugin.md +++ /dev/null @@ -1,1492 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.plugin 模块 - -## 插件 - -为 NoneBot 插件开发提供便携的定义函数。 - - -## `plugins` - - -* **类型** - - `Dict[str, Plugin]` - - - -* **说明** - - 已加载的插件 - - - -## _class_ `Plugin` - -基类：`object` - -存储插件信息 - - -### `name` - - -* **类型**: `str` - - -* **说明**: 插件名称，使用 文件/文件夹 名称作为插件名 - - -### `module` - - -* **类型**: `ModuleType` - - -* **说明**: 插件模块对象 - - -### _property_ `export` - - -* **类型**: `Export` - - -* **说明**: 插件内定义的导出内容 - - -### _property_ `matcher` - - -* **类型**: `Set[Type[Matcher]]` - - -* **说明**: 插件内定义的 `Matcher` - - -## `on(type='', rule=None, permission=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` - - -* **说明** - - 注册一个基础事件响应器，可自定义类型。 - - - -* **参数** - - - * `type: str`: 事件响应器类型 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_metaevent(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` - - -* **说明** - - 注册一个元事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_message(rule=None, permission=None, *, handlers=None, temp=False, priority=1, block=True, state=None, state_factory=None)` - - -* **说明** - - 注册一个消息事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_notice(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` - - -* **说明** - - 注册一个通知事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_request(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` - - -* **说明** - - 注册一个请求事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_startswith(msg, rule=None, ignorecase=False, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容开头时响应。 - - - -* **参数** - - - * `msg: Union[str, Tuple[str, ...]]`: 指定消息开头内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `ignorecase: bool`: 是否忽略大小写 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_endswith(msg, rule=None, ignorecase=False, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容结尾时响应。 - - - -* **参数** - - - * `msg: Union[str, Tuple[str, ...]]`: 指定消息结尾内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `ignorecase: bool`: 是否忽略大小写 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_keyword(keywords, rule=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息纯文本部分包含关键词时响应。 - - - -* **参数** - - - * `keywords: Set[str]`: 关键词列表 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_command(cmd, rule=None, aliases=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息以指定命令开头时响应。 - - 命令匹配规则参考: [命令形式匹配](rule.html#command-command) - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_shell_command(cmd, rule=None, aliases=None, parser=None, **kwargs)` - - -* **说明** - - 注册一个支持 `shell_like` 解析参数的命令消息事件响应器。 - - 与普通的 `on_command` 不同的是，在添加 `parser` 参数时, 响应器会自动处理消息。 - - 并将用户输入的原始参数列表保存在 `state["argv"]`, `parser` 处理的参数保存在 `state["args"]` 中 - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 - - - * `parser: Optional[ArgumentParser]`: `nonebot.rule.ArgumentParser` 对象 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_regex(pattern, flags=0, rule=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息匹配正则表达式时响应。 - - 命令匹配规则参考: [正则匹配](rule.html#regex-regex-flags-0) - - - -* **参数** - - - * `pattern: str`: 正则表达式 - - - * `flags: Union[int, re.RegexFlag]`: 正则匹配标志 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## _class_ `CommandGroup` - -基类：`object` - -命令组，用于声明一组有相同名称前缀的命令。 - - -### `__init__(cmd, **kwargs)` - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 - - - * `**kwargs`: 其他传递给 `on_command` 的参数默认值，参考 [on_command](#on-command-cmd-rule-none-aliases-none-kwargs) - - - -### `basecmd` - - -* **类型**: `Tuple[str, ...]` - - -* **说明**: 命令前缀 - - -### `base_kwargs` - - -* **类型**: `Dict[str, Any]` - - -* **说明**: 其他传递给 `on_command` 的参数默认值 - - -### `command(cmd, **kwargs)` - - -* **说明** - - 注册一个新的命令。 - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 - - - * `**kwargs`: 其他传递给 `on_command` 的参数，将会覆盖命令组默认值 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `shell_command(cmd, **kwargs)` - - -* **说明** - - 注册一个新的命令。 - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 - - - * `**kwargs`: 其他传递给 `on_shell_command` 的参数，将会覆盖命令组默认值 - - - -* **返回** - - - * `Type[Matcher]` - - - -## _class_ `MatcherGroup` - -基类：`object` - -事件响应器组合，统一管理。为 `Matcher` 创建提供默认属性。 - - -### `__init__(**kwargs)` - - -* **说明** - - 创建一个事件响应器组合，参数为默认值，与 `on` 一致 - - - -### `matchers` - - -* **类型** - - `List[Type[Matcher]]` - - - -* **说明** - - 组内事件响应器列表 - - - -### `base_kwargs` - - -* **类型**: `Dict[str, Any]` - - -* **说明**: 其他传递给 `on` 的参数默认值 - - -### `on(**kwargs)` - - -* **说明** - - 注册一个基础事件响应器，可自定义类型。 - - - -* **参数** - - - * `type: str`: 事件响应器类型 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_metaevent(**kwargs)` - - -* **说明** - - 注册一个元事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_message(**kwargs)` - - -* **说明** - - 注册一个消息事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_notice(**kwargs)` - - -* **说明** - - 注册一个通知事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_request(**kwargs)` - - -* **说明** - - 注册一个请求事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_startswith(msg, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容开头时响应。 - - - -* **参数** - - - * `msg: Union[str, Tuple[str, ...]]`: 指定消息开头内容 - - - * `ignorecase: bool`: 是否忽略大小写 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_endswith(msg, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容结尾时响应。 - - - -* **参数** - - - * `msg: Union[str, Tuple[str, ...]]`: 指定消息结尾内容 - - - * `ignorecase: bool`: 是否忽略大小写 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_keyword(keywords, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息纯文本部分包含关键词时响应。 - - - -* **参数** - - - * `keywords: Set[str]`: 关键词列表 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_command(cmd, aliases=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息以指定命令开头时响应。 - - 命令匹配规则参考: [命令形式匹配](rule.html#command-command) - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 - - - * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_shell_command(cmd, aliases=None, parser=None, **kwargs)` - - -* **说明** - - 注册一个支持 `shell_like` 解析参数的命令消息事件响应器。 - - 与普通的 `on_command` 不同的是，在添加 `parser` 参数时, 响应器会自动处理消息。 - - 并将用户输入的原始参数列表保存在 `state["argv"]`, `parser` 处理的参数保存在 `state["args"]` 中 - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 - - - * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 - - - * `parser: Optional[ArgumentParser]`: `nonebot.rule.ArgumentParser` 对象 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_regex(pattern, flags=0, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息匹配正则表达式时响应。 - - 命令匹配规则参考: [正则匹配](rule.html#regex-regex-flags-0) - - - -* **参数** - - - * `pattern: str`: 正则表达式 - - - * `flags: Union[int, re.RegexFlag]`: 正则匹配标志 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `load_plugin(module_path)` - - -* **说明** - - 使用 `PluginManager` 加载单个插件，可以是本地插件或是通过 `pip` 安装的插件。 - - - -* **参数** - - - * `module_path: str`: 插件名称 `path.to.your.plugin` - - - -* **返回** - - - * `Optional[Plugin]` - - - -## `load_plugins(*plugin_dir)` - - -* **说明** - - 导入目录下多个插件，以 `_` 开头的插件不会被导入！ - - - -* **参数** - - - * `*plugin_dir: str`: 插件路径 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `load_all_plugins(module_path, plugin_dir)` - - -* **说明** - - 导入指定列表中的插件以及指定目录下多个插件，以 `_` 开头的插件不会被导入！ - - - -* **参数** - - - * `module_path: Set[str]`: 指定插件集合 - - - * `plugin_dir: Set[str]`: 指定插件路径集合 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `load_from_json(file_path, encoding='utf-8')` - - -* **说明** - - 导入指定 json 文件中的 `plugins` 以及 `plugin_dirs` 下多个插件，以 `_` 开头的插件不会被导入！ - - - -* **参数** - - - * `file_path: str`: 指定 json 文件路径 - - - * `encoding: str`: 指定 json 文件编码 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `load_from_toml(file_path, encoding='utf-8')` - - -* **说明** - - 导入指定 toml 文件 `[nonebot.plugins]` 中的 `plugins` 以及 `plugin_dirs` 下多个插件， - 以 `_` 开头的插件不会被导入！ - - - -* **参数** - - - * `file_path: str`: 指定 toml 文件路径 - - - * `encoding: str`: 指定 toml 文件编码 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `load_builtin_plugins(name='echo')` - - -* **说明** - - 导入 NoneBot 内置插件 - - - -* **返回** - - - * `Plugin` - - - -## `get_plugin(name)` - - -* **说明** - - 获取当前导入的某个插件。 - - - -* **参数** - - - * `name: str`: 插件名，与 `load_plugin` 参数一致。如果为 `load_plugins` 导入的插件，则为文件(夹)名。 - - - -* **返回** - - - * `Optional[Plugin]` - - - -## `get_loaded_plugins()` - - -* **说明** - - 获取当前已导入的所有插件。 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `require(name)` - - -* **说明** - - 获取一个插件的导出内容 - - - -* **参数** - - - * `name: str`: 插件名，与 `load_plugin` 参数一致。如果为 `load_plugins` 导入的插件，则为文件(夹)名。 - - - -* **返回** - - - * `Optional[Export]` - - - -## _class_ `Export` - -基类：`dict` - - -* **说明** - - 插件导出内容以使得其他插件可以获得。 - - - -* **示例** - - -```python -nonebot.export().default = "bar" - -@nonebot.export() -def some_function(): - pass - -# this doesn't work before python 3.9 -# use -# export = nonebot.export(); @export.sub -# instead -# See also PEP-614: https://www.python.org/dev/peps/pep-0614/ -@nonebot.export().sub -def something_else(): - pass -``` - - -## `export()` - - -* **说明** - - 获取插件的导出内容对象 - - - -* **返回** - - - * `Export` diff --git a/archive/2.0.0a15/api/rule.md b/archive/2.0.0a15/api/rule.md deleted file mode 100644 index 0ee615df..00000000 --- a/archive/2.0.0a15/api/rule.md +++ /dev/null @@ -1,266 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.rule 模块 - -## 规则 - -每个事件响应器 `Matcher` 拥有一个匹配规则 `Rule` ，其中是 **异步** `RuleChecker` 的集合，只有当所有 `RuleChecker` 检查结果为 `True` 时继续运行。 - -:::tip 提示 -`RuleChecker` 既可以是 async function 也可以是 sync function，但在最终会被 `nonebot.utils.run_sync` 转换为 async function -::: - - -## _class_ `Rule` - -基类：`object` - - -* **说明** - - `Matcher` 规则类，当事件传递时，在 `Matcher` 运行前进行检查。 - - - -* **示例** - - -```python -Rule(async_function) & sync_function -# 等价于 -from nonebot.utils import run_sync -Rule(async_function, run_sync(sync_function)) -``` - - -### `__init__(*checkers)` - - -* **参数** - - - * `*checkers: Callable[[Bot, Event, T_State], Awaitable[bool]]`: **异步** RuleChecker - - - -### `checkers` - - -* **说明** - - 存储 `RuleChecker` - - - -* **类型** - - - * `Set[Callable[[Bot, Event, T_State], Awaitable[bool]]]` - - - -### _async_ `__call__(bot, event, state)` - - -* **说明** - - 检查是否符合所有规则 - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前 State - - - -* **返回** - - - * `bool` - - - -## `startswith(msg, ignorecase=False)` - - -* **说明** - - 匹配消息开头 - - - -* **参数** - - - * `msg: str`: 消息开头字符串 - - - -## `endswith(msg, ignorecase=False)` - - -* **说明** - - 匹配消息结尾 - - - -* **参数** - - - * `msg: str`: 消息结尾字符串 - - - -## `keyword(*keywords)` - - -* **说明** - - 匹配消息关键词 - - - -* **参数** - - - * `*keywords: str`: 关键词 - - - -## `command(*cmds)` - - -* **说明** - - 命令形式匹配，根据配置里提供的 `command_start`, `command_sep` 判断消息是否为命令。 - - 可以通过 `state["_prefix"]["command"]` 获取匹配成功的命令（例：`("test",)`），通过 `state["_prefix"]["raw_command"]` 获取匹配成功的原始命令文本（例：`"/test"`）。 - - - -* **参数** - - - * `*cmds: Union[str, Tuple[str, ...]]`: 命令内容 - - - -* **示例** - - 使用默认 `command_start`, `command_sep` 配置 - - 命令 `("test",)` 可以匹配：`/test` 开头的消息 - 命令 `("test", "sub")` 可以匹配”`/test.sub` 开头的消息 - - -:::tip 提示 -命令内容与后续消息间无需空格！ -::: - - -## _class_ `ArgumentParser` - -基类：`argparse.ArgumentParser` - - -* **说明** - - `shell_like` 命令参数解析器，解析出错时不会退出程序。 - - - -## `shell_command(*cmds, parser=None)` - - -* **说明** - - 支持 `shell_like` 解析参数的命令形式匹配，根据配置里提供的 `command_start`, `command_sep` 判断消息是否为命令。 - - 可以通过 `state["_prefix"]["command"]` 获取匹配成功的命令（例：`("test",)`），通过 `state["_prefix"]["raw_command"]` 获取匹配成功的原始命令文本（例：`"/test"`）。 - - 可以通过 `state["argv"]` 获取用户输入的原始参数列表 - - 添加 `parser` 参数后, 可以自动处理消息并将结果保存在 `state["args"]` 中。 - - - -* **参数** - - - * `*cmds: Union[str, Tuple[str, ...]]`: 命令内容 - - - * `parser: Optional[ArgumentParser]`: `nonebot.rule.ArgumentParser` 对象 - - - -* **示例** - - 使用默认 `command_start`, `command_sep` 配置，更多示例参考 `argparse` 标准库文档。 - - -```python -from nonebot.rule import ArgumentParser - -parser = ArgumentParser() -parser.add_argument("-a", action="store_true") - -rule = shell_command("ls", parser=parser) -``` - -:::tip 提示 -命令内容与后续消息间无需空格！ -::: - - -## `regex(regex, flags=0)` - - -* **说明** - - 根据正则表达式进行匹配。 - - 可以通过 `state["_matched"]` `state["_matched_groups"]` `state["_matched_dict"]` - 获取正则表达式匹配成功的文本。 - - - -* **参数** - - - * `regex: str`: 正则表达式 - - - * `flags: Union[int, re.RegexFlag]`: 正则标志 - - -:::tip 提示 -正则表达式匹配使用 search 而非 match，如需从头匹配请使用 `r"^xxx"` 来确保匹配开头 -::: - - -## `to_me()` - - -* **说明** - - 通过 `event.is_tome()` 判断事件是否与机器人有关 - - - -* **参数** - - - * 无 diff --git a/archive/2.0.0a15/api/typing.md b/archive/2.0.0a15/api/typing.md deleted file mode 100644 index 6d339e12..00000000 --- a/archive/2.0.0a15/api/typing.md +++ /dev/null @@ -1,278 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.typing 模块 - -## 类型 - -下面的文档中，「类型」部分使用 Python 的 Type Hint 语法，见 [PEP 484](https://www.python.org/dev/peps/pep-0484/)、[PEP 526](https://www.python.org/dev/peps/pep-0526/) 和 [typing](https://docs.python.org/3/library/typing.html)。 - -除了 Python 内置的类型，下面还出现了如下 NoneBot 自定类型，实际上它们是 Python 内置类型的别名。 - -以下类型均可从 nonebot.typing 模块导入。 - - -## `T_State` - - -* **类型** - - `Dict[Any, Any]` - - - -* **说明** - - 事件处理状态 State 类型 - - - - -## `T_StateFactory` - - -* **类型** - - `Callable[[Bot, Event], Awaitable[T_State]]` - - - -* **说明** - - 事件处理状态 State 类工厂函数 - - - - -## `T_BotConnectionHook` - - -* **类型** - - `Callable[[Bot], Awaitable[None]]` - - - -* **说明** - - Bot 连接建立时执行的函数 - - - - -## `T_BotDisconnectionHook` - - -* **类型** - - `Callable[[Bot], Awaitable[None]]` - - - -* **说明** - - Bot 连接断开时执行的函数 - - - - -## `T_CallingAPIHook` - - -* **类型** - - `Callable[[Bot, str, Dict[str, Any]], Awaitable[None]]` - - - -* **说明** - - `bot.call_api` 时执行的函数 - - - - -## `T_CalledAPIHook` - - -* **类型** - - `Callable[[Bot, Optional[Exception], str, Dict[str, Any], Any], Awaitable[None]]` - - - -* **说明** - - `bot.call_api` 后执行的函数，参数分别为 bot, exception, api, data, result - - - - -## `T_EventPreProcessor` - - -* **类型** - - `Callable[[Bot, Event, T_State], Awaitable[None]]` - - - -* **说明** - - 事件预处理函数 EventPreProcessor 类型 - - - - -## `T_EventPostProcessor` - - -* **类型** - - `Callable[[Bot, Event, T_State], Awaitable[None]]` - - - -* **说明** - - 事件预处理函数 EventPostProcessor 类型 - - - - -## `T_RunPreProcessor` - - -* **类型** - - `Callable[[Matcher, Bot, Event, T_State], Awaitable[None]]` - - - -* **说明** - - 事件响应器运行前预处理函数 RunPreProcessor 类型 - - - - -## `T_RunPostProcessor` - - -* **类型** - - `Callable[[Matcher, Optional[Exception], Bot, Event, T_State], Awaitable[None]]` - - - -* **说明** - - 事件响应器运行前预处理函数 RunPostProcessor 类型，第二个参数为运行时产生的错误（如果存在） - - - - -## `T_RuleChecker` - - -* **类型** - - `Callable[[Bot, Event, T_State], Union[bool, Awaitable[bool]]]` - - - -* **说明** - - RuleChecker 即判断是否响应事件的处理函数。 - - - - -## `T_PermissionChecker` - - -* **类型** - - `Callable[[Bot, Event], Union[bool, Awaitable[bool]]]` - - - -* **说明** - - RuleChecker 即判断是否响应消息的处理函数。 - - - - -## `T_Handler` - - -* **类型** - - - * `Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - * `Callable[[Bot, Event], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - * `Callable[[Bot, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - * `Callable[[Bot], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - -* **说明** - - Handler 即事件的处理函数。 - - - - -## `T_ArgsParser` - - -* **类型** - - `Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - -* **说明** - - ArgsParser 即消息参数解析函数，在 Matcher.got 获取参数时被运行。 - - - - -## `T_TypeUpdater` - - -* **类型** - - `Callable[[Bot, Event, T_State, str], Awaitable[str]]` - - - -* **说明** - - TypeUpdater 在 Matcher.pause, Matcher.reject 时被运行，用于更新响应的事件类型。默认会更新为 `message`。 - - - - -## `T_PermissionUpdater` - - -* **类型** - - `Callable[[Bot, Event, T_State, Permission], Awaitable[Permission]]` - - - -* **说明** - - PermissionUpdater 在 Matcher.pause, Matcher.reject 时被运行，用于更新会话对象权限。默认会更新为当前事件的触发对象。 diff --git a/archive/2.0.0a15/api/utils.md b/archive/2.0.0a15/api/utils.md deleted file mode 100644 index 8584f390..00000000 --- a/archive/2.0.0a15/api/utils.md +++ /dev/null @@ -1,85 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.utils 模块 - - -## `escape_tag(s)` - - -* **说明** - - 用于记录带颜色日志时转义 `` 类型特殊标签 - - - -* **参数** - - - * `s: str`: 需要转义的字符串 - - - -* **返回** - - - * `str` - - - -## `run_sync(func)` - - -* **说明** - - 一个用于包装 sync function 为 async function 的装饰器 - - - -* **参数** - - - * `func: Callable[..., Any]`: 被装饰的同步函数 - - - -* **返回** - - - * `Callable[..., Awaitable[Any]]` - - - -## _class_ `DataclassEncoder` - -基类：`json.encoder.JSONEncoder` - - -* **说明** - - 在JSON序列化 `Message` (List[Dataclass]) 时使用的 `JSONEncoder` - - - -## `logger_wrapper(logger_name)` - - -* **说明** - - -用于打印 adapter 的日志。 - - -* **Log 参数** - - - -* `level: Literal['WARNING', 'DEBUG', 'INFO']`: 日志等级 - - -* `message: str`: 日志信息 - - -* `exception: Optional[Exception]`: 异常信息 diff --git a/archive/2.0.0a15/guide/README.md b/archive/2.0.0a15/guide/README.md deleted file mode 100644 index b737031e..00000000 --- a/archive/2.0.0a15/guide/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# 概览 - - - -:::tip 提示 -初次使用时可能会觉得这里的概览过于枯燥，可以先简单略读之后直接前往 [安装](./installation.md) 查看安装方法，并进行后续的基础使用教程。 -::: - -NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人收到的事件进行解析和处理，并以插件化的形式，按优先级分发给事件所对应的事件响应器，来完成具体的功能。 - -除了起到解析事件的作用，NoneBot 还为插件提供了大量实用的预设操作和权限控制机制。对于命令处理，它更是提供了完善且易用的会话机制和内部调用机制，以分别适应命令的连续交互和插件内部功能复用等需求。 - -得益于 Python 的 [asyncio](https://docs.python.org/3/library/asyncio.html) 机制，NoneBot 处理事件的吞吐量有了很大的保障，再配合 WebSocket 通信方式（也是最建议的通信方式），NoneBot 的性能可以达到 HTTP 通信方式的两倍以上，相较于传统同步 I/O 的 HTTP 通信，更是有质的飞跃。 - -需要注意的是，NoneBot 仅支持 **Python 3.7.3 以上版本** - -## 特色 - -NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义**，并且可以作为插件进行**替换/添加**！ - -- 提供使用简易的脚手架 -- 提供丰富的官方插件 -- 提供可添加/替换的驱动以及协议选项 -- 基于异步 I/O -- 同时支持 HTTP 和反向 WebSocket 通信方式 -- 支持多个机器人账号负载均衡 -- 提供直观的交互式会话接口 -- 提供可自定义的权限控制机制 -- 多种方式渲染要发送的消息内容，使对话足够自然 diff --git a/archive/2.0.0a15/guide/basic-configuration.md b/archive/2.0.0a15/guide/basic-configuration.md deleted file mode 100644 index 4bb33f4f..00000000 --- a/archive/2.0.0a15/guide/basic-configuration.md +++ /dev/null @@ -1,86 +0,0 @@ -# 基本配置 - -到目前为止我们还在使用 NoneBot 的默认行为，在开始编写自己的插件之前，我们先尝试在配置文件上动动手脚，让 NoneBot 表现出不同的行为。 - -在上一章节中，我们创建了默认的项目结构，其中 `.env` 和 `.env.*` 均为项目的配置文件，下面将介绍几种 NoneBot 配置方式。 - -:::danger 警告 -请勿将敏感信息写入配置文件并提交至开源仓库！ -::: - -## .env 文件 - -NoneBot 在启动时将会从系统环境变量或者 `.env` 文件中寻找变量 `ENVIRONMENT` (大小写不敏感)，默认值为 `prod`。 -这将引导 NoneBot 从系统环境变量或者 `.env.{ENVIRONMENT}` 文件中进一步加载具体配置。 - -`.env` 文件是基础环境配置文件，该文件中的配置项在不同环境下都会被加载，但会被 `.env.{ENVIRONMENT}` 文件中的配置所覆盖。 - -现在，我们在 `.env` 文件中写入当前环境信息： - -```bash -# .env -ENVIRONMENT=dev -CUSTOM_CONFIG=common config # 这个配置项在任何环境中都会被加载 -``` - -如你所想，之后 NoneBot 就会从 `.env.dev` 文件中加载环境变量。 - -## .env.\* 文件 - -NoneBot 使用 [pydantic](https://pydantic-docs.helpmanual.io/) 进行配置管理，会从 `.env.{ENVIRONMENT}` 文件中获悉环境配置。 - -可以在 NoneBot 初始化时指定加载某个环境配置文件: `nonebot.init(_env_file=".env.dev")`，这将忽略你在 `.env` 中设置的 `ENVIRONMENT` 。 - -:::warning 提示 -由于 `pydantic` 使用 JSON 解析配置项，请确保配置项值为 JSON 格式的数据。如： - -```bash -list=["123456789", "987654321", 1] -test={"hello": "world"} -``` - -如果配置项值解析失败将作为字符串处理。 -::: - -示例及说明： - -```bash -HOST=0.0.0.0 # 配置 NoneBot 监听的 IP/主机名 -PORT=8080 # 配置 NoneBot 监听的端口 -DEBUG=true # 开启 debug 模式 **请勿在生产环境开启** -SUPERUSERS=["123456789", "987654321"] # 配置 NoneBot 超级用户 -NICKNAME=["awesome", "bot"] # 配置机器人的昵称 -COMMAND_START=["/", ""] # 配置命令起始字符 -COMMAND_SEP=["."] # 配置命令分割字符 - -# Custom Configs -CUSTOM_CONFIG1="config in env file" -CUSTOM_CONFIG2= # 留空则从系统环境变量读取，如不存在则为空字符串 -``` - -详细的配置项参考 [Config Reference](../api/config.md) 。 - -## 系统环境变量 - -如果在系统环境变量中定义了配置，则一样会被读取。 - -## bot.py 文件 - -配置项也可以在 NoneBot 初始化时传入。此处可以传入任意合法 Python 变量。当然也可以在初始化完成后修改或新增。 - -示例： - -```python -# bot.py -import nonebot - -nonebot.init(custom_config3="config on init") - -config = nonebot.get_driver().config -config.custom_config3 = "changed after init" -config.custom_config4 = "new config after init" -``` - -## 优先级 - -`bot.py` 文件( `nonebot.init` ) > 系统环境变量 > `.env` `.env.*` 文件 diff --git a/archive/2.0.0a15/guide/cqhttp-guide.md b/archive/2.0.0a15/guide/cqhttp-guide.md deleted file mode 100644 index bfe69246..00000000 --- a/archive/2.0.0a15/guide/cqhttp-guide.md +++ /dev/null @@ -1,117 +0,0 @@ -# CQHTTP 协议使用指南 - -## 安装 NoneBot CQHTTP 适配器 - -```bash -pip install nonebot-adapter-cqhttp -``` - -## 配置 CQHTTP 协议端（以 QQ 为例） - -单纯运行 NoneBot 实例并不会产生任何效果，因为此刻 QQ 这边还不知道 NoneBot 的存在，也就无法把消息发送给它，因此现在需要使用一个无头 QQ 来把消息等事件上报给 NoneBot。 - -QQ 协议端举例: - -- [go-cqhttp](https://github.com/Mrs4s/go-cqhttp) (基于 [MiraiGo](https://github.com/Mrs4s/MiraiGo)) -- [onebot-kotlin](https://github.com/yyuueexxiinngg/onebot-kotlin) -- [Mirai](https://github.com/mamoe/mirai) + [onebot-mirai](https://github.com/yyuueexxiinngg/onebot-kotlin) -- [Mirai](https://github.com/mamoe/mirai) + [Mirai Native](https://github.com/iTXTech/mirai-native) + [CQHTTP](https://github.com/richardchien/coolq-http-api) -- [node-onebot](https://github.com/takayama-lily/node-onebot) (基于 [abot](https://github.com/takayama-lily/abot), [OICQ](https://github.com/takayama-lily/oicq)) - -这里以 [go-cqhttp](https://github.com/Mrs4s/go-cqhttp) 为例 - -1. 下载 go-cqhttp 对应平台的 release 文件，[点此前往](https://github.com/Mrs4s/go-cqhttp/releases) -2. 运行 exe 文件或者使用 `./go-cqhttp` 启动 -3. 生成默认配置文件并修改默认配置 - -### 选项 1 反向 WebSocket 连接 - -```yml{2,3,6,10} -account: - uin: 机器人QQ号 - password: "机器人密码" - -message: - post-format: array - -servers: - - ws-reverse: - universal: ws://127.0.0.1:8080/cqhttp/ws -``` - -其中 `ws://127.0.0.1:8080/cqhttp/ws` 中的 `127.0.0.1` 和 `8080` 应分别对应 nonebot 配置的 HOST 和 PORT。 - -`cqhttp` 是前述 `register_adapter` 时传入的第一个参数，代表设置的 `CQHTTPBot` 适配器的路径，你可以对不同的适配器设置不同路径以作区别。 - -### 选项 2 HTTP POST 上报 - -```yml{2,3,6,11} -account: - uin: 机器人QQ号 - password: "机器人密码" - -message: - post-format: array - -servers: - - http: - post: - - url: "http://127.0.0.1:8080/cqhttp/http" - secret: "" -``` - -其中 `ws://127.0.0.1:8080/cqhttp/http` 中的 `127.0.0.1` 和 `8080` 应分别对应 nonebot 配置的 HOST 和 PORT。 - -`cqhttp` 是前述 `register_adapter` 时传入的第一个参数，代表设置的 `CQHTTPBot` 适配器的路径，你可以对不同的适配器设置不同路径以作区别。 - -### 选项 3 正向 WebSocket 连接 - -```yml{2,3,6,10,11} -account: - uin: 机器人QQ号 - password: "机器人密码" - -message: - post-format: array - -servers: - - ws: - host: 127.0.0.1 - port: 6700 -``` - -NoneBot 配置 - -```dotenv -CQHTTP_WS_URLS={"机器人QQ号": "ws://127.0.0.1:6700/"} -``` - -其中 `ws://127.0.0.1:6700/` 中的 `127.0.0.1` 和 `6700` 应分别对应 go-cqhttp 配置的 HOST 和 PORT。 - -正向连接可以选择支持客户端连接方式的 `Driver` 来进行连接，请根据需求进行选择： - -- `nonebot.drivers.fastapi`: 同时支持正向和反向 -- `nonebot.drivers.aiohttp`: 仅支持正向 - -## 历史性的第一次对话 - -一旦新的配置文件正确生效之后，NoneBot 所在的控制台（如果正在运行的话）应该会输出类似下面的内容（两条访问日志）： - -```default -09-14 21:31:16 [INFO] uvicorn | ('127.0.0.1', 12345) - "WebSocket /cqhttp/ws" [accepted] -09-14 21:31:16 [INFO] nonebot | WebSocket Connection from CQHTTP Bot 你的QQ号 Accepted! -``` - -这表示 CQHTTP 协议端已经成功地使用 CQHTTP 协议连接上了 NoneBot。 - -现在，尝试向你的机器人账号发送如下内容： - -```default -/echo 你好，世界 -``` - -到这里如果一切 OK，你应该会收到机器人给你回复了 `你好，世界`。这一历史性的对话标志着你已经成功地运行了一个 NoneBot 的最小实例，开始了编写更强大的 QQ 机器人的创意之旅！ - - - - diff --git a/archive/2.0.0a15/guide/creating-a-handler.md b/archive/2.0.0a15/guide/creating-a-handler.md deleted file mode 100644 index f11c1463..00000000 --- a/archive/2.0.0a15/guide/creating-a-handler.md +++ /dev/null @@ -1,197 +0,0 @@ -# 事件处理 - -在上一章中，我们已经注册了事件响应器，现在我们可以正式编写事件处理逻辑了！ - -## [事件处理函数](../api/typing.md#handler) - -```python{1,2,8,9} -@weather.handle() -async def handle_first_receive(bot: Bot, event: Event, state: T_State): - args = str(event.get_message()).strip() # 首次发送命令时跟随的参数，例：/天气 上海，则args为上海 - if args: - state["city"] = args # 如果用户发送了参数则直接赋值 - - -@weather.got("city", prompt="你想查询哪个城市的天气呢？") -async def handle_city(bot: Bot, event: Event, state: T_State): - city = state["city"] - if city not in ["上海", "北京"]: - await weather.reject("你想查询的城市暂不支持，请重新输入！") - city_weather = await get_weather(city) - await weather.finish(city_weather) -``` - -在之前的样例中，我们定义了两个函数 `handle_first_receive`, `handle_city`，他们被事件响应器的装饰器装饰从而成为事件响应器的事件处理函数。 - -:::tip 提示 -在事件响应器中，事件处理函数是**顺序**执行的！ -::: - -### 添加一个事件处理函数 - -事件响应器提供了三种装饰事件处理函数的装饰器，分别是： - -1. [handle()](../api/matcher.md#classmethod-handle) -2. [receive()](../api/matcher.md#classmethod-receive) -3. [got(key, prompt, args_parser)](../api/matcher.md#classmethod-got-key-prompt-none-args-parser-none) - -#### handle() - -简单的为事件响应器添加一个事件处理函数，这个函数将会在上一个处理函数正常返回执行完毕后立即执行。 - -#### receive() - -指示 NoneBot 接收一条新的用户消息后继续执行该处理函数。此时函数将会接收到新的消息而非前一条消息，之前相关信息可以存储在 state 中。 - -特别地，当装饰的函数前没有其他事件处理函数，那么 `receive()` 不会接收一条新的消息而是直接使用第一条接收到的消息。 - -#### got(key, prompt, args_parser) - -指示 NoneBot 当 `state` 中不存在 `key` 时向用户发送 `prompt` 等待用户回复并赋值给 `state[key]`。 - -`prompt` 可以为 `str`, `Message`, `MessageSegment`，若为空则不会向用户发送，若不为空则会在 format 之后发送，即 `prompt.format(**state)`，注意对 `{}` 进行转义。示例： - -```python -@matcher.receive() -async def handle(bot: Bot, event: Event, state: T_State): - state["key"] = "hello" - - -@matcher.got("key2", prompt="{key}!") -async def handle2(bot: Bot, event: Event, state: T_State): - pass -``` - -`args_parser` 为参数处理函数，在这里传入一个新的函数以覆盖默认的参数处理。详情参照 [args_parser](#参数处理函数-args-parser) - -特别的，这些装饰器都可以套娃使用： - -```python -@matcher.got("key1") -@matcher.got("key2") -async def handle(bot: Bot, event: Event, state: T_State): - pass -``` - -### 事件处理函数参数 - -事件处理函数类型为： - -- `Callable[[Bot, Event, T_State, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, Event, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, T_State, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, Event], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot], Union[Awaitable[None], Awaitable[NoReturn]]]` - -简单说就是：除了 `bot` 参数，其他都是可选的。 - -以下函数都是合法的事件处理函数（仅列举常用的）： - -```python -async def handle(bot: Bot, event: Event, state: T_State): - pass - -async def handle(bot: Bot, event: Event, state: T_State, matcher: Matcher): - pass - -async def handle(bot: Bot, event: Event): - pass - -async def handle(bot: Bot, state: T_State): - pass - -async def handle(bot: Bot): - pass -``` - -:::danger 警告 -函数的参数名固定不能修改！ -::: - -参数分别为： - -1. [nonebot.adapters.Bot](../api/adapters/#class-bot): 即事件上报连接对应的 Bot 对象，为 BaseBot 的子类。特别注意，此处的类型注释可以替换为指定的 Bot 类型，例如：`nonebot.adapters.cqhttp.Bot`，只有在上报事件的 Bot 类型与类型注释相符时才会执行该处理函数！可用于多平台进行不同的处理。 -2. [nonebot.adapters.Event](../api/adapters/#class-event): 即上报事件对象，可以获取到上报的所有信息。 -3. [state](../api/typing.md#t-state): 状态字典，可以存储任意的信息，其中还包含一些特殊的值以获取 NoneBot 内部处理时的一些信息，如： - -- `state["_current_key"]`: 存储当前 `got` 获取的参数名 -- `state["_prefix"]`, `state["_suffix"]`: 存储当前 TRIE 匹配的前缀/后缀，可以通过该值获取用户命令的原始命令 - -:::tip 提示 -NoneBot 会对不同类型的参数进行不同的操作，详情查看 [事件处理函数重载](../advanced/overloaded-handlers.md) -::: - -### 参数处理函数 args_parser - -在使用 `got` 获取用户输入参数时，需要对用户的消息进行处理以转换为我们所需要的信息。在默认情况下，NoneBot 会把用户的消息字符串原封不动的赋值给 `state[key]` 。可以通过以下两种方式修改默认处理逻辑： - -- `@matcher.args_parser` 装饰器：直接装饰一个函数作为参数处理器 -- `got(key, prompt, args_parser)`：直接把函数作为参数传入 - -参数处理函数类型为：`Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]`，即： - -```python -async def parser(bot: Bot, event: Event, state: T_State): - state[state["_current_key"]] = str(event.get_message()) -``` - -特别的，`state["_current_key"]` 中存储了当前获取的参数名 - -### 逻辑控制 - -NoneBot 也为事件处理函数提供了一些便捷的逻辑控制函数： - -#### `matcher.send` - -这个函数用于发送一条消息给当前交互的用户。~~其实这并不是一个逻辑控制函数，只是不知道放在哪里……~~ - -#### `matcher.pause` - -这个函数用于结束当前事件处理函数，强制接收一条新的消息再运行**下一个消息处理函数**。 - -#### `matcher.reject` - -这个函数用于结束当前事件处理函数，强制接收一条新的消息再**再次运行当前消息处理函数**。常用于用户输入信息不符合预期。 - -#### `matcher.finish` - -这个函数用于直接结束当前事件处理。 - -以上三个函数都拥有一个参数 `message` / `prompt`，用于向用户发送一条消息。以及 `**kwargs` 直接传递给 `bot.send` 的额外参数。 - -## 常用事件处理结构 - -```python -matcher = on_command("test") - -# 修改默认参数处理 -@matcher.args_parser -async def parse(bot: Bot, event: Event, state: T_State): - print(state["_current_key"], ":", str(event.get_message())) - state[state["_current_key"]] = str(event.get_message()) - -@matcher.handle() -async def first_receive(bot: Bot, event: Event, state: T_State): - # 获取用户原始命令，如：/test - print(state["_prefix"]["raw_command"]) - # 处理用户输入参数，如：/test arg1 arg2 - raw_args = str(event.get_message()).strip() - if raw_args: - arg_list = raw_args.split() - # 将参数存入state以阻止后续再向用户询问参数 - state["arg1"] = arg_list[0] - - -@matcher.got("arg1", prompt="参数？") -async def arg_handle(bot: Bot, event: Event, state: T_State): - # 在这里对参数进行验证 - if state["arg1"] not in ["allow", "list"]: - await matcher.reject("参数不正确！请重新输入") - # 发送一些信息 - await bot.send(event, "message") - await matcher.send("message") - await matcher.finish("message") -``` diff --git a/archive/2.0.0a15/guide/creating-a-matcher.md b/archive/2.0.0a15/guide/creating-a-matcher.md deleted file mode 100644 index 61a5143d..00000000 --- a/archive/2.0.0a15/guide/creating-a-matcher.md +++ /dev/null @@ -1,148 +0,0 @@ -# 注册事件响应器 - -好了，现在插件已经创建完毕，我们可以开始编写实际代码了，下面将以一个简易单文件天气查询插件为例。 - -在插件目录下 `weather.py` 中添加如下代码： - -```python -from nonebot import on_command -from nonebot.rule import to_me -from nonebot.typing import T_State -from nonebot.adapters import Bot, Event - -weather = on_command("天气", rule=to_me(), priority=5) - - -@weather.handle() -async def handle_first_receive(bot: Bot, event: Event, state: T_State): - args = str(event.get_message()).strip() # 首次发送命令时跟随的参数，例：/天气 上海，则args为上海 - if args: - state["city"] = args # 如果用户发送了参数则直接赋值 - - -@weather.got("city", prompt="你想查询哪个城市的天气呢？") -async def handle_city(bot: Bot, event: Event, state: T_State): - city = state["city"] - if city not in ["上海", "北京"]: - await weather.reject("你想查询的城市暂不支持，请重新输入！") - city_weather = await get_weather(city) - await weather.finish(city_weather) - - -async def get_weather(city: str): - return f"{city}的天气是..." -``` - -为了简单起见，我们在这里的例子中没有接入真实的天气数据，但要接入也非常简单，你可以使用中国天气网、和风天气等网站提供的 API。 - -接下来我们来说明这段代码是如何工作的。 - -:::tip 提示 -从这里开始，你需要对 Python 的 asyncio 编程有所了解，因为 NoneBot 是完全基于 asyncio 的，具体可以参考 [廖雪峰的 Python 教程](https://www.liaoxuefeng.com/wiki/1016959663602400/1017959540289152) -::: - -## [事件响应器](../api/matcher.md) - -```python{5} -from nonebot import on_command -from nonebot.rule import to_me -from nonebot.permission import Permission - -weather = on_command("天气", rule=to_me(), permission=Permission(), priority=5) -``` - -在上方代码中，我们注册了一个事件响应器 `Matcher`，它由几个部分组成： - -1. `on_command` 注册一个消息类型的命令处理器 -2. `"天气"` 指定 command 参数 - 命令名 -3. `rule` 补充事件响应器的匹配规则 -4. `priority` 事件响应器优先级 -5. `block` 是否阻止事件传递 - -其他详细配置可以参考 API 文档，下面我们详细说明各个部分： - -### 事件响应器类型 type - -事件响应器类型其实就是对应事件的类型 `Event.get_type()` ，NoneBot 提供了一个基础类型事件响应器 `on()` 以及一些其他内置的事件响应器。 - -以下所有类型的事件响应器都是由 `on(type, rule)` 的形式进行了简化封装。 - -- `on("事件类型")`: 基础事件响应器，第一个参数为事件类型，空字符串表示不限 -- `on_metaevent()` ~ `on("meta_event")`: 元事件响应器 -- `on_message()` ~ `on("message")`: 消息事件响应器 -- `on_request()` ~ `on("request")`: 请求事件响应器 -- `on_notice()` ~ `on("notice")`: 通知事件响应器 -- `on_startswith(str)` ~ `on("message", startswith(str))`: 消息开头匹配响应器，参考 [startswith](../api/rule.md#startswith-msg) -- `on_endswith(str)` ~ `on("message", endswith(str))`: 消息结尾匹配响应器，参考 [endswith](../api/rule.md#endswith-msg) -- `on_keyword(set)` ~ `on("message", keyword(str))`: 消息关键词匹配响应器，参考 [keyword](../api/rule.md#keyword-keywords) -- `on_command(str|tuple)` ~ `on("message", command(str|tuple))`: 命令响应器，参考 [command](../api/rule.md#command-cmds) -- `on_regex(pattern_str)` ~ `on("message", regex(pattern_str))`: 正则匹配处理器，参考 [regex](../api/rule.md#regex-regex-flags-0) - -### 匹配规则 rule - -事件响应器的匹配规则即 `Rule`，详细内容在下方介绍。[直达](#自定义-rule) - -### 优先级 priority - -事件响应器的优先级代表事件响应器的执行顺序，同一优先级的事件响应器会 **同时执行！**，优先级数字**越小**越先响应！优先级请从 `1` 开始排序！ - -:::tip 提示 -使用 `nonebot-plugin-test` 可以在网页端查看当前所有事件响应器的执行流程，有助理解事件响应流程！ - -```bash -nb plugin install nonebot_plugin_test -``` - -::: - -### 阻断 block - -当有任意事件响应器发出了阻止事件传递信号时，该事件将不再会传递给下一优先级，直接结束处理。 - -NoneBot 内置的事件响应器中，所有 `message` 类的事件响应器默认会阻断事件传递，其他则不会。 - -在部分情况中，可以使用 `matcher.stop_propagation()` 方法动态阻止事件传播，该方法需要 `handler` 在参数中获取 `matcher` 实例后调用方法。 - -## 自定义 rule - -rule 的出现使得 nonebot 对事件的响应可以非常自由，nonebot 内置了一些规则： - -- [startswith(msg)](../api/rule.md#startswith-msg) -- [endswith(msg)](../api/rule.md#endswith-msg) -- [keyword(\*keywords)](../api/rule.md#keyword-keywords) -- [command(\*cmds)](../api/rule.md#command-cmds) -- [regex(regex, flag)](../api/rule.md#regex-regex-flags-0) - -以上规则都是返回类型为 `Rule` 的函数，`Rule` 由非负个 `RuleChecker` 组成，当所有 `RuleChecker` 返回 `True` 时匹配成功。这些 `Rule`, `RuleChecker` 的形式如下： - -```python -from nonebot.rule import Rule -from nonebot.typing import T_State - -async def async_checker(bot: Bot, event: Event, state: T_State) -> bool: - return True - -def sync_checker(bot: Bot, event: Event, state: T_State) -> bool: - return True - -def check(arg1, arg2): - - async def _checker(bot: Bot, event: Event, state: T_State) -> bool: - return bool(arg1 + arg2) - - return Rule(_checker) -``` - -`Rule` 和 `RuleChecker` 之间可以使用 `与 &` 互相组合： - -```python -from nonebot.rule import Rule - -Rule(async_checker1) & sync_checker & async_checker2 -``` - -**_请勿将事件处理的逻辑写入 `rule` 中，这会使得事件处理返回奇怪的响应。_** - -:::danger 警告 -`Rule(*checkers)` 只接受 async function，或使用 `nonebot.utils.run_sync` 自行包裹 sync function。在使用 `与 &` 时，NoneBot 会自动包裹 sync function -::: diff --git a/archive/2.0.0a15/guide/creating-a-plugin.md b/archive/2.0.0a15/guide/creating-a-plugin.md deleted file mode 100644 index f5deb009..00000000 --- a/archive/2.0.0a15/guide/creating-a-plugin.md +++ /dev/null @@ -1,119 +0,0 @@ -# 创建插件 - -如果之前使用 `nb-cli` 生成了项目结构，那我们已经有了一个空的插件目录 `Awesome-Bot/awesome_bot/plugins`，并且它已在 `bot.py` 中被加载，我们现在可以开始创建插件了！ - -使用 `nb-cli` 创建包形式插件，或自行创建文件(夹) - -```bash -nb plugin new -``` - -下面分别对两种通常的插件形式做具体介绍 - -## 单文件形式 - -在插件目录下创建名为 `foo.py` 的 Python 文件，暂时留空，此时目录结构如下： - - -:::vue -AweSome-Bot -├── awesome_bot -│ └── plugins -│ └── `foo.py` -├── .env -├── .env.dev -├── .env.prod -├── .gitignore -├── bot.py -├── docker-compose.yml -├── Dockerfile -├── pyproject.toml -└── README.md -::: - - -这个时候它已经可以被称为一个插件了，尽管它还什么都没做。 - -## 包形式(推荐) - -在插件目录下创建文件夹 `foo`，并在该文件夹下创建文件 `__init__.py`，此时目录结构如下： - - -:::vue -AweSome-Bot -├── awesome_bot -│ └── plugins -│ └── `foo` -│ └── `__init__.py` -├── .env -├── .env.dev -├── .env.prod -├── .gitignore -├── bot.py -├── docker-compose.yml -├── Dockerfile -├── pyproject.toml -└── README.md -::: - - -这个时候 `foo` 就是一个合法的 Python 包了，同时也是合法的 NoneBot 插件，插件内容可以在 `__init__.py` 中编写。 - -### 推荐结构(仅供参考) - - -:::vue -foo -├── `__init__.py` -├── `config.py` -├── `data_source.py` -└── `model.py` -::: - - -#### \_\_init\_\_.py - -在该文件中编写各类事件响应及处理逻辑。 - -#### config.py - -在该文件中使用 `pydantic` 定义插件所需要的配置项以及类型。 - -示例： - -```python -from pydantic import BaseSettings - - -class Config(BaseSettings): - - # plugin custom config - plugin_setting: str = "default" - - class Config: - extra = "ignore" -``` - -并在 `__init__.py` 文件中添加以下行 - -```python -import nonebot -from .config import Config - -global_config = nonebot.get_driver().config -plugin_config = Config(**global_config.dict()) -``` - -此时就可以通过 `plugin_config.plugin_setting` 获取到插件所需要的配置项了。 - -#### data_source.py - -在该文件中编写数据获取函数。 - -:::warning 警告 -数据获取应尽量使用**异步**处理！例如使用 [httpx](https://www.python-httpx.org/) 而非 [requests](https://requests.readthedocs.io/en/master/) -::: - -#### model.py - -在该文件中编写数据库模型。 diff --git a/archive/2.0.0a15/guide/creating-a-project.md b/archive/2.0.0a15/guide/creating-a-project.md deleted file mode 100644 index 2b3fbce0..00000000 --- a/archive/2.0.0a15/guide/creating-a-project.md +++ /dev/null @@ -1,58 +0,0 @@ -# 创建一个完整的项目 - -上一章中我们已经运行了一个简单的 NoneBot 实例，在这一章，我们将从零开始一个完整的项目。 - -## 目录结构 - -可以使用 `nb-cli` 或者自行创建完整的项目目录： - -```bash -nb create -``` - - -:::vue -AweSome-Bot -├── `awesome_bot` _(**或是 src**)_ -│ └── `plugins` -├── `.env` _(**可选的**)_ -├── `.env.dev` _(**可选的**)_ -├── `.env.prod` _(**可选的**)_ -├── .gitignore -├── `bot.py` -├── docker-compose.yml -├── Dockerfile -├── `pyproject.toml` -└── README.md -::: - - -- `awesome_bot/plugins` 或 `src/plugins`: 用于存放编写的 bot 插件 -- `.env`, `.env.dev`, `.env.prod`: 各环境配置文件 -- `bot.py`: bot 入口文件 -- `pyproject.toml`: 项目依赖管理文件，默认使用 [poetry](https://python-poetry.org/) - -## 启动 Bot - -:::warning 提示 -如果您使用如 `VSCode` / `PyCharm` 等 IDE 启动 nonebot，请检查 IDE 当前工作空间目录是否与当前侧边栏打开目录一致。 - -- 注意：在二者不一致的环境下可能导致 nonebot 读取配置文件和插件等不符合预期 - -::: - -通过 `nb-cli` - -```bash -nb run [--file=bot.py] [--app=app] -``` - -或 - -```bash -python bot.py -``` - -:::tip 提示 -如果在 bot 入口文件内定义了 asgi server， `nb-cli` 将会为你启动**冷重载模式**（当文件发生变动时自动重启 NoneBot 实例） -::: diff --git a/archive/2.0.0a15/guide/ding-guide.md b/archive/2.0.0a15/guide/ding-guide.md deleted file mode 100644 index 46295ee8..00000000 --- a/archive/2.0.0a15/guide/ding-guide.md +++ /dev/null @@ -1,181 +0,0 @@ -# 钉钉机器人使用指南 - -基于企业机器人的 outgoing（回调）机制，用户@机器人之后，钉钉会将消息内容 POST 到开发者的消息接收地址。开发者解析出消息内容、发送者身份，根据企业的业务逻辑，组装响应的消息内容返回，钉钉会将响应内容发送到群里。 - -::: warning 只有企业内部机器人支持接收消息 -普通的机器人尚不支持应答机制，该机制指的是群里成员在聊天@机器人的时候，钉钉回调指定的服务地址，即 Outgoing 机器人。 -::: - -首先你需要有钉钉机器人的相关概念，请参阅相关文档： - -- [群机器人概述](https://developers.dingtalk.com/document/app/overview-of-group-robots) -- [开发企业内部机器人](https://developers.dingtalk.com/document/app/develop-enterprise-internal-robots) - -钉钉官方机器人教程（Java）： - -- [开发一个钉钉机器人](https://developers.dingtalk.com/document/tutorial/create-a-robot) - -## 安装 NoneBot 钉钉 适配器 - -```bash -pip install nonebot-adapter-ding -``` - -## 关于 DingAdapter 的说明 - -你需要显式的注册 ding 这个适配器： - -```python{2,6} -import nonebot -from nonebot.adapters.ding import Bot as DingBot - -nonebot.init() -driver = nonebot.get_driver() -driver.register_adapter("ding", DingBot) -nonebot.load_builtin_plugins() - -if __name__ == "__main__": - nonebot.run() -``` - -注册适配器的目的是将 `/ding` 这个路径挂载到程序上，并且和 DingBot 适配器关联起来。之后钉钉把收到的消息回调到 `http://xx.xxx.xxx.xxx:{port}/ding` 时，Nonebot 才知道要用什么适配器去处理该消息。 - -## 第一个命令 - -因为 Nonebot 可以根据你的命令处理函数的类型注解来选择使用什么 Adapter 进行处理，所以你如果需要使用钉钉相关的功能，你的 handler 中 `bot` 类型的注解需要是 DingBot 及其父类。 - -对于 Event 来说也是如此，Event 也可以根据标注来判断，比如一个 handler 的 event 标注位 `PrivateMessageEvent`，那这个 handler 只会处理私聊消息。 - -举个栗子： - -```python -test = on_command("test", to_me()) - - -@test.handle() -async def test_handler1(bot: DingBot, event: PrivateMessageEvent): - await test.finish("PrivateMessageEvent") - - -@test.handle() -async def test_handler2(bot: DingBot, event: GroupMessageEvent): - await test.finish("GroupMessageEvent") -``` - -这样 Nonebot 就会根据不同的类型注解使用不同的 handler 来处理消息。 - -可以查看 Nonebot 官方的这个例子：，更详细的了解一个 Bot 的结构。 - -## 多种消息格式 - -发送 markdown 消息： - -```python -@markdown.handle() -async def markdown_handler(bot: DingBot): - message = MessageSegment.markdown( - "Hello, This is NoneBot", - "#### NoneBot \n> Nonebot 是一款高性能的 Python 机器人框架\n> ![screenshot](https://v2.nonebot.dev/logo.png)\n> [GitHub 仓库地址](https://github.com/nonebot/nonebot2) \n" - ) - await markdown.finish(message) -``` - -可以按自己的需要发送原生的格式消息（需要使用 `MessageSegment` 包裹，可以很方便的实现 @ 等操作）： - -```python -@raw.handle() -async def raw_handler(bot: DingBot, event: MessageEvent): - message = MessageSegment.raw({ - "msgtype": "text", - "text": { - "content": f"@{event.senderId}，你好" - }, - }) - message += MessageSegment.atDingtalkIds(event.senderId) - await raw.send(message) -``` - -其他消息格式请查看 [钉钉适配器的 MessageSegment](https://github.com/nonebot/nonebot2/blob/dev/nonebot/adapters/ding/message.py#L8)，里面封装了很多有关消息的方法，比如 `code`、`image`、`feedCard` 等。 - -## 发送到特定群聊 - -钉钉也支持通过 Webhook 的方式直接将消息推送到某个群聊([参考链接](https://developers.dingtalk.com/document/app/custom-robot-access/title-zob-eyu-qse))，你可以在机器人的设置中看到当前群的 Webhook 地址。 - -![机器人所在群的 Webhook 地址](./images/ding/webhook.png) - -获取到 Webhook 地址后，用户可以向这个地址发起 HTTP POST 请求，即可实现给该钉钉群发送消息。 - -对于这种通过 Webhook 推送的消息，钉钉需要开发者进行安全方面的设置（目前有 3 种安全设置方式，请根据需要选择一种），如下： - -1. **自定义关键词：** 最多可以设置 10 个关键词，消息中至少包含其中 1 个关键词才可以发送成功。 - 例如添加了一个自定义关键词：监控报警，则这个机器人所发送的消息，必须包含监控报警这个词，才能发送成功。 -2. **加签：** 发送请求时带上验签的值，可以在机器人设置里看到密钥。 - ![加签密钥](./images/ding/jiaqian.png) -3. **IP 地址（段）：** 设定后，只有来自 IP 地址范围内的请求才会被正常处理。支持两种设置方式：IP 地址和 IP 地址段，暂不支持 IPv6 地址白名单。 - -如果你选择 1/3 两种安全设置，你需要自己确认当前网络和发送的消息能被钉钉接受，然后使用 `bot.send` 的时候将 webhook 地址传入 webhook 参数即可。 - -如我设置了 `打卡` 为关键词： - -```python -message = MessageSegment.text("打卡成功：XXXXXX") -await hello.send( - message, - webhook= - "https://oapi.dingtalk.com/robot/send?access_token=XXXXXXXXXXXXXX", -) -``` - -对于第二种加签方式，你可以在 `bot.send` 的时候把 `secret` 参数传进去，Nonebot 内部会自动帮你计算发送该消息的签名并发送，如： - -这里的 `secret` 参数就是加签选项给出的那个密钥。 - -```python -message = MessageSegment.raw({ - "msgtype": "text", - "text": { - "content": 'hello from webhook,一定要注意安全方式的鉴权哦，否则可能发送失败的' - }, -}) -message += MessageSegment.atDingtalkIds(event.senderId) -await hello.send( - message, - webhook="https://oapi.dingtalk.com/robot/send?access_token=XXXXXXXXXXXXXX", - secret="SECXXXXXXXXXXXXXXXXXXXXXXXXX", -) -``` - -然后就可以发送成功了。 - -![测试 Webhook 发送](images/ding/test_webhook.png) - -## 创建机器人并连接 - -在钉钉官方文档 [「开发企业内部机器人 -> 步骤一：创建机器人应用」](https://developers.dingtalk.com/document/app/develop-enterprise-internal-robots/title-ufs-4gh-poh) 中有详细介绍，这里就省去创建的步骤，介绍一下如何连接上程序。 - -### 本地开发机器人 - -在本地开发机器人的时候可能没有公网 IP，钉钉官方给我们提供一个 [内网穿透工具](https://developers.dingtalk.com/document/resourcedownload/http-intranet-penetration?pnamespace=app)，方便开发测试。 - -::: tip -究其根源这是一个魔改版的 ngrok，钉钉提供了一个服务器。 - -本工具不保证稳定性，仅适用于开发测试阶段，禁止当作公网域名使用。如线上应用使用本工具造成稳定性问题，后果由自己承担。如使用本工具传播违法不良信息，钉钉将追究法律责任。 -::: - -官方文档里已经讲了如何使用。我们再以 Windows（终端使用 Powershell） 为例，来演示一下。 - -1. 将仓库 clone 到本地，打开 `windows_64` 文件夹。 -2. 执行 `.\ding.exe -config="./ding.cfg" -subdomain=rcnb 8080` 就可以将 8080 端口暴露到公网中。 - 你访问 都会映射到 。 - -假设我们的机器人监听的端口是 `2333`，并且已经注册了钉钉适配器。那我们就执行 `.\ding.exe -config="./ding.cfg" -subdomain=rcnb 2333`，然后在机器人的后台设置 POST 的地址：`http://rcnb.vaiwan.com/ding`。 -这样钉钉接收到消息之后就会 POST 消息到 `http://rcnb.vaiwan.com/ding` 上，然后这个服务会把消息再转发到我们本地的开发服务器上。 - -### 生产模式 - -生产模式你的机器需要有一个公网 IP，然后到机器人的后台设置 POST 的地址就好了。 - -## 示例 - -关于钉钉机器人能做啥，你可以查看 `https://github.com/nonebot/nonebot2/blob/dev/tests/test_plugins/test_ding.py`，里面有一些例子。 diff --git a/archive/2.0.0a15/guide/end-or-start.md b/archive/2.0.0a15/guide/end-or-start.md deleted file mode 100644 index aa072c3d..00000000 --- a/archive/2.0.0a15/guide/end-or-start.md +++ /dev/null @@ -1,8 +0,0 @@ -# 结语 - -至此，相信你已经能够写出一个基础的插件了。这里给出几个小提示： - -- 请千万注意事件处理器的优先级设定 -- 在匹配规则中请勿使用耗时极长的函数 - -如果「指南」还不能满足你，前往 [进阶](../advanced/README.md) 查看更多的功能信息。 diff --git a/archive/2.0.0a15/guide/feishu-guide.md b/archive/2.0.0a15/guide/feishu-guide.md deleted file mode 100644 index 342ea3af..00000000 --- a/archive/2.0.0a15/guide/feishu-guide.md +++ /dev/null @@ -1,57 +0,0 @@ -# 飞书机器人使用指南 - -基于飞书开放平台事件回调与 API 进行机器人适配，目前仅适配企业自建应用。 - -## 安装 NoneBot 飞书 适配器 - -```bash -pip install nonebot-adapter-feishu -``` - -## 创建应用与启用应用“机器人”能力 - -::: tip -此部分可参考[飞书开放平台-快速开发机器人-创建应用](https://open.feishu.cn/document/home/develop-a-bot-in-5-minutes/create-an-app)部分文档。 - -::: - -## 开启应用权限 - -应用拥有所需权限后，才能调用飞书接口获取相关信息。如果需要用到所有飞书平台的 API，请开启所有应用权限。 - -在仅群聊功能的情况下，需要为应用开启用户、消息、通讯录和群聊权限组所有权限。 - -## 配置飞书事件订阅 - -::: tip - -在添加事件订阅时请注意，带有**（历史版本）**字样的事件的格式为**不受支持的旧版事件格式**，请使用对应的**新版事件（不带历史版本字样）作为替代**。 - -::: - -目前，飞书适配器支持以下事件： -| 事件名称 | 事件描述| -| ---- | ---- | -|接收消息|机器人接收到用户发送的消息。| -|消息已读|用户阅读机器人发送的单聊消息。| -|群解散|群组被解散。| -|群配置更改|群组配置被修改后触发此事件，包含：群主转移、群基本信息修改、群权限修改。| -|机器人进群|机器人被添加至群聊。| -|机器人被移出群|机器人被移出群聊。| -|用户进群|新用户进群。| -|撤销拉用户进群|撤销拉用户进群。| -|用户被移出群|用户主动退群或被移出群聊。| - -## 在 NoneBot 配置中添加相应配置 - -在 `.env` 文件中添加以下部分 - -``` -APP_ID= -APP_SECRET= -VERIFICATION_TOKEN= -``` - -复制所创建应用**“凭证和基础信息”**中的**App ID**与**App Secret**及**“事件订阅”**中的**Verification Token**，替换上面相应的配置的值。 - -大功告成！现在可以试试向机器人发送消息进行测试了。 diff --git a/archive/2.0.0a15/guide/getting-started.md b/archive/2.0.0a15/guide/getting-started.md deleted file mode 100644 index f5e61215..00000000 --- a/archive/2.0.0a15/guide/getting-started.md +++ /dev/null @@ -1,87 +0,0 @@ -# 开始使用 - -一切都安装成功后，你就已经做好了进行简单配置以运行一个最小的 NoneBot 实例的准备工作。 - -## 最小实例 - -如果你已经按照推荐方式安装了 `nb-cli`，使用它创建一个空项目： - -```bash -nb create -``` - -根据引导进行项目配置，完成后会在当前目录下创建一个项目目录，项目目录内包含 `bot.py`。 - -如果未安装 `nb-cli`，使用你最熟悉的编辑器或 IDE，创建一个名为 `bot.py` 的文件，内容如下（这里以 CQHTTP 适配器为例）： - -```python{4,6,7,10} -import nonebot -from nonebot.adapters.cqhttp import Bot as CQHTTPBot - -nonebot.init() -driver = nonebot.get_driver() -driver.register_adapter("cqhttp", CQHTTPBot) -nonebot.load_builtin_plugins() - -if __name__ == "__main__": - nonebot.run() -``` - -## 解读 - -在上方 `bot.py` 中，这几行高亮代码将依次： - -1. 使用默认配置初始化 NoneBot -2. 加载 NoneBot 内置的 CQHTTP 协议适配组件 - `register_adapter` 的第一个参数我们传入了一个字符串，该字符串将会在后文 [配置 CQHTTP 协议端](#配置-cqhttp-协议端-以-qq-为例) 时使用。 -3. 加载 NoneBot 内置的插件 -4. 在地址 `127.0.0.1:8080` 运行 NoneBot - -在命令行使用如下命令即可运行这个 NoneBot 实例： - -```bash -# nb-cli -nb run -# 其他 -python bot.py -``` - -运行后会产生如下日志： - -```plain -09-14 21:02:00 [INFO] nonebot | Succeeded to import "nonebot.plugins.base" -09-14 21:02:00 [INFO] nonebot | Running NoneBot... -09-14 21:02:00 [INFO] uvicorn | Started server process [1234] -09-14 21:02:00 [INFO] uvicorn | Waiting for application startup. -09-14 21:02:00 [INFO] uvicorn | Application startup complete. -09-14 21:02:00 [INFO] uvicorn | Uvicorn running on http://127.0.0.1:8080 (Press CTRL+C to quit) -``` - -## 配置协议端上报 - -在 `bot.py` 文件中使用 `register_adapter` 注册协议适配之后即可配置协议端来完成与 NoneBot 的通信，详细配置方法参考： - -- [配置 CQHTTP](./cqhttp-guide.md) -- [配置钉钉](./ding-guide.md) -- [配置 mirai-api-http](./mirai-guide.md) - -NoneBot 接受的上报地址与 `Driver` 有关，默认使用的 `FastAPI Driver` 所接受的上报地址有： - -- `/{adapter name}/`: HTTP POST 上报 -- `/{adapter name}/http/`: HTTP POST 上报 -- `/{adapter name}/ws`: WebSocket 上报 -- `/{adapter name}/ws/`: WebSocket 上报 - -:::warning 注意 -如果到这一步你没有在 NoneBot 看到连接成功日志，比较常见的出错点包括： - -- NoneBot 监听 `0.0.0.0`，然后在协议端上报配置中填了 `ws://0.0.0.0:8080/***/ws` -- 在 Docker 容器内运行协议端，并通过 `127.0.0.1` 访问宿主机上的 NoneBot -- 想从公网访问，但没有修改云服务商的安全组策略或系统防火墙 -- NoneBot 所监听的端口存在冲突，已被其它程序占用 -- 弄混了 NoneBot 的 `host`、`port` 参数与协议端上报配置中的 `host`、`port` 参数 -- `ws://` 错填为 `http://` -- 协议端或 NoneBot 启动时遭到外星武器干扰 - -请尝试重启协议端 NoneBot、更换端口、修改防火墙、重启系统、仔细阅读前面的文档及提示、更新协议端 和 NoneBot 到最新版本等方式来解决。 -::: diff --git a/archive/2.0.0a15/guide/images/Handle-Event.png b/archive/2.0.0a15/guide/images/Handle-Event.png deleted file mode 100644 index 6546632c62c9dfee7d4f8e0ad5d2a7a082929542..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126466 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 z zHuSyaZaZg}!X+LOdpdDN1$Z}?6&M}49`qn#(3rlv@b%lwihqvI-~aemLjCpZ&D+2ZIHJa223EOs;i^^ZDOwjQv#&s+;z1{>NxD6k zelzS3FqMxVGt6j1>>e&U8=;_{^1EZg6rgRJP2*|WT=oG!i0)lX<1aFNy$4p}L0btE zE!Z)A;D;QIOBlfOVkt&%XrZy+D>xqs0n=s(# zGuY~rH$UX$C})DEv~SZte!O+)___Dbn-9};0tf(r$bp9Mp(^fW)ry(+j~8}e^xl(`K$8C~ z8$5d%Xj0gZdL|aY5nTJg5fTODf%T9qX!XY?X8pi_&sELeQwal8VK-o>bwU`8*i*H< zIZ?0wYru!{faU$Hjea%Sq;2~LT9bL&zZ_^Qp`*S2-|P=4p6wq$@%*n`fPc{$|1Apt zEeiiba{uKN{p*ka<0Lq5e;{7ORG8MO7Y{mSBYJfW3$9hu`VOzm=fPVmX3_*wWjsme z{EI!DzKk7W6SaJc2Y)Q=4_Im8bs?1Xx6&Gzf%@a^?Bm^d_!=|9|h|KRKp@Y zFakvPnUqX#&-kQxjR)Vg;FHKJEZGJ&P0`?wRa%$z1unAUi;CU+5_B{O06ZcMSTK5n z$y^F=ll`r?I`Vg4 z9;CnXdK*;6f6BT84tl3Je73eJbiJ3>8sM~w{kym|FXb;LuFDOq@V&EdFNOayU;9vdIb&$v(!(*047j$2w(?gRCQt!}mI= z*L!?!zuWhByM6!t{DtG3^L&i!aXqf^348D3Ba{fDVi?D(zo ze$s&fC=Sa0dGJFWTu^U)&2l}XGhw}-LDln$GJbt)^%=9@Km;K(*>CXlV?bqE+>5^| z&g0iRs^mux?+Djyh73bx{e`b1JEgUW42q|y1@Yk{k6ejX9*YND2E*?X_sg+Jkwmv+ zZL6wXVuqi8Z2ySy!!NvbTiV^8mhL~9*f%{d_n33K%YCtI8j7JVpmM?f+}(DkJ}`wz zqGqVGz(^H2`k(An_}nHGuKc)8w>jo%g9M9R#X{-9)S89Tp$X`!UGN0+4QpE##)mYi^enXd_#;qv zq(+ZIBP$+}U%m@?g!1kVfhvb+`+eT+JDzfPWr^|9U;FtC@n)d-z5Tt7)v8c00OJ@v zHKS!mrGeUy#+L?dcc#iwt?w{{-IwaB+)r`BXrcm&9~g}g3;eTtjCY}^%7em8fXUM6 zAT9>=&RN22;p)lj>G;k{!y8}&86i{-ZmD_49-Iw;Mpc3WJ_fIL;-s$3Y?fmkBlXYTVXzEG1f)4pP>6tif87>@CHT= zr+EvgihK}Udvou7J`RiNWRR%M*j!I;X{8TGj=lD?+dj%4=TOQ6RoiEc`ad=tg}0*dX)1Ry}9%ADqe-%jf%keUFh{%0c%_ z3;Qf4gu2i6z41QT)&Go~a5{f6W&DKaw4P_lH>;oDKiPiUV8ah@|2}qMr0|&INSVVl zjUxN;8e&T|yMD64>#Q;!{apw1y+v9~f;&T@o3kH&2vhEtRhlTk#I|ZU?MOcmPwkjh zVCxm;C31=S;?`4Ryxfbd5ov6}mz+?i*$!6*=BmE=l;8{F!XjUYdmnZi9`qS>8YgTY&iym!GDK5lm% z|Gg|X!T!t-X4LyP173z@8BX`t%;)?5&C+DK0hnWrfP?XWSZiOwOr=deM*Gh8b*k+-6fa#4ozI}!<4^Q_umA*gmjI&a%!e8H{md|lthU+tJ9v% zD031kL~-%0KEe+=9d)JguQRxv$U1>!E^Vku#keQEkMH4 znfrHbWc*+hn@vJ&Pi3ayw>UM<1H>b}FW?~zd;fuVqA*D@*b *}eYX-4FxSv>JU5 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

*N@WS@+EN$Q;{@LQ)Z!7WSW2|_;9z|pPtZ1U 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 VK6&fZIU5*&z|+;wWt~$(698!sxRL+> diff --git a/archive/2.0.0a15/guide/images/ding/jiaqian.png b/archive/2.0.0a15/guide/images/ding/jiaqian.png deleted file mode 100644 index 8895d6c6d866cd6049642da40dccebdfb94429bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102378 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 mCp24mDwTf*(Y3iRAG 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 diff --git a/archive/2.0.0a15/guide/images/ding/webhook.png b/archive/2.0.0a15/guide/images/ding/webhook.png deleted file mode 100644 index c957e72f925e1490afdfabf2af7b0aecfaeb3252..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102603 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%0DQ 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 diff --git a/archive/2.0.0a15/guide/installation.md b/archive/2.0.0a15/guide/installation.md deleted file mode 100644 index 48dd9615..00000000 --- a/archive/2.0.0a15/guide/installation.md +++ /dev/null @@ -1,115 +0,0 @@ -# 安装 - -## 安装 NoneBot - -:::warning 注意 -请确保你的 Python 版本 >= 3.7。 -::: - -:::warning 注意 -请在安装 NoneBot v2 之前卸载 NoneBot v1 - -```bash -pip uninstall nonebot -``` - -::: - -### (推荐安装方式)通过脚手架安装 - -1. (推荐)使用你喜欢的 Python 环境管理工具(如 `poetry`)创建新的虚拟环境 -2. 使用 `pip` 或 其他包管理工具 安装 `nb-cli`，`nonebot2` 会作为其依赖被一起安装 - - ```bash - pip install nb-cli - ``` - -3. 点个 star 吧 - - nonebot2: [![nonebot2](https://img.shields.io/github/stars/nonebot/nonebot2?style=social)](https://github.com/nonebot/nonebot2) - - nb-cli: [![nb-cli](https://img.shields.io/github/stars/nonebot/nb-cli?style=social)](https://github.com/nonebot/nb-cli) - -4. 如果有疑问，可以加群交流(点击链接直达) - - [![QQ Chat](https://img.shields.io/badge/QQ%E7%BE%A4-768887710-orange?style=social)](https://jq.qq.com/?_wv=1027&k=5OFifDh) - - [![Telegram Chat](https://img.shields.io/badge/telegram-cqhttp-blue?style=social)](https://t.me/cqhttp) - -### (纯净安装)不使用脚手架 - -```bash -pip install nonebot2 -# 也可以通过 poetry 安装 -poetry add nonebot2 -``` - -如果你需要使用最新的（可能**尚未发布**的）特性，可以直接从 GitHub 仓库安装： - -:::warning 注意 -直接从 Github 仓库中安装意味着你将使用最新提交的代码，它们并没有进行充分的稳定性测试 -在任何情况下请不要将其应用于生产环境! -::: - -```bash -# master分支 -poetry add git+https://github.com/nonebot/nonebot2.git#master -# dev分支 -poetry add git+https://github.com/nonebot/nonebot2.git#dev -``` - -或者在克隆 Git 仓库后手动安装： - -```bash -git clone https://github.com/nonebot/nonebot2.git -cd nonebot2 -poetry install --no-dev # 推荐 -pip install . # 不推荐 -``` - -## 安装适配器 - -适配器可以通过 `nb-cli` 在创建项目时根据你的选择自动安装，也可以自行使用 `pip` 安装 - -```bash -pip install -``` - -```bash -# 列出所有的适配器 -nb adapter list -``` - -## 安装插件 - -插件可以通过 `nb-cli` 进行安装，也可以自行安装并加载插件。 - -```bash -# 列出所有的插件 -nb plugin list -# 搜索插件 -nb plugin search -# 安装插件 -nb plugin install -``` - -如果急于上线 Bot 或想要使用现成的插件，以下插件可作为参考： - -### 官方插件 - -- [NoneBot-Plugin-Docs](https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-plugin-docs) 离线文档插件 -- [NoneBot-Plugin-Test](https://github.com/nonebot/plugin-test) 本地机器人测试前端插件 -- [NoneBot-Plugin-APScheduler](https://github.com/nonebot/plugin-apscheduler) 定时任务插件 -- [NoneBot-Plugin-LocalStore](https://github.com/nonebot/plugin-localstore) 本地数据文件存储插件 -- [NoneBot-Plugin-Sentry](https://github.com/cscs181/QQ-GitHub-Bot/tree/master/src/plugins/nonebot_plugin_sentry) Sentry 在线日志分析插件 -- [NoneBot-Plugin-Status](https://github.com/cscs181/QQ-GitHub-Bot/tree/master/src/plugins/nonebot_plugin_status) 服务器状态查看插件 - -### 其他插件 - -还有更多的插件在 [这里](/store.html) 等着你发现～ - -## 安装开发环境(可选) - -NoneBot v2 全程使用 `VSCode` 搭配 `Pylance` 的开发环境进行开发，在严格的类型检查下，NoneBot v2 具有完善的类型设计与声明。 - -在围绕 NoneBot v2 进行开发时，使用 `VSCode` 搭配 `Pylance` 进行类型检查是非常推荐的。这有利于统一代码风格及避免低级错误的发生。 diff --git a/archive/2.0.0a15/guide/loading-a-plugin.md b/archive/2.0.0a15/guide/loading-a-plugin.md deleted file mode 100644 index 5f445a14..00000000 --- a/archive/2.0.0a15/guide/loading-a-plugin.md +++ /dev/null @@ -1,184 +0,0 @@ -# 加载插件 - -在 [创建一个完整的项目](creating-a-project) 一章节中，我们已经创建了插件目录 `awesome_bot/plugins`，现在我们在机器人入口文件中加载它。当然，你也可以单独加载一个插件。 - -## 加载内置插件 - -在 `bot.py` 文件中添加以下行： - -```python{8} -import nonebot -from nonebot.adapters.cqhttp import Bot - -nonebot.init() - -driver = nonebot.get_driver() -driver.register_adapter("cqhttp", Bot) # 注册 CQHTTP 的 Adapter -nonebot.load_builtin_plugins() # 加载 nonebot 内置插件 - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -::: warning -目前, 内建插件仅支持 CQHTTP 的 Adapter - -如果您使用的是其他 Adapter, 请移步该 Adapter 相应的文档 -::: - -这将会加载 nonebot 内置的插件，它包含： - -- 命令 `say`：可由**superuser**使用，可以将消息内容由特殊纯文本转为富文本 -- 命令 `echo`：可由任何人使用，将消息原样返回 - -以上命令均需要指定机器人，即私聊、群聊内@机器人、群聊内称呼机器人昵称。参考 [Rule: to_me](../api/rule.md#to-me) - -## 加载插件目录 - -在 `bot.py` 文件中添加以下行： - -```python{6} -import nonebot - -nonebot.init() - -# 加载插件目录，该目录下为各插件，以下划线开头的插件将不会被加载 -nonebot.load_plugins("awesome_bot/plugins") - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -:::tip 提示 -加载插件目录时，目录下以 `_` 下划线开头的插件将不会被加载！ -::: - -:::warning 提示 -**不能存在相同名称的插件！** -::: - -:::danger 警告 -插件间不应该存在过多的耦合，如果确实需要导入某个插件内的数据，可以参考 [进阶-跨插件访问](../advanced/export-and-require.md) -::: - -## 加载单个插件 - -在 `bot.py` 文件中添加以下行： - -```python{6,8} -import nonebot - -nonebot.init() - -# 加载一个 pip 安装的插件 -nonebot.load_plugin("nonebot_plugin_status") -# 加载本地的单独插件 -nonebot.load_plugin("awesome_bot.plugins.xxx") - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -## 从 json 文件中加载插件 - -在 `bot.py` 文件中添加以下行： - -```python{6} -import nonebot - -nonebot.init() - -# 从 plugin.json 加载插件 -nonebot.load_from_json("plugin.json") - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -**json 文件示例** - -```json -{ - "plugins": ["nonebot_plugin_status", "awesome_bot.plugins.xxx"], - "plugin_dirs": ["awesome_bot/plugins"] -} -``` - -## 从 toml 文件中加载插件 - -在 `bot.py` 文件中添加以下行： - -```python{6} -import nonebot - -nonebot.init() - -# 从 pyproject.toml 加载插件 -nonebot.load_from_toml("pyproject.toml") - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -**toml 文件示例：** - -```toml -[nonebot.plugins] -plugins = ["nonebot_plugin_status", "awesome_bot.plugins.xxx"] -plugin_dirs = ["awesome_bot/plugins"] -``` - -::: tip -nb-cli 默认使用 `pyproject.toml` 加载插件。 -::: - -## 子插件(嵌套插件) - -在插件中同样可以加载子插件，例如如下插件目录结构： - - -:::vue -foo_plugin -├── `plugins` -│ ├── `sub_plugin1` -│ │ └── \_\_init\_\_.py -│ └── `sub_plugin2.py` -├── `__init__.py` -└── config.py -::: - - -在插件目录下的 `__init__.py` 中添加如下代码： - -```python -from pathlib import Path - -import nonebot - -# store all subplugins -_sub_plugins = set() -# load sub plugins -_sub_plugins |= nonebot.load_plugins( - str((Path(__file__).parent / "plugins").resolve())) -``` - -插件将会被加载并存储于 `_sub_plugins` 中。 - -## 运行结果 - -尝试运行 `nb run` 或者 `python bot.py`，可以看到日志输出了类似如下内容： - -```plain -09-19 21:51:59 [INFO] nonebot | Succeeded to import "nonebot.plugins.base" -09-19 21:51:59 [INFO] nonebot | Succeeded to import "plugin_in_folder" -``` diff --git a/archive/2.0.0a15/guide/mirai-guide.md b/archive/2.0.0a15/guide/mirai-guide.md deleted file mode 100644 index aa598dfa..00000000 --- a/archive/2.0.0a15/guide/mirai-guide.md +++ /dev/null @@ -1,253 +0,0 @@ -# Mirai-API-HTTP 协议使用指南 - -::: warning - -Mirai-API-HTTP 的适配现在仍然处于早期阶段, 可能没有进行过充分的测试 - -在生产环境中请谨慎使用 - -::: - -::: tip - -为了你的使用之旅更加顺畅, 我们建议您在配置之前具有以下的前置知识 - -- 对服务端/客户端(C/S)模型的基本了解 -- 对 Web 服务配置基础的认知 -- 对`YAML`语法的一点点了解 - -::: - -::: danger - -Mirai-API-HTTP 的适配器以 [AGPLv3 许可](https://opensource.org/licenses/AGPL-3.0) 单独开源 - -这意味着在使用该适配器时需要 **以该许可开源您的完整程序代码** - -::: - -**为了便捷起见, 以下内容均以缩写 `MAH` 代替 `mirai-api-http`** - -## 安装 NoneBot Mirai 适配器 - -```bash -pip install nonebot-adapter-mirai -``` - -## 配置 MAH 客户端 - -正如你可能刚刚在[CQHTTP 协议使用指南](./cqhttp-guide.md)中所读到的: - -> 单纯运行 NoneBot 实例并不会产生任何效果，因为此刻 QQ 这边还不知道 NoneBot 的存在，也就无法把消息发送给它，因此现在需要使用一个无头 QQ 来把消息等事件上报给 NoneBot。 - -这次, 我们将采用在实现上有别于 OneBot（CQHTTP）协议的另外一种无头 QQ API 协议, 即 MAH - -为了配置 MAH 端, 我们现在需要移步到[MAH 的项目地址](https://github.com/project-mirai/mirai-api-http), 来看看它是如何配置的 - -根据[项目提供的 README](https://github.com/project-mirai/mirai-api-http/blob/056beedba31d6ad06426997a1d3fde861a7f8ba3/README.md),配置 MAH 大概需要以下几步 - -1. 下载并安装 Java 运行环境, 你可以有以下几种选择: - - - [由 Oracle 提供的 Java 运行环境](https://java.com/zh-CN/download/manual.jsp) **在没有特殊需求的情况下推荐** - - [由 Zulu 编译的 OpenJRE 环境](https://www.azul.com/downloads/zulu-community/?version=java-8-lts&architecture=x86-64-bit&package=jre) - -2. 下载[Mirai Console Loader](https://github.com/iTXTech/mirai-console-loader) - - - 请按照文档 README 中的步骤下载并安装 - -3. 安装 MAH: - - - 在 Mirai Console Loader 目录下执行该指令 - - - ```shell - ./mcl --update-package net.mamoe:mirai-api-http --channel stable --type plugin - ``` - - 注意: 该指令的前缀`./mcl`可能根据操作系统以及使用 java 环境的不同而变化 - -4. 修改配置文件 - - ::: tip - - 在此之前, 你可能需要了解我们为 MAH 设计的两种通信方式 - - - 正向 Websocket - - NoneBot 作为纯粹的客户端,通过 websocket 监听事件下发 - - 优势 - 1. 网络配置简单, 特别是在使用 Docker 等网络隔离的容器时 - 2. 在初步测试中连接性较好 - - 劣势 - 1. 与 NoneBot 本身的架构不同, 可能稳定性较差 - 2. 需要在注册 adapter 时显式指定 qq, 对于需要开源的程序来讲不利 - - POST 消息上报 - - NoneBot 在接受消息上报时作为服务端, 发送消息时作为客户端 - - 优势 - 1. 与 NoneBot 本身架构相符, 性能和稳定性较强 - 2. 无需在任何地方指定 QQ, 即插即用 - - 劣势 - 1. 由于同时作为客户端和服务端, 配置较为复杂 - 2. 在测试中网络连接性较差 (未确认原因) - - ::: - - - 这是当使用正向 Websocket 时的配置举例 - - 正向连接可以选择支持客户端连接方式的 `Driver` 来进行连接，请根据需求进行选择： - - - `nonebot.drivers.fastapi`: 同时支持正向和反向 - - `nonebot.drivers.aiohttp`: 仅支持正向 - - ::: warning - - 在默认情况下, NoneBot 和 MAH 会同时监听 8080 端口, 这会导致端口冲突的错误 - 请确保二者配置不在同一端口下 - - ::: - - - MAH 的`setting.yml`文件 - - - ```yaml - # 省略了部分无需修改的部分 - - host: "0.0.0.0" # 监听地址 - port: 8080 # 监听端口 - authKey: 1234567890 # 访问密钥, 最少八位 - enableWebsocket: true # 必须为true - ``` - - - `.env`文件 - - - ```shell - PORT=2333 - - MIRAI_AUTH_KEY=1234567890 - MIRAI_HOST=127.0.0.1 # 当MAH运行在本机时 - MIRAI_PORT=8080 # MAH的监听端口 - PORT=2333 # 防止与MAH接口冲突 - ``` - - - `bot.py`文件 - - - ```python - import nonebot - from nonebot.adapters.mirai import Bot - - nonebot.init() - nonebot.get_driver().register_adapter('mirai', - Bot, - qq=12345678) - # qq参数需要填在mah中登录的qq, 如果需要多个帐号, 可以填写类似于 [123456,789100] 的数组形式 - - nonebot.load_builtin_plugins() # 加载 nonebot 内置插件 - nonebot.run() - ``` - - - 这是当使用 POST 消息上报时的配置文件 - - - MAH 的`setting.yml`文件 - - - ```yaml - # 省略了部分无需修改的部分 - - host: '0.0.0.0' # 监听地址 - port: 8080 # 监听端口 - authKey: 1234567890 # 访问密钥, 最少八位 - - ## 消息上报 - report: - enable: true # 必须为true - groupMessage: - report: true # 群消息上报 - friendMessage: - report: true # 好友消息上报 - tempMessage: - report: true # 临时会话上报 - eventMessage: - report: true # 事件上报 - destinations: - - 'http://127.0.0.1:2333/mirai/http' #上报地址, 请按照实际情况修改 - # 上报时的额外Header - extraHeaders: {} - ``` - - - `.env`文件 - - - ```shell - HOST=127.0.0.1 # 当MAH运行在本机时 - PORT=2333 # 防止与MAH接口冲突 - - MIRAI_AUTH_KEY=1234567890 - MIRAI_HOST=127.0.0.1 # 当MAH运行在本机时 - MIRAI_PORT=8080 # MAH的监听端口 - ``` - - - `bot.py`文件 - - - ```python - import nonebot - from nonebot.adapters.mirai import Bot - - nonebot.init() - nonebot.get_driver().register_adapter('mirai', Bot) - nonebot.load_builtin_plugins() # 加载 nonebot 内置插件 - nonebot.run() - ``` - -## 历史性的第一次对话 - -现在, 先启动 NoneBot, 再启动 MAH - -如果你的配置文件一切正常, 你将在控制台看到类似于下列的日志 - -```log -02-01 18:25:12 [INFO] nonebot | NoneBot is initializing... -02-01 18:25:12 [INFO] nonebot | Current Env: prod -02-01 18:25:12 [DEBUG] nonebot | Loaded Config: {'driver': 'nonebot.drivers.fastapi', 'host': IPv4Address('127.0.0.1'), 'port': 8080, 'debug': True, 'api_root': {}, 'api_timeout': 30.0, 'access_token': None, 'secret': None, 'superusers': set(), 'nickname': set(), 'command_start': {'/'}, 'command_sep': {'.'}, 'session_expire_timeout': datetime.timedelta(seconds=120), 'mirai_port': 8080, 'environment': 'prod', 'mirai_auth_key': 12345678, 'mirai_host': '127.0.0.1'} -02-01 18:25:12 [DEBUG] nonebot | Succeeded to load adapter "mirai" -02-01 18:25:12 [INFO] nonebot | Succeeded to import "nonebot.plugins.echo" -02-01 18:25:12 [INFO] nonebot | Running NoneBot... -02-01 18:25:12 [DEBUG] nonebot | Loaded adapters: mirai -02-01 18:25:12 [INFO] uvicorn | Started server process [183155] -02-01 18:25:12 [INFO] uvicorn | Waiting for application startup. -02-01 18:25:12 [INFO] uvicorn | Application startup complete. -02-01 18:25:12 [INFO] uvicorn | Uvicorn running on http://127.0.0.1:2333 (Press CTRL+C to quit) -02-01 18:25:14 [INFO] uvicorn | 127.0.0.1:37794 - "POST /mirai/http HTTP/1.1" 204 -02-01 18:25:14 [DEBUG] nonebot | MIRAI | received message {'type': 'BotOnlineEvent', 'qq': 1234567} -02-01 18:25:14 [INFO] nonebot | MIRAI 1234567 | [BotOnlineEvent]: {'self_id': 1234567, 'type': 'BotOnlineEvent', 'qq': 1234567} -02-01 18:25:14 [DEBUG] nonebot | Checking for matchers in priority 1... -``` - -恭喜你, 你的配置已经成功! - -现在, 我们可以写一个简单的插件来测试一下 - -```python -from nonebot.plugin import on_keyword, on_command -from nonebot.rule import to_me -from nonebot.adapters.mirai import Bot, MessageEvent - -message_test = on_keyword({'reply'}, rule=to_me()) - - -@message_test.handle() -async def _message(bot: Bot, event: MessageEvent): - text = event.get_plaintext() - await bot.send(event, text, at_sender=True) - - -command_test = on_command('miecho') - - -@command_test.handle() -async def _echo(bot: Bot, event: MessageEvent): - text = event.get_plaintext() - await bot.send(event, text, at_sender=True) -``` - -它具有两种行为 - -- 在指定机器人，即私聊、群聊内@机器人、群聊内称呼机器人昵称的情况下 (即 [Rule: to_me](../api/rule.md#to-me)), 如果消息内包含 `reply` 字段, 则该消息会被机器人重复一次 - -- 在执行指令`miecho xxx`时, 机器人会发送回参数`xxx` - -至此, 你已经初步掌握了如何使用 Mirai Adapter diff --git a/archive/2.0.0a15/sidebar.config.json b/archive/2.0.0a15/sidebar.config.json deleted file mode 100644 index 5fb75fef..00000000 --- a/archive/2.0.0a15/sidebar.config.json +++ /dev/null @@ -1,193 +0,0 @@ -{ - "sidebar": {}, - "locales": { - "/": { - "label": "简体中文", - "selectText": "Languages", - "editLinkText": "在 GitHub 上编辑此页", - "lastUpdated": "上次更新", - "nav": [ - { - "text": "主页", - "link": "/" - }, - { - "text": "指南", - "link": "/guide/" - }, - { - "text": "进阶", - "link": "/advanced/" - }, - { - "text": "API", - "link": "/api/" - }, - { - "text": "商店", - "link": "/store" - }, - { - "text": "更新日志", - "link": "/changelog" - } - ], - "sidebarDepth": 2, - "sidebar": { - "/guide/": [ - { - "title": "开始", - "collapsable": false, - "sidebar": "auto", - "children": [ - "", - "installation", - "getting-started", - "creating-a-project", - "basic-configuration" - ] - }, - { - "title": "编写插件", - "collapsable": false, - "sidebar": "auto", - "children": [ - "loading-a-plugin", - "creating-a-plugin", - "creating-a-matcher", - "creating-a-handler", - "end-or-start" - ] - }, - { - "title": "协议适配", - "collapsable": false, - "sidebar": "auto", - "children": [ - "cqhttp-guide", - "ding-guide", - "mirai-guide", - "feishu-guide" - ] - } - ], - "/advanced/": [ - { - "title": "进阶", - "collapsable": false, - "sidebar": "auto", - "children": [ - "", - "scheduler", - "permission", - "runtime-hook", - "export-and-require", - "overloaded-handlers" - ] - }, - { - "title": "发布", - "collapsable": false, - "sidebar": "auto", - "children": [ - "publish-plugin" - ] - } - ], - "/api/": [ - { - "title": "NoneBot Api Reference", - "path": "", - "collapsable": false, - "children": [ - { - "title": "nonebot 模块", - "path": "nonebot" - }, - { - "title": "nonebot.config 模块", - "path": "config" - }, - { - "title": "nonebot.plugin 模块", - "path": "plugin" - }, - { - "title": "nonebot.message 模块", - "path": "message" - }, - { - "title": "nonebot.matcher 模块", - "path": "matcher" - }, - { - "title": "nonebot.handler 模块", - "path": "handler" - }, - { - "title": "nonebot.rule 模块", - "path": "rule" - }, - { - "title": "nonebot.permission 模块", - "path": "permission" - }, - { - "title": "nonebot.log 模块", - "path": "log" - }, - { - "title": "nonebot.utils 模块", - "path": "utils" - }, - { - "title": "nonebot.typing 模块", - "path": "typing" - }, - { - "title": "nonebot.exception 模块", - "path": "exception" - }, - { - "title": "nonebot.drivers 模块", - "path": "drivers/" - }, - { - "title": "nonebot.drivers.fastapi 模块", - "path": "drivers/fastapi" - }, - { - "title": "nonebot.drivers.quart 模块", - "path": "drivers/quart" - }, - { - "title": "nonebot.drivers.aiohttp 模块", - "path": "drivers/aiohttp" - }, - { - "title": "nonebot.adapters 模块", - "path": "adapters/" - }, - { - "title": "nonebot.adapters.cqhttp 模块", - "path": "adapters/cqhttp" - }, - { - "title": "nonebot.adapters.ding 模块", - "path": "adapters/ding" - }, - { - "title": "nonebot.adapters.mirai 模块", - "path": "adapters/mirai" - }, - { - "title": "nonebot.adapters.feishu 模块", - "path": "adapters/feishu" - } - ] - } - ] - } - } - } -} \ No newline at end of file diff --git a/archive/2.0.0a16/README.md b/archive/2.0.0a16/README.md deleted file mode 100644 index 1ee526fb..00000000 --- a/archive/2.0.0a16/README.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -home: true -heroImage: /logo.png -tagline: 跨平台 Python 异步机器人框架 -actionText: 开始使用 -actionLink: guide/ -features: - - title: 简洁 - details: 提供极其简洁易懂的 API，使你可以毫无压力地开始验证你的绝佳创意，只需编写最少量的代码，即可实现丰富的功能。 - - title: 易于扩展 - details: 精心设计的消息处理流程使得你可以很方便地将原型扩充为具有大量实用功能的完整聊天机器人，并持续保证扩展性。 - - title: 高性能 - details: 采用异步 I/O，利用 WebSocket 进行通信，以获得极高的性能；同时，支持使用多账号同时接入，减少业务宕机的可能。 -footer: MIT Licensed | Copyright © 2018 - 2021 NoneBot Team ---- diff --git a/archive/2.0.0a16/advanced/README.md b/archive/2.0.0a16/advanced/README.md deleted file mode 100644 index 6bdba844..00000000 --- a/archive/2.0.0a16/advanced/README.md +++ /dev/null @@ -1,177 +0,0 @@ -# 深入 - -## 它如何工作？ - -如同[概览](../guide/README.md)所言: - -> NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人收到的事件进行解析和处理，并以插件化的形式，按优先级分发给事件所对应的事件响应器，来完成具体的功能。 - -`Nonebot2` 是一个可以对机器人上报的事件进行处理并完成具体功能的机器人框架，在这里，我们将简要讲述它的工作内容。 - -**便捷起见，以下内容对 `Nonebot2` 会被称为 `nonebot`，与 `Nonebot2` 交互的机器人实现会被称为 `协议端`**。 - -在实际应用中，`nonebot` 会充当一个高性能，轻量级的 Python 微服务框架。协议端可以通过 `http`, `websocket` 等方式与之通信，这个通信往往是双向的：一方面，协议端可以上报数据给 `nonebot`，`nonebot` 会处理数据并返回响应给协议端；另一方面，`nonebot` 可以主动推送数据给协议端。而 `nonebot` 便是围绕双向通信进行工作的。 - -在开始工作之前，`nonebot` 需要进行准备工作： - -1. **运行 `nonebot.init` 初始化函数**，它会读取配置文件，并初始化 `nonebot` 和后端驱动 `driver` 对象。 -2. **注册协议适配器 `adapter`** 。 -3. **加载插件**。 - -准备工作完成后，`nonebot` 会利用 `uvicorn` 启动，并运行 `on_startup` 钩子函数。 - -随后，倘若一个协议端与 `nonebot` 进行了连接，`nonebot` 的后端驱动 `driver` 就会将 `adapter` 实例化为 `bot`，`nonebot` 便会利用 `bot` 开始工作，它的工作内容分为两个方面： - -1. **事件处理**，`bot` 会将协议端上报的数据转化为 `事件`(`Event`)，之后 `nonebot` 会根据一套既定流程来处理 `事件`。 - -2. **调用 `API`**, 在**事件处理**的过程中，`nonebot` 可以通过 `bot` 调用协议端指定的 `API` 来获取更多数据，或者反馈响应给协议端; `nonebot` 也可以通过调用 `API` 向协议端主动请求数据或者主动推送数据。 - -在**指南**模块， 我们已经叙述了[如何配置 nonebot](../guide/basic-configuration.md), [如何注册协议适配器](../guide/getting-started.md)，[如何加载插件](../guide/loading-a-plugin.md), 在这里便不再赘述。 - -下面，我们将对**事件处理**， **调用 API**进行说明。 - -## 事件处理 - -我们可以先看事件处理的流程图： - -![handle-event](../guide/images/Handle-Event.png) - -在流程图里，我们可以看到，`nonebot` 会有三个阶段来处理事件： - -1. **driver 处理上报数据** -2. **adapter 处理原始数据** -3. **nonebot 处理 Event** - -我们将顺序说明这三个阶段。其中，会将第三个阶段拆分成**概念解释**，**处理 Event**，**特殊异常处理**三个部分来说明。 - -### driver 处理上报数据 - -1. 协议端会通过 `websocket` 或者 `http` 等方式与 `nonebot` 的后端驱动 `driver` 连接，`driver` 会根据之前注册的 `adapter` 和配置文件的内容来进行鉴权，从而获得这个连接的唯一识别 id `self-id`，随后 `adapter` 就会利用 `self-id` 实例化为 `bot` 对象。 - - ::: tip - 需要注意的是，如果协议端通过 `websocket` 与 `nonebot` 连接，这个步骤只会在建立连接时进行，并在之后运行 `on_bot_connect` 钩子函数；通过 `http` 方式连接时，会在协议端每次上报数据时都进行这个步骤。 - ::: - - ::: warning - 连接之前必须要注册 `adapter` - ::: - - ::: warning - `self-id` 是帐号的唯一识别 ID，这意味着不能出现相同的 `self-id`。 - ::: - -2. `driver` 会将接收到的数据转交给 `bot` 对象进一步处理。 - -### adapter 处理原始数据 - -1. `bot` 会利用事先定义好的 `Event Model` 对上报的数据进行分析处理，将数据转化为 `nonebot` 可以处理的 `Event` 对象。 - - ::: tip - `adapter` 在转换数据格式的同时可以进行一系列的特殊操作，例如 `CQHTTP` 会对 `reply` 信息进行提取。 - ::: - -2. `Event` 会传入 `nonebot` 做进一步处理。 - -### nonebot 处理 Event - -在讲述这个阶段之前，我们需要先对几个概念进行解释。 - -#### 概念解释 - -1. **hook**，或者说**钩子函数**，它们可以在 `nonebot` 处理 `Event` 的不同时刻进行拦截，修改或者扩展，在 `nonebot` 中，钩子函数分为 `事件预处理hook`，`运行预处理hook`，`运行后处理hook` 和 `事件后处理hook`。 - - ::: tip - 关于`hook`的更多信息，可以查阅[这里](./runtime-hook.md) - ::: - -2. **Matcher**与**matcher**，在**指南**中，我们讲述了[如何注册事件响应器](../guide/creating-a-matcher)，这里的事件响应器或者说 `Matcher` 并不是一个具体的实例 `instance`，而是一个具有特定属性的类 `class`。只有当 `Matcher` **响应事件**时，才会实例化为具体的 `instance`，也就是 `matcher`。`matcher` 可以认为是 `nonebot` 处理 `Event` 的基本单位，运行 `matcher` 是`nonebot`工作的主要内容。 - -3. **handler**，或者说**事件处理函数**, 它们可以认为是 `nonebot` 处理 `Event` 的最小单位。在不考虑 `hook` 的情况下，**运行 matcher 就是顺序运行 matcher.handlers**，这句话换种表达方式就是，`handler` 只有添加到 `matcher.handlers` 时，才可以参与到 `nonebot` 的工作中来。 - - ::: tip - 如何让 `handler` 添加到 `matcher.handlers`？ - - 一方面，我们可以参照[这里](../guide/creating-a-handler)利用装饰器来添加；另一方面，我们在用 `on()` 或者 `on_*()` 注册事件响应器时，可以添加 `handlers=[handler1, handler2, ...]` 这样的关键词参数来添加。 - ::: - -#### 处理 Event - -1. **执行事件预处理 hook**， `nonebot` 接收到 `Event` 后，会传入到 `事件预处理hook` 中进行处理。 - - ::: warning - 需要注意的是，执行多个 `事件预处理hook` 时并无顺序可言，它们是**并行运行**的。这个原则同样适用于其他的 `hook`。 - ::: - -2. **按优先级升序选出同一优先级的 Matcher**，`nonebot` 提供了一个全局字典 `matchers`，这个字典的 `key` 是优先级 `priority`，`value` 是一个 `list`，里面存放着同一优先级的 `Matcher`。在注册 `Matcher` 时，它和优先级 `priority` 会添加到里面。 - - 在执行 `事件预处理hook` 后，`nonebot` 会对 `matchers` 的 `key` 升序排序并选择出当前最小优先级的 `Matcher`。 - -3. **根据 Matcher 定义的 Rule, Permission 判断是否运行**，在选出 `Matcher` 后，`nonebot` 会将 `bot`，`Event` 传入到 `Matcher.check_rule` 和 `Matcher.check_perm` 两个函数中，两个函数分别对 Matcher 定义的 Rule, Permission 进行 check，当 check 通过后，这个 `Matcher` 就会响应事件。但是当同一个优先级的所有 `Matcher` 均没有响应时，`nonebot` 会返回到上一个步骤，选择出下一优先级的 `Matcher`。 - -4. **实例化 matcher 并执行运行预处理 hook**，当 `Matcher` 响应事件后，它便会实例化为 `matcher`，并执行 `运行预处理hook`。 - -5. **顺序运行 matcher 的所有 handlers**，`运行预处理hook` 执行完毕后，便会运行 `matcher`，也就是**顺序运行**它的 `handlers`。 - - ::: tip - `matcher` 运行 `handlers` 的顺序是: 先运行该 `matcher` 的类 `Matcher` 注册时添加的 `handlers`(如果有的话)，再按照装饰器装饰顺序运行装饰的 `handlers`。 - ::: - -6. **执行运行后处理 hook**，`matcher` 的 `handlers` 运行完毕后，会执行 `运行后处理hook`。 - -7. **判断是否停止事件传播**，`nonebot` 会根据当前优先级所有 `matcher` 的 `block` 参数或者 `StopPropagation` 异常判断是否停止传播 `Event`，如果事件没有停止传播，`nonebot` 便会返回到第 2 步， 选择出下一优先级的 `Matcher`。 - -8. **执行事件后处理 hook**，在 `Event` 停止传播或执行完所有响应的 `Matcher` 后，`nonebot` 会执行 `事件后处理hook`。 - - 当 `事件后处理hook` 执行完毕后，当前`Event`的处理周期就顺利结束了。 - -#### 特殊异常处理 - -在这个阶段，`nonebot` 规定了几个特殊的异常，当 `nonebot` 捕获到它们时，会用特定的行为来处理它们。 - -1. **IgnoredException** - - 这个异常可以在 `事件预处理hook` 和 `运行预处理hook` 抛出。 - - 当 `事件预处理hook` 抛出它时，`nonebot` 会忽略当前的 `Event`，不进行处理。 - - 当 `运行预处理hook` 抛出它时，`nonebot` 会忽略当前的 `matcher`，结束当前 `matcher` 的运行。 - - ::: warning - 当 `hook` 需要抛出这个异常时，要写明原因。 - ::: - -2. **PausedException** - - 这个异常可以在 `handler` 中由 `Matcher.pause` 抛出。 - - 当 `nonebot` 捕获到它时，会停止运行当前 `handler` 并结束当前 `matcher` 的运行，并将后续的 `handler` 交给一个临时 `Matcher` 来响应当前交互用户的下一个消息事件，当临时 `Matcher` 响应时，临时 `Matcher` 会运行后续的 handlers。 - -3. **RejectedException** - - 这个异常可以在 `handler` 中由 `Matcher.reject` 抛出。 - - 当 `nonebot` 捕获到它时，会停止运行当前 `handler` 并结束当前 `matcher` 的运行，并将当前 handler 和后续 `handler` 交给一个临时 `Matcher` 来响应当前交互用户的下一个消息事件，当临时 `Matcher` 响应时，临时 `Matcher` 会运行当前 `handler` 和后续的 `handler`。 - -4. **FinishedException** - - 这个异常可以在 `handler` 中由 `Matcher.finish` 抛出。 - - 当 `nonebot` 捕获到它时，会停止运行当前 `handler` 并结束当前 `matcher` 的运行。 - -5. **StopPropagation** - - 这个异常一般会在执行 `运行后处理hook` 后抛出。 - - 当 `nonebot` 捕获到它时， 会停止传播当前 `Event`，不再寻找下一优先级的 `Matcher`，直接执行 `事件后处理hook`。 - -## 调用 API - -`nonebot` 可以通过 `bot` 来调用 `API` ，`API` 可以向协议端发送数据，也可以向协议端请求更多的数据。 - -::: tip -不同 `adapter` 规定了不同的 API，对应的 API 列表请参照协议规范。 -::: - -一般来说，我们可以用 `bot.*` 来调用 `API`(\*是 `API` 的 `action` 或者 `endpoint`)。 - -对于发送消息而言，一方面可以调用既有的 API；另一方面 `nonebot` 实现了两个便捷方法，`bot.send(event, message, **kwargs)` 方法和可以在 `handler` 中使用的 `Matcher.send(message, **kwargs)` 方法，来向事件主体发送消息。 diff --git a/archive/2.0.0a16/advanced/export-and-require.md b/archive/2.0.0a16/advanced/export-and-require.md deleted file mode 100644 index eef88990..00000000 --- a/archive/2.0.0a16/advanced/export-and-require.md +++ /dev/null @@ -1,117 +0,0 @@ -# 跨插件访问 - -由于 `nonebot2` 独特的插件加载机制，在使用 python 原有的 import 机制来进行插件之间的访问时，很可能会有奇怪的或者意料以外的情况发生。为了避免这种情况的发生，您可以有两种方法来实现跨插件访问： - -1. 将插件间的要使用的公共代码剥离出来，作为公共文件或者文件夹，提供给插件加以调用。 -2. 使用 `nonebot2` 提供的 `export` 和 `require` 机制，来实现插件间的互相调用。 - -第一种方法比较容易理解和实现，这里不再赘述，但需要注意的是，请不要将公共文件或者公共文件夹作为**插件**被 `nonebot2` 加载。 - -下面将介绍第二种方法—— `export` 和 `require` 机制： - -## 使用 export 和 require - -现在，假定有两个插件 `pluginA` 和 `pluginB`，需要在 `pluginB` 中调用 `pluginA` 中的一个变量 `varA` 和一个函数 `funcA`。 - -在上面的条件中涉及到了两种操作：一种是在 `pluginA` 的 `导出对象` 操作；而另一种是在 `pluginB` 的 `导入对象` 操作。在 `nonebot2` 中，`导出对象` 的操作用 `export` 机制来实现，`导入对象` 的操作用 `require` 机制来实现。下面，我们将逐一进行介绍。 - -:::warning 警告 - -使用这个方法进行跨插件访问时，**需要先加载`导出对象`的插件，再加载`导入对象`的插件。** - -::: - -### 使用 export - -在 `pluginA` 中，我们调用 `export` 机制 `导出对象`。 - -在 `export` 机制调用前，我们需要保证导出的对象已经被定义，比如： - -```python -varA = "varA" - - -def funcA(): - return "funcA" -``` - -在确保定义之后，我们可以从 `nonebot.plugin` 导入 `export()` 方法, `export()` 方法会返回一个特殊的字典 `export`： - -```python -from nonebot.plugin import export - -export=export() -``` - -这个字典可以用来装载导出的对象，它的 key 是对象导出后的命名，value 是对象本身，我们可以直接创建新的 `key` - `value` 对导出对象： - -```python -export.vA = varA -export.fA = funcA -``` - -除此之外，也支持 `嵌套` 导出对象： - -```python -export.sub.vA = varA -export.sub.fA = funcA -``` - -特别地，对于 `函数对象` 而言，`export` 支持用 `装饰器` 的方法来导出，因此，我们可以这样定义 `funcA`： - -```python -@export.sub -def funcA(): - return "funcA" -``` - -或者: - -```python -@export -def funcA(): - return "funcA" -``` - -通过 `装饰器` 的方法导出函数时，命名固定为函数的命名，也就是说，上面的两个例子等同于： - -```python -export.sub.funcA = funcA - -export.funcA = funcA -``` - -这样，我们就成功导出 `varA` 和 `funcA` 对象了。 - -下面我们将介绍如何在 `pluginB` 中导入这些对象。 - -### 使用 require - -在 `pluginB` 中，我们调用 `require` 机制 `导入对象`。 - -:::warning 警告 - -在导入来自其他插件的对象时, 请确保导出该对象的插件在引用该对象的插件之前加载。如果该插件并未被加载，则会尝试加载，加载失败则会返回 `None`。 - -::: - -我们可以从 `nonebot.plugin` 中导入 `require()` 方法： - -```python -from nonebot.plugin import require -``` - -`require()` 方法的参数是插件名, 它会返回在指定插件中，用 `export()` 方法创建的字典。 - -```python -require_A = require('pluginA') -``` - -在之前，这个字典已经存入了 `'vA'` - `varA`, `'fA'` - `funcA` 或 `'funcA'` - `funcA` 这样的 `key` - `value` 对。因此在这里我们直接用 `属性` 的方法来获取导入对象: - -```python -varA = require_A.vA -funcA = require_A.fA or require_A.funcA -``` - -这样，我们就在 `pluginB` 中成功导入了 `varA` 和 `funcA` 对象了。 diff --git a/archive/2.0.0a16/advanced/images/plugin_store_publish.png b/archive/2.0.0a16/advanced/images/plugin_store_publish.png deleted file mode 100644 index 9466ab9c466e8c9f9cd3979233dae0aad1fe02d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94001 zcmc$_bz57{*M}R57PsQA#Vt5NiaRaR;2ERh3>ECmymc;lvh|hboBHKDV)O%ziuSE zv&GwTS{aQU1-!~m(Ep}b9WS>wE{osXJQl27sJ1>`FGWed+`&|Xg1YA;BO{r}7nVRG zB5#qAkyDbB=_4W{TnCvmv(}QytjF?_iC8t1tgS13OeZHNnV6aTmaSg$oCfc+(Ew&b zv2#AJ0KX|g+?8;i;S4T;_?m%8J$~Vi%Rx&kD;8e?vq2avlUX$*Yt7Hsmq}32W0BSk z0(0UIszm~1;e0{G!(azUKg!eispHdwKp=X`umx6DR%?SfDLuM4z$*Y?kp8@E=1v%j z0#KqVLC@kl1cV4^t$R`f0H;z<$DUXu`yTa9$N)8|P>d`BhA`Bz4N(+A069{)DTbb3iPoHi$DP}G~d0$w5YRBWd)M9CT7uUBn(PbF} zBgi1{&Z}9&$=TVApN@!sm@?-Db}bf|Op;5FSFz;g>C z;|mkq)@@=6*ik*VcPvC3mj_el7lkiIU5`6FtiIY6>Rw*W7S`6V=$@cNiSuYt{Lbfl zxa<0FB)65vyNjJ4)wTSjdk?poFPEBD3x$u{tlt)w**rG?yuL632Adgnc-Q+MsG6qu zTauHxiO?W~mcNy*jK zb%gXsAoSo{U-vV-JBKIFIp|^O+o}XWns7XImCNu~%e7U|{ZwIwX23t~jc!`s{o?PI z5baHK+J`LtS-i`;!^NiIJjly=W;ZY-+@c~rRW=HDQ0lQ)Y9QCSi>xDMp^8MZFO&6KwWOOgwT$FIBBw!X}s2d@s0&9E?9STFA|YJWB*Uces1z@jtkDYB(_z zewkG9#)pzid+%mj6LyMDsf3~5)6c2$qY(mmi_mF6_y_Wu#0&>W2M7tBs9!^AAEC4Z zb%9qLY@B(b?kPTpp2q|~2!RvB zy%*gyV`@@Y_}%vw<(yT<3;dWYS7;U%A;v=KtiI;{6+5V{C(mN~Pe&&Mf@iC*N6n?U zLJW`74ed7{=d(UU;n521NjERM#!gSiJzK5%opdrj&!Rmv!X)jx%%2G5#(zV5BCtlU zZFnl5^Tr&)555R%K(_W^&xf$G&Q9a5=c~HmHV?QOUaOGg^utLv53T=c$N~Ax&3hQ$ z^N#6rA8-;9#>~UR1BLw&cXYQaUC?lw+bivcwn+u(0+(Y~}SdvC?>`WwN984uj1Zwz^^{SH4OBR^T)hFB5ppR_qI z>Z2|uEZ*b>RG4dv-!Lrcw(-n$zjwY~(52P448``m4t=hTAQjgrOo zgQ6bxa(-I^}jn8aoD+hIPJw7g$)pkKRAP+Er$)mn_b4r=4oh2uM;GwlMIhLbtRhO zb7<3ZIfRC{HaLzmR%E?mG;`KZ_fIp#w>M_t7%`tGFa4V8>%YFcnfZIdoN2`0X9yHK z+L>L4enLVKUKE*AiwJnQ&fcRwaZD_eiEnEYoAN1IDyg$>uwtCws=lJqrJP)x@R(8; z&X!IP0uBugmHqlPi_ItMeOlCUv+B3uCOXPKQ9tj=$V$GC7(8XljIrQgp?CR^`UAD7 zx!++0ly$iI|cNw^uC|_nFE%p?Fe{ zKSkN{FdUOuOX!_$rtS4Yow`$3=z>n6=!z(c?s+GLkAsD`KQhnR-av%4GiQc{yYJNJ3QVOM;Rf+$M!kKE|2qH1*o81-26#qN9hc+x>amd zu8%8Qu4jFuQ8&7|f!3FJ*eWK0GLx3ktOoBwG46|Juu*X65U-0zMFt`I;!D{dpgD?8 zjY#QG5ck+{h;kI4&1iVGTqD+T_e-E#irrNAiU`)(vM(I$x|9A<z+iP$t7cz${(3^)!6P+{i{f^Vf37d27a8FVh8>X4Rqr@em z?Os`Eg&_qhpU~p1JS#0uf#c5y4l%n&F^Z7z5nZ;jX0&l`y7p$#rh^uQ$iyF0%fUJ)a+1@wdy3>N(cH>(2PdrcQ_>*|c2vBes%F0!& zKUOYS3);&FL>yk(Cd)f!9+>ZJv%v6~q@w-sWxN!gN+wGD8~K9Q%Lw>zm~6xno{#$- zut(pyB*aq2(%7s-ir;p+4BJ3#N)jTbiRkODa3QxPV?yunp&O^#=kC=rX70*CB9GHk zlWmtIC)or$_N9$DL!?>o>y9PPg#B0k)$%6Z|DsW9AAU6-5}9Gza)k`kpdM`$4vdE` zyhA>q;2aN*!ZrPgEUZE~nw(9wI8}v8??HlGURPJ}dkHC04i6gL=M-%NkZCrCAzd0N z@honXZjD~G8o5u%?{=tXnsx_vN?c8AvuMk}4uF8q=y(`(w^6wLw`Yk#R5U*}55LWg zkng$RJ{gOTLq<2TlSG}Hu__)ytbXrbe8uv%$%v42-g6-qzRz>-o~a?0nr<8CM6m|H zYR?FH21^~81vhGhHtv^zdSjkzL%J>k_IhP$57)z1D;DHH)-XajvdR`Tfs zJPL{NO>qh}tw1a$8=fBT4;Stasa)yKoCZ3!J45MP>{;Js(2tU{OrV#?jMs&#Q3wkS zvnimr*K2@!_d0jGZMGjA>3{mK@}yg~;8&m> z732-t{1nwh*xKv6Ue3+77Zv6M=f+VGF9&(YDnr*Ab#s0>rw|keYvF`9wMSWeS-A7t zE=cnbTa|J0yRoX8clfB?GT7-|#K!5JxfQd&)6fWZMB!j^bF4WTjB8dbbU0F~nXn!fPBS-*5uSWwC}uRp z2;m7AGB|GO{n|eKOQc!!6YZZae!4m4lHe`uig<}9CpRMf-}t@2DGg-w#oM`vueK_(r7H@OEm1lDFJGiKBumqYJa5wciq( zpzf3n3!9akBON=h4}0aABrOmK>@{;SbCLU{IemyzJc2SRG@t~-s2lcaKVAw5c(TBW z*Iq{0pQw%fBnL>>JDH{hr)`kM?##`=vy$Z7LE?#tO*&uRb8|YG?za_oi|X-@_Xh#0 zc3{onCoh|@KX&{3YZdR$e=gs=`}tnS4c_Tm2PZq{*vXl&V}M99-+($6YlNpE{P30+ z$=9fa@8X++XXfuTY|3Zve^Jqx`++SB#7g3e_x1FLu`~w>aCE|*4B9uGlG|z0^G9

D26ysIHlI~%T3(!*Pn21i;It-?Y79xn>70CHfHFQLli(V zOy{uIuXM@=+LPnA+iMisgp$BKg-1|vL!4X8R%_^~EA+~iG0^XnPc5wdol{1%bg0K# z?u|nV`jJNj#myVxVHf0OTz;EzGe7UxQCBuk*?^<`*^BlmL-p|SdpT1gKf@lG=-fOk zG-T2em>`79N>n?#$G4W!BDLvuH{Y*jEkChY(Q~!DJ_(2M75&5lD->o>J@d1Bu4~dR z+POaP&$EPT%csg(j>l|lF2DYO2~|_zly~0#@Q#K{n zK*P>}&mM2XOb+J^!Z0bcPA~A$shz>pNCr~}=^st_;w?ve#udIlgY_eQ+n>Rm-8tWi z<+_&40&rM&hOs$l{NL;7T+PSwX6=JOP5Id+}ey3Gz;90CGHms-o(Y@Rut^7}+W`#yCXT z`l&ciH2{*2*xRMQuUfa=z*TL$vDrKpyf zVedBtr!K;&N6F#!&P^xyb|UhaBsxZ16U=x<|Cm0-PqgoF`?y;-I$#R_%(dJrO*F)r zKwt5jY@&A%^lkDA8acoK|7~vE=(_#|cAYX#FuamfO%?u8>`7A!&u{Q`+G>EbZ3<#_gVy#vNr+pjfj7uytpzt%r#2}#w~#a^_ovbCRdaXjWY zU?>n+!15C|SXf%jI~5pLvyvBB6%a#ElQ5w6Q&O`zq5jE}_lpH1=-kcT)H%TWW00T4 z=?He?#M9teYctJFM!DYBQx$1hIg96n;;03giC4Cf+tUZ1`wcPC-Uw5G4UUs!{KP|x^B%vfxvuFcuFpxC`g_wm*klna4rLd;tUD;jL9Ng8nQ%L2P z^O_STul;o-BI~fgFf%jLm2*8&`*A~1;1g^MLiikTv$7YfbMx)?Kr_g$qH20Qu}jz- z6$8R&Wo;}sIrm!=2@Qv8{}B1UYjH}4-7&7su@Wu$5)_ZkuvRN+ppAT~OS2d~yEx`H)V1iOofu z2Ca^8b=STD=2bO(3mRLEr!c0bBVj5qA zE5W6y2o6sc&2R96k+}yN&Lu?)x%za_IxeQHv6n@ThIVUmJE%dAFgi5rsVE*Eq*htLJJY| zei;TPFg}Xcle&fC`Oj<>yrp=W3`?SxK3(F(@pYL&p0w!Z1*X6&qmOjPQ&FGzXKdEz zx}UG)oHg>&1_jqzKMtwITn*%4@~IaUeYuNNcTL5%M$cMxb&OU7njM|pd1 zr>y*q{8v!~%}S*9{y0)|701zMY+qU&p+9am!63&{gd=8PLoe=w03Ohs-nIS88Rs39 zn7dNf{Y>4x7^MuX-<^f8ya_K2?R{E6CmO!z@iJSx=MjJY>-*+{ImgwG1ta%cMTDo3 zJY_TUGq#Yr^Bj%O5yliCq@XlWA#>tyRYCvKUbwG`@a%L_U}=2N(L4nCb*Z{(ElfC@ zVtes@HO!txNm)HvN0~3)&+oVQHg9+_l)lx!Z^vpr>DYePyEK9%DpWvV|LQ-dyiE9W z$g>L_1OI$dNzg+L#t$oug(C}VlF&(5UB2>mS&+SAr|0tD(rYs#EDpOwFiqJdo&So* z+~Aa^6sQ{c^}W0~Uc{+6K<0o{u12T!Y+U+}8WzKT)2j>oJY9!Y6UV_F0y%BW2{9prjo^9 zFh@F6`$=3O0F^u&To2{KGM_$>2$T6?@6N}?eS1pnx@IHuLn~wCPlWFaa=lddZ}$nh zP?F_Fds?}Ms26#mKlu=u+Ro*(TAm_u42rko_j*n;D4;s zLt)>*ii6R`-W%taYiFx=!PDY+oKd~o&b0@St*tE|&IAsnkdm(MOtky{rxP%(O|O2l zVHD+(Y(jqt!ktWGG0F!Qs#Q@ z)lLR~GmZRFR%xkJICBd7dENLtUOzrY^V3@ICy(H;oyBwLot5eI#W^v&d%43%`%)(g z-*z?>6f0|iq>!GSO#c+{l#)Snql{%fdHuCUI`~)RN@Px=XW;?<%}3Qj2o2;?Ry-H^ zwI@Kv)}X}n@4DRN_l#?j{Sd2?lhoClb!eD?lLBsjy$p}QP;!9YRF{=S*jiZu`nFi} ztidSw{0Lt2*Tgs$620VtdV=~!kv&u0Yn3Z^?kEjJ$s|${CV5w!eSG_YQ1Wwn*PE6P{9o!|5+4;S{)D1( zU*Rr?+r5*p18WQKSE%D9yw{pAUJzVMHcVKf$4e9wq62pP1)BxG){~n)aWRy2L7gb{ zW5S_E|Iw+XqP=&twj$!^1Yzwzemz(JOh$`CXu~4Ugp*)nzBK5hCXOX%chZULco|{rkNm(-%;3H9kzA}`YAgt~tZ-k*Rt7{JS}a3oy_a9m zD{ejYlX86we%W+7d}=-_H!w1gRt!a|udcE^{mpIRthx5RiNM`->I|<>zHh_4&5B;h zW;bG_MvaJxY?>3LzwK}XKu&%zyGGtMB&UQ{WzNHYbs1Je{`!8`mX1D~F`KB^v_mXV z(H1S#6d6Os?=_^T--5l#Zd-efZz>eynbg6IdV!SB|0w*PMOCSZq^x^&q(vJP*El3X*m>1k^gzqYVX%!tMwmX zf|WAZt7ysVqLlwjHP}+I>(5Tb@6D~;xxwB3lML|{O!nHZwzY6hS{{fT7bQlbl*@xe z=AdA+%?31TCxM_)74AlnQ~$XJC9J`|HnaS`wfh8>yk2pC1V1V&$Sbh6pYfBSOc-$% z_hPT3uz?_1kxcj}QtPj#orwXRv|$+6gFk5-iPO7|osa;Xs}=f$zV)%}|4!b#c~d)l zpIy+riZH#bgu)PEyqpUmP*CS)42K%yMSVX_>eItbZZ@TR%dvf3r*1xJ$gdZFLj(w|dM|_SRq!NL8ldNdBQ3wtie7a z5#X|HaR?)+S`KLT$QKYR5>NyVhURi8%zCvbSEk2#|E;L#+dB8QC{}6?jll&M!^#{j zI^)R-_ZsZC#cwiDE8RQHw*yYDbne_*NP3?bX^py`sPVjL!(M-ocyjqZ7N#*gq!X{L zt_|-bp_ndka~x@VbFI34>kkgVSGK2qOa1DfgF~XVZ{I;#yhZcD#-ZbknanmYmqcN@3m@MJNGwkvS4&`5C0qHo7)vE*vp{6(^7$9N$5pqz_o^y-i6Jz>1(pBsBf1}l zyMeZoi*ysOQkH%>3TV6k^I2W-T5~Lzt5DA!xjXtVQulIK_`-&W#+_N>%h=X=SUgpq z1m3i77$AwcZ}_b}m`p!i3P@1LJAgjwO^IHl7fjh%ee06)Je7W#RcN{1Wi>pdBjKW{ z3P~Ag!@G7N&M)p6bk=V0Dv-21IsvgrTWcPDmua2D>u`$X&7#LE_6&AILw`N`%Z!%v z{+$elqqUuaj%iR~tBF8)V}o1S&w=jVACE(%ZL+Q22C0C%1~}4cb*x@{?iz1NneHI34T zG&ko)mZ4!B9^%&Zp+YgAfy-&SSkAkB2yLdMo_v0 zW(@miy*O?dka*bvn*1+(HMjReCLEztjBjqnSA-Ljm-f z6DPR*;|dXRV-@7rZL%lQ{oz1R9Oi za1G9JWc8uqTG_!~ZL=9mb*t{X#z~|kGyIJVLnl6HaPwNA-yg@E_j?X;imSDdiGuIN z0E(7zHNcV9_-E2F2Mo~M1RD-x>|49vQ02;)%M0SfA*V}wY80?X5srF$eaW6%&UNin zzpb=fVPnGJ?9!E3fHP2A#@g{`l*Dben?%R80i2ftL3p^$j;L_4WRJ*%Dcu_(A`dV_ zL6MSpyY3M+-gKZ=Q8wyWm8kiIXBL_+5UY>JU5bO9J$Wo`YI5>1#MazqLXNA$CKRo> zFee=!m+8|D#r@@ZPawdM+`U~Dl2GHrwj_Nc62abDs~_UFq(8tkw2C_*>oQY!`i zs6>B@1N>vYSmBLhoyA4=1%bqefi5P9!Ay%h?LPBk;UQhQ|sbZSZH!f&(kc;hy zwU@5P3EHP*+i+F^Q2&%0s2u0en`9-n-vzCF@8=@95K$Pq#=V4~2(O+sxIhXn+ELiR zcX$}uXx+Y(%^LK1kt$nXpI?O6%t`p+G3i-~*o}JZGp=vP{t<`=i(SBCT?x4;sm0F1Z@5l?!4X_0DoJmxzzaBN((gErEyqUlWMR8M>c4i4>@Se~TB+RhKVkqt%|bZS%x_6PLpH2^Ro z8F;usdp`ahiC6Nv^|@o{j__@}(yEB7(!Vut*)~`nU$cEkUkEgioC*@fW#huL(iR@W zx=T7_IWyBxW|ch{^F=CO0s$%UJ@V2Z0Hr^fg!6-f5V$cjxkncOtyyd z9}wh#GEN4t!t)E7b9>6mGiu$QR2{W6bCDkNEKKj}l63R4Qiw#%O}q`>{1I{jxpo-c zD=TdAq@oKbp&S5Uwp$;|rf5Yw$qTSb9JqLdOal?tGTB@JuV_b(lJD4$5#Ncb!tcq5 z;T+x9 z2$G8?StfK~J>)_N0gBEuqUYp^MVFKg00h6Z zpkgfZ<6$rXq&NS2WK$3xoQj9Qmck4PEdSrKEs0h$GDIzdi6^drQ#>NM`9^Eal4e8+ zBHiY_X6QiRNZ(cwEkLAox2kWe|H}cAsQ%ORe@XNIm&_zlCsHau(Beso_&MMYEG=z3 zaUDhvuY3~!U!%ynw{aM3eoFHoBQrcb@lVfL2hvhd5fia1slQQHB^n&~SzzgV>fDJK z?f;V5yA<|lvj$u=bou*x3ngT95Qu+zg-g~NhK7upjP$CLTTu6dt1A<;u<)$_v5wLN z02vAOe@{xN#?ZYJ@h%DpbKA4nA0a1_=9LLObWrBvNKG3VF*BnRoast^4Yc|F`Sehq z{BS=hZA?SCK0|X5CVV4+gxWy#zgkZJyvU%42ahjtggH7w&7@^Q%1pdJ^R`PzvCqo{ zN1I8je3yLp50!Kv3D*Myl?ZLkkEbPJa?(sIL>i$WL^413z?XqjW{II28}obrOS9dt z9L?uo^YLMfV*G;%5UHIr3q!*Np7J6Psj#CX{`qMpw!Xd;gHL4G3T6EI|JRrLTcK!P z3p~^Pe<>l_l}v)H{T9SopD`$?$TW9@8Rv^`5IaO%oS9xI8f#=^Xb6g*_y5TxdJ{(X z&So}3W>ori9a))+jgNF{pz!c#m=@q&EN8{P`^ia*pG`AHq_|AH5CnIJkmlQGEQWA9 zIvcc}BrCeK3^aREwJQhAw%SW~qC71YMw!qnqW{(yB1r?+c8=k^k;SVf0^u@n(kz81 zpnAVer2HrNY`@azaBA^Xr8<(LK-&KeMBI8cU1;`DefQc(PZ7@J^ya25t%;c(lZ`^? z)h7eI&;QXTLP|DP=>Mx6e;aW(`CpggJZw+T9C~a6IX>=Q%uBwS{>lDnG3+)RF=nR! z-AI=4EAZ*QoBj0+s#43vp5^ya#w_xp2;xdxvM|bvx3gO~`b!8jflUlc&X-D60eF&* z9{8Adxa#%WXjQHAlb+soyla$z>prRBPCpEOexeFZVP_kTTbk8C-n;nL^|%{fIypJP zBg#yw@;;;cizy(3 za_4DJ3mQH)^=#1<0VdXH652`zG4*6p(W}^_?m(IAv6qzT43_PUfXeQ6Rf>cTJ7Zj> znMlf=zyC_Ag5nbNd>$-1fm9>Og1NIweQ8p!0Jpt8sy{6IuUX44IfMrqCN^hwQEthr za!10zEqYx|wf_9}O3}yntUJZ|;D-BM!<~QIOa7#N9~fW*vhA^~SAp|&u~R)brb#f} zJ@E`5!Q1QwpHDeI?C&J6QakMQ+rQK~taN=O337BjQTKxSFNoBccplbdMif?MyvJjH z&9|`iQCdiWhVf|5Ic`s)qp+n$HjHNp-rvM5uqOg+^3`ls@p6(@A*B8@xjxD0SN_!m z>_3zF&@+7@kNqWug8r2@@QUBg{m!=X*)r>#Za%s#8l5 z%!5FOl>PkL-90=8MX6P+1Mtc#D^+W+Kw5~^OKRjIQzHB|XWMWO+SG72O|o$B+sH}T zB%{y$F=$lGC;n^owYQ^VAsefDGERcs!ebLmueD{pQfb(l;6|6Z_%MHINpBs2_ z)3v<(R=?y|SilzIbFmY{F{{*6diCWx3VA{%-P;Z8Qm*>u*5_&xe~kkV)Z!I)#niLk z&vPNx*=TdPl?i`7@gMW8`JVjC)FG9cHFR#@dfm{J@=0KwjThhdP~Xx;T5MH{!6S;Y zY(p;7{RWd?Po%K-IOivwN9hwbD-nv5}b_|=P)Ir^W!i&95VEE5kWpT_KG zJ7le_zA(J)!e9um^f){gYI?mX7DpHA<6uvT26j}Q`Vvbatu*bP$W=Ea5XE76ab9)e zantO;2F~J0-(b8q(r;-oU@vUI8v`}m*fdUO++UWV1fK-lZbY3wKb$BUudS`|Gqo>nv0s=wC(8*|HV<}qvP5O&q1n=eSos{A=VG?OJD=W` zZpA^A{a-1iivL2t`&GO=$L;}>VB{&lo~;;W=T4H2M7e35WwCYUN?{h$6vu?mzu*kx0nP?NlXZTYS@IL zk3K)6IO7GE%}h^Qyh1UbI1Kk%^-)jayg-`-;+f8=ClEl7?Eq$lV+o_*-hzDcw@IQ&II zc~k#;X^&~*kjBOfe5_BL+#lJ|I?HOd6ulv>-hOpq!eQTbbzQakZ(afPD|YEQj|mM7 zn`(pt-p!T>p7&MTm2ob8eQ5Qxm6!)UdYPmzdmHNhQSsgW1N~_E@;Z5jW3zrjTNNhS z)}##zwNe<%6^1?5N=eGxC@uF@P?C9Wzp3|#!lb-ijDNl!O0zai-it` zZ?)R{O2$~_oK_xG>206~3)9kCM)h-*VT+wMj&jfAx26;;qptf`b30AVhGk8Lj4`$! z_?zEl)YYWVl&-+SdTQpO`NzAy3tsEdKp_w12T{Jn+>ZvF7e6wF7RzH55^`PD-@8@Z z`W(a~Cvh$=E|$E)Kt)AODJ*o3$PE)EwoBhZp@dZH3cy)bg zQ)+3!Iswe43Mlvtl-#?Zw?YvlwBG%Sb-lm+&OJLloCv?CT+zM}4Y<@LQrho?uxGJ@ zB1`%*hhy?#%EqdVki6!xiO2Lf{9>b72Mnc^vC_$TV`|CDgW4cv&%E!~L1?2oE_V)p zDaP;}!WD-yEh+8FH>`kf@w@3!B_fQIZR$B)q z9{i`%H~lrpI*9|{=C<#ecN4{jme%fb9A5h1u8&6BID6$++sZx@ZHMf2$?AprjFzQ; zoP2X{hBVcsdxhv$9Mv1(drLb{IKu5tAN$3{cj`@P+?H9ryRXN$XgUtJ&ReTV;~9A; z8CesSSf523`~&HHlcR~>?rnJ*;zZs5$}A6DBhU|;QmDeYyGv8 z;HMMn)TgJ}>iU)sDlzgI=qBlVi9$-UUg^zqEHjc3$LXt*@TfHnjxWR~O9XE&?c*^6 zZ(zxwr!F*c%7vo z>+>J$F77lRp|fJj-jk<+fSxYNzkBU<#<)j;$|e$%^qmLUAL{4rroh!1go#hvi&X^G zEK}czShxTCM#9rr<3)qm6oo*IrDwh94#X^Yri*gqIPS=y1Sp%cgCVjFMto;t~B;$1|4xszttYwk;7+6=|Q(ae{J zd$Q!|sk-5p=f{pRW8cYlq%gUmc)gMO!me&0B3+mopK(ucPn{YY1>ocS%e7URZQf89n-%zt@eWCHH ztugh;Mrjx&%J>`hP^RGwcTP1SiZv;p)-*CI`CD^3yW?Zn8eG=YsOEShCrB4BNy`H*BSKfkXk4@_ZPF;F3R2I z1LQWOt7RPX|J1H(F@7C$p~=rr{;biKs4>WnB`cFfeKq^K?MjTI`0AsmW=;MaxP8VK zT(P~uT7__j&CL}{XTY#%kl9H|KOJT1iQYOzaaN!4ifkBVy8nY+eqg&ArKGmC$Ou7$ zcn;_myYb*WcTn)js=hV1&hr=VT0M}ip+KsS6qxVc9&Ugwvky}Vx8jlh9FtumXD;HO zSx_>!Qc$m0Re$B)JosQx$mH@(N5kDgOGDc3Bc9T*ATF`An@~-3`{ab`c@MR-s z@K?2%aWsKS)}fp*DJz;>FdHAm`C?~uYH-Y>jzv)o{g-R^UQDXrL68wWTP z9)k3l3$x(-az)jwBA(M?T8p$9L!y=`O#$r^b@}d3iskiJTOVv`710gLk6X27-+gWJ zKeK`la}fIs51BAE34b!3ELIta_qdvD@QzQDKhgqoC%eLXb4Zh}=8Sg4!b@)UIapAK zIEA}~>=eOy-AW`Ut285r<8$XtTdoKF?93o8Q}&VjNow>>hHL>ZC&B`JWU~0N9y1P3 zPO8SS5H!NP5cJL@T@0qP{+7w2Xh5bxYtIixkph2yP_Iko zL320EtuOI^D0ynOlD=1d+$c66VBjxK(eV5`;F+MRpgy9OT_WG`9K$a=!Tis#9>n*qjElSIk=P4|+u>>;b; zvllQ8oTAwhz-N&*e9u9uypr0s9!zCtm##VD@nFG|QY~d5c^;Nxz?80w%D@FBI=`N> zu5tS|ZZ5)3{Sn+MK_yMr@y`eSc;K1vkd+;#6QlGr9A1b@uMCTRsb*I?C2Z!-yKp;Q?f!=HZ z>yfpbZ%Iaox$LPZ`T1oML+E&P@cue;1RML~o==SnP3aBqzpgPewLfuaSe3iVYOR=x zdcVCfITGI9=}MaF4GWy>xq)?<-shG-te_DAcxA~CIbu1&WGM_*)Ba8gHZ+Kwn@ngk zSaJPGhk@P6O%4R0!SCgc!aDrnZq)j94F8m)P|DneNN+uJG9t-`~I@ z&jo}WiyTGTe0DhWNg_d2AgcHi82U5C2-+&0jEioV8FKv7pv=A!{;$mn=nzK`^fn_IZ1 zgo{H~?7WTmlMD9!+45N@tzK-$q*N@yb=`*IWgALAi^tpS+a-Q-oL_S`a`T~mIG&R%*)E$1Wi$6XSYWx|E zqL}>m?N8qxX3(;8pPV_ab@bQH#)cptu>bI4v*R&2_UL(rN1%R#m`33@Etg_BWP(kR z=TA#*UuAP8bUyOfGnl+2_v-tzhzrk~_`HB@#Xbs1q}`V2o~QHF@OLLj4o7Md?r=V z50*}@1?d#bgG{>ubz3d^$mYx{$}rhRshRC%Dj(|uxHOf|sb)Er%VwHL27AJ>RNjUeU>1eyYtz zMJ^6)4WQ|^&l@gh{xW1*IK}o{wr%hNBxcA?4SMRcdt~x8eEjiH2F$}i_*}ldp%IXI zoYC%lKlOd9tfRP>&!gf87K26^n%|DjlFxzvRu-fNTMoOKO0>_s;VlkoM_UtGxN5KD zJRLW#C71rgpvGKN-1i4wJ-jxam~Ub_oDh>>e+>2fRTv7OZhzsDms z=dHB*iGa=T**R`tNzaRcrSqOEmE8n?r@nHArRKrdKFN^}O6{MxjWbvt@B{}77{MQ? z-~72qMLI}KC-_vuGHn+!MW! zO$6v6&HoPd8@V=1iT+*=8MJ;q;PW|*zJh`pR6X_4JNx*?7SAz()LipfQd7c1^EB35 zelgqskl3eL>+codbRK8KwH-wUdORx}@pW)o(Y7cw}F2CqqFBCsB-|N%QX4Kz@ zY39^(N5!uZ$9&g~2-1YM4mA9{3qknP#<($$pIY6xz`1lg%$K@Ttllebft;kz*^scu zPU#3+Pk2qFKp1w{X4?y#rsI=ghC8oWReV}Z>}C@KG@LRPrqsy^>WEpq{5m@Kw+{pU z0w?oJHJfkBH>&Qw8T>2f+;5R)SU7>BX;8Sp)r*w0+Y3G5k|Ls(5ReVX`}nE9jauB$ zawD=@4Znv*+VHCn_|RutS+uM-1M=RPn&)p5t@7N-T#Hp%g#J9x zKI*CgO*{V~7j79;BRMrIylr-2Icv>1y?@fs#fk@yBp&REwVD+TM|^C)2rn$)M!1>z zE%N8fZ8Venb*9+XhyxDY_L$1Q4>)MQtIVaM*Cq+PRH+JtTUMP&@py>ed>i>zZ(|aY ztuHOL2F776H*fWu@CHr&e=I;q(X%#qL*uR|W|B?xZg_Y~5fhDoA_uJS+&6WD<3C#v zD$pby)1!GyExKB7q_SLaD%}p5S9}iTXSP+S25^iHUixTSDSOoh1Q#o7jG{DekChH z%~Npu=Na(AYo{2ZP54!FOxElpClu5_=X`V&97-ILt(zPE>skFiXi)deCtnS~WCpr^ zyQZ8Iah1JZr=G)Xbe_EaOTVsnSKH76_D!H+#JQIO^T*EL+_3>oS}9H(9w}Snce2qn zxnl+YQjVYb=IEd`=5QKTw6fz&smzcZ2IY3MbfbWSKLzl-A^DW&`}eksSK$th`b_EM zl{@3;UtYx>IfaBvS9H8w6b{Tr6kB?{_3XxV)8`mw5rc>SKg@mgTU1}v@6bbsAPoZ| z5(-FncOxxGNOyOabV!$!baxMkqI5}1cX#(a!}ocg`ybrkW&z=S<`FPF%mj=F_p)EGFiF}mzRzM8hmpJXSBH1|5&q{o(L@x1S z`{VeLtayKNc^~y%Ro~gg+4mly3yy(GeR9l6=HBoV6JFn)4MMpFG6I3Mc!IbQ;)RP1;_Aag*B5(Nq~W)LWa4m1v4d zMDp02U5F{N+ia2na_Z;6ww4K{p~Q%UO**WmwF^`2M#cOJ0RvCABI<^gwnz1nad;Frno(w_hzIvFBgTnq+zR^H+U)b&%Juxx$exr}0|DgcJ&`R~dFC z@qb?39W^C80AGv=)9$jy`cH*K(@R^|{rabtzZ4q}-0*wVIOm_S&54 zPvHvVuiGkS=O9ZOKD{{&-_wvelAD_k4KmXlXvijY?IdT-DlA5Z0>gY zK6kjEy3aa3L?{w$zW_HR**l!v6@xV%2CQkuxEwL!@)vSvGgF*1+TadUNU-rI#{%7@ zW`!(wuX?g?)Y^?5A1{RpRo`K0q4XV`_V$sq(|bL)r^y+yC>kW?N6 z%(HD;r16l{mCQqxm@56_xtXK)kfXM%Lz=Ey+^dJJe+3n5^_lK%dVfn>eo%vISYivl@)}A^@-i7{yfS_$9iWM`$*N|j zsK=6gBUYtd(-6cQi;-?@sgM#!J6m^GZLCfZ?p!bX6sZ0oX`jj+R9Gk?ArS)G2JZb0 z84qwC$tR0gT9%dsmWz?!-buN7Bql3Pim)pF$rR(Ko5GKk6t_FGS1I#PTUmBe>5=f_ z3^QO^2|!6ODDCCOFxz&%gr}9I^T+WP8czK)fl&DI3G=YdEsC>FD(XV0-l_iFGP|0D z?rF=)h@CFNQc~kzEJson`c@QS2fIeiuP}!PT9$R9%Fk!)9J$zE;G@eMtFqlNU0a#2 zegwTg9X|m53NtFDKsX>Q(7x1;t-0MK{qr!JJ%JyqxWQ5Du-LdQPnXdV>MMvP)&Dj= zgc0Bbf3%pUI?{0CCa3LU7$#Y#9(S@tQs`e#Ql<<|nFRN)8Fe>$ubxewhQH?&vaDlc zl|Mi@_+jt*xjTNF7Zv6wx1bW+6SqBvUKtlR&)ic?LjtFafbic$Br~T3!2`Wi=~Ttn zkRxPtj6dUOvvIMO?qlH?~1+%C0B-uj)yPc&dk z`_0LCoXjSuTq!VD#FGlCk_uepU$ipm@@xK${l-2^d|-E&&?8?MdLdC`Fj+i8D116< z4FFYuUB;BbReWBTx?OWma{zCd~r%y*~0a~^f=g@{9G zb)&bRi@%2awxtvXoQa`4wMG~0E?m$lWYHOE)geHD*MQ`jF)XM2 z1?PB9lj33h=;u<6ktsv0@yVQNP@oGQ&&(99nAx!OM~M*P;pL(sfVg1}0r}Z~5H68_tS`JoPf_`A+a^TcYb(vpau^TL7&}>(uJY>M) z=BX9;(;ufkf0+vZBx{(P|H(c8!}mHDqp>N{ynknObV4BJTY&v;B1U6lI!LtCUC>`A9l!Fm4?jg^@tc zV*KsLPFxUN*-Did>EL;6x}+u7b&utBXdsr@t*RB%_RRF9EAj3g+b`Pl_k)Qs7)Bsa z^XQKNf%@F`c78HtSl4XsNyU|Og#&f%1M)Z5QwIYA65b3=#QwX+MtNcVwJW%HxoftL zb!N=4&|$(Qe}0nI@r5%$%Y5il!h@o|TKCmd3d@Ef?Q;B{i$Iu5_vwt$v3Tosb}^L0`+QZjp?{F^P6V|=W|4m$ZK)1XwBn< zQ^r4{0QNbd0*yWJ3IN9mrqRUdk_m!KPs2fbD{X3e?CG`nMY;Niq5ygAQ_S6$XZQdM z8;u=~h$tLmy(gNeegUgkRX6qdp=u6 z6#;T50muKk6B*AuE{N@L!@vpl$NYu@v0;h%2|g|Ah6eTclsHV%qAs|d1Iv`F3`JQZ zJK@TY@7-QP!(jvQ7f%;B7?~J%+%AEBIPx@Vcw0i?hm4DilK=f6HPih_z`~lFKH6rh zK*-xDWU$4$QqAm*{T=L0P~D$>RBGeo{!D*qpR&1Vv-LrbPqf2x>%VWlpZ;ys%HD1z79NsArLwoz`gk;cDk>r=V74(#HRySQxu z=oG+zrew3^gEyh4KU}Z6zzNd~d=#_Pe6%geA*3CU?6TqP_;)19v`H!Iax1yN{_eOs zX+9f!wLkEM-ooAo;l{rSi>n{*&3z7m7g{}RnM^mntF;onsz@HvFH4G`Uxcl40AI!) z`GpO32J-KNggu{t_+_$IFzD0p!1y$tjFL$yxNV^4he3Tz9)V!OiufvTL-qZ+yJ5K_ z|2qYXw6yp`j;+u3!k!~Nx?hb=+;yMF0AiCrMa2E%cv#GTv*cA!BXnDMe$(K%*D(2k z-4wFY&VI1Kq=S9lTuuWa^}9pX<}?urmN;#hvowjB{*5vs*Cc2E>fI~V+Hu-+xUaO@ zFWTS0dS`H%#v>9OXxVa7M}E3?aPgPILG`Hydb+-XHrw8AKB4YBA;c);f)0_6DSzBA zGM-J0DXb=WnoV0IJsGO%>ui>HAkNfaHDlnycpj`~AE7vr$xI-=KGSriO?-tHZ=S8? zzl*4L_b$xZ%b)VoZI^!6>HLj#>Ul4SSxsh(Dw8;VQ$x3gd)$}V`}zwhp2^n0RIU{w zI^I!Hd+|g3aQ2mp&=Rf7TE~(H&-uP95Bo0bWbKVr!-w}@hn^pY$k2SkfqT`!(ZST# zN*j;#l{r#lLOR6j^M7Qf0;Z;E88*VKy_yj}B#z4~faSIWjzy1e*Er8-gN|%8FLFgI zANN0?cDH&|OATLcNFNfZQej|Z63PrD&IBQN<~tlQewgN6!FwcEMurYCLqqkD?@{pOLfoqHI$( zYXrp`f4C|hfCrUVf3_(1ho$TTftXB9aSW@)cJ+M~UE9ZAKg5*X#U3Q}==CKr>uK+R zu`*K%p-TNRMhG#lQP!{RvJyhElKXF!Y~ud4+?>o^Ixu{4Zz-?3Ji7dkuCTJN>SFcn zbfEj!eXbs?)c!b$wAw9cxL*_G=`-0h;cZtEooryy#dUq(4y713rE%nER9PI2sUq!9 zgIF@Z10Ii6E}Or5u3nxc6M9cF+I|j-6AB(@Rf$#eAKrz!3NZ35?uWNRukr=D4U^O` z#222|&yR8zu|ROo`m7D+-+wR5Li8bwLar@?q?QS5Z;Yx6sx2$5P8%C57|+CW|jyCGF2d1}6Ke zBo-!tzbh{(dxya&|1BVCWHy>G<=3QKh(9d|v?Hf_CsP!@G@LH^vHv?QA`w^(|jhW=|(AiCDWSQW3NmLk1(=%ZSsN~L3MrZgs=Xy{Juls(*ZU7)whFYVF&xxy!G9eXo6*xe2d&ZVwbn zj4yr+d8b)h%l65xe;_sMD>>9`IBd@UOaJQq`y;-hLXD{urTdz;y*cBjns5T^XQ2i8 zi%}B3tWQqGdlN|d$`A^Q)*>QDc}{>zSYsW!=cr4n;e-n_frf7~U3 zt&J6Twfx~>4Pes00{s)+oBg&>-fT4AZKEp{nuR^nyFnv$7z>5ZyVH(6?`T`z^=q9^ zl}(6D3`uXXt;}a0GQDX3LqMXkv;~3(1eyHmO)IZ9#>swTqX6K7MIXmrn-&j=4@4fH ztb+EPzI}SH`f`N+v;*_`&${m3N2AW)kkz=PtD~-`NUUHcPsoe#$2Y;yUs#%Dh<@{r zW@_92JpOYZsl$*znP1(a51rU8bxFIyyv{QoSNP}93`DfgBs=lRO0PSq#mE?hzagVy zl`)}1c=Q(lXZ+|bbx3(;0_SOK9z%<(SlRv2u+d+^Q@H%gTGZ)32?2*@>a9F>k1!XHwXjW=e|g9cmO**)>M3qWMF|Js)X7E9CO?&g+2WcAELs!tNYZP?*~C{QV*L-UG}E#@%nJ1U2cXp zl97Q-^fQxgNXWS^{k!3m^9evW$Va-^x%pJoUM0OOxpj}0n+lZn)2wS>8l!aac?@wX zpz-p?CWyUw?wDy&K05XDi~-3qTPU8-+(rMRY0&?clX!|M6cQ4Wh-tC^cuiSBe!l#G zXVKd*;kf4>gZzlfq6Nnwzw(2?i2rE;(oC*8zU^JXs3^GefhdUh&(9rmnJpW@E+WD5 zh+ZyzN5TcOJm0~g)C+|F+J(q`MeGKo<--WWpm0Z}eZJ+tvoXaKOF&ayb%iILdTx*W zP?9n+q2`oUiT2;u4IKA5@0S5UgU;NsULDRvb0FCE7twiqaBSqHyI@h_Ja{Z6l` za@A?_5<3HFiUqg+w?Q>Kf+u_WPakh@Z}Fh?M!ScH$w1OZkBJ8&5DQ=a8&80$>wYm- zwNq>Ac@*f{cOeyyo&U3{l2KPry73y$c7Wphw7q{$1jhT05XH%#KH1- zN=iyj*pLK!?Nv18RqD3@o=5MK-|y}8ffS;%ogfeqb|4t!Z&8FvT#$xIdDAOJ!^fxN z=;XAqKU+sDoD+cXsj#L-CHbv3HQ)($e7yH?${rjX6t}&N%ENpTYUgEH<>dn(@4OB% zTI_^+2`}>b=v8XrVi3)Ug#6rB>ywsy?`L!hpb04#u@f&JW0Nk{Fu>+7$4KqkanD>g zI3j!hJc2>hxWIyuPeq1rXJBSdf$f8APs?eU2+9ht+Rmm zAD#IOcKF;4_9eWrDgKf3+UqeQ2qonkv&hrL1cj;l5tjCmo7XQ3wj3`nw&KJ4r@o!K zq0I#&1=HQ-b2!9dCj!p9t0Sd(PQOR*JC!6}hm8kdAAlOCC?ZIhP9%u(Bw6onB*$}y zb770lf0S6`8^@#%!?;FE<9CtB#*)%JAEiRw-vQ_^He+@ye<7%o^EX>7EgL;<%t9+{ z&%R()?iy%SVKwdwUy=zL1)&js;Lf=G#(K8I9e?dDo{i<&8sw$>di?69-eP>;MIB+= z><6C$)m&F=A>(z?TlXS3q=l;8;A$|S9br+ygL05G(V#weu6HehwzIXr6~*j>D4U{@ z>1|6zTQ|dfcl~mDn)?x+-ka?bB;-7r^|0dFsZV*|_2_il|atZGGoJ zs@&|e+bE?$Q9E~?jq+~C>wco-9FzH1|CTedTX`uBuk*HYS+*uf*n|q0^!gl;yJm+q z>q&nhy52;gxMK~5W(zctAUq^=-ZLKO?a_HX4C)nl1m+7VbM7f)LH1g?uQ8?dJ6`i4 zwz~v*BEF45PJT|}S8U}31Zo2Ld!^3y3Zxu1)CpfAwuZmSsR8LDI5@)Xu|W)kz$hW? z-=Gu3eJbB2XGfp{xa_^75@jqHq@07u*tRU+BRfBc1d$-&KY#sS6A247NttUFi%(l4 z+r_7{p~Y7Un|{d@^$(cHu67FtOC#!3?$E}y)RH~jhsBUCW6pB{JslmZ7zzQ)A~XvZ zyd&qV>iCNG`PJ_0t(q9y19K^>=NAH;y zvGvAR^b7_@OTCD77{{N`6nVhhj4J2g!~RxtRl+I)*IkUIe$LYy*wHg7UT-#%b=iu1 z0_=yaOOa1cieNwsEJf4pL{fixtKY$2({5R)rjVa4CD5o@r6+Fzu!mN4IFRVrtUM-7 ztLs6!;|Agd@96UHite}wWNI{0cIhz#3HD~ZiYfp7l7GuWFAtldu_qy87j)Y*mHqdV zgL<68$LWIgbvL1Vx9Odot&5zZ&M{g1X1A_ZX0({M2KHsk20wqq@Kl^D_niw=G6XYy z5==#le~ZzZC>mZMm-25H@t~@sV^KbndrX7U_-|de!#I;}aS=pBsLGQ9SVVbvaG<#4 zCNvQQ)NkR5IXGQN2q;)&V3*Bt^;hOkXpo6+m2s*MNt&-Xkib>eJeGoP+RSHjCYU@2 za^sYOoHcC~g7)`v(ziF7W^uYHDQ^iY(L@Arbcwc#Hk8;ZevSz*DX1!6ba71UCd`Dw zgC49~O0(rl@!D5%x4)OZJ}0R?NP-8^*}$f;9v@>cont`nsxosK`L@!l4Ou9@k68Uc zCpSQc;R6CB1gAHP^xCTW$Zd6y=gjXVdG)lq!?Gv!brD;$I#FQrYnlhGZ&U(EC?unM zcY<`{_Hr4tYw1arpemdZB!s+(AY%ltE4F=#BY2b$_>Ug1%{>EshtP z|NiJVBhdL=uoBp{|W)#KKW`^CrJ+UtssPmFdRyWcLLJ@f> z2%sG2=awB1(A7!JZv#@AZa%W|dX*jv8+OgNI2{Q0extg;vUg5aHB+5zf4A`0Nx0>> zGI04R%Pk;dc-0bD*{2{W?aNz7J| z?`&TIX5G|O7V(2a|IEqcAJf}WgTACscNy&-89#=yg@h(}FTo>oFS_>hvlix7&(s8P zaRfMCPX6$jC|0RBEGsFgSy>1~Lf_xI1Mu<9Igoq&3RQwaEXE5%{-wC-U~=L^^3!7vHa*))umDcFzh&p(m}Qe&EDl?gk7KYZFp069(qA&7l3*oE3DU`PIEN_ZR+DtKAEF4$B3 zAy?3M0r0CaIB+#0F#XtHHl@$&Gdv1D0u_A3mr>Yjy;)BW?78r00XT3-685kw>nP*Y z%HUuy9r!2Ae9Ez(zq9*^C?1Ui=OJPadjOwOl>&!D6wx@!ANG?@!EkZl1v`X56fs!R z9d;#As8AI4GhgEQry9jiL_{iaVOc~lh+)$0@hA)ErsMh3r@5w?P!PyO#0WkRkz4(@ zAgG%V?s=Go)}T;X#QLAiV9@eg*NKRerjSlE5YD?ou5O*&M}07^!HFa~C=UDH2hRU= z?O{PN2Zu5Q%>#_fKxDTM0^Q)9bA9RL11bB0@mIU<8b;hwg~OBs++U!8dfz-P5np+f zb_(6w!26$yq{dMic2qvHP*FY+27?KLxy(WS-e->$C!r{YKLI6U=ewJzFXF?4{3VBL z)7C3#x*eRA^}Yl^pBp0+@}1A*cKDeo=<^Sl`ZTAlVS>BSI7B-#IEWUYik4JXasql0 z7df9R`!`+})=#a@?>RU)ehb!@yCWccnu0q0E&u1yzc1+hCv#(j9ki}*{pYBLC$4s) zu|M^3;a^%f0$*y)!*HjWvU%Ky36C6;xU#+d@v_L-VcStUkk9EKmsUeVL!neGMIn$m z{Ss3PSmlvEsWn|WoUqG2ZudcBt@vhW8&?S zZ>_Wx5{RJxj%FhgKuM54K^u9cN`R zav#kR`7M~Qp&Mo&qrU>e5pC5^Mj|pNVZHNJ4b84gd8jlC}eQ{wl$$91UN|EXy$tSRuLo7;+d3; zpWhizOoVz^4q=g$g%U|4j!*eg!Lfx07Mjg~%kz=PsGB2J=uRLB}c;Yv;Z_CEbC6`TG_Dkc^61ugy= z%V*{ogmZ2R)x!Q24v=u%vD>(^F+{?oStJ{k`&H61(e~07cuFRC~zs!-alIkfVbQgOEb{K1@GER^hLFqu=> z1YgYBbSW#rJ8^E0(|q!7Y)Zj)x)Hz4LE^T;%Pave>REk&Oo#Gi66Aq2cGR=k-4@DZ zDMsM~4j|$Ai=FYF{YB{9BebHVg#K~`)ccd*mDNyG?zf?T3zQi5cG((cySz;tXBw28 zb68)Fd>l{w6$@>W-bWV=n|hP^ag?PzT>I(q#yRp4s?}Es3eE5>Oju|6tW|5*?HNZN z1nQ+|HdfW(7kJv~-1}4YumnJIt%0s8BMAfQOvJ^xYjqXVR8K5rlc6LNugk9SuQ+)G zM1?Iaz>vnI^t{}kT@}1Smx!)Oey3xKj7g$)yup0oS8vb-&*pWxuhF9kz5!!^sX%IY z4~J7njtX|YMQY>3sUv8?Y|WL>mXlT6&2=w?qbFTw-)gO18uQlpQ~*(6D$fVR&*{-Q*Ud^`>5=v>l8Mxw8e&sP+T<3EN!>m zF9;<2nMK=PX7&F&tJ?aZ}l-N9k1`;`7N=yI-b zDy{42fKfW-is|Wy!)Kggp!D0D!EvhuB@cV5&^1iBzer#-b~O|G>-E|0MnY#HzxKsx zZK47~#GP9<4-JQwt5_ni+@g4IEkSRVEnpH zb*y|LwJr$ul-ll?*7sXj+=?P*`vc2so_kg1I5qZNs%SxQHb>`fY`V`2L+{^JkI>^u zeNSGsh`t+nY}P;sG9i#%pv)2-PzZXn9*1|Ym{dss`cT(5ipdrrBu+FYR;%HUMG zlWD;}+v=Bsd?SM3<7W~mimdQ{G-pBRTB%3hAqVvNX{<2nYOSC;U(6**yJ1gjl@qFH zSFB9&vmT=c-#O35(0d>C-Ls2KEBbq(&twK1my3&+!*T0%|8rqz!*ec>nOmQ|8 zGes~tx_i1uMsp~Z1%{Fg428FiqRDnF4G~oZ5e!twkzQ@R#p(sLm%7DliAOw@b?}OVI)>Q9v8=li=I7jFBamK2K^8 zSjueq!ED7Wx|l;1#f^2Kk&=tqrr&nC+y`S@&xRz1tAWUSE_)=(S5jzZN};HCQ;UG; z{NSUFBA1V{_IqDpDW}~*?Xx=qslm%HXI+7}0_Xb^Q-eBZT{cOK+fVfKKX{%3M3dD~ zqweJNR78V;npQI&=?*VwrNc_$R{$Hwc2cXRq@)kX;@PW#-W(A?%w|eMu|_#x_L&Op zk;{`Q&RzgZ*GNL(>3ghTy0g&Ubd{Y;#;xAARcUDuK#8-8E9s5P>B^4b;PMyM0kNbF_VQB*+eGy zUQ zB-ESKpUduk)zER`^9IKtE3W1%B{O?Q?qWC5RygO<9gN*yIhH|}2SFJpi0XXqWn|8S zC0Y7Z!9U@dp*54!x*{Qka$y~Zaw$w4fa)TB+dxYP^0zXi8>USCv+9mGSV6@+8c+xZxxpY*4!_AtS zgf@m@_3Xuy@zG@(6_yTd!#RXTCBLc*<-klq7M1Ac>v7O}AjOu_HhTwGu^qST6hBdQ)LO$@ z>ui9>T1j1n@33<=^39v!Og5V(Qi$N)AH%xChaEg40Rh~{s-ibPiwdV^)nDxA3^ob* zlp;rxBiFx2=j2T9{I)RQTw-CB;;g10(mFh8svL_|*deFm)FX9EbNhPxI$PIihDn0Q z$J}fV-Oz81XS~5E$tP>vY$VMM%c?ZQZnn>q>n&665|xCu=X+_>fIuH{V|6rQMLUCg z{n`lDcpd)*EH;#KPXr=UWH;*@|ua1%C% zbo>43fS7<_F|5~-)!GR?b=~WiH(XC5;lZ}vj z>m=vLp)R2Xk!WlJrsCX{Lou^`*0>h3NCqNcL!RH&JKi`g!4ExaKQRT0_HC?LJM|rU z^`0P!+@0CGrJSZ0l`l*UuCN*Ovh|P9v1PSskF?QWavLw!2_He7D9?=Ju*C6b;w14u zdJn)c^a2`>%~1fbBkCW_!$+o|eq7Z7_*jb7CIzP2Pf~Q|!&e_aV=St`!h9G!mwg#4=i7>L7lNPxhEjF&C z+`htj3D}B6q$JLk`WK7-clWZ0ulB6=Z5DAvvaJlN2#DL8A{*_veW$Rl)xXBQ!@RE| zo*TltZy3?tCOZ1myrieuyzIT$6r7*!rsE(Y*(Z0|!DY81YHAqhrJv=c4lg3w!XO)# zL+eGd{|8D!m948P@$K96>_diaYoD)xbK_E5aNeFz)n`GvSWl&pRH6@GkiXMmr!(g9oL z056^;h>q}9;2?Qoh)}}}l$T2n{^i-oX4mP(TLb@d^_|pE()ZTXv{$?t5*abGJ7B^| zH6R1wg;?!=b#BW-wMr;QUtHTnTn+}8^gr39=&30o9@HtN zG;SX8j}uQAbuA%`-tqUr2Pk!P^8QLlYUCAL{1vkA`No)%mZh3mQvwy2T}agjmw`uI z**`}XUY*QbI4ia)L=>bswydFr1I;DluuSwg8{#?uEn(h6V^u@^DZVoV>n?#kGsGh< z-F7GF>%4CqbtdDY{9KTUS&gM7$64H8py&Mk4aLUw#~vhFoUN~_WVLej8J*XGVtBT5 z?TR`|t7kLeE;GPTE&zhtl*;1Oie93u0 z0DT-^N;WP#1ck*~^|*2%v;nE`{jCDG+ZXKr$P~Wn0)MnsLGV&XF(>gC5`A4(r%P(aeV-Qh1d z>zV&JBhQU~T^bku$eSQksE@)IZ8)a$PKov5W`e>sJxD{;-SL8|t-tH~k;Am7YrGW};L^>A5tPPj#>CC&%9)I+5sP8uVjhf&= zLr$}GzI^3&@+kP3m=>Qw8WP^y1V~&@w(qtN4jTJ6-vJdemwbCKFQ5Z?w^VqP{ma)^ zQpkdT+E{}MSpoMAKQ8sPMRirq%1IAp69LtDk&<1F4X0Uop1XV|iR14TA`nCq4Hss~ z9m^t)Ks~(la>(}0xi1zC9=#F72q`99&8@J=tXMnUUHz7gUfS?lG8^4ar?wEfZ~##S z%c*@{i!AMF&wr)*c{M9{*#)Ots=L+*5(>FmwFlRCbJ?B6C#zxuq#pzuE1i# zJbD_m_9vQ+l*?A09WhFDhRfmhw)iCP7Gj>md^^8{sB*s&uotvkP}ShJRLb9c+RymH zhbYVIuthvIZvTm9a#?VH4-E|!jYsPZ5lC4EpVrFci|nBYVj`Y`Qg1%*a`eKRgV!(8 z_-W~Az+O>(@L$xr#AxU6r3#N;v5~z+IS|}n5=BJQ4n<80JXu06n7VeyIAJChR$drieHe}h2dygDNvuZ{#I!0>~6{1(~H`DXK#I@undty z1LKw-Ef^6{+a46BYde0&fukc&_d)i04xwLnd=b99J;1(*V-I@F{24q*@qOu`Bna{L zRbp#i2$*Ewk^qjYNwCt{^%3CjHFn+jbmALhQj`sp90DSC$GX47$A0(#HCf*k62bx~ zdh9cPz@|IAvbV*&U30IxF!MffFQ-_?Rcw9GqVlXb)T+1h8(s6H&L^oZdkXv+XU#zP z6A?}&1SuE`)Svd)XpW}a;Wz!-s{Hy9)5FIWBwdix8SnukGw7)Av!2+$)gX3KV**J#l1-F%i z8mPJjBWqSA!teC!cr#oN{>=*dl~!Lp3L!pZn~w#_H!@pZ3BThhhU9(_4Q`I077pX( z4`Z0jlAYx{YByqhSpDY) z_Oh}jaF^8dIy{Gc}Pg0aMA@B>r_)QFrT z%*kBZ$G5bokUxwC`g-b~HzTMBC!86BB)l;ifdTjp>jZ4jF1+Z>dBs*;eF@>i67n*~ zhEHXnok9oH^%Oo67 zdxVG{e_!hSEl4~2zJPa~g^K0KO-@10uPTy)S{m@$*boFJ)4!E+C==~{EiBDdjqT-C zy5%${^`6@-2RkR8F79ZeB;gYrJ=VEtL4-G)a6vDxv2;U1j>2CBH*hlti#*uD09QRx zg0+Hb?^kj8)jeRd9octoj}vEh1)*fXoQYW?;diyMX<<74aRZNRC4#-Q#bLMZYqiWE zI>ZaYzn0*Syv;?@1Zb5% zYUAw|oTfOMX&fOIPz00&aV+GRnC@8eJ%d)cbo>mS2?n!zU)$F?to^A)#ardZ88YS- zN$q((SESPlX)j5kI20J`9~`+efg1EprVzTjo;Y)carL>^2`GZT8# z#JCI+C@LzAf*4x+Jia0A{>&Tnor7K~hRi}Si(k7@l{7DY!~(;x5j`DiSx}Sc94N8! zPd=3;00awz(A6@1<4qk|bT9F^=y>Y!cE3%%va`7y$^`QqQQMc}Ome^SePbxsH?ufo zYFyR$t`z4~B^sv;M+Bcn*L@|V&}Oc2Gn#9W1#rkPUQ(G9q^g5w1>H(JkasSRDukPX zqO*0LzQA`tHy8R#tqU0CRbEeQBX_qi4Mj;jF!BB#mb};mIzdpOA0qZvX_SSRGf@G`Uwky(e_P0Dd;u!uj&hO-6p)=K* z0w|-}y(NM$$PzSM+}P)=qk(k0Y?bo^W@G{m`H!lAXkhGW5LNwsE`B^-ipg77VX6X{ zXRJVWSvJ5mPk(7xK+vQI4ne~a7r=q_x_cV%%nSk*bH{DBD1&K96AMYp@o3g#JFtKn zHkYdmIP(XKHhK7aI3kJp805SYWCETO`wMN;$Y@Z{3sx5w7gz0G*#rdwQO-L#z@S6N z-wt?gHe*<8Z{H;qE!Y}9kS@^Q`wLDrKJaA6PsLLc#9q$Vxs~giZp+Me9+}p%Z6D zEHV~Flv>)~jm?RK4*^`XPWRUiuOMKV)nKzRh7eVUerkO`$cYHU!JL&3>76#{oEHtwiGAEtVE|Nqxqv_}k;q7I%u2QjhF;U-qr(Bybc9@3 zWJ;Oj@3$I7uI&-i z4M*1ri92A86}fsJ^1O;|N=mU58Fr>K-h`X!`! zBK|o(NN4kSb(zL)q@J2hX#C+60fr<^Y?NO*deio9{6w0z zC*T?)9;Q6su~YZ0bh-20tR=?IrUI;~up;M&;r3}Z;$t&UubS=ycUe>_(Ws3zQoaO9 zdP7fI90>3bsDOUo>$X}%RImp*ifa|<6ZP*y+H{$#3G2(0T^=y7GYA-1{E#JvihN0o zqhHJC`*?EE;8X@<0@2iize(&T2(ZuBu?7*rZg7+fPU(8WMJj!la$^1DgZ5 zt4z{+GkZXdjz=8SgQz z^U1x^L6 z1IvB|`$J)2Q|o{Aedj>v16C;s$gAfX5Ifn3EqI+np7R7N z&fEfI5&tWwud13bTWcb>>d6TJM+eKQIxMr@_GfBLd*i4A=IGbm_iK6vM|>~Y?mQ&{ zVX(WqTkAQjrctSDf$$B$Bc>03W^znQwAfQ-VOr{s#*nS!cf@3Ir>xb>58u|J=M@V(9Qaqi{3e@v&ivi^@8C zu6|u>9PV*BYc>Sn$_C8@&(fs*;P$MbfVJ)Q0IOOKM2jP=mw;aPGW!+dI18ja~w%RgYxk>6c#z=>14WUFBQc>A_RiN@-03vEyTVW zDA4Kz1e(3tf%r19KoP?m_6N}_`XpGLZ!D-%2%FIDSgbry%ax56=E5-^)^~}sk&aUk zUiQPF65D}@7YnDA-=xbBh|UKEr>B#g&5rm^%{z|+AqjkZ=bgX5_4FGolb}E@n{0NYqS|Y-&ZhC$<75C`!eVSR;dmso_n|(A}*W){p zc@NZ2c&eV}bKW+vZC?43X!4kr6^@;^rIyqMSm8r}82mV2w1a2Ye)0t>Xz@2+x`@@h zv#Rs4wZd2VcW|LRzAQdmkms9X)K|c$(U<}DCLb3kV=fF*p#Y!34g+W4in! z;L=H*`u=vhlhbK)utou4fpf0Ou1SuR_Pa<28INOk7O_%8p1&tG9r)Px`=2k&9oKo# z%FQo}vIurnhzB}UVyv*WfM7R$W`QcDPU2ot6+l8$dMZLCnrp%E8&;`Y=iuu*O#wjs z`Tqo?VFn`K8&V50FVFa{w$oH;IRaagr*ZPOo^eDEa$CR zzPA>nistkZM-jLH0I`lyW&QRkFNbEi(HvZci8oY6U|J_(EByQhBUFD>q%IDqIBe?T!;b-Bk&5P7RgPALxi zH^}UVP*@fASb@t_XeIqil?xMP=HO6DU+x`z%m>zk=_>vHk{5>g8HG6|o_*!RX#Mk<7`&)nb%dgQ|#za{%x9y{DwR|qD_@RepL zkkTqQaZH!e$fPRgwyY?V0&#LhP1p#i)PE=sW`X;*-POqLkDyooOdy?44@YkbA;rAH zCXcY1cR;=7(3?Ib-}p%<7#N2CcKdrH^A8|8HUyM3`Fl~ zs%!w<#%5FJL&d^TsNgx(*-vz4@!BPz=sXo5F8$qQrnVsC>Lj(F4si=2adN}*NSs4w zmDJ`E<0&7ur7o#UL8Bmj0)(@z5xcQiaY-*eQqQ z_!}*>x@-d7=Mh)}z#Q_i6aw*!l!c+4rxaM0V7=*k~ zwMdZ@r#HAz`hME)A>}~kn9J{s%d|g{o>Tnz@7a>a);HI{_x(GgXSSg-bZk*+48Qam*!_w2jDkrA1&`G!w zjo|bIxZ*Mg?h+`-)t4XSabc*ej7va%1;az*C8IF`i#n{70`T<5rphrx*^9RJ0IfnX z7SOSUE$EClgz%28B9-Wynr|>=&A%y@H`ds(5o+T1G zQ!@k?vL1xIqxs1tDeb+{7t9w}fVp9r0oY#vC-$*hAIS0w1 zP?RJfNkqwDK#*9V5)~v#4oZ+5L=iy+B`8r+fgnoGpahX5L6EHEtVAg&s^{kP_k3?Z z-F=_#_q+Gc^~X6{;@+#)UVF_k#~foW%pTnD_}}R5qj8Dwh?AAYN)H2uvK!C_194xMNT2*(p}0FKBhWgqGm}Int-6HQ69Fd&C9ke!VndU9PKlge7A_Q4u?S(tUOOpW#NB- z-=D0YE?(K*)OP#$Mh1M{SY?((%uq@|?Hzy4O%%F1HwfVSyUP#pjU1UajIo zKN#~KGM`&NTw8aFOFv|_Jov@NY{*r5yS2!?rZe%3wbOQl2-D$w&|%v(LQtu~uV1IO z!(HNE3z_I${=Te|R&!NuU(>;Vd(gx=Dt%UvoR%~Gp8x4f`FbiSXaP`fe{W^@S*0tS z2sD?I;v$u{KQ`Y92)PR$9=b*>dk0^P#}>~uh7j*P5QdAh_Uxxl?DHxw96If!ECxg= zi!d^91aibH%LYFHrf|jkv}=-+W9Tcb-cqq_%=t(<9!D}7_P9z{V54@jIOQ?L5h5qo zDyQiHN(XL^dG;hB48ZW2&P}*D|AibXep4fX&t^*GbE;qEi1NkEs|S!>-7Ii#*0%5M zm3M0<4J5KgTm5`_P_ZkgU?}zYgwTWDXc-|D2Ax}at|ZPifjGa9pw_!k#|hV*$<&*s zY!&&VCaA{ob@pMGWqG`#qk2&fYZ;W<-_`~Ju)DXYF8h0P1diFr+rRoP2qrW65?_GK z)(${MXYUjY18>lQyXVUA8PC}SlaZ5;pJFIVX=ajT@2)g9=%y(NzgUI4CACDerJPFj zX$~wB006Sd$pXW!uBsT4lrwBF+`?>BnqrYNg@fZTlkJR>fW8%!0&cDmtMHY9#Ts0GiL+ zS(xK^5}FGhD7D{tWo}y!5q`K4#hm|A@kx!)OP_(pKoBSI{2Hnc@ZZdq2>4c4NA)&@dN_6%?m@spk5XftS$-0jh@1N;kdc@`gP9@Ig`hN!-8XB-}>-&b_h7ypy^Bs4f^?^V#5 z$-|urXV-AA(#|Z?C4@PMNLc9%$`E1LK>Mm_svrJC6ZgMsS#wRy*!Yu^a}t0cM?Z*I z9`IR1mtM zBII92)qHY+>`0!h@#xIuJN*ACi;mB8GWKcTMP38~A>{~*B)UHrqk;=teAkZHi!C4B zSZziDBYC_;v}A+EUs5C)j?a~x4z{tTFd|b6mujLHhmV2{n%Q$?7zL2a9I31ssDx4Q zTfH0X#QYQ}HPSEh5`=+G$lqp1{2}~+sM?WVY9LzfzRZC@lD^OWzBZ5lLwl|EpFfbN z5-)}fy`8+3a~2@rji3LdTt>^ggq}ZPZf@>2pPIoBUelb|{++`%lGRTQ z=DpiaO4!}$x~_fSUU!7{i^@&^qXxUs&9OB+cS|-tR$j<4s`2cJU%xt&r00G<UAXE+8#^I*&pU=#vEuiQc z29!v2()s)1M{0RJqFPqLJ)>R*)D4b6VUdJ$!i&$?Bykn1OUFMltiV34sNs#nJE^`rn(GVkTYIWzSAdt{*5hu_l^{_D;q;~TSI zbt+uOJHcP}K|u+=)#sFnnwmwbJs-Xvqp0Q$GV(n-W~yTXC%7nbv8|6c&zf_qhug$b zatX*o>UP&V2&2-}5KyJJ9USEL=F5*D+F>>c3#X#WUsTfez5M%q6s?FRfz&5un3tx_kyYiyJK);=# z3GZ8k3Jpr}BGmoBfckN$)ukJ_!EAbZYC#MK_7+bJOI*4zp(>QF+z6ZJm3Ge|)Oq}< zILI)^g7CPVJ?W&ibdhjyHKw=*ESn0)W`HK1g9ka+>DQ-8?K3YrLX1W=(IE_8wsn1^ z0X)wmNESnr%~rY3wdn61sEhR*b6oC?4@Qcpv8w$iY7J>V2jxsg5KYWqZrwgd@$ua& z41=8Wh>a2?V0Jp)vb@kr}WUDlnMC_G~R=M^=#;8^!{H4#6>G z(y>sDFgN)_vns+_Z8XJ_@DwfM_agJV%AlP;yA@c=$~1W}ca|9ymUB~xMo%-GTF`7; z6_Zal;dY|4gE5eb?YWL8T#`WV0;ly^S=loAXKAsH;h6T_g=d8;6A7OQ+~3xdg4QvL zr!g8sUjMg6A{n{hy<~NTBC4jK6i$9ex3n)D4_uFHxF&?|Wbmu@Q_0AxwdFcSBG6QK zRJ3VdAuQ+ag7epMpZtuKJrjTBf zg=*sZH+*RD?S77XY!rXVXAaSvkjT0!J8FfBF7NK3^m>AUa^vFnDPSyZFnguG#hd$z z?BFoxiN%B@r5&B6>})zQ?w|)+SGycebfJhU?hUQc{LK(kDYm} zf*J(BY$j@b=e}AVe(=RE=6X)NA{#k7`M|Sabi9KqpM;bUL)I%p!R9vR@%8lFC1tGs z0-DY2_+{m7y9Fp!CMkGhaATz0i1ayDe=yu4x|vLZl$wg2MdqI($)9QSd=wwm$n|gg zj8W0ZVWZkx%I$0w8n@%T3Z#Ab*ff=i>WoiM%Y!=W^A?SMTsjU9;Opv5*$gXH!Z3^& zNDZHRL?8?XLBu?d|9loF$`z&d!Ilo}OM*-1e#f{z_+&9O5D97N=rUl}Bg!g|VT-eNpyw8x++Mz}ieWu5V5Dy-Dx;|$BOral8HpS!hqIn5 zT{ojuNWU>9jMv<+Fl0I~y1{=K`8Y7y*R;b{|2yK??w-E@iSR|;aI;rF+M29X^vVZrx4&EopdI+92i3@!dmB$z^5pBs z6~bXfcgMc~csxJ6(3gGHCRSMRha9GT%U$)2?5Dy9j9!WB@f7V z?Y6MUz*#1M$#EXdw|s@cU^IpT@2BjW?fSajANsh*?xkp7Mu2zzQhrr%6iu;Fa^iLd z9CkSZME%mzF?M_ng2((+rI@kkPuHGRGx-gv1?I6jCAqu8*rlyr*}{U zr0OtRZ4yY;nSkQqKe#S94&+dGo^qdiUitc*XY0g7zTv6AANy<{$y?tI|_%WCKOXVT3}gep4ajMC&y$6z8blNb%Ztb1q^c zm-j5B&~JCwN6Nm|LVko48s`4~nYLZ*%NE|9=NS`ytv4ImVSZrd9TpmHqqLo`n?y)V zHr)6#!NlSWI2))R@alUvAzRYMu$1@4%oT(o8eIw(Hq03wGPt&gWU;{=IqnIq=egvZ z-cQ##3161?T8QH~>+*UL-u3WH*STSQ@}PJqSOgzg-660$i9oeh4$1+|=iPz7K+4pk zwC~h0|4okinArRLczgadN*#{g(qOPZ`@hyItldfuL}-l>V^$K*&S+{znO+liM%Dr4472*irV*mk{cFd63(i7t}bP(AcDZ6WG6kvDNIv=qOfzx5MW6i+$ z9!d=!4)Yy>YF-UupM>}m(>aVMQg(wNiQfDbEs+c}JDg91q38`(M)UJ0dt^+hPG0ak z6gRJaJ7&=@ymhlSf%J>T3lT1v_xH!FLvyanz70%I_<@=+^EcQCNASbxgq4TWmOej8 zNA;$G*Es_vpSdrm(qwv+@wHV;n1YpgRimnOXPH$iM6mJuU0gc*7ANA6+gHyMIR46l zj_R7xvvfYG?Fi&%!3H@P!kAIB;Pe+|$nj%!MfsE%Jqq=@X|R$J?fb+u$aD`}*X}=l zQadqj=Y*FT+AAtudb#Laq~FP?dK6N*!|tx9Rd#(l`ywr=66RZSvl;sUq~pPT#ai;qM0Dxb_rlSUi`pR|65P&R0E(Ukg}1!DH5=0+~hA7khcr_tZB^Y+HBgtTiz zg*U8o`F$MTH#qd4^xv`Eyj43Z{w42As~w!AZQOI5^I#Hi$vxjMxoLqTX7|UvcVzFL zmwgbA@cog;LGF1LY1TqS{#UDiE1C83!Y~g{ZjRkTW?NO;lB}a38TwKlTll`;Vjxb% zw*q1QgAKCI#ESIdWZHYY3z=n{Rr@(1WU%`5o$ZDN@Vlrs&MEMb!fg!dVqyR-81n{K zmt@mj#k&&pEeTh@>bwE)48}Yst0S!s%G7+^u{oOii*5+ z(q`;zv2kRtr(*-u4IYi6&t&M?z;3^jGJbwlrERX`j#rvRia5sRx9%c^UzdwQSgM5i z0)jYTEe{epK3K>mtjBb}c=wzw@|wV1g{mAad$HNPd0voaAW8r==iHM~oHonaH4643 zV!iy6rrpJhRM^N~BO=;f+2QXh79qi*MCNAM&2YlIgFl14@&tqWtri60o&RehpP@u` zE1&Xh8Z|9+wdwnHk0<(mcg$UGj+1CZs|;7SZ+E|K19u;;bPX9$lyuCjnRi7NbI}*$ zsjuO!F`T=;>Ld}zs{e9f+srj1DT4m61>I^;>O#CS65!bSYCsjo2+rG8tpVu`=f~Jj7@vo=LekY)(5ldiOv0b4 z_M|Oi=#T+3upQQuX8zGFuVXl1Iq|pZ&WWp6V3?VXaGtKC?N3_9vFE(Wwo^POU_

z}oWj(U z*U!eN(a1_{^#tiNW!paC99#Bfv9C;})+&N-0k$T7Zo)60pFy9nPwj?&O1A@X%a)_l z-#e(6>e3%m@Kh8ex)DBns;LTIk2>4cp3^alxzIKuT8$WeKJRSk(<_GZTiyt+3igO! z?x3;w(rTKW1LJ&Gwn$daxq=<~>m`$DtoIwNecw`N@5c}gepDge%{R;?GiF&(o@gKn zv&6JUJtdnyJfYRpG##t#Lca2}nT+;3!ZOF2{0zstVWFr+_sck&%1njzt_fTy+iziW88`s`zH2N ze)5&9!du?`%irr4W03Ks$5*M=1x1kQ+#ebieKFx_q42EW&zpuvnMBbBW`Bwb)kwAp z+E0A>)@Xub*wXofguhYXd>(%uh_FW;;Xlx{limET6$X+YrY0vrgAx}ln zO}r}~^en(MlCt|fN&Q+UeyMm5YQv?kyoiI)=klb~l{H>j_~qlsh61lF zq==}b2-1!64a{zZToa4FCLi4zolI54T%eFtz+AG}>Y_-}=zN z@E9u8SVE6Az*4^4*vzWu?(dlaV*c*DjfB zsGQe9hormu>1_5oGEBF{R(v(|TU^c=MYCoIANLy<+dHDajU2f1UNkR}=Q4lbv|gGi z5Fs1zyml*CJX3fABd{wmn)hDCTIkJzj^?!LY8H#XK>P$Fd2djB$DXu~hfKO9Ko;ks zymR85MhN9+yE;-Pmv~t-Yz1kia4{-*GE;q6@@WI~yT{43SR>7VstWR!RNAEfV zxg6kw52{q)_Go~Iw#9JS71eHNoyS`i(AiT3CzD~qEoVh0I!IOx zXHO%Dgz`oG7m(DDjZ!x`=LR<=6fF3}i!ZuU(X-qX`qFpSTtQc9?`>Uph68CeNuA5k zSAH>B?*Wfz$@S^QAvvN8vU`i(!U6pv?AV)#28QEEPe$5(B=-M~LBY^%W*_$JQJ z`^>yL=6d<{7+Mxyd(O~9;_Wowucs@92dQO*j2qJf94R#dKIL(=b|i?du4baSOPRvv zx_qiw*=6pZj7pWzUTh#+fEux*dkWdg&D3wYlfw$eY}YG`W18c%^QzS>`Ov&V@mJVX z>?e8!Uzy!jC&MWtGp-`s|LFFc6UGtMtwzbs>C8O}RhW|O*5oRgmnQT|c=iwR@eiWX zn;JMR?61`y8p^hR_kMRfy~nOI@tY%m;mL3j#c%1Rn|igA1lY(bP#AZC5TO&YG$-K( zmwp+NH;X30>8?Vuibhwi_MVM>ekvjNZ!W$Pugy|lQNk(J?E!A*ROM(LFHjy>(eqjqriN>8`$ZmG$q3NGb{=HT}{}ws&KX(-R|L`*W*3dLf z77^C{05YY79s$z?dMbAq1?=^Z;ML>uk z4#}f?fMs_sclz;sr{q&4tu&HgI*gXTtFu==e{V$+WR4w6*Czt^oj-yM;`2PziKXF` za)czwsj52n=QZrtXQ9CI0reU5A*+`ZVN8l2{U-PUVb1~C;OIUIZ`n-}KIqaR2c>Ws zFx#9#L<>m!2G9{Ax=bnD{%*x+?e=%moxeQ03R^d~z3-)cMe?s7e-N&l;8(VoS~!r| zqanW$3mwwQ&hhSDq#wtMU{v`HXmn8*2&#aQ-zwGj*Im@3NU4t{LhZ#)HoajglzK(e zh@-@DP(<3Mok7}VOx}MqgqVC~YE-xF0O1IL|FGe)`U^aM65?W|+h8peI}UB;gYkj4xQW7g|yo3eNg}?BwL|XNe}cC zY>K1>G26Ahv5~X|cZ3z{IdiKy{4t<^91Ta6xYuClSt#;|npQ8_ z;cL7WZ|9O!PXBQ!7G|LmFuR@+5@^)Vx#c$m1coS;Mq5UJ=zv>4D|ZAP=9-=ll9&09 zBBC{Q66fN!e5}fZ?>x`Gte#-#?w_NvY@m%%p%})oAAx8-AAe?f&cd1w!f!Y3n`AR+ zggMeCveJbA6ruJqwp0zx!VpK0773^fQcWlkf3)p-{1)5z70tG={J~>Z%b#YAJ(m02 z?OdmJc>2tiFJ7F|9pR;|?$OcjWg#a;71@R6oD(Y4k2qRX=^jY5klsU#|3Dg+r4`Uj zzG>N&)A8y$=AD+(I%OWyw0%WSHaHn&;kTH5@Aqj$18PXyY($=?pc+F7%%F?1NnCm~ z*{rl}=X<-IK|Osm6>N3dMq(N~{87yzLl*vBov+XJBL)u(laE)>G(tkXL)Q#X%aB?_ z2OGJ|?2=Y00%mSo+lHi}L?i(*Ti*KgRA?ceTxq?dlMo1I-_59#(ALXdzIRKlTt@Qy z0BHoJWA8$pc~}5i&YpkO@AQeReA?TLnwHQvAA=Mq8X zcsoy+!o^QLv7Y$Qd8-P;HE>FU_ zVfS{q0hieP+5t`XsUp}6M(Mtf-w2}pHOOKR=DDp?iO^rGss+3xv?I9Ds%5H^GQC4v z5lB+`Xf!Qg2RfuU66HIRoE=vMYS>m;WK3^6T#Z74fFUl8%pqbBO*H@EdjUkHj_;y_p>%m_(ljC*$_5 zs8DeDvxO$}D{Xd4@5r&S3$eSg9Lt*zQzO)w?Uh^dO?RNFE}G>>JM%*}^U!6zKQ|T{ z+i9&_LLrzJsuT&{Q4E7#WZyV^D>l?I&N5TRvTBK1B<_O*R1BFnzkmC-MCs=ut4m|} zXi9{dg+H$;vqDW36>1SC!pibo=yI34ZO=E_9QS<@bEJmB|fh1`dVz)bxL+ev5+hUK&Oy-G@tY1Cu*m2+B1KCeg# zfBJ2Dv-#0A<4;`-;P@?0ER4C$E^VtlRh}=x$f9DeSCmQ$%m1DEX;ni)nFQ4e;lwBr zl{kcWE!61UM6~1LvH7fQEEM)4VWFfv(V?_;#_tBw8JZ{eRluqBP=pWp{?PhCOpS!L zqwGZHO9QW~LYR@pn&+Wpvj`R#Ei$W;(icn@WH*l`MiYo#f8S^^#1!M0voQNIB;M?$ z>_CZqM{rhC)ysQEmPGDh`)c~>>CqPbaVT{sWpXs?GL#fo|5T+?JSCzuXYpGYh6=(M z=9>U=+w@x48>VuE+o3LGXW_pp%f)meg>I^u#Jm<**p5&D%qgG+N`^y2lYs8eHj6&?buPYZaqY?WTvmsArJP=7aqCy%Bq{I;P%2Y#NMhrZE8i-No9f&~s zuwcm0!uI)XW}!!Eg~~w!Y)c`9b92j`^Ni24*;I=G4cIEs+&kz zSd^`FMev`Vfbk8_=^4F_Sq>6e9Ol#964s`uNizzwJ)12+x3ygby%|=v&B(AwcxGc0 zTgbFh|YB6Dg(?=YE#Pfh8Ygwp6jA^q_Rj#RkaH1) zBhtCk2t%c3LBXi^rye_4eA16QimVSJVmXee_Gc&*Q^#3-YI4XboA&=j?83C`I{dyV zkS1AbYPFbORq@zoG=+BRg{nau6$>4=eB6hdYO!g`LG`rUEYBA_(GotN=wQtnVgdO% z@-1ccLeJ~QVg&jJZ)iplkn~R7{26LFyh!6>Rm9NbZpcxq8fMdX{oA(KBd9KZn#5z%+sLt1>`NvL@(ppd<3R423lWHXV^fHnlDt3i;oq^=d4|??g3N!j} zFGYHm6ZTqRA}0?rBJ!4+&`Op0T;h!sRGi%7xs6#cwS{v>SKwD8X}lCb{ZicAv1jLQ z`bzgBSh5a)mZZV?kkW!OpoEo@io`5C%s9TcMJHNsYHDZE zWz%Kd#S_QKqHypd4R_<>(HB(lg)Ha-xaX&u!ge}qLkZsOv5`_as#QY6!~LpIvh~KB zMyT{SRl7gi`XM2vEh?g?7UW!m!X?KDEcQJH$;FL&=MNu~42`NL5K)oKB>Xg;#J+qZ z^(Wf$K;WBLAM~tkDAH<*5Ioc(uQ-xnfGVzKGu6SQETrOWNKgXVkhY#7(^%t(scq#bqcQkX+|93wqw$!1`OwII<1@4F2^SO6P!U0ccUnLHenR|C1PLJwKk;_! zYhi+-%NLr`{4!MXGJ}a!RcErpiBt(osP#j5DRcajE>?J>)W(M?R!b__KE((UHAhhj z_P&Xt#7p|ouA0YukNWZKX~d7Ui%zyV9A$)MXdw+>=28_6m5GeJU+?l>t*$Qyti4u9 zNZOqV=<3|x)36!q1eBQC=^s6{mpZxWe|_U{M)&Zo_3A=Qt ze~AYj@QXQZc)H5MWO?*h<|#F@wZ*pIu<5!_RdpIaHTP58k~SxRw@|k}cZo*N2u5wF6)7@8M)CWOu)K z-Wf%kn9B~#0}MYl0oCanP?9XHKW$lGd&qIe)c5s#^5|Dw(!q*%!(Qc(QrHfc%`nbx zzgqtT$m^=B{lK*0f8dfeG|zPpKfCEU0u$Hx_8%SRo1FehHExxZdSUQ;E7hd0LvvXJ5m==@l%u+e^ed34!gw^~!_>z@q} zxuc;4fcZ*4T-}O9TRSQa69xgJ!Eff-rKR^%zy|sA@Y?KCOVsL-Q#TxL7Z<#^rjQ>P zhzK78I^Z8k8lM!!m*T)J1r!E>?q*i6OTOKc^htXlWFKl)$ z!CPLmi|G9epreM1RorjbTr&N(zFk@#5`55JavNgowm-L9BcXrY$+mhpp*NS8FYxcr z!Sj=Q-HwA8wBaa|?by9h=RuHsn5J2K;+5et4g@^Aq}Yi#o1Lz7v%C zE)BSyYLVl>V(7hbYo_#HtpEdyV}Fj$_I=|W#nsaOrC>n|F#llXDXo4X1vT8}X;xLd>Y!b7vcT9r<539hS85np(>C1j~p0q^VqoiN?wz zUX$g=q2f}#5@A@HU$IKq1qHKqtMeNc*~$DUO-hDLvohU8J*+g#j|vW=nZWKvn48xl zJD{9h@g949RjD8Biv<4{-neMt!nyjJ1Mx_bsMG;XC z3(Cudj<8BpMu&Cn+WD2jwrTP_zfQ@U^naxKv_G+1@0SJ>;uEKOuV~9oB`uJIqY}In zhadg$wRR%Re%m}zNxTi*XA@W{HEcyQE;YXlXQ5OZ3AuD4xP33V2)?_Dgf*Xljg?s- zr=Q~kk(wXb zR`0cD5qRwU4)N{%{qK9YyEdvsqHlQJL{Pb>YkXzO`=* zlxUB7-*sD81fEBg&@&p`h^smf?vJGj&n=K_=Rc>&)W>C2F6Ar`K;Orfp(v?q8PX?# z+Nbp&+p=z7Haz!DGsk{wV*S^+NE%$u?*+p-DE< zwRZsRPFQ!%0{Bi^u^Sf+7h5*e2gVlm^*UWnw4k9R+&Fk|vh!7oA?f)yB^TrC?T_i5 zf4rP~uDNDsI-#6E@ytr#tDCY zK0Hml^zb#kxZnH8zBGa~*RdOZn7YOmoP-R3_4i1U2_j&5(?NxDXRnG~_H zTt91E3p{^rx!t3-v5{`2{T08eugJksBHCXzUUup6GqKG0{{^n=y0ZBG-1d)(AD*a5 zQ>8XAzkgI<5&min5#jxoSPdA>@6T&(^LMG@Bm+mfm2c1;@iZf`^FaKZ0KNHvam(=gG zW6gdT^S%ZATUh4wB zTyEvBN-$i4kJ4up8Al8P;-2GfnP|cX1b!)%TH(Lmf1)dJg+DcpB@Q!$>^)08=J4UV z@m>4f+r7+4sPUj=WY^+!dF?xw6u^bR1IenBAB20#M=+R)Zd{8N2VT@dfC!bMM0|1^u;l>O4!SL@Y7 z^>r4effBfGP?54L0!5w&eU;_BP3sTRiX~pPb?tYx>F=B#**{ycT|K#86}Z1O>Kb=z zH*Ix!PJOSgv|+tPZUfZ}{A4a!8I1ou%Zz|?>!-ach^;M3Z-ld09ZKV=5Kw*n@kM8| z3mZq^MeI(Nj2!PGLld_@{LRa1eNL`euOlGy1UV#!fZ%_PZvJbN@_&n^;BM4wU~0Xx z4VJEaKPVTn?Hj>nhC*gHSU*m6^=$p0nA9F~_ZHSc2o1{9){}0ZXa~24EE|S)vYskn zu%AyU>GJ?cQ0%!Qx1Q3p2OhBPB}l&)OY!ICUmKc3gdc>rSo-(t+|82MfWi^5P&5W~ z%;kkTN6gs%~=TcrB@dbD)ca{p$) z>vHZ*!!+yw?0$~8ir@(fL!}e|>RkQ)+v#E>0aMdhzT@rTwuyGo{X$W>H{noiyepcfA6Fv(W z59hXqoe|8J3U8((xHSz8j~z2m3kerQJd|W)6qM%?48N2M3~K2bQ$LDyp?3E2;dc+{**7vg*P zy{NblH==NwaQbsIaheKW@wU~eM3fhpo_5ZZ>D2iN#1o(<^%qY)vlcY_Qjd5{m-qKl zi|TepLYlw`EXk>D7wlkzQO)6w&nL)z?V+XEc&#CPhbiLDg8qapDNO;~u{l#R zY(7!DuS7TrnZw$!%jKk{C*kDJTA!x@KU5G#r;vwTGHDP|fwjk&%S1>fWJo0S2GvD> zJZzfgUjN^9SbJ%le{GfUpgLI&{uy=rY2waswy)I??v!TetGh*2IdrCT)`ReZTOCp` zrlUm9Y;8c0@QFPn1Ix6nqI1T%?4LjE(%ymJx@qZ&bocOGDwP}EC8vLWhH|ykA5n&Q zwD<^9=FIn4L0&=vt5P^yBRDW@xN}-}GE6EP)#Ex+nja`msLqDtMcgxUOX3KAO9%oj$1zyKt~k< zYv+kFil|f1;eDbK1%lQU7rF;`S_;M5nI7L@yoD?{=(|_f=IMY<%x10Gu}oZDf~jtt zVH9YjNg#_}jQPFQuR9dBMnX;fPA2FH&CJyn_05hT`0@1P3Cz#{(d_poY)7rI?rk$< zuGa#PU-rdQ|A4^A-M%lEOUpt@rFA_{1*O9$0S6l>xV29kaa>1YH+$(x` zxdg;;vl0;2k_N2zd0Oc)#8HJq=b36cx)05tp;biF68IrJ6vt6Gx-Fn*g1?>BvYvic zq;b9efp6K-nHaP$gXhrux8m>ceC$)JAy<8-dMIgfVCN_9d?#7G`*f4);$U1FqCLbQ zfF<=%55qKqX8Gt`IDEAsTYUcu3)nobFGRgM5UQS-E!i@&)yFSD|m@cIG{*c3on4nSU?^*oZstovr*rh6%Q=_)Q| z)Ng!!*Q_A`yLz@=`z!vE!-&dW9Ss*h2;|G^xrfy(Ua%5xCCLd(SA(&PDAhLob=7RN^KLH z#{?)4OTU#&=OBAPlfS^s=T}<9h#uj(5Xaq~T~Zt=HDfZ5?8kxQ@R{WOj_dv>MQ?hQ z2^C1!VwVb{{~%0>WXZAHg?0QWHUF+}aM+6pY(l0{6+p=bKYDfMUh7DgNcdjf#l#^& z-V_{t2l)+Ti9q;tgwp3AtTqfhS7S(ggX$2fdchXL`XF>tFp7OAog;3&yyF#FMZ-KN zt6?v~cN+>$Nh3Q@3o}BBR^}eh==olZdAax6rF`*RUF~YCvoI_#3%cj4wCk@pd3V2Z zufwGN1FU9(M)n%mS=shkBFllSsS{}(H7VYw)z~+mO+e)tTa~VtMdD&<+ z8L<0~PJSxb5wcil8+Q{OTQ&djR5Mt^Rvp9pPD}C0@wvc;z5S49h;Tu2PDF#9g~6*z zSv#?J_OOy%W%@6|LnOu!(_e6l4Y4ntvg*a<1pZWQXtb&poiYCu@#Df-;SCOxBC{Kl zBMohHN}di)B8-{g3&b{9q&&@Twb(Hwp;=->R~(JnPm^C@*6Ky zv5zFVgV}RZ3r`}Ukj^()u*)Hycc}O5h^>^ml)q-8(x}#PU!|J)My3mNgex79I(a}g+rf`Z+qLZGj-#5pp zGp_fhQgrd7I>=+(xq`)Qq9mbs_c33?{vi>r`KXNWBv;B+DLJes@Rpjd*^Vn`In%9^ z{T$&Gb>45(q+T6+pr9UKPjSa|^G_vv3q!`Zf9B9(m|FP8M~;>FNuBeT?OjB*kmCE3 zasw2vC;E}(3lS1j^Ga8_qxE%aP63uK$&9_kJz2|JU6o|2u$Ya!DQRq(1-7t1mg^aA zt%(g(NoYmsY44&E+JK#ETp;0&<`mGjGpawaQ*_&2_X=!lt(R&>tg4kLL>Pr$>NX%= zqTqj+rOQWv?Ef7=`afbXQMP>&G7x#}-cD1qlvb>`W%&v>TD<7}WGAq0t!Kt=UmjlU zwz_U+c%nLWt<+$h8nyP{KNBt55Uc+_4;89>8HSlS;Wa%ULB(-QP=f)QJV7SlU>x6> zOG?X#P52p`<^H<6cfvJsk)|%^^p+pI#82uE8vK)rB>C`st|FhC9m&Wyc}|L5kLq>h zzpy}mHy*!m@r=g8ZgLSytppSub*X$TLZ!QqbzU^x#7`e5?)DJvIa`s?R`OtPBR`U&Baf)H4FqYqMZa@Dq?>E@7Ae@fq%8JW?4kuaEj+c4 zt#&-CDt}<{bfkA(3oB0!TOENURkHPR5nG0x^@MtOW&r7VIIRfgu}-ShCAMyUq&AWQ z*Rgi>3bNrzo|XEZTJ&(DaMHT_sfl4A1? zIGEv|S*_`4NA+4LA;SGc(@n*l)Cz_SOKGsI!v~$QfzxYMoY4}0y^wm8)uHz1e|}R- z2~mjP|AOZHuO$Kqen;--{s+uC#uBx^n+HJcZc$Ky5Fvwv_Q*-@yZT z*5egO!FbZ>@VzVWTuZ&`^zW{nUoG|ZPkVFzzA-{1;sW9Ph_s4bcqZ4yKm>$Aue_Y=GA)3+ z8d~f@_(Fu7#2982ZCq^tps?Ju)o}0%|3Lw_)t?*C1w}p6fc??QqV@UMS)_4N0hA4k zH~mkJV^bRTQm~5Bl6VvRk|pgnHqb!U4O+&V0F7aXlP7HS>QEx*d*HSWQE7!$0482L z^GO8s2KloDxj_MC~tOLNHqxT7xaO_u-kF$UVv#FL~v>B3tJ>b*lrnn(jwJ$ z>$Q$elpExICayl8xN>-NW$J@!Wf)LZDQd+x@f|dk-cso>{(y(d;&PKWQAqsz z+PyB|6diE$*n8>!6`N1q&=qmewD-I*wbKzrZPF&+J zKKviP0z|5YWyAln97vM|v`vqL6z|41(6*yqP?)j0(w^v0L=-MCNW<~Uwl*QUdfHJy zJ^a8Rc~i#&|N9etF?82WR^=qTM@ej;8n?CR?CNi-I9v}kQw-v2OJ(|&edglM)nD;? z{9(H?=eSRV?ZkJyy>*ERa}Yv%yq^|ncc-u-P*IKm zE%JM|*YStz%Q$J$<9+k|gqL$9WqK5|<@d4^QW?ocA{yNBn9&crQv&kI3JS1*+2Dfd!4ieYc|rKMX@D*bayCxaZCBI&$qf@);b z`L{1esJ&u9nappJzqFw7HOEksW$P@C#~FzllG}dBu~!R!9yhz0O>$};-+jOS%vi)VREtTv<&UUcG8HtzXo;e|Vl~n!dE@V3f(l{m8|iLirmZO!(Q7ap^Uh?*%Wpq-G32AX^-=QV_# zaJtfhaQ~@YOw4LFH#K+mB=EBh1EWmbGapYB3gM$XI$!(Or;#AhU|MK8(@e7aZ;o)R zbYSwAh>6RBYQ@$sqx;QsI%1y-G7H295?^@$+^#S&Ziek9mI|DRflIN1vxgirxoRlF zPwCbyS6(ww#WSFAWPY+<+UKtBd@*|T)?|}WV1`e#`}`pB>>saG;Og`DvrW{Vi9{a! zWLphlM{X@(IMR=QcRK9gN0GtM-4V4`+p5O%ol8MkR=?E4X}tRJ{Gv2A-jVT34bwd9 zdH$qZFGAcyL(RNhUuL}xvn|iQYL~-nqon<6K**3&>eR{N#j-K$!|NXltxuFL82prc zLbJxKcY@#%3G4i8&u(7N`&eA(>3)I3IoCtm;^`bJlp?bLei#Y^>s^b!5c}OJK5EI9cG2{`OPji|1lZ>XA4#T__miO%`b&)d@o2k2< zizR#kTi>voc8-^ulS#ym9))$XnEzya{;GNFgZ?iqD`w#?krb4tJ(l}iUE{TFqI$0; zQ=e3^7sm}>#T=8GMTMv`<=*>oMJ-(0x?O3HcwvJ)p;4f%V~J*UmY4aaO|qsz9tmw% z@9i9qLK2=E9%t%knQqQ(<`N0;s4&O9#iA+_ib}z>nye#S5{qE8T zphQyKPp7B*uTxGP!-!vu=GClycd2KnW~h06!#)lys<-2RGZ%8>xuoE3&~NgfUWbTq zuZ~WF3w2b<8&|uHqO`9rpwYd$#uDub*g20_N;WC_lXXlV9;@YC=)8Ei03BDpE2sz+ z=psC@x6gA=F-1mXpR2}Ze63Ag+4OIKk{?UlT=~|M%Zobo^Wpq3KU-%<>#4GC!{#c0 zCZQzmR>mLrO_`D5I9PTaot}wq-C&mKBcDPVe3A1i-%>AXyno~6@vy%}gf@)<&^>R+ zP?YK73BAjj>SWk3tc=&Q%^sGp_)j)fEwv^hBFU&r#(M1{)Qfv@N;LV8p&Gub6~6L< zA-ir#%?~v*oUg`S(Z>ZZa*=I~l)7P6@AD5k38&acA@6DUvVBIddI|hHJXe zB?g~Me$tcjJIYw-w)?0UVSsV@0VcYXJiQ&}qd$+66>pvKbvam|9?c51%5o%$X> zsa4+&I=IMi5kFGVn@E-TQp zc{jmwWRvuG?|e~BY{w%WxEmavWE)rXQgtU3xGC%Z?!@1X(R-X3u-|j!(bW4)CyoDB zUnY1M(XaKq#R`jaAa>^dEghjp4XfGy8-M_{YS~KM(?8$8gy!bLx3xCLWBDHffAOTP zlO&i0T@ea8v*Kd#h*~h{7Bd$hwJ>|O!UQ+l^ifStbo8d054G;Ac(ZwcT#h)P@*YCyFVpnZQOni1 zVvAkS9I%ubcO0H5 z#ONvI!8tWpv8gSbZKt96z~^u2^M>_;hA#P+Av~;a`PmNKpdz>-O(nbUKGmZ< zDi|r}C;@Ej24|+LLX)tyL8WSI{5pNY;eE`DLCMY1>{nn`XuYEOMUUvCgG zsx4ur==>)(R1Ky>VC9R>AlV;Pl@0k0>8kv`CB7-GS85BhPz+<-feI+TnOGs#HmZd0 zLA@@P6KXFna2*NA2NrFEh7tZ^(7XSEBFVx}_DHZ^LpL&4Bie$cJ?D`$z~kzi?fT2t z_sTw%kXQoQ%oqT_OLQMe*le6ZYM-mgXX)_j76pWlNapwb2bWMSJ-%Zus>U^ZA$^kQ zaIYv}4YV`CioVW@a|n?8u*_AC^&45y`gvvay%}5ALin_t1PjU4(FX zcCEk6m-5ouxEx>1fR%>fXKnnS8cq1WmZhlDp%qGZC*eQ>+Tc5o6e&b8^40Q=;_8IN zn{#xfZU0JG@!6{%3M{+g)%jip;&qz_KMIdV^9Aj_IX4AGkT!UY$aTWwLtKR5-7^>B zf1=oKE-}`CP!~fHrM7VK!(qjf;s~yxqq{$cgriC3`pjkAXGq>ohpvsZysvjjI6=fk znTGTLf3}VZ$S?>jk&Q@T$;YETGhVJf5;Vz|t5#bEk+O%sd^zQMPBMy<+@q;7J+oxM zT)wCrg>|2fALY0C`RLsq32ooIeUhNY{vNPIY&+KrX4mgs_p&*cz3Rd|Cbv~rQYz9? zt?q*QuEvEt_vMwWPs9BICcx9U`x>8+SkZ4RjRa zEDuncrU%P>NZ+{N1)-d?ex@Xj3DCj> zKZI0u&yrEK1fko$7yyMABW=|b=stjD;g6i9v z0c#|EJh1u{h}&+%zT{)%{HVVyKX^#QkwtRy-?ae9-Vs?cNm29uyPoxQcoz3lM zaRhYhV*ngpxwRayDW=c%9nmOYn+S1osWi|yaY3S|$DkPI4cW^=jPRzFP5kM1@*vmp zZJUNxmL~k%#NU%GVK;~r&6TpEn7eYh(7!c0KI853n)XfpwCBbxMIzZU83o zgH9&=ax0ByAawZXGHD?P#7`Yvl8BDVRn)(2>Lyx^XIKlFO|tHbTyNPYZ13M(+qV zu?{dmx~(RK1lyr7K@saDYyFsjY(%5#k|DzN=xXvbx9dFjW2;Cx436rB3zb<7GewNla3?o}w8%1+yo%iuvWSH7~EjozT6dzI`u3yAZw+H8j!aFvR2*l=a}oW)VanFcf6P` z2if}&$4?!rP?hOA(z|2jL0+FcGXAEvGy0^S@KMR+>A>z;A!;R+jTGL>w~U&;qr1E# z2d3bE&#e)#PA6OmE{-SgH5=|jIIUf%!n?_e4mNPepZ{U_)Vv8G?49YvXM0M2d!q8= zb3~2pK)QtgfVe|Y^I3q&u}e$AxWE+ps6jR{XE`Vc3DIo(#*^M-`i7)OXS62yd*%k_ zsm>U19m;+Gvw~N_7yk#rD^mKuAitn-u(X#$4cHd)+`s!@{^q|(Uwb;j389!W2#M1J zh1FK$(7%~fG^fS|WqJvQZz+Vp`Ud9I*yRM){M&kfW&4@G699P8CCr%9t|Q;C5J)<9 zzjj6k>MDmD*94}C4S@NkjzUn7dBEeWT-NXHKrs14`gA^2vE>+GjAcNu$?uwj$5=b- zZG>6{Oq`MPOkL$upnsO07;4s(+Jk=ua{8uYX@Dp~>rwvGO3NQ#R+C-l{|OmuYMVYk z{pvWz)YWGf^tXPs_#Y@dABLP7m`&P`E6Hpa&5z2gFzVQuQNXG_*t9=Da z)juG+X&YEGY%Z&}Jb;A5pfJn(Y11#WX<&wc6e0yzX+udli%;`+-<1d0RBD2kQNVjW zKZW<0yY*#S6a_1`-17u%?*fXYV*i$sLz}zp4>_~Gn6HW()o(D5>OVN#&p!E9NJgh7 z9$!S7fb|DdB%ecH;!!N0UGyI#Ji28jTkuE|DlC9n1QObqeFnwz_WNFvP0r z=#KzHBGaj36cW=ckGM+jr+Hg`el*oGp@^^ft3HuWmto^YUmR&rh16{LqfBK`fwBKZa4+INr| zw=>Z2lI0!wlXaHbD(gjX`;Q$V4*0-kIZBm3o}Jc11lfFKl$G1s zIC;d9$V5d%nmz}L%-_0nRgQ|qbR%})5WziP1I|r4Rm!d~?Xnk&(zEZw@FtVpuPzYz zas_N)%Q`I>pTp-MMf)U|wNIuKDw++sm!zl!m!x#BQ4-P50Sxwpl(FjkdqA&``^8?D zAv8RHopDZptG~fn0F{t5RH}oX8+~TKLr)5zjd@N(&J`XV zKUl_5WelvguCggQd+`p}C5|DX?mGm=<@yK zgur)&Moz_Sz9t$fio6XLY=tMW0`A$6=xG*DK!ag)g1=AA)+QXLD=9d@QX<>&o}J16 zVZLH))=Bmw@SJm2Z|}V5`ho^ylD`?u!}jIF6_2|Rgz+4&n+hHQ@mCeX(l-uaqN*>S zzJR}zmv}s_X3*H1!7ol5H}@1 z4?v;k3^ADltx{uzJAUJh$CAo8FIOrL#B2BKE`=^R1TQ~0^?eSbtmZo8DX zhdM#cXE)3jppFAxBM&*phWLzXoGLXTB%`wzyjE#du3*I&GwdG%xY7my97-YHWCKhx zrNHp1{g3?yzK$o-fcrfPg2*C>0wX1%0^3zHJy5FKUp4?qq(P}kV@*&TE}6J_`S{WV z0Q`1-Ew+=(e)C&>fO-NII*vwd(bLZxKTCqZo=p#@zd6p}?58)YX91(DyTc3y*Mnj) zz&lG1Jz(wKt_AJdZ8{=I8H%YNiCdIkg389g8AuDS278;KisN=g2k5-_JlfVj4O!>uU-VK9H+e|ZnnENJqwv@OT_!n@_ zeihlS7V$vFrw0*dB?p5K$|06}6Z;aX_AUXKQYQL*=5dRm^%VSN2;TJ_BnG`X58H1> zp7VXhg^t3GKNI@|tbDpHE3-R6J|^13 zO8DnCS~>C;&{`FFoz6*Ru0)UeP97JwLQ=^w5w#jJ0)`e<44xU1kOucgcbW-s(oL}$ z9zAvdCkoOhVAog{xi8be1cDjK*0BSGLe#7Ud_n#YrD zWZ-U3_@Dwew~2WEET@>2mEa22xjZt8BDtuR)?k_*AR>RTRUyr^`W5u8;xVZJ-IwVAq{qNP7pQ<<;}PP zql+nv1y!(+ZYTCb)rq(9FnQGnyHR))5@w?iL$YSG1&GAxzM*&b41b3xl>M=zmrtXQ zw++byc9R7_ z&n7oT^;q`YaIyoQuMB!%*{!knS1cm1n^piduFh6Zro?VAPRgQbszkdg{|P^jdG=C`rh$st zgwMwpyeOLC+)w7J=!oGjUj~4^;sW_*mksKh3|iEmcgeqR^%S%lG>C-ROhRRTa`t~L zpvFZ^c@m%cFG)tK5tjI?m*>R&OClbuB_h`Pp-H=T4qg8YhA2JuyzhUE(;Ph7|3~3k zz1dyy-kKE|-!i90kP8xV9sq7+TO;UNx4E%B{c-(?2>b#HhiVU=sjU^1XPe%sSMN%Fn-yQQJBWfK1b4RQxdST29*;pD~{sB z_83TY;$o!)KH(VeIEI7&Vyz_qNAm~Vq@(|oDYBQNvY%zZmc$U+3zo*EG*clj$C1*U zT^q2SgA~woW(>^5bu2sMn$2CuJ})2vE|i*lnI&wKvz0LpzVoAE6c(=ad{)SFDQKq+ zoNxexz$ zFwOyFCZXbis=0XHe3;Lt4^S@6f>{-)C5(rnmC_oUVHeZ{!4YT$$3QcNddN&U20Ai7 zzU|R3Fb3Lh$Sf{00r%z@Ack}z35nQk-Agm40ith2-U{_GBa!Naww8fgR?HJ} z(1&OoB@L=Z4+Xq6w$Q&TESLY(OKp&g`U~zz8Sb77XjXCbIivR z@P>DTMj_L^mwOBVxgy&^3Gx`I*+cVCp&typo6as%+XVER&WcS_3k^s)BdcyxNr-2$ zkWVJL-=*AF19|PO89Xh zBR7i>w)|4Bm;ZYSr}$y@mEFQ#ivn!LK>^%tk~Rnf^fSW8gyIB;k@yZ6CmoVM7-Pxp z2et-u1kL)JU4USJA>(v^zI?iVJ7MKD#7~`klIcDfFP*D{SkNx^r0yMiNR$k9XhKNy zj@*L1Beu)(GC;isHT8SoEV#h*(uA#-b*J2$qf6zqr`5AWC1bIK&Lgg+I)t}D`(EWr$J??A+1igYcyD4J02RD@t9oao$QjKYq0K6-gA3Ue2d87Qebb zw=A{qOJzWE0C`rxtv2tu7y5HVu5xo;MqaUi`pye`(`zohV~0Ez6HKn0c(lTo@6BYx z-1TLL3WvTc(Ao~qmfV8hz5dT`|6p*H$#bTQ8Tsu>Iw|6f(7T=c-xcN>g}uRQ)W(1f z4$z-T5yHL$9LkonyL_R8dPD&bBXZb4#h6EAQA~9;+k*D-*U;`BJJh?sWKg!1a+3ba zR`JJ=%+Z{o435O6mx(nxV{RRkD!+1C03<%YTL^ks9C<7^Iz4)4&xf8^&h)z`v<*bK zMJuW6JK%uHFjgFO)ATbD(x*3axkA@08?y11)n4Ft*V8kF_U@q_#Pk^LY;HvDn-n;* z$x^=+z9*(;qu7G#11aDoP}7FetF^c*`#6-mLws6ijEP|am?7|~VXg6k;?DSlCf2+` zPqr-z0!jQt^qgeIvw4Tr{nOe%sJjZH()Ag%?}|;u-1vCu>!0O+@Bm11S0X5|SDvg} z#p8!J6{sbRT}$^P-5?Or>kk6{r^55>cH^=^{?cRNP@N}Q1^oR>FV1*C57mcWfRsRp zSZs~?!|*jU1+u`Xh+u;Uv)YsemATqIRlq+0I7j^ZN#=RT4GzL(j6Q>Wd`FQ;_wXiK zTS-MC7zCL;5xbrFS?5)P1CB}Y-Cn&o`FGdaxpb-bFK-O&)CH9L#vKbs{2{$zOc{-b-&AT;Tec$@-tLHhOUQ)Yy)4P&AuWFj)!U1+9L$;NbVi9ZqV~cT zLVb>g_R-wERB;k6|DJa=1$IG#yno}F<n&9Gq%{KMi%67dh5}nf#V#g;Cj3Z3$0= zbf>2w`e0Hpu;UjFR&clvXvt>)mdX;Bz7)Q4q%tt-uGX&{y8~aZ|E!D5->*aOFY)QT zF_X>Dlm6Lpx@&?qX=jH)vV~ZLdtwq{R{@J$?9?raX85$U^a%FFUDc-*iDEq;{ z4&Gz=S5`>=&jJWl?vl2uQ5nwH_z#Cw~S{4pyvrYC6WahIGR zG^ya$RdwKO09Q-O@k!H!vJ89zq;LOve{-c>{7MBl*HfK<@?p<4s0`@9D>dzU?Um^7 z=i`8B11tH1Hp8vBfGF_4Sn88pF)=ED)E<{O27lx?RCaKZ8u_Prhn#QVqyIbE9sjfU z3iki(7XQEf&w5lN3Bj9Xv;`(WtY9S($oED@nasz$J_@!y!M>0Y?x#c|)4o#7ND4qn zu&z7&>ihv&LJF#Z>#4!h3Nko>xBnK}6a20DoDHLtBep_xKorHt(;oxE!?ef$V-O3G zTl#c5Iw@GC8ysQL0`N;mEMH0V`ZCc~pQU&gD^_aKu0Z6M8b{q6gs2lHl@<2 zTZgxJ;P&3XW(MwEurKI2mbt_TlLNXidT zjhlZygICD>k4_AdaO@K1@l%zZQb@dCZ!)e>UgQZh3t zjhg$ta};VSWH=PlxIalny9N0UAXfwcXo4WS?}orhz%e}agd*1@Myo+-rG2FxERzja z73vmPl7_5p?}Oj>U4o!b-jfssEHE7;E&+&X#)@U?o;a;%OOe@&VLtxUzr?=dt`?$0 z8m|L7pxv*gx)=CS}~ z7XOr5_=|ph_BKRE3@CH{(<1;;Oc6#{EjC>oV{zX;N=vvsY{hD2JRn?Tksc2lt5s)= zoj+A0YIxJG9IX&mU#+#;%*Co8FdM1I1Z7)%q;}da_@b`~pE_uOkVf|+au>G5~{+HeNt)~CYB@0kW7OQLjWeQA$@Xke%q>sL zo~|hGyV@QEE4Wx+?n0-(@~HZQwG6mD!{sDM#+XIVh~uDkgx#8mbMCkm7;A^inAtwh z@Uv6Q3tiTm214SgJNy>kffoyRK_2<|1`VuLgJJsS z;~8cz0o$(r-D<}4R9v6T^4IO00cs_t<&MegN`8esg)Ndw-hSnx!nYrKVi)E6_R_ASzM(qT%+PloyKr1E}Bi&07& z)WXj^F_PvR- z_-Jwq@OJRr@5EZnkFK1y+Nl>U2X~+ftwRM(di^ocUkf*L#Wqh;tJz40|1R}CV>*m&$8{>LY{q9O!O<$FT~<4+F*GfG7*W--#JgxvJf^Xs;LNy3dzvX9Sz z)Yr6+u!`UIfP4lCrd-?Az0VIevF(EfZF3$lO`DqR9&r-N1n%>_NHFZxl8B1`9Ca`L>r0 z@5V5fnxWGqr#XM zH2W0ax=L}87PHH-(VKO}^o_lW+}3TfnUy(Obe{GZTj-VO+IsL+v$^Gs=4{LP&Z8G5 zN3xeKLwe&gXF5kM&He+w4vNHSX?g?ZWu>IIeKUQ36>p%B_Oow4KQ{O5U!CxmSH$B` z9Jv=lfhFfd*Lw8>OPnVmIdvuPO@*hogj@_R-IBs?^uc#!Q=oB?y zyoMI(?8MI)AfU!ogSjU&D)rhoBb0l8{;af>iB?{;c#owDZd(*I!uqrap3Octql7x zENzR%SJG_tegSq^$fi)xuuXu&Bc!A}}) ze)cvCb35N?dwiJZW1MKpck;iYJXoW)Uc=h(6O_q$B;U4nUjx6H@I%h!6oC33pQqVA zgfJar;zi18ap4pfyCH@g7<3nTnq*9B;UC#-$U!cR_N%_D+#Jn@u8>r0zOZsae?$fp({;-EUTuyZqaIdp z54@uAFpF}!_20flxxl5q_5HKS*7Tkm66EUQR1HIdk<(cvSNS1Gv{kvNhsMP+DIel_ z!0uR&-CScAFM7rmb5CPQZV+>RRG6`d`D0ddneuEZGCIo1?tlNzXF5M9XxFy0Z7hGN zM$Wmnt<^S0$Kj4U=aQ$A1c2XkkkRh>|KcRt1rmBbdyZn<`36jwtQPS;}{7J+|MQ1ircO3q2?Z>p1wa#poB+9YW5s@WY6s{pm!(d zBF>I^LfD!vB}df#nK_kGgnWDiPFwk_9tukR5ebS90jYh#?pAN%y&Ac4D3byeN_p=O zHG-8R&>KRBkJHwILFU-EZGUt_bKYW>^j$NfZ^azQ%IK$bDwZR7(NnquFM_UxnNcUQ zW_umZ{SZ9c@;`aj5&F2va?5@3>U#pgXXI#aP4KVzOu}hA(?c;7Ph_u`Gc|OIlewIk z5nD(pDU9)OylD*6g-~4tIa!0C0AWb%V`2ZLuqYG z!wTKz-eL26g3M){a&%5C7cnqnm|giqilMU)kg_Afs-x_9jVv!0_KlFzxqsv_RmgsV z3X}K!sU!k7%s%w9-g2fe=Mt(}o!0r2{l%^4AzGvP#l{tzY0rK|E}x<{e8PO?XPqHG zG`7|`BX}9V4E_E5N1m){@#Kn6MMV30;YCVhaR**`E% z#&>?~RTTK?{_x$U(1JN<)(3NxNw#-;1f_-=#T>M(U!CnZqieS_3UvFveE7i;b$bXv z_}1l3$LU)j-b!Qg-QRH@bU9{=xyn;?K?!=2l#{V*eSKOql%mnO?}Fb&Kwlr#|I#^r zJKO{I?+;N?di(o*e3}p#{+V3y*a8s0IZz;BB7oLCfzF3O6L5h-hU(hz)VE5H`0E@K z=?c!CeEs&HQ{_MJY~@Q-S}EK#?!R^d`I7$vQ*RGItVc3#9$aSxvg|}42C1Q>G5Bn3 zXJMs;M_*I^ZNK-obufaW5|Fzt9RnFP3v)h<)Mon+In}}rU8e865%4YecXFk&)ioKS z4wi}^NdE$I^X?wYdlN5kf?_#Pf{;64p*28T=@y9cZs8&)aT!<4S7!9RkbhUyZ ze?t!-%0)%LEBn*exChoy0B7_mXl1 zgn3H7Poy~{^U-CDYRWdz_31u6uDma~0P-qxpk}pihD!fk8%cq!!;cY{3=SH+Gq0bW zzTi%CLJe-I_4)68Nr8HdA?7ewCt~f4ztdtUDGBcrVJ`r&V0I>;>k|PV96Go%S8DTwb`v4ML1&|fr}+}_ZEf0t4jKXuj~EpG9O@>JlfE_ zU@b&9@;-;%vf)_Diio5-PZ7NeNd`yf$;m(%RS(F19D!4O+je%zU<9_8nC{lMu@_7S z+du#Mt)$td4{ig2>ZK|Z6E#Mb#aDS4UYbuh)P2sH}q@0s{e2nzLY&C@=Rc|Im( zeul_ojHLSEMlQ80cQE}iPG*Y4d7hDnpiM%%pe{M8%G^LRf=&uB+KE6aUl{Y+3ve7F zp$~?#(rk2?WOg^>p0tR8$XBcBW$p`Oo4UNIOECW1H69e3?x7Rj%<~obY>- zJ-c{PgzKP*sHbu6s7#)G7I10eP$SLs z8^k*Hu4ew*UlZd16_rRHv>W}012uc3h4t!B^-q+1FT-y-KYQ=zl^5IfRN z+b;7sWC55~9g@D7-)?&iJx92;*Tff5JZC;hpY_y73lE%&91KrCTGb_StSZDmu63Uw zqzqB86O`*r9;U#6!~rP@Aa~$oJ|B)ur%05EA|b?H029D7zZ32F7g`jQP?(o8BMW`V zL6Z4P5_&X*&!-E|Lq>WJo}c*8DBxtiTvN#)i0edyk%vNDslsupJ>T-eu1(i7DcHJ4 z!OTg>68Qydaobej;_oe4GbwH=(kMNInNe#AFD&18y`W-Xg<&=AAwHb~0YkOJm(l4*E*LQRq#uco znx4=w;nVLE5(@XfqE+Rr69-|j84;I2l`sdV>FA)95S~MB)&@N*T$U8)Q|N$LQW0Ov zm$9@$ic2^wQdq0jbvW8LoLT;1)dM2SI9OeYV*748O(&v1X?>qU0^#Z`XRAT{29vut zpi@oIuyQgB%9_T96YyJ0h1W1=bvSSL(A#4u9R{_CB3cN(kl&z8CLujVp_@?8@IruY zx2#@1>T!#^Jp?|vUaDzR}AMXuX@6rp2D}1e; z`O1}gKQ6VEALscms1v-XA|q(+`Z9|{BCm4bF%2BYz}sFuksKx`lguvnm@E7ff9A`` zzaZT;<7|rJPD6wpKOQb?NH;NFoF1HIhs48t0+;f-iR=CPk()2&?=t3LKEBtE{kIrY z1$`kkn|RbtPkWW6h<-LzPvJh|ZBNmsT1L&l3B&6*a|K!`(E}2G6m|($N8T%_4|BC7 zHvivne9@ei(>E<^8e)b8FGp~Hc7CyPOkI7y`C~bq_H9U%+!F3jO1G>iVmKE|-XXUG z+?jvorPRtFY^2p>*Tf(}$RFmb1!jD+#D7Z!Ph?rmkE&~-4nr+l0X~)72{R1$V0d8> z{6pAHhd>x?!^Xj18uIE|h#Pk>VXJFcvzMeD-F2aRB7As1X$Y|d4qwL8g;A|2uU%)J@|J_JTo3$@IaDpE#Kfib-iaw`v~y`gPC2L7}|iV&!CkOvHjDrEVebsThg(~S3AfZaaA?&-gy ztdKQJl1}X|JmYvY!>gcZ^f5bkVZE4Gk@amz>}&v)65e&m#(y(0A?exFc(Z6dFim9K zf*HP|AcS1{A~BA5xGN-tbq@Ura&Vm2GmtCHR-%I@>{^68WCZ@WEMeL~A^d`C+8~JQ z_V~5&m*&B)Z5uQQKUEq9R7Z4mrr0bH-eUsxAzF2SktRd%ugbq?X!4!2ORP(!%aGjG zq`+-!F*(pQf@j#4_+S0NJkkVwg6TwC4lchvrK*QOV#xRxR)<0;?y+&J-4d%W)5GPd zsO=-X=Tu^mnvxG;>f#ZO9U7L)*b#hrnLt{mk%XgwYuN!rHscq{lF)4PkzODuT!OkY z;uXa!D!JM7Y0%uN3;atL*a+5(s(5RM{y@MDr3uehr3G@L6sd`7`3+ z-?-s%hou(^{CC>l2Y$hCPyF7Ze>^UQv>N~Fjb{?QoPEZF(`_H za_gJzpZ&@$p=bpi*Jja-7v{ROj@TJN7 zbw|hF$j{0J4qS*@h2lOu57__u-Oj6Fe;IkEwX;uG<)?jL+ecTW_P!AUc=UpRz+<{f zK-^zAf$oO$bC>^RoF|yH_ojj01`s3G`l&q_G%*3lx5l;#XmaFIzR!5htaxn z_UJ_`kO)XaowR)FZw^LoFU>Lf%(%r+t2I}!dPXGurCZjpBV4M%XE+BMyxOxI(;6t~ zu`(;+Q4(&6_#VS*m#w8reNZnILx26E6rv#d5|MK+bsxA7y@-jSF7Iiexqm-L$rJTp8~@$ZBs40{sbvWysM`N^gwjr0vOpl#hv3 z3g1sJ=^2#(qu%Uyjpz1_kt2gVO(%g}$s3!8xLg;z!6#Exv0-45(c-r1=!$rK#Rl>Vmw-#tp790^ zFH=F1gDDTA)(3J|R{{F7u-7K$b@q$|4xuv5U_Zzyc{g%`kMaIKMXcLZ)&BmHf+`Ou z-5_JvpVJCHW|9Tq)u`~&RKKCaRB&VUb&3c^x{SL#N_Py%~+a!ayMgRef{e@u$6|9Y5iMuRgHOEdmfF{#=?s~wdL#8Ar z`%rUp^N z?}dr6*`h1jFLR|}&atm9`S&TG(ljZFKN0XHYVio_rIlyvt#vVDDj#T-b|7?@-E~4Ll>QO-#?5q_de3V4anyL>9xNt9wM~FcBSFC8x+Uu?)c}nUIp38 zPFZ%hwcHuI5Mtd7VOBzSwmnh8#bj%qQETyEob0)%_1i8x47|=LM93cGmC#?4QlH=r z`)F@&`7sJHpVlVZnsCjDqUmbFp1yX1kG`NNu*;iOElh*7?bssjVd!e~!HC6MviuHK zW&VXJ-=t z=K)jDA_I!6KvBlSENsqS#>AJTVl0X8?3!de#kGjT&P6d-m%8kKTRZz*uPDI}xOW2L zXHrxbuGnbvm;0`a{Rw5)1r`*O=VG4B{m^&PiXHf{SzLAim6GZuJ z%lFJC*#{nzz1`Up{NcmM<|pQwe3}$>=<85V7VW@oiEW2(#Srr%h%@?A2hiL#_8ooM z_6K4dVWhx?IHkBtnBcXg9P~{^yXT-~pQR+XxI4RR|0jSt!40VC_2JA~wJ_H|#w-^< z%|BL-jlZF8C!Bh}r}*^1z4^ncJ7qha4uLn5*HiHUhjZbEwWdOCWhQ%jR;=OpH-Yxn zLKtls-gk5C$1#@;jP1hY3#}fEqGYRr5z)hIOKG_a8gpuA3u17R4xAu1JejSZKx0>F z(}FuF`cW3n;c!t?hx3@xE?^LI+Jlo z_ou0VhmzvY%#v@qU8>bCgE-$w)Xu526lb2M9?|N1#`>XCDmSKmc%h=q8~;`zCTS4W z>%)sQc&56O8`N`%xc8y}b=R0X zBp>?RcPD-Z0@;4tS^gHY6XKNeLEEi+?-x_~`#%cTDx|E1Xb;8&Y-JD=?=c{C6|)Po zPH=vBn+}5R8WnD|3a|J`Gg$a6UZ}@2k>NMp8!apQ$%$pLR^J(wjdhnoA>%`27^cX{ z*5db(osxAki~Y!ASFxCIw>_hFiZ+2ZMhoSAf9%(a>#)6szt-ya)DQ9~-+d;GZx*LU z&N;OTA0Ezz6a8vYqOxL4Lx!ovys7rF@Xf;8C%1iBKJbU*3osA<(0Vwip(qtYHSfzB zM>ryW8bvC+Rypg5lhjLY)cx&Rl0eLZGS=foB%`jAb`Z~cfrm5v(CEH}9i8_p+QF~y zR;X0_!di^k#t~&PRALg3VuO!BS{dPu_ec^Y$xcMwfkr0=KB4+XVP zZR7SoIR~V4ygc-GAXIPI`9gYP{9L zWj2is8bL^jjmxn}z<$K-aOG=n*v1U%0Tju>FHE27jR|NOaob~1yMT0{E4h%fxK<=c zK$gSBwQzd6X8Di&y8neH{kls%)=w{|bL2GWqcL0hte*FtGvyQKPkn^WJTYE*xxYlY zd07+kKXGo@w{fh_PNzI7omg>wq~6oq?_v2Pm5+0~$wc^6c!_O$FXsk~9af6efAxwp z(pYRfT(x?T>;NW@_!Fq4`YA>y#s`-35$8|#p1+3Q*3iKKN+4&)%krlpBYWaI z79^gY9TaDW*^288k$+w8w7p$_O-Sp`NX+{j_3RwT9UG34H0 zX)at}Rb+_BuKsd=#DV&8vI7>}+T&H_+d~ejg!owQope=xpKShLd5Y3aQLp;ie2qIg zUJHc9N+L}Y;k^Eg>r%F*Ig#^%GhOyKnCs4vEfKhE=4ExmcnXml{|TF9?@H{eKjk3?apo-N;;e) zGS(RJ^QgM8QeASN@WO%?Hbx4L`tDBs4dWiayt)6b1&F=k*8T*SyVR%zlQX< z4+2FIet6Qn7GBdJev3iPm*Lr3o8&ake(V6p2tUW`+c1`4i`I(#X7+_~BBe0W5Uq3+ z<`U&X-yU85<_!0o!`uly_qz{OBaM-+Int*sa*bEMpZCs0#*;NHft8Xl5cXZt&4DXDjCZ?t4NoH{mSs)`M53Cj)3a!a5xxhSmxaq2dN13odP5%1|KY#7zH?qOa zD_$e5^Cnw=4eR!XY1}a6iiSLe`QQ4oSCo4Mmd_hBqC0iqv}t8?7XooTacp5RuR=Tj zYVW+3Q$;e|eY7+^N-^&lrNopKpYs4!p6tMBPD9BppK3XM#{=7n6wQ&G!MV;K5%6uX zbm__UCIkwb3F@ggOHtph_T z5pVeED~`f|BiUKK5?u6^v0SPTxh~4O0S226VQp`iIxb10sMM5OlQcA} z`KkqfOnFX^saC#D^039$jB8uhaXy9qJYXo2CNBZs_vsm4LVi@3rxCZA^SgIH31C&X zRd4qxMG@v70D$+dmB@!@o2xaKBRA-#uDr(vM2?Or&;li-sXpg|w_g)7JjxIszA3;j z{2F^|1>Rk|j2vAcU2pb%>a0!SY^luMkh>yjE6=I`H^}9s*=tzm>R-xW9v04>Il<5+M{nZmQCQ=SV_?!%TbMboG4%h2;c3g91PrBJg;Ud0kmQS|p~^H)geVFXGxn5pv#Qrm2iDFvpU+1O zM_tRo?=Fa~7w$fVQ$sd7`MZfWI4NTi7xfDY?xWdwE87RCFqmYdY;j+`K^n2MO-+KcJ64!s62`D=zHmM&KP`krSW$N!7^pmbgcRF3KfYITYm)d@iC9ZmSip7T z^+Me4pykpLT`U`PA+ix{Tk$iQcvQcSbxiMZz5LbhKn*YDXMTYb6b-NYE0rTF1)>N& zZRaKk%?)k^Zl6R_o5N_)foOIT_yT5~U2Bt{2uJ+2a!a5A@7u00R3+4Wbh*;oYGAs@ zl35vIqI$fOTuO{kpaRO39N+X*VZf{nFI1zW{=J%%!@IlL zj7lnvq7`-0t`K(14FhnYh&<;|xNg&NE01L1DG_$2{ye@KF<;=g8|mW^Kn-cU2g4)S za(bngqxP{&?9%;}mL*CZ^L?1Xx#<;&Cr*kffGUl+p)$Q}J;4=5@$OD6 zMF+SzVgt`p3MrhB3TxM8n>>$SAr6((+=NDc-2y;_IomFxyG-7TiG;#TqZ;7csG6D% zoD^GJh-2nu^HSwFTrcqHXl$hmuU_PVx)26h!*q&*w%P;xrct!!D@ylv-?-_2lCurE z5{S{HNYt^N=%(LDY((|fW~jFr^RXoppW;Qi z>uzOX@&$Y-I-uT3M(W#YiuBW_NvN?oU^9DOS@fuE7PmyevaY#le)tq zaF(&fE7MKhd*`kIZqPY3e&3uYGd2PO`x+zhCsi1Rd4s0*MB{Br7{SBSCe?~msJE3g z5JoxQShBz|Qh=d7j3kF|^Kha1OD8#*hJQFT{JW_J1#A6h-tWbhySTTLWl>PSewfL@ zst|HS4Pq5r9&1~^eU#_Z5T1EGx!Th6Dl?$;oTT}fGH@jdtfg*inFOQpOvN@Qy@9Nf z#-Zg5?yIwgKiL(v=KL?_F93w2tEsxFv9kzyz*^S$=Ud!9q6 z4gwddJS%%UXcAB^#Nf<^LLp3}Y|vUh8?p92O7a8Hj89QdlobN)qI_y3rtJ7{cxJsJ zJI;Kn_fC}Z)*#2}+l>AE#+Z3tVeZG&kWe4ii$S5clhZtM?j{k_DAuX1ZfoWDRUz>2UT<)ig$(23&I z+oKCxQfY=lvqqsv=|eaxOs@P?K`gl8oMcWfH5%IWhR)_isA2n3v-Il-Z?7N zK3~zrwCNGW24Z1=1K0q=fh0YJ=E?ovr@$2}-VDrYnagx=_D2}Pfxjgjle>XI@b)(6 zYlZ8NT5FFVB$$E=6Jm3l2wOeZRlX4>g|%o)uI8R~y>00=l0VxjN{V3db0`bM*z|V; ztyU5N%>8e9r|sM}b9{BNZ@>dsM)yvo*!m&hvE(=F!M-zK&AFpqbN2HX50{zWHX?BP zVo-;a2rYhu*)aqCQSaiGeNH$tY_i2U$hU#4zZbHD3{NoNZ3 zxtIM5B0pdCKZ(7+a>f(t=yGRtV&L0T%zAn#ohFm%M%tH=1dByzz%J{LE@==^(X9 zI}RY!tfxK$?OPH7tPtD)z&txGp>T>954SQ(Y{F(ncytkQi&+En5|i+p^M|&mzBJya zyr)<fq;qIU^hM#}p^iEF zt6}V8_dPe3ZSJ`z&_9DseX(wbUdsu}eKP+g#{{UmBiE=Wz|iQ5$&TtjzyheUIRb!HA`-Ye`iF#8Me={wpdeMyuCOtkp;n4*|veO&1A_Lky< z4vVIV@wsEjzf*kgsfR}hIRw%eOUX;A`R|!rw@gS?2|K8SutL(?t zg@iIIldMN!{$Pni5VQGC_R4#qhPhHRu9wrU;+ri%*=Ot%86CqQIouBhxFyGAmfWLO zWY?+MG|k@zUbPnYAl!{ONEvPgY%+;2zusaHSNf=EOeLioXIQb8s!6XsI z5udlrzVMMLs@JWbJwki&bktYk=<%BT56T@qP0I}H1r`9W>upRq$euZZH}ar!rtf&K zixQk)hL8v3SDa9omSc(_cY+M2q8;Z?rKRu}Ud8^XwcmDUf|&<^y(C%a^&`RnIr|11 zI4PTQpII!h@zz2@6vkb!@S+BX@Q;{))|mcTfY*AS*KfUp(WojLFu?m5n>Pi~Q^B5^R;FMFf~_*W>gQ^j^`hT4Pj_ny=g5^12c zt87x-<=}Z&2qk9x$c;_`n5yH^?=;r6?83(rj9+#F0YaFo^?{L_nPQy5Qu}zru=U7Y z)IGXCpbw@@dT;O3{-PadPq;enowZ4S4Km;>g;zjl$9ZNH7IZDZkcA2(jEEBH9nhG> z8EkzoS^i$x*?DK(fQ&QZ(+6z|9c&=##=H~XNA}p!0Lz$VQpvC53-7M5ReW#8SPzCD z*k*#JL2>yd>`pO{D=-+jQu^Vx;)2%d53GQ@HSIoX;f5)Q_pPzT{kHgW{E=l49|y8x zuII0HkT6@G7>C<5%yykBg7FBk)DGJ;*2JieuF;Xb%t|abO=E6804R_<0Sf zCH}K(Y$=iZbIGpElMut)mwgn$zc{PCC(n8(nx}o+I6H1FXnNh)_ge5=GL9!j7=J?Z zeik+K)Pd3cV4U82Ru}A;chQs?=+qQj(@{yr$N?SiEJjWBONb_t@jeLzF zeUjU66e81aZ^IX= zED3^?y=g!3Sm>%keTYU^o6=V97nbFsU#-H_NU{_iis(;+aQ-gWhq6)gcx4Q~B(H#R z6H&I*MeeW=C#VmDBZlXNayR}IboJI-f2P1GDAf_cCx#4J*{I-6Da8!R^_J`567%C% z_OeYZBqGNiAxcRZdmx3}0^ni(y!Nw~Wl;1MQjR$}xRBq0OQ3iW0eMKyV>8XjX+$dc2BbN)?501L?4M?u7>HDI5PMvED)mqIvul0^Ic(WxfDYyZI7Visl?{r*4`SJ#@(o%%rywjW zOF7BXW2hyE7^IYDmF1+}Yy1h|Gmbm>@}CY3>qvi70#kYX4)jHgRrG<3FseQu&e-?H z^(wwOetxj_eeO@*6VzFMB&KY0nEeM^7}J4<(Y^D&wrKX~itmhxUVmuK<@>*K2N1c8 z>7S>j;cQwfaLXvZod2hAT)x8GKH zk~`C{P61P1F|Db=diSS~9jZC+EnGKWg45#j3K4-){(4TDEv%nKudP&D_&+4!8U`*}aeEU5=0XNV^iPuN}LpRD1tPj9X|O3m4LAi}^OR>$2n@ zONeS)ZHwt8B~@e~nz*fb$$Vs_WB%rf#piD4%=d0YVIPf>$gcay?qGeRg9eO!saKjK zIp-($<-D5NS(=)$iq`~NFYQ)l@drLvv)~p(sv{uaQsR?3~N(@qQNWF6BC_c@lEujNf z>5F!*{_Qw>qBGZ5jf2`OHQEz45otHz)lNp^Rfz}2OCehm1^1r4Z{siz;LN4nag^H+ zw98eNf3=jO9P}slf=&NdaOGXK_K)hP!ko%$H!i3P^E^79TaduVXZ9rTelxj+VqdV6 zp9Rfz7Qws{BwoZcFl}o(QXhst6P|jZZPcccKYOCGLkAP&tnf77iQFK=>oY)nX)eD} z@fE^et}*H9F2Ai$!f;%yS(`+-U7 zq!3E$II=26T&DdSb|KXiNmlMm>tPtp#SVa~k|cxlttY)u+owEVrEtqRZ72nX4aDM~ zymJ;^k<+zob2o+K^|?5fq54e{ZX?^2fuE_4ezm3YGjiYMGHV;4O?D1Y6dMbSxabqi+@np*n~LW%Zr91hy^ z%v<&s9Y-^&oRomMc&+=R$ZQw__Q06zcVQ|3^0o3v< z)jR=H_qB~T{#5cA8^JktEQAOIrYYuyuPuGOnCKKog`nGROx2XtIvOXO`s&2 z#VIct93RMpRrm1^mDn+K6LnQX3^mrx-X_n{!c;TZGJh%lkUT9_zgd7J$CvceozD(W zZhW|>5#g-Pw9KLw>O*Kojzro(RE1CtFf*aoAStNn?PzzPR^;NluMgM1t`)#PcFGZQ zXP>i<@dP8DYpv5GHq+C8zP>~?-V1+sK;jmEh7`qf;U?8kB_355B%Yu^Xuwe-hsKfp zPMx200(;L{_k&s&?#)J1{}}SRxwKV6^75p+v3LR=SfA4oOTih6m@jnfR8wg#_Jj`K z+%E1??`)WOB@ipQNvDvkvnUm##v#FRRMchcwvRr4LYdtibU>0wj%Kn^z};{iGI)Cv`oBgaO{aVmB z0u|Ecpp3cCuN{4}%frMU5`q-y4Na4wg`n{IBgDqj^#+P)d&8nALRqyG3?mIP*oE}j zA1$XHNO4u@k2f$|g{TF~q~R{3#DZ+P=y}b!EN;eGvHI~H99qjJaGm$~#!yTU;Xq+@ zB0b3ZWwSv^HI~mIBC&)7VdSG)GKX@-HeVO2nq%D*+~m4ViuyQ|Z=Gj1iH(*2Sd*N- z-#4E0BKFasrwP?f6ojLz6yML3!t9Lc?s1W1so1G;yD3bwothiUfJ{AC)iWg7{NCIb zV&%_RbI72Ubr5Z`$ley*oJ7~7F!A7fCQn&mAnR{N-Uo zwL>Si2j4G>7c|E)19Ur?oM|c>N?G|Wx|--r9=$-L^ndl6O6 z-Qows{c)ao@~M6!P=l}X!Fh*&ZMc} zT~Kt*YkkKg;!8kfq@lziOAnI>leRkh_w~Yd3AXjg_T=rp`sTpbZ+cNq5RzqObB1TX2%LU&6rktbOvQE?$J?>HUwH>|oQav$_!AQ0_IkXU0X83)19KVKx5KB;%q z4ZYcQ01iJ6PROr|)@2QtJW}L=qc;)=-(bWjiEis(4fnlLimE{wc^;vMJdD>Cljq}*s48S zAK7>OV`=%+ocG0d2O%xr>?DuR87QG<0bzF1cijk$h?)f5*a>=uo9X+E@|$!=gk!Ob z{!@Y3rF1_T6D%2ek`+%m&%*Rta#r0oJghkK%7yfjFxIc!k*BO>31SpgEitB!lvNCU z4fT3vkJg%~3%VlwyX#b4Zy{nA2@W7*)bh+Fk)6=O0(b@*^=50ZqhF35U7a2N)hG6{ zwNIs8jIhwY#w#up{~wFs@cS_>@2ICOG(Q=g6w9x}*>_7WR9xj7QCqE3$OPTA`_K_| zl=waP0=i%QhZIA;ur}X_^RthB_ik1nN-A=pixX4H{6i_S?hPH%1wf9=u3`zB%#6D5 zBixo!KghBEaVD`VXpd8Kf1i-BPuopESDF$1O`PFkK8+&P_wffsZ^|yv`^8Fj%rpv)!=~)Wy3VlZ z-_J6+MsI1lrx_52yw*EpT2*PJ$IYcleY5iQFh4AbwxGt5hx5E=wo^!oLXDtXqNjT1 zMf^2~${YU#MxTR+?fsU#qrcKt|Fk7Hd8Hmm6eTYajE1}8Gi;(Lq%PKCJ#_nmr)3)Ux$heT^PhZq!f%CJq z$e*LIMn~-fX2pWuvi>}rAHjptIX3qiADvL%>q9(R7*F+?Iu~YD8<;k5RoC;&{a~1h zbH#Mbn^T!};cf2x>Iz zAsTCrD}fyCA&ZIvzBYEp8M#%=tODL;*}qtORDR;XPUo;Zg<7%e{ioSUXcZKU%XmjK zOH;~E>|unOCdmMg@Sz?1*re{E@+}q^gHY~89^-idX}&_A01d5XU+QR|xEd#G?1C5^ z2}#&*P0S49@!Y#LN(Uvtf6a34rR^-`Q6pbw>+)*+GChDN5D7IB;rfkf1#GqdxBw&B zGarq!<l-7Z6}j?#R3rxF+~wwZ zjgG9#r*0ETPWKNj5MRq!=5KKPz34S!_qidu|L`9^t)w41u*zRaRV<-81%`_#Ss%eQ_J~Rx&SpEfP;RG>alXou$((KB zyJqTZ@I6g4FWy)CQ)%wF!tsybr zRCO`9!cO%RJGCQ*=^$<$u_oK4zjzOK$YE;~IzR38ec1V&f||lOI+h0VGK1*hc^7T_ z_#v;_nDrA?YO412p$XCu;s|z1l1CbRMNgHWBe2S<&Z})F3cB|Jj`^muc^4;-_n=ssMEl|3E`uY0sLXxcuezOIS~V6qlc!;RO3PGT~7nMa9kM7tFer z535%skxM<8r!9(b`EdA5UeL#&J^4`@D6w5eS@_eQUvK(d4^h7^gg0-Ix@Uj*cp?`c z7QSMe>W6Z|FfKsK4!q7{EQhUQi@LaD`ROv#0`e}Xut0jwDEh zk7FIW#8|T<4mMsMZ@(?FalmC(g|D-ocBM|#JP2*v&-G4O(9e29spZzEN%DI+6Y|bs zs`fq{W!Q_-|3kF>gAKm_;wo~PNlvkXqT6%8?arR6%4{-v?P4e5eJml4%xwRoT&~90 zO`&hJ)uANuvHqs8+&sD~x|0uZ#e=S9gruh|(`%!hEY~vaE$x9JHgow?^hk^M2oGD&Up-2toxXg@#Hn^||kRPHGp1 z$nCpvhpkvyQC3`_@FXN~a+wOQr9Azba;QOcf_YOXEg`ImRyf%`43()F%%W>;6xIB> zoPHj{9#`@ZBcvj%#G)4N@JcumLDQma!0y+Axbw-ctd!ky`fa>i7u!BWBjWimrTl|A zA%SFHzAjQ{|Di%Ncm0FK+M3Vwg#-!y{msx}y3OV(j$RSd8vY7YC2i}H7gLY_$fstqDfFBwY zK6N6T+hhdZHQnt1OxDuZ?Q?7k9G6*)^d0o_9U~GtVlESxtV&_lrMS;gkqnQvay|l3 zXjZRfd-mNfJbcnGQfQ5E{HYB&Z84e*%?05&rLYWZ7bjy&LKtkzKZwLm#4EC|kvLT( zN`J7?W-{`V;TETj2Q-&p@YC3Xrge52oR>2n6_aNaFS-?7q~pwyX}j9J8I)9>(+Z+y z+@lxon-=E-^m1+>mhtw<6C;%O1)%mI#W5xpc+~$8=bcXIu~Dz^0o3}kO6Ie(>bi3%8Gx_so@ z&GgbbZir{6k|3L-MQ?I*>3{Lr47Qh#5&(6%IO*=O_~6`0Qr^XyZim%(VP$a`p*6Z!4E>5_TKMs} zgp>bTnND=%+wy-f54U*g^a56>a<>0nixzUl~F;S22M5|P*26)PDGBCNNzA*4#UvZ?P#x(0T&$V0!pTo9N~RocN-!lwu- zCC%t&?{OTCU=6cTnrk3p8aF1R+hT{%Dmgl8q1AY{pn}~F6l;j?ZHG^;+doL4A}mw8 zHBk@lPhnI{CSLXVVDA09y#3>b7^Sj?Iz@3eJKkFPJ8P4cS1oU~`b&N%<$B(ECU$4m z@jxYmjV;-QdjUpK8luAudk`2uf_g|fAhpK4t1{#J!4d4Vz5Vq7RbNPNc=_sVRMx8_Gtlmmt?MqA8#UIecq&vpAy00Ao!=Iqs(WKN@AmwPo3D2o zd&b9Ad_KJ=h_&R^n$yqE=BDw00n39%1<&4G4xH5c6v@04;kN*<;3?9x6vhJ;k)50_ zc?T8a=aA131TATu>B?Q>K;}@phCt`gEX4-<-A*ym zOGi9Z!RFhCAMSi1!1lRhgg>?jv8r6%aE~P>{0VwU@P!*eLqVpEDkJ|}ch_}J=mO4< zmUMS%h3!T}u9k{QuT`pyw@IIXh>i&f`0C!)FuZiGZ^CgS!X8*Kh>AqU@^z;O@;;9o*6-IZ^0Y4!zL{YUmQaUS!7|bkC>*=%w*_rxUxRjo z{tqToZb(GQeJJ#kh_SiszRa_%YS1m_B7~u)ga)Ro+lD0K{t20%5Adk@}#E3dJAco&D9om=-M6TlgjHFgse|!{4p& zu``K%`6YA&Y(iEoi7>moYkv7(N3)3R(2G{V^NU(3(8?e^L`ijk+2j%U>vY^1d@DZv z=!z&fbD;9<8XaW{G;WQ_-^K@&yvch@Wse8F{uL6qqpIeJqLvo<2R8BmM=jthv~j`)n*yI`$?h0ceX^+bW8Gp#W;)OK&`zE#v^oJ_(!fF*ipS3ji1X z9)N8wD9c!c0gDO9-foiv#?>U?Q1mbL4Ahy$rMHWdxWGqawRK!jXOu*6 zK>ca=_Y9buG>B)~@QK5Qvr7|1tT zH!A*M%kX++3V*&2099Y&^owAS@ErJ!3pAQ+VNI4vSdQ@AKCrOoV!;bJy0@%sumA*4 zrZ_^!&sZ!&Hm-e%*Dy%Jsy$++Ie`Hyzb@%r23;&xeXZ-Zpo?Gp><^;XbR`B=C^v zr<73}`Hp5-Iwuo2mfAhzEyF^{w@WlnN+!;*Jx<%=QoHq&nVTF{H0l@-a(q7BK-Roy zxEPAQ96TAwOPQBj-wwF^X}PqW?aqqzl5ZeN1704V{*v9^oO!}qWWs*Nh8K2mf=#1p zzLG%KmJc{va3yp+6W{k;s7ozNoF+IufAUta6tQ^V)f_zK3<|38na&)UMWr!VVu+Zv z?sn$FFi6;3?)!n)5bd@B?Qq$3fDDcg^G!T=vlw{;}1MJiMIpn%s;geT7`5rcxnC`TZ?LBiA~a^B3!L z0mpyACcG_a3@u+z4iQn#M9)}e`b2d(GBJPv{pC%lotw-ESoFYIOlJIc|WAzjqH#j-1f$yVNBtqk?eKm zcRCQ`OQst8{MW8V$RjxTemdjEvCdGYX3m9rcP07pXPi}rN%xPSHAU7(MCR+Ki{=%R zb%vGP_>{6&_FQdCzxi#pw%{7e^lPnj+rs%LAKv|*m*nnBX!VF~7Nv|+X|1~#xPOwU z&N5d#7O2BL5`~l=#c|VX=H3=1ES@=TpZ@ynYSVmRX-300Q-spQzW%gBDXYUQYw1=W zhH34DdBO^W%)mDYR!j=pb>T#AI&x#tHx{&mGPz;d}gn6?gwa z)kBy)(~<|Xd^y@Ww%f%ToyUe`Vcg0=tWvp$T0yi^Q@CGYg91PY`&Qo`xyg%k!xx^p zwMk#pt!6vn5{7yph({)3!%=}kJQU94i3fc~O<6VOV)%qv&v%~0^l`7+tqe}8{w@`PvFlnbwL+oS zjzR8EHD_*B)XGltcZ(x3!?z%#jC-Ak2yLI_C0Ja%zerEP_m=s=c=wj#0ZjUvrRy3@ zvZAYg%aTEE$>s}FH^YyMZ;Cu-ts)*D`RHWLh$V{!FFGx{qGMUE>eF7G@c5CpvTer{qB3+tP)6xwNY`wdp~~0b%<;(|&A=yZP@e*jzb-^=-|co-dQM z_P6F6@dmj40A!NIQjb49+zJyrp{6K~5SWr(x7P5VhZcvR+cCHltMPrkLM823K^HjcKS~O{x^9 zU)vzW5-{N<86AML2#+Y%1ILaeu@M z6?>Ioa`xJ|%1bwV22LZ5lIpIlivAQM1_5k~DvwPVhN3K6fW|A;%bBQwx@esCtvW{x zre;iz=1NSj4lP0QkBR;Zx?5axk>xkT@JQCv3*Oiy@}9=<#kkE2?<rsh7_ zV_eRSQ7v|9;j*Y4aSo$3WEE1HeMk^Nc9)Q}wxWG~yAmA{k# z^B|<#Dc#F&c!2$UbitbyYRJ8q!mf>Jr~H==#y~f3DmwSBpSSKfk?>ID`>;CQ9eL8g zHqzFMm@h1$RVEV{B8y(lrr0g-;b5&k--Z#&+rlPhrk}^04xJB-3g5quLt4j3@`Zyg zzfT&<+Jq@`TfEmM>BkDHxEZ-O7E9zV+>Ad84#$k9uL-lD&n($zZi|30cJ`(klr=iv#A6}8Ibvw=P%u<|TH+BWV{@SY?rC$d% zRFD(LBbR}G>}c-HyKTE&n`Wb<$t%L;%o<5SQKdm{&r^D+k}rqGg|uahkM`=LGmeN# zbW?t(*W~QN_{zN+kL1kJw#u2=TffQvR3hD$Pi2YDPjSx$Lq`KeW~jU1$a7J3ZpZdXs)b|B&!W;btMgro{YPW<9qwK z5@kLA{)OXM;&d^s)${Z6kw=l~mTV*3+e&ZIN$S1iBDaIVW49XsqZ*$pS>Vy#7!+@N zQa)NUDy$NAb0*JXrqYJ(k-Bgy<}LFRM$N0))eDH&*>jj40`$K#;(q;i6`eBkbS3(P zldG!u;@*?&aFa-uHguT9TJ%wwP0pWJm_C_}$xg&ms;m~yoc!qXp)#?DkC!fEO1{0k z>dGjnTKU!jKw+hWW&MQ{8_t+CI0je6mf_E70KQ{$Qwjm;)7+xNOwV)XE}EI>zzlB- z&YnhqadR3MHe(%nOhq)MMtEAn^ZDry(HtqUo!NR%=u|c>kCqGjdfH-y$tLS^_E)Vv zbJVXu1$7m*`jLePK`(+3yc@-NqPE`GGaQ*ic{NhVQz zp3giJ*mn53VX73V%@TCB8a#O$W%ANFCj#-xGZGXTt>bPBQmu#Kuy|HN+f-mVxYJMe z{PZ?cW*AmSPrwg+`7Erif7h~JNKAegaC&gj-w*3`Hysp}}U}S000W(9uP=TGg za{;i7%aO3F|H1;p?~Jpe*z}%s>jF!MW?O z8}f$g8;XK-mGE&nKd2X1BkQ(IyA0K?5Isa5UE-ZgtFz=pIyA_qi=%t+cKGb8__1Hg zURi(Z#D-S>NFJ*=-#uX?D|$ZK`#)RZJ=uiKKtqdQU5Z#`i5u#q(IkzDZ3L{liZ`;Z0P_KIQAMzSim2 z?(zWHX0K}xLBMgjL)0!RZS>1-l@a2wS1I=QSqRp}s2JnGua1?n6dA)f>sD^&nGpR( zva3e(U)$wK-ja=em8ckTnvhHPL-gm@C(w7jy(5uq7*2R)@>63Q=S7#9pLY^Rtf)3s z5>9K);Y&VkFMuAhA0zO(kAftNxD~l0hCt_*Vgf zLJh;A|A|F_eOd4y2^W0wm}C^Q z(8{-93y6ZQ3Rx%#OBI#1naZ~#mI%o5(Tt^QHdbNG5Q}wo;RrsNwTZX0w>PRk1$(~3 z>M{Jv=^+FC1Yqbvp|W+35+0LP0BvQuDJo7mODTMt1;n}ZASkehqe-^pZ^aI_?KM3{{<%aF4K0PXLPOs9H>CmPk$_G z6e~pyU~MwezyOn$00Wytj|*>ik;JNR8=ZjmDSvw0)FF=m9K5K7cwjji0D6Qdmg~d~ z$`;(*AfmYEwI>f4l}-Lg+AgviD2b{4fU_#ryb{I71>!dQYwNIM_EgCd%z6!d?ZPAo zUXRzb06uRm_1Oyma|Z8${v+JshwY~$uDVz+*;}z(K-d|uygstre>2LTd>}p)^Z?;* zevyMe7`m#puH(RZVm)8~5HohQGlrkyZ)sX5M~i`GM`3T@*u!SRSARMWx|YGAz@mLhSa5pY7ktt87{7&dDj(54FHBbcD-(t)?4~5rIpNj9t_^BGj?WcY@8Y6)CLe|7yz@&Y2Va+ zL^h*+R6-YKtfM_xfTOn4q3iW-M-JAGhE*+F<`HjkBKARN@+`w`lO*-r zL}1wPC|l}ZwTfVt(98u2Jk|V#O#NwH(FiS2lu1j+97_J_6hh`*?${Gl{LAxIJ2{k{ zAm%=P^pXY0WE%*+{BYeM^B$aCfwUaH;Np^ulFOTt){K>yi5y&1UE}j(o$quwS&t>h zzaqc>Ma~V_!@Fx(!DT+)16BLVaWLglc(j<6j1@l<95ihWqn}3K9fT(!NSOm~pkhjn z(&EdH{46X;3)ds265Q5Dp-9yKs#Ws=iHIT;o5-z-)mH{xZdO9VhFE1Zb>gjfkQ5i> z4s8NgM_HUf3}TqnYWGh!yRPw*#Tz!k0B@>uwYPs&Ww2^b>KU^bijC*omhbl`ky-+P z&M&2A(ogb4DYhXD85W`^+gKZl=QW+L^z;2NVD)C14}iC$c4DBfE5+$PHU9cyHb73; z_s*cm;0kuBp7NJOdNHOVWqCe7!%%Ym2%w^L`&3%2zAqSEQD$?j14YxBgxh9oLsd#G z+a6T}DM#nUBW^HxPSmqGAfcEE;co}-^`i=XGm;4mo>D@yhZPIa!_=-D`!7gk;P z#>zyv$4oZAbTP6tEI#}g6nC&sE$qnpp91-Q{t+>ei%oy!K=W!yV%O{hRfvoQ)!Uip zzdSStuR)EuA?Z=lo9p9n!GHqMOQC$}uxYFQPuX{vVyEWV@`ibt)TDBhq?t&wo0Gi) z?k16|mfOUH7H30)FYd34N64+BiVKn^sN6eo2*i?TzsRqgNz<-pTiiZL8z{W`@!{(2 z`~)a`tQU;TfQg!FYCQCH{|%&+ppe!F6@_Vv7G*})mhI9Xo=U?O+FO<*m0dVwXx59* ztkg|dwRZ$hoAvrn-#eoq^qJoEw&LSFSx(4TlX2`w8*hUfvgZwsKc70zKgAwg&w%Jh*%4|pC^;*Mvg6pp zSV80!a8+&%>n(PN;C7ekg!FZK0+(QwaK%0II_0$Nq(jNUSo+jQhMVlndD3Bkf#>{7 z7~Cz*v9ATt1yWT!6MrGIz#+Ple?Hz(;ur7X?+uvuyY;%UdcaH0ie+BPw$(lXDVCZ| z)L8e`aN$^DliS?TDZ_?zA-h_@$v+-EaGF7}089yKz<~y!gZ_EZ4-ZqF2)&tBGZ>1! zYFU*J4>%(ZR!uA!z62}|ky#xQ$@Y9M@C|7weN@KYn6%&SUH)jrZ#yuu21$2ZuifG& z(_8E_Y&T!G%s&DU3n3C6EPr46qGO`5=Qo@f!5FPS$Z;q*ZBN#qU>?MiGx0LhJKGbQ zTpLd})K9R=BFd8_$OVnEOS3k!W`)Z`WPNth&A=^oVNa0?MO`EF&yT}`M*%^M$q%XCvlB(!)D4k&uO2q5(mQIAY zLEsj!FJ?l4-`Go(PFt|3E=@^BN5yzlaah3tsdh2!6wmWrM2sldNNG<}u*W$%@bGtK zyxeV=$;@T;bNutH8z{Fj(mU1NYGcvhu?eQMq}X%D7Rz>rTeaCtyT-XaQ2y=4gUv|p zeYJdp$$QEm2|&mKwMhH6Qc^E)NCI0Lh4ZKTYKn6(pm-t~+|9H8)?dMxe4T|G>L*}b zTUfA4)IC8&z;??9lzYbXu;k}OFEmlo$7!q?)I_nF&rEDoC)Zu$fGA!g>37=NZS|=A z;A8vXY5&;Mvstre3(W;11GhhRfX6}bS1IwYGh2wibk1GOPVC2{>1SE?`v6y*u>*$a zDIEb^_R3iwz~vQPN%kK@Dc7xwC`YypBs9xjUSlUcZy9N3ln9u`=7ptq_zVl-fdD4l zD;8trsJ7z8TAoA4L#nQQZ=F5HBDN@j@4~#V{ylw8*~Gt}5-ijgf|eboV&q4LO5W2# zy{ira4}L~vWSaQPr1}r`<&&|?gQ^YiR4637mo-S$B*m!ie*6JqD68hu8os%E`7Xel z-ov-AC&2^)Q3%FJt^}qE!>ul$;7$Xvz3(VmiI4)w*)9j`8y&zgEneWeVCRuDwOmeW z8CD-r0KYb*kAJwJVhnpY^pA^86^wmI1)?Ou48IZr(|~|EGinI$cmYLXO@;d#r1B+F zRI8lt`XuDh36Qxx_e4F1jvs)kVsVUwr9|vw2qc>dpe1Nv_9s;#gLeo*Kv@`7i4UF| zr{8y2u@f2a^Z)8>o9{k!2UMOD4BpcIF8ApIxu}NTW^~`@Ou;=%0`?XAB`;|ToY{wk}A76UXK=1%W^;?^S zjaa6mI>URuv>wkpN6Wkie{AI5dEpej8TogW()?W;f*|MuTbQ9Q1GVzGRQ}05Ck%E) zebAjfWtA}f2g;;iV)BFwJ6D71g2C3l|Ga4JJINA>P~&jGE}Gh1=yH`?RF<9)7anta z4v^8g!E0gP8n!eDymz8WFfwV|T2OM7?1%;<*!jDYux$L;oG}z zy+m*oR9Vxk2TVa4jurqgSPTJTd9xC33$SFrdI)xdOqWt8;;*Be0GQ)#!P7Qp2Z+V7 zm*$7rgnxI*X|;BiqA!GfKLa%fZGI}S2V%Zl1dP>{!GAMV*8$hBJtlGy^+*1jJWQadxv8;i}LFQj}(FJ=cdC#bn{5;b5#n9`@`=%3lM_(W>j}*rO<-0Mw(~5XeDp zA6+#XlpT$+E*5>rzbt19r9F0tnp`oB9mZ1g*c{L$IL_iZn zYZri47f6QUQ1$6;*3lcnY9c{e|LvMJAMXhtW9%2z(%pe$XnCP{6*h@MVCh76lg8Np z28&dkn=L^RDlMrp?15JS^hk@?|Jo^F^`)e=d83wD{YoV#`PD%lK(0|dI8a|71YJl1 z?U}A&C#z3G^ZxEeP$oJ$JAdEKH#(pqzy#D0+_c$%3ml_)VMm|ohq_!y1Sb8Ny>`*N zwD{V=3D^uI;p%b$*hUbHEzlnNqJ#0ut#VlAEcgiF{ufxr%>n8 zGkqVI6SD0;?mZ27kpr}@B>1tylfI*ST3Nsu=f|3^v+*4r6Rg;FDhED}04ng9Iq7ds zvBabAm0XpT**WO*>}nV9*N!F1L8*edG2W zzVpDw6EI~xikxzG{_2hkX2zf2?bi3%4fN~HZwckk_eMcH^b?eek8E1*#gS~v1H8ya zFjD5mT?uW=_ZblHe2M^;0~y~N_&_Q8k*92zD>(fDZQbzGTM%?3Ps&CeZ_vdK6OV2( zRBFn024#tU*IS8T>p#udE<0~F(E6Fp5EC*tA56ZH3YL3i;6Ixmn1(^?PEIER&(Q%H qW|?yYcs>;bMCQ|RVacQa?8~-HKKO~%@e%N&6UogY{5K$4T7OxeF{G1U|GI zUWn@Fyqv|wV#rD``phx#ZP@VbAUa>a<0tr~N0(UTLX4CIHJxq^-`i4n zEc?fY%WooY3A^p${rrL*My>regNVw@(}B1;(rz$H#}i*m-Y6$3lM5-9E+?atr($mW zd>zN_UX#uZg;!YCdS;P_5XZmlF{zvM%v`^eiDj`jcPCv+Y6EtcYB#H<`ikn-@+Xk| z&$q$?*Ya|ZV{0EACXjaSOFfCW1^$y7Zh2R;9JCX(Xt2wNMpX$#nhnH7E6hGkcB?Y4 zMn&2VJC?#~P$c$VmydFGC>%dc?a{Vp7e{a>U>^3&on7!9y4#-EGJmFcOq44rx3yQ zRmBa{ei|_)LRMj#tDf1QD)Un!7zw_=r~tS7Te>O-sErGsc&L`kQJ1@AT2{;LH6s zOL*;neH-XxY z>giMTX9O7j?u(A*7C7?$5`7u>Hw@#pOVHy=XvDGuFA>6 z@hak2M9kLjpycFG%5Nn-vJM|is>k&zU^l8rV3?}5^u#Paf4bK0c!}=d;Ps+vWJeU6 z*mSoPdP6;iXO###bj9^tk_haUsD9GCt;S*f>#A<56^U}Z-=R`x3Jb_0dI_>i!8U?- zld(_mO2J3|)ty(9?`0v$I3L6Y?`4>un;jUKSATa&pQ(n8hlS@7){5XRcFhD&Q6_IJ$WJcSh_8aTDTP1 z%jbML*j;v@IXYY~!7GDRRnJdZ(ZKC=OGyzdBnmXn)4G5~-QAfxVmI=>p ziSh=otQhYE5;g=2-T5InfdNLLoLkP>CRD2fE?pcaw_ zr8lx-^+mh3JNRvC9$b1LrWyh^q_fklNAP#F!ySBqg@e9v>6?euA>``9M`^2El*DJp zN6RV>*KxAs+T0Hx73{JdMZ3gG8jyJ;(4Q)1jWBfo6>3j<)Jw&E`bIUrk<3mMUiXmS zHy*Apfhfn?qxDS=BrYXJ*Rx=CD1%H$CP2~kyOw-!nBwl1*~I9sIValulcAmS!X-NZ?@C@>z|tI zPR4wVo>-6i&8q1N0qx}4W_oVc?Dfz3QgZ66_ZVlBIloUv(R>HZMT7_a+W2yGi3b9FulbofaWNU@ZmiRM!Ta;IVHG>Lk^7EpahAJN zE=dpMxIVXB$e2BblBS0?YZhX(QP{2d)?_%8IV=M2zgXqN z+$pf9T$%&@^gqEvb1!Hd^e~rrOK#wk7eXv6O+s(ODN`#KFepoNAcb9)}kjKNsF8+gd zKQ(O*SF0HiM>zwCU8vkci5vPh4L|x&HF=!AV5hY|9P=#IqUiU(Ea$tmshV8lr+M# zV4L5RhVmn=n(OH|-AkM4U#<_t#fTVY*IdWky3X`d4mSV&qHbZ&RMe;D0SC|-x|7yl`%&$HI`@b*%n&9jV0!8&h#>oL&s~nm z=#wd4|G6;SxNU6jQjyAL#Sk)2s`8lXExbKY1QS1ZkXxvtN2_iZuH58ub@2-tVND8H zy{6ndn2{&tV{AL5t|4n(0Rql6dyn#7tO^gN~05CibGZ#8(3sq7^hLP&Ji zMa|&{Sy~Cc0XitWA2z7kvdT4)yqBYr!fYnD1|2i{RBqqf6^{sDzN9VTLVz#0C zqPfT89m?_0I|apc&hl6keANR@@g?t;eXeKyke%su6|S>1Nodb zp7Kuu@&Chp{O6JX$=igk-HXMA^7lT&Ncp3mCR$4dc19mA6>ei@0%Odh0#~lLy9s54%<68 z{NV1>@Q7(%q3CDpMFT#DY|~;7m7P20C-98&%jGv?!A6bZ`lJ)Th;hy*2@RbhqOCLuTqD6PSR&!VXW$mw)%0 zjz(jGVII9<=Bh;k;|{2Wc3R5ikkf-~_drh2R4i~)biu~@nLJ0*&YU+TO zu)PqgsYcK2ZYa6ul-+e+FNJw#4edjB;_Y{*%Bz0_n;w(#96@?oLj%~Wx`XD z1xIh_DfWI2Quq-(8uzky)TWnL`WY{2hKzmMadf3rsEE2BvUPvkLi^9ph>shWqBf+$ zkZ?3h;x$>n0J@<^jNLPsMr$p!$YZB#OJIgR(#?eIZgL>8t<%04*vi8FT4KPe;_(h> zCiE}GP}7owPiULe#j=o-{((w9T!t^t5^>tIXu|{3XZazkUK~cu*^pb~MC>jxOkfb? zDK!0oMd93BZehNtc=$i?)uq$bFRL9{epV313FnEC-K=?^0t^ee%nPl zlnrz$*Ga#%mS}>nrhSaq!L-50TKW75o(S^9hZLA?z`FFYfC=4<;3(Hh_KEKs@)ArC ziQVoU&~a-u2|qE9=Ee%zZy&O4J!qRC{)=&L{AF7VZq^-q=jzMo8eV)>*%d&fnHC^Uz1+bO^?oFRX3{7B9o9Q+ssb(`&5t!uXo_|9m zpa0(&)DMN#*x)H%uO4X}$jW^|#PV4QxV;%N9*vDhHtckX;XqE(cU+>mhy|XL8}7Dt zgz3-0lvm?E`lqOA7TXHDHO;@5klH&!Vxjf@f0q6zS}v8%}~qGs}Ddzs^@b>HOGLQq)DO68MW( zYBE8s!@%S0$K(%V!ns{B=R^3{Z=~Gx%ANv==}fMEhGvmNTNE1(Y{yvnYt_@9TGf4u z>$1juCXRdKENC<&H1&fw1kWI&Cd8+7^Vv5MsWTULX;B~$sDl#61*c9Xt0y~-*N-A~ zh*b{?H4JD5k#^nF>5+U~l)w*yF*jOfp6~X$PuDzi2XTdU)fMrRhJf9=-*kaT^|IM- z;Xsl~E{r?hq;qum`s@|RdpAYnl-gN-Jp*)6NA&CeEl&SGBuhw0XURQoIce zqj%vQ>L?8u?+usH!byzUI=;K(EF|;E!+NHEQN;<^voHziYl^c^Cd2>!lK55a$ z_>xNS^QvHSU(6-xZ$rSh_bctafxvFZ>3mn1@xCaOe8Jn(Y>U9U5oS?#{ zdo(53yCRHwY{HhI*w<$Lu4@EMO92;Cmd7n(%mI&YSGtwJtwwT146h<+FGE>B!~AA^ zDhnO+a<>t2xMHE9e+>sG6`(p7c_L4Q~+; zryzTLL4SmrV(th61ml40=~~XieHaocW8fZ)n5*NT7rP+Wq?<_O+3@{C9}<@!-*z4BrWJ8-}f~`$TzJf#)om5hVeR+ihmt6 z*9%{p0=v?a!7VRR^vt2pPAqfdJ3{Vcr?dx!k-o(A^E@zERHa$ea zm>+U~&yS?VH4O8h%gpS1US;K0C}njPbL|&Oe>;3IRTPvKl-{lg(EpX|G!40aJqAu) zzr`^^3Olq>p2t0W@!4qt0%yLk86o_CzA@*^mGD^CPy2;|ee+!L5KRbYu!P|gs)JMX zDudAvd@nF_3tOP$Ms#W(C9?i9OJvQ=n#J1@=J_DajEFLc|)i51a^m|bLZWi-cY z{gm@Mz2>sz27F3qyXo5q_Wt>Y{k~?lCgkxP^|WFci^F$ZhMGBflVi)B3N% zPpI#-wg`gEUmG6}L9&OSt5xi54;P|iICd%APD^WDq9u7{#xdX+Sl~tBXHqT|RS$5) z|Aq2qyvOP-R#WO`==>s1=mBRx9?lZiiMU!Us%6+ubVBbNsiUf^%9XNLDnwLmZ{Ob- z3^`A}<(;KIbwPe|;}P@M2AWr+U(RoGoK%kXGjbaepYt)9j0j(FE6?(9d=RefSNr^6 zM>6cIb&+1}a6!T5;Ilszmt@bCbyY;7Udml7fX$b_szoWY|Kiy0VA?k=6`$+n&g7Dx zeLF6j&G?ZJ6k~m5H%GCO?|6Kh%cWwOcZ#StlQ!$;_SQaVCr@X)M9(~ElzXXw0di!F zV4Q2CU4ZAw%I}6F%Gb)9G`#;HOuSLBf*BUK&9>5pU4x8tjEDCqvF};x zrmMV`dE#`@7@ikRfLLnYfw5$Vhc%#`5V99@-#Mu4q4Di6@C-T0X08idPc|4leJk&*50+)B!!9|l z?yhP(DHpL5b*7ZdWGms&fy+vgdk1S?qlXn=>4=KHN46F!E@xuKH~vy9y!^2Iw~751 zqIvFi9^dTASAEqU4SZ8Gucb_6R5Sv3AKAT^VeD>22U!UYdVJ1h<*m)pV+kKM8rKY{ zhOrbUshvmPt)9?s^61oxc&YeWb461t|D40k-A5VOBNdq4?C*Q#`1-}dg0Rfn>GGA2 zYpe?OGw0N4kTGI(&+2aKX1Jcq;5u!QF!(hoU0^UV+tR&m9d53=R(V&db-b%W^^Ck6p9^;J-fu>62>?1E$hS?BrzvTYjR&&Qt!PqgHGz|<_^M;z zdtvNN!NAm1BorUbxQlJon3&b)-Z!zsIl2YvZ?P}vR+?U=sG`V>Pg@!u##IV&$-xnD z=vF-JTYJj5^taGy7XOf=1%8Ly>BsE!k0v=ZB^=udmEtc9%s>~8+1_nE%9EEr+Y++3 zG-rME`GT8GfxAvtlTRzNf;YEE!?VqsLF$@ehN=jKmEl1W>lZP(E3u7&`JYz99f}OAAjl+ahE>X@ zUYp4@K82n2Ux?oLps|jbvT3JHy(T=?XsB8|Yv~rbs1v!s{lFF8fy;c@2e<|^)@0(q zVCmsS?u!FaiLrO$C%@U6=V>Y@7iBqK<(KBd0PF^iVm&Vq0DQbL&-RvzQ!i7dnJaUwFu%Y|7>?p8%USeutiD7M2EFb9t zwLmk=RxTIx%k%q9Kciw)80+@IjGbbnu&`lhvB00~pT&MRn2=L%_M`-MHxQ3i@14Ya znfH!#Wab{`4941eHFS)Vpe2S)?YgYm(EN&cx%^TmkW2in1pom3;;e+3=||SrF14Z} z67s#pYZ1s=A`!ONcuEz2y;Lf@|B{l^BHhj788usl2XA`$KuD*P@d*wqezp-r_+dHA za&2?4o{oP0a5z+d4o}KIIOPtulOkO?BUcp8O7xgH>$7KC!I@yjh-j658Rr`!{?&^T zKT4J>$6#LA{dR>loe)P;1M!my&tyWm0nNs8L;Kwu9(ByG-FzBL!6ouR)Ve7lj4@I5l47`_pAt%_u+Yhw?+P2u6xca zzk1n+r_AT3^OJ9z!{4iTG>*C{JV0{lwup&op6*W0$}?Al*<#t4EV``{2apQWPw$St zbuZk$sFb?<-N4PYD#^b1T%NuXNK#rpE7v<`?JUg%utWNlqh>zg!p7bd_6SJU-+jzS z7hp$Q1xIzLEs7Y9ZjG+n!EE!1?-n-`;N-65Wwe&RW#E9k$ZJ#G8tg@>;|FrYuQPJP z#lg9e(`dyD$>lbF@Ro3Z1@Y+@PX0@k)Oy?EaGnKt?tWYeNM$I`1z9gjcP?xfRK z_VV&)P<*MtX(J5#m)!HL*%7c{IUxNMB;;6X()#S5nogG$Uwhw#H7AC%5gtc2$MJs` z6Pnev)GwWnJ*797&9?>k&m#Hz)vyK4l7V4A#`dDf8)qKoKX|)}nf}P}BQm;3eLpNY zyz(hJ&gqsTHZD=UoHPDZs=_HPb7KY?1sTVhuDSJb*^h)5%~jfToVFcS8&_Q#MVV3W z<)WTPXOF+`9c9(I>GXK$V|(#KT1Z{&V-k&F_5<^PW;%|FdT~|5qk!f>GS5<8*+Wxu zg%tK2BP5jdYsm3I(5|}9N=R3xX1a7y%_Kb~k*5Lo_ zKl&Rnu`HUgqh6wC&;dja|Gxgs?Lu%&^^W2z7XI1)XtO`<_J4FXX-&NfvUvXg1NiyB z{)qo~0p9<)$1|>eG)ZNy6Ec24S5iYEVX@Jdr2p_s%rnfXn<#g1KqGuc&D}S~%PP@S zbjN+hXUqpM`gZ~O3zQ$wxrr#Q*k?t)oPE)l;5>}%&BnJNH z{dv#Rw--9<7h;t9m^o!K-KlVUKj{i@QzYvrOtaOK&SIp!A>De3s_}1zg3TmANZB`&W0Y`T^KCqU zbWF6;&26LQzU2vDx9?fmtEW3$8!^$Xp|z*mSc^7w)*6q%qm>_^^5h;|=vubt4n{<|skFTt>? zYP&7@>h$sCLi2KD>Jj`i@mnZ)-R1;7`nH5GFspYz!ciiD@Bu>M8_=TIvch<*PT)9bPDc`DEp~HXbaQTXY>A?9S}1 z4wVnH=}T3IJLpHf6*jg55}mxo7LIL)FZy@W_~?khb;CCORHCn1AzqkX01ZNH0KWh) zrfOfV>U>=RfKlw^1Bv)p_hteB{g9AJ1Lt1=j_QW({`#bAj~4r({OkQ)(S+M5idMY1 z2&$ngjbsEPi{yMY5W~NfY8<~pn%zKlOJ?ODf!IwItDu)B#9{UHc73;gBD^@x{ab@4 z!n5-qxOwrrm_Nz&l6T7BuKtEjv?qv_2#R=u?*Z)ToQ@OW31p$%<$O7!+5= zxBosK4NRF5)O1N*M-z3vH`I`RRT`Y-Xo3`xMTHGMk{^E<(dG9SA@FEq4jhMct$ES> z0|}R~CYh8@*t+tOWW=A2K}^scHX^b~y0F;ygTB-=uWzx0?BA{L?mt)m=A(Phubk2s z3YIczBC^IJ{vkkfG}9@BuoB@{j?cIKL3IVHoTmVCloJQ|eaHH4s;fwg*~O?}eLnMs zQe93OMRC+7gyNe({YmvNUOSvJb@c&Yp#O|8_yQU1FPneG{T~K*e?>#(-*z=GV}{D@ zLG<|k@hR_PfTp3k{*1)#u%T`(fN#f804q*OMFYj+44}5xXMs4UWo#X9QQU(JvYrTf zb%V$cj~cO5TH1+4 z&404r5eF;ybM5L z-70XtaiEBr0UC~>sK>r<&CBiWPCNj0>n3^nePdYQMwte96a}ll1p+yd`bl<|LGu96 z=^53;-1J(i;k<5NW2g(QBz}eE_}BnE)_tWvT{})+C>%%+GH{*%z^JD}#A}kk+!g#S zq!8QfNxVJ-3*3x@n#SvhR_S_w%-fk9hqL~!@E8E3s}&*LxSU(?q7%-g0U|I3sZ{Nl zAAmBg*?$uj_IRN~1ZO2G?e<(>=M!Q-#{;PQ+I2DwLm3@*#s(53Co-y20Jip7e`)z zL3=7-pLNKm5 z3uax!1DZn9*oslW$VnUMcB1)Jlmm6x5=Ya0s`Gy`pJG9D;TbL(Mx54BfqpSF z-b30i7Y!1J&Bg&Gur6OC{(96!vSu!Pa`)JQv;Kk2;uBtH<5L1xN3TgM`g(uek9Otd zo;0_v+H&2!TYsqZsmNF#kb157(Y^lb*-&(H)8 z$G2Ep#GS07Pl;6npWXV+`%SVq;JhnF_#kbHWmY@ z24!+>kAt)yZratRa$R!Rm**FqgK|A>+M%FFV7$2bN6Jb6U6z4z^KfDUtry*vbbc(5 z9mUJN!UMUG0XD}hG7QsrJwqeb7X#>|dBvizN73826mb}!wVcF9^NguQ+Zf_SQGK5h ztUUiBrtB)YROs;5GyWjxMdZR}a(qB+Q0jdUb}YUMY1C)GChB3t_LdIvXe}~WDt~%M zR37~?%KBC1Glnw0&eCcNwmA;;ew*W|)>*B+Y9v%GAj;sHQ5mjcNXO@t?s{zcR$o}3U^b&4wx$^P^8W zWgYd341ZLa`oxbqEshdNPY!wd#|ZV1Sv<6G3|zl)&_%4VxK{9~;N%z{WcFsXK)i^j zY|)#x0Y{KyswU}}U&+_C8XaOz zkX)V0vPfBpicf|H`kG9v|5`5RWY~e{?!vR9Q?_<~QF`&WaXN|7FR7y_icj5|D-Dw@iCo}Z)a=+ z_8RM4n^}JbBu^2|B6^WE-#$M)bZXCrNI~QB!OZjJ9`hGIJROG z89^VC(0QGN)#APWk)!5t$`l{yU@LJnd^Io{R)Vh!u0AxKGLS-DjSXQd|DcY{{xll= z&dqCJn?FVj8N;|;J)nYJi9nMbN^>~C?~Hk!36dGt4+ zazg0RCbpS;*@oJAjOF~d<|G%sty#0h^k!zqM9Gbs39jGLpUKkUm2jAHC7_7VRasT9 zLn{a(r|X9=6VX^&gnuxcw_cn)?S-*JcfdayT`u@J_~!oYyl@|;KjReBmy=TBA1v-l z`G`5X{`s;U{iL9~Ex%#Ji>(_~;WkdyZY@g8^`GuCaHw#DzleBmbk%s2QKyw}E%iR) zG($?etkSiiaNBM}mca9sn*=WRLmnSH^^PG-$now*Iwq$lbfKZ?&R&49bt~=1hBP_+ z&hvd`=)l4hzoU(X)U%B198C-}TWQFBd32@L2&d@)tSAJx(fMQ5kcY(70aHU)LQ|KznY? zgLWT&1e@G?ah|?|Dn}%u!zGx`P_&junbN#T^ZujcBlCRZA8A%O|OLrIHP24;xg#}YVyD&0hlKs_hgIE< z76`iP{A2vYS1u>lPbWI_*+P3QC?aV9QDuqJ&$Yg{#^Xo0zeS^1Hpj}f-^^v-OX~Xd z(ICQ0z2>Nz>T=l%Br_McY;0d)djE#C<1Q=nV6kZ|`F1^*gfpvU3_MZiE0T2aT)n}g z@+C(KV+DIqYbm1GOmW<1IVO9*0HT z6qomHbElPmzQ5&q<}=~-SiyRctwzUtYx8Nq1bD4mCC_x|)(!-&tVMC-6qUyn^7w`J@vz|+PY&B@0r zaU(xz73Ls6D3uXeyJ@QG&*q;uk~-IK?c&B&uZLn45$Ot3IQEV+HgL2!f6e4{kHu~B z-Kp%*rp6L=XuM+a<2)YenP)ipH3?e=50z~BYvAatw-}F>*C(`H%hUzo8yptGduGuEapPG zDLm`OOUA;E2CA7CYl#^|OISv$jwFxauj5rOsIA!&K;Ym-?- z+>*_saUeBy?tot^6|J`DKvd92>N6VX znNhep$PogRn58M1VQOe&zs;qyDX2Or6g+Sv(j#;}9@d`-dyzD2XMgtDFP*ADW&bBsJKM&@PJ(KiwX4>QFUTG--j46u&1J zk<>K+guK90B>aUZ_K?& z8MCJJpb~+0k6#B~2BuDXY};OTyKu#k_a?e7843#JV!tUCN5Kt^rN*UmU&U2vhrJHJ zO({|-#bl%qX3r{Z=xG(nIP0}3s{~cm9T@w2-B8lu=0rR))LSZRE<4mQb#k@LzrW$$ zUGzl64URw>##-b@hg7y0gdB0cDy+6zl?|xC)Gu_!anXMqWHU`m`KX;S9; z+mbvi?AV{ytLHDa+>rcd8+{ew$=T=r>u!`{Pf<+6yQlE-hCQzC<|+YnPg76nJGi#L zr9V?c;TZNroN^G({UO2R$>URs#_cj*d*qw*qvIm2h-Nji!Iag~*>r+^!`6u9Xw}s0 zSoXa*-RD0qrnvJMFRH6tsGmWx_IA1@5bLj}Rk+3QMocPm*SL8ZMk3V8Bg}TeRB9kh z*#ZzRzr)>j-Q|sCkMEEreV_j->RyiR$j#}pBH4{uR(w@SHX7hrkv36S8c`zPM0pu8 zLdVQ>yM2KHKCi$GaB-U~v++vJ@6O|+A3WmNS!5OdU>Q*&kwGfzlF~J^pNgSlVt>;8f?PhUNZENwmZ?fH37+CV7MxZP`9Zc? z-zI5n_>bOIS?0Bso;^9Tt|W)c03y(<*zvuF4mE~R@{9b zWH<6gi+Wjok0-6GD!E6kwITNc9;7JBbt+zH>WTx!hb#Qd0yLqi*?em5OM|3|5#^J! zgOJd6$H~XwDp3|T*D649biml(pgSif!l>m5o z%R@_`{%$PzZM(Pl?rjR7!jtKCK*h0tk?BmXLU409o%;!e%1*=7hv|5 z)p68^H6wKZQO<-IhwTAwWf^ETBddz;vKmpDmP#xz4dy_Esni;Fr>1=Zg<`cod~ zDT+G4%#CBHQs0#4JDn+9R2lz$T?EsdTF=aze`^7P7+Z355wlnHMt2#VM_OlRVt`Cm zGORKjXX##>)s18%QbJYKO_|;qIJ;BJf%fMk9i|*aWF1m`Oni--!UHK(9=ysv0yN%l z0@8b%I`6zd0PjzOnOmpUIaBMoNkB0?O1saZa&%40OJ6TJfp4KC!}w?~>6WqAT&1=R zd2-AdU67t8W2qcm00+`YNPpm79w@juxXS|l)&7q2@8Vx^>w95`)bi=855ByoH2QBp zCIO157Tj>gu%f~4&$m+cCmrx(aP|8};7GNHRxmXeh>t@Wzp+dYrEDU!+0~x+Ns2RLr4r8!o7k0mfP?_S7`E zHhkG+H?SorKDn5tOoKnj+gEPxwP4JTY+oMb=l%)Y%5q7kY!(S!e{%Nwn)Kyc=OdEe9T4L>`Q(Mc7jKLMYDxyEc*QiQ>}8R^-d7)B)x@)Vc9dRb}IGYwo^>PuN?m#`QviZG?_h1B=n zjM~to;%C$aKi3q7%lxF{Nv&q8e@lHYfozs8!xrN>Kru_4ACLU@d*3#4e#I#3|et+n7$i!`hN^ zJQ>J?tpodrVJBARKn`y-zio!c_m<+rp*zZV-Ao6T3uK6GhZyCtStHY7viRZKM*ms2 zWqEVx(0yL|Ke?MoLUy8;M8k1vr!pIGj(^vkQdtVOvNrY!(rr+``G{H#XODfGzc@tt z_3nD#QwBc&hu(>R>*%2x7a*C0#dSMR;Tcws@9sgXI)LH_|LQF7q#f^}jt7|fO7w)E z)ro?b>%HN?eSDsb3&J!YNdNAYY21*m3X~i`#qQxsmbW{mK&9f$%0R{p(5{Z+enM2U zb+JE0)P-BR(_*(=xFUhqG~ zgL$6tIxMCtk8v+KU{9$G%KSP3)xRFe%pFe`DVl7?8SR!#hdHco^t(()bkffV%Zz|8FxD7#>;Hi8(|f_$3)Jeg($J&m0`|@KG@SjU-b?H^L-MmP3-c< zwn~G3g(w$^-_0;W_a!SxDak)Z)CMW+d_L$)D-iY3$*-^uTGXV6!_bU#MM76FAFpU3 zLse;>dwjcCy#XvYc+~+y1q%gSiu;sXwNHk6^jhaP0+ZKLPiOe)lm`~)-)B4Grfaj} zhx}ZD-8b)V0L7*izfc}^tJ$t6mKhddvtWo{f^?~-zXfUKJ)ky$0qFoH=+d6~mNVFJb|u!St&IGQoABm!7AJg@X4g)M(^$`^0C*#bQFrOQ_{7dIif7Ruasc|C* zV;xoFV}Pg(zb;X-v%2pONG>GSr{Tq_ASmz6m7}#?y+Y`6i@uLaKrI0-p~yNcH!1&u z0gG4MEX8C{SqZ#7puGJJmz5eKZtad+NlXd6TfS8{Vvy{l;u5kPWDiNoshbPLl3_*V zbZv(ZApA>qYfo_ezva7939*guD~P?l29ya~#rR)?n42tKX%cio@q%ki3AwP=a{UCmm?z`GP4JiH_Imiic-_gZ8>nCvL67}^~ zQM|qp%dgYj#wFXAMzzXFxfaW;ZXp}c?wHFWiVkeiHSYsZ-yk>BCKcqC?7QVI{O%8->M*)0$ANF+l`Se~3*U|2xUQ&7Ems1}9iA;7$h???lt=F_ zmym(gk4pU!FJT!^5Qv^lV$l}&fk){1+@w-RGfI4%D zDFIn5u#W&(8}CpV-cgY7XoU27CyK?fuEWC3WNiT z-LLS9%{ycTakUHCtsY%S{XeRE&#)%9Zr>YWflCn4rC2~fMWl;`qS6!*6{HhF3qcX- zph%I>QHmlULO?`%PY9u-1c-`?^cs37A_fv5v``Wf&Wvk4@4KJ(!+Z8V*WMq_2d`T~ zNbcPC%$#$K|9|`jZjD%E5=;mgn1rOeFf4Zr)0E{I{;f&U!{>v6ui(LizdT7yJo#JE zDw+lEO^_qwWcW0w|lXIL2-54uFVA#!h)_xn{CC`8%J-O^Uq(1 z&3PbYw-|R-CO!^hA>w+iKK-MhO;O`wXHu%#z_lML8FG@1smq+G6v1;5u@Vg_jW-KY z>1Fc)L!nD$i{&%+l-kwO(sx5EzQKeE@Ai>L_wCKs0-tD9ZFKv0HhMzH?+^?Nayr`j zE6=Fjlj=LPVgl1)?r|?tXNNa!A@SV9(wii$h5>;*`NpL_5gJ~@bmwUKzCZBx1@m6? z`fWRSvv%rjmF*`TrEAsq)-jD|wm59p^4GZRTxrFhyC+M`Uvyl}=DoQ)b=*+BMgvdM zG3%^QzlAwkZ&g#zYXk|S=>351T^B9a(RQ0mPOj9w;I`Ln_}9?ZPTj)YiRxP=O(nO87epulV z=b5_wH79LY0LX$>w5x5OglIxK!Xr?U4w^u)ais_fA{p#GV+}e1ea&|-DgCFtI`+z$ z4PZhak-I!%K>O0dj;?@dB9ZCV5MI7^hWp$Ik6!En_e>#ergLCSY(QCDvc;nmIE8~HYypvnL5v_D;h0{7nlx`zuA=g&(LCQf&u2x~pJk3YS zGsvo@=m=(fl2D)FuXpOEv}T=X4G+rA%EcPwO5V+=Sx6k>AYPchZe@9v8_Dt; z$Z+*F*tBRkK5zq5DiAX+?g<}tyc=tuIA}B&+{;>d8tnS)XL@1D>UVO%sd6=D{i^Hm zV>o(9qjj_sB@HcK)f>Mot6XzpuP^g){d!oq6QSjzK(tfKKt!lW#293#LOYy0fd>vy_Bc&By>B6T*%o4nWxaSyJ595 zHfaLZ)E?9ctl*)sLo+k1GB3#K{x%POep|iMmgu)lja#4+~?RMt7$<8A%xAJeQo zeZ?hRTrU;v9z@ut8B(ws>$tvE6G z>mrnjHh5c3eJ#TTh@xH?CxP=Yf}=ylG!No0*j8ca~ zPAlYp6@oe_RE{F!>%(rFcOv*X8FFnuU%RMV!7r&^6(@H*J5&+&&BbY!8B?&g(mg)^ zCO<%XDW6b2K6yWdYJbrq$zftQW1o40%T$-J$ArqVf*(mAI|Ot4C5BhK7h8tldKJ{s zsg=mPfCZ|aIKvWZ)hbHraPbK`YKo0(PfR%?hDOUde9heT6Jrh?5^EBjR&( zo(*IluE1lrcR9t5J@2cztPDxU;B4*O-8izO-tdwdyY%#nR2cE)bDusZ?WVoZ9k%

2u^2XY_ehTZ@KJ_+RM{;hc%GY7;Xpz^4K~k5&{pRe=)h~X2cCJv?yi0m` zLYdk*`_j?zMpNcI~N^VA#xHy05`=f?jY?YKrQ( z6E%?V82%mT9(EV&KiIf!Ed?t~d1oxxT}*P;l)bdRJDDywG~kuyQRggAlX%CCnfFp| zOUVC0f9l*+_bt<-|G`SJpV9|S3UpU}rsjhNd)AST6)p_)obr$1@T{dX66Iqh56j+l zkX!^I^Ew8Y##I;O$_sAax>T(O;gzA6JiyPARrqi%@Xox>K9-#F6sz)6IK*pGj%2tk zYCOXqGQ|gv9)FcTPvD1WMIHCLRrm?6eBy%g!8@WM>yb+juCPSZD44Fyinh4B*739l zNy93LAqQjo2EFyvq1z2Ts#v;PYgt*;S0NNl$Yex8IW2bL)&NzeQ0OKm<55m+W!;U~ zBSG+zPj)F7ce^+F8SqUZmekF(x;v@9|$H;F6#yDyZMLJ zJlLW@{PGa#9^)HcC2WtQWZB%HR_vI+l8(ckiN5f~vXc-+3%Pm*%H3WT@n{|e8y*|? ztym~k;m##K`SxJFd{`7UrdFa-F}Cy|UXKDX53;jYDhW1Gznd;ljvM;+K*dE{meQm~ zU;IkmC9>P!w1MqehuJ390=JCxIO{Lr?qmIERe~N3!iAt81@gxjB4^puoMcIE1 zv7LYgMNyD_qE^@e&w1L7nerfGGw7k^jT_^PS%wJXtQk=w;E;$UO(U)T=Jp$AE+IwlQnQ%FHdP^CMhDV~y2Hx1HiHmL#n}69taVfg38o%JtLb?l#7Fxj z4NQphtscl>|IoVGFoi-%D;mve)*;|oUeAivu@{IzQ*zj#2HUz+w`MZJTHf#*UU2cF z*3x)tD^rTw38%6|<{7sQ9e4UmMW3J##*|v*KkU>Nnhm2mkcls|aR~42RGHJh0W(Pr zz|h*0MvT@hDimzM5vAt^JxEB-5K-?emGb4&S5&K(4JtX$9~xt)#OOgh6o{b zp{kz(_x}=BLy~X#lM_7m^}MtSgOd+)K6)&C#u>womT z{|o3VkeyGFxBeBpl9>4(NKuE+J_hi`4+jm^&IbS&d12oKNIYt=6)kW7^kf{E$ccct zVNrYBO1WmSF{iaLy1eT|O(wWOMjao4n*#Z-${bDAtGc5TSU^=T# zJv%rSeL&pG_&&()Yse3Cj0+5~B`LmsAc{=PU*^sL3GB2{pta?G!qo!`i3g1U^#dwQ zTW|=QiaUemK>;v`58yVsAG8LABSt;q*t^qds(z)v^^$1ri3h;--Xf&IYV1QM0G=d4 z1P~E>Cda}V0ACU|DFQ}d9w-XpCIi7N4L6f)JqGYF)By|oSSv%UVOU`oCldmNRhxEI zgx}78@l1V_Mfr_ww4f@KY%tlrweWd0-)%i|k;ZK5#zq|EFGujtd_wgI+$fS7%{^Yu}}h>f1|A)jAPE9O5_Q z=KH&sp4tZx0h!vLUGy|4Bv3x?j->YLDPWkQ1-uasPuQ82l*YCEc}HvNAmHMCJ|vE0 z7ql-v&Scn3tw(wLXjdu7?*wfwO;x)a+3id|6?m--W{B=kjRPO?YrT4l02tBA`9(lu z^90{3aJ@&zW-yM!Qs3W!6!Adfgf4Hg{3Y{lROo2eM$J`UP;WPP=sSyoXSvq2gLI&! z-bG{k(|bdK)&KJdWo>K&zr#FxtsKtNbA{kkoT8P>6Q18L)h$qb*KSVtdP2UOv7 zwuZDy7xvo*jQf)y!$|Nw+JxWUy+l@mvT!Ry1ig|I#tm(}`+>)PRW2j|;B-9bYjYms z_5Q=I{d}c1exNK%Baw;so-<)1eEPkntZ#&saDV6R6|ASI%YPh40N>?RD=Kw2k#zyl zFp%rcE(T1N$s62k`~Gat!3xD>cAdW|2WFg!@LxRXI_U&&0G=F=82Or6Z^7$SPe$2Z zBm)Vxm7ZT82=nN}n$*|=*PlwA=)a)jty z*F3}^r*&=mlZeOmunV>-AA+;|j7QEWbam-o|f+JONHnUS0uw8hElBM`klM z40_@iB@FmL!%8khS0l%P5P4Qw$tAC7!T8u5tJJHm7r#ki8%4Q? z-y*-6c%gb3Y*n&zQ3IWHwBuav@jz=8aO3N`KK@f0Bv=seZ1tmTL_sZ^7yY>K?IC8# zRd(95nv^u2J8av!*2qq>da&V9l(wIljLY<#jGc#vk8#t4v|atGm98{ydwnZnSCvXR zPQG<51(X9t?Tgt?Z?AKQD1SFy=~aILI9Y-`RplHi?+P`jmwVQ~WNZ*{4A+vq-*}2g zt`bhY4bzFu$-$KgDJg!o*#PMizqgAQwD$q-=v5`If;*`dE8%=+o%}9OzE_n7@AD!Z zcwkF&i4oxc97eX8X%S}}>QeiSZ;H(PE}c5U{c&evyn#axLJSa{co+I-G*|RjdnvPX z0urag|2maBd&juv){PrC?-|J)PM)-}|B|GVD6{tuEt5DE!Psx7C$CQJf8KL)^Un>J zdk#tM4vHttO0Vhb9=(2EO@~`&&xtb^NVT3UNlHnj@5VUu5)s|CVM_R#9k3Cs862=s zZO+Bfo%iRGzP6^04^U#25X#^zyT26umPECm{l=_o=PdwAtJ4~rtjh7dc;RChS8N6t z@*EtOtBa>jgJbBWs=2|d?6vw!HU^eU%5J{$WXaB}i9bR0GVxzt0F^uiCQ;WGF_(WI z+@2P8=_sbpeZ~hAjGf41!{kq#+J0p!ko|gzjlgC?C8jYhpvtxd1wjj`vr8y_uI~vH zcnFLL_a_>IVl&vrlzxs~Y`A6gt*TwN`K`bo?sy@HzIMMkPGn9m1dX`$;aeiB4B>1e zKAnD|5kpr0R359+RgSn98*a z=g2$$Ln{%13=G6JR zET<=`oJ~`s@}mIxJU*w+#M?G>NF~{VO4PZ! zht5n;sb9Xdxlc^vogA#Ls&BJu{8v{dTxu-?kd5cOC^&ZgP2m;{aOW=o)Ynf?+1#rB zj=bo)^V)|p;4?NkJAssi7KA9+ygzptRK|Mo7cTGO2pu>S6bhY8SMjv1006Z(6EAL8 z<6QmPe(O&I8bEe!z7jdurd5oLG{3^n?HyELw+`^u-g~ig4zchlgK0mKGvLy*^SFIo z=2%;z^R_bfZ5(c|vLSCI_!sb2prgyuF&)Xi`g4wlIb*svm4Z6b@HXp~@|IEr`o>^k zfn%HX7vK_leYYvn=jBbxb;?(PA%DPJRwe52_SWbRV&R#cR3H$)23wZ$?uUoheIA#) zkJhZIGtoP6Fv>(?<5%~AVQOW%w#)X=&qFTlfH(S@M}s?$Yxll9s`Oq|lJ%i0#Hkzk zS@gK@ce5*D*KaYs`jrAO8|DrXR=GmA!KY_=$Z8H5$_Mmi41kVb-l;5;0uKYz} zi^huknDD-CwFa;OzC2)a-l`PLp0%cPrN4&5y(J`mcs1DcpxIPSWv6S7jWd6hb zkT0n-J&o1ynAE8?U19PV*V4-$<}q8vzwMstc&WS$E8Nf!u;Dvzh`_&|0`m#wxyDD? z$v831#=Zbvgp7la!jXmfcfb)%Ubc}uk5m8sJGcZxjuOr9u?$ys1~I~ zxA=OW2mrNDJ#rDosc<6Wnw{Xi8u{*M86(iqz~!7aNyMP7c!r>n=U!~$6A==!_4oBP zT-&A52225bA%#w_(D#LC%Akfq@lGx0jtc~QPYt@5=_THm!MIGLrN!ImJFQ88GVzut;*+arf$ zwo_alI@7u-%ibr@FYfd>lMB9x#ml4HYM$2U70)TZR^n<$=2_XKOlYY2~^$US)6EsBFAIxet?6?DK#lN{c||6IAlNOe~xQF}|B^1h91 zg5!|abE>n7M=IXKNbvR4G-7mPM)`~qrnD(HC^s1ibxIJfQKO+Q)#JdeqON}CV+^hL z6z_5{SD%rm~qjDbM?ob)h(>!;5&NPQ}=Y$Ir5Q+e+YUt*1AoaDsWV(4j3^&^FSlV!u0WxH{06 ziSDkxh(9AK+hAVL-nHE zY7Jk}?f}k76;U6C)1Ya3eUo$&?0cHBe$RBNPV*VO5q7&FcNbsbx@S zse;hx{vu~1^U!>S%ZQdkR()G&l(`9(1q@J%Z>VGc5XD@RXeYPaK+QFS&HM@FKb|Nm zL9Q)RD6;jyqoIj`+Un=pgH`M(&0}pZ$Be~bj0PcQFkYPYrIEA?(E4wLQa`PDe?985 zG@5QkvSqe0)HnOl8jaRYkt%nvZ2a@9!WuU34#8eYIeuyj0w6V5i~l)scM!3_h1A)BH;0$YXpOsdF1RLO zZZdFZH{$r$Z*tiCACCP8IRCeYgc=r;q4KXc+w;GD{(s^n|1W<^{WRDM84i@f(&k5N zu|1XS#xj4fhhqQR&l@WuJaadfo>Pq`4~(F>t)bWw3Kwx(H6e8=uU(#9PYlUXuuF{xt!*6WVK}>c8@HvWyo4 z*dBhr-XA_|Gc?lxOq2C(`q!l7aNY;c1#fTu1Y4c9`fQ^tpl9I6W`fiYJOP=>M8gnz z-={~orUn+BGWSqfLw*B5EeDnxfEiEx*!g?fzx1_}L6Z6s0IUbUW-q*FRMR|9lZkYxK_h1O&K zm`zvpI|Ce=zAcYpKGWhvRA2K8E9dPD#(wiBrKcpLcIbn6gJ7^{^V`b+F=xR}UH-;d z>v){+0(p%E>Y1;w1`rI;$s==Zk$3?Iz64hltxknWdwUL7VKR`|KnZz~T9m|$ z#dDwWSMCxMb=S&VMs6G~}*2p5Iv5>w|mr2t?2Bb9j_No^Uj~ zBS>GxT;vZ>s6r{K%iS{FWS>z+X&>-``U*MDs5_tylF9egEBdNi3=4K{D0*fiG0|6`ueXD>6XvbuUFW6ylM|u}ru$Zo;+`9A4sc6@+VU0w2QOblSbDvCAMBnVE57QpnFncPbGM=TWkyS!!S#Yb9s!wW=NAoDr+r z0wLUJ%L>KvGkKgeId?QR0Gg!1M-h$}>zk|_Inv0RyiSN(R*`TivOfDA{e=aZ9!Og*6dY&HCZTrC zgUyGk*L`KrG+ zU#}0bLiS-toUwvId+I+Ip`Jer=4i<`x$mZWPe$#Oz|Z+apvXlU zTkOyPL^$~qkUcnV+WrXFhC|&DW^=}0PN^j)QCc`M2^TaORS>|W4N9_IxmLZUbL3xN zU_AH)4AEvuk4=4w?Q@;_9MOD4!FFtRD>^*F8zQkB0#ICFR;mTn++X3G6X|9y9V$724L9z4yvw9b1%8!;KXWyBu4#VnPGwI zeN}KG@G1MG79Q<1v|6`14i&noUh66DJnAg$5^}zV`kp$I?_=wdDYfCB?-tS@I4WC3 z9W6H_zwdUW)jgWL(r;07);j32H8=i?(601;0M~l!Myyj(_a|%r===H;I>T zlw>Xgwz%xujI(PaDtI8ELDra76+V*HBR2;?fcOs3sBhzgnY}xs%egc)5GsSXi^k5$ za>rjBJpBFOU{^p59m((+kofb$eZpoaXLV%dSav+QPp7 z@xp*QyaIA7xowU)v>MNeMw{uuD}CIs={}8ub5`EW_l%DqpzeiA(;BxBpv#x)`jpk3 zCjK$N3h||9#EIdG*F4V#`5vF$URc~&oLIb4zElF0nv7WAlM=TZ-*44c_HgR64Qa8v z<2ljHX$)D?XL1)p;!al?n{h!>j0P^Z*VN+D<@{#9Vfxp7kfTSo{iQdmzAIe%ZW?NI zU(`sfA)r^_^4uQ~GN&J~=C9@Da7^4$_85D^Qgvuenk1RGUItK<`v6U%l=iHSgU9iIss)%I4@oK8uNR@QMun2&E6Q=tR zeSxlGY(50I5@Bj>Zj4!WuNaRPTKOGTQM~QSJ9Je=57qT5v8bBD8koFC+0LlE9R^Eb>1U6Q#4C!%8cM>24UU+@?i1~%Qbr(F z?pGxkC{$u?RlBZ=9)zpsy%}cL*F*C1vOc-@C9-Ec=wql5%O;nj+@Qmrqd5fSGF9oM zbWY^Rh#}ii9>>&QT}!71O7fTTe#@a{+iNw)2$#95&ka>h%)Yt=pCX11ggOFvV%cVX^Ev2aX@q@#LlCt)%6o}Y{f<%FS+ z0e@~#L8{BSstPCJa(YR5f>QUg@bGL-ZgbX^xuIND*YEZd)rm>mLbWGjC!)W8j%}y_ zcEP3(u}{Y$Z&*&$Hh=bTj%y<;IHq&BH4^8dgqY8S1dvvaCkNikq7%%Dzv=i3E6l*C zmfN%h!cvRaS@f<%{GG)OElTZ}H*q<6r1T^!*iG(L^yl)1!e#5SzCcGMn~H}?)dCMX zVzg`rOvN*C^=#s1w(#K);h~*sybGSdLNnige?%5=q$u}4Q7{z0B7BCr?x|C=*GdJ{ z5LfGWJgs6QYy0s7`iuRQ0=oKpKL31w3eoF!egb}-&x2sfx z`7T?rN*>!uKn%<{(Lwm{%QKbdN@$CXVCkV_g{5{bHjLE~uGn60%X##E!Z@_gUpv2g zk#Tqg+`PIu>5=t(0`@xV!&OQjiibYJ_i!hxyK`Z&%=gq%RNv03=={2cMfMrA zVzcNY@`3b#oT@nnO+YD#?{RhB*4oqD0tou)B`Tupb+ty-q8X>-{7)fNZSjU~#7nm8 z0L(Uz&}MGb@dlXC{SimY=~i&DJ?sQwCB$BH!Y9ayp0D0RWq0QS%m@2F2bilvf@-{G zS{0uON`GQ5c!s1UukC;)Y2T~yqbufCgEd0gbd(jen!HE5&6f=alo26JAQW7MviYjc zE}3iAeUGR+JbxZn6Ca*alMo>eF|BYYpT5J$(ao=pNAl*^h{+tah?X8{x}8y&bXH}* zOZtaZr)%b`r5r9Ly3deW`;MN=YEvU$#E2s=9gz+T1gm>r2u-oxIJ?;+)J8__b&f<6 zt)$n|pb{Rny~Rs3o6CRv9=9X7Rl38QK8oSZ4Zw73pzqQu(nN8`di6^^hFT#heIy}+ z=A86GnK{g!Ep4$$pWalE7)5-p78%%gHa&WQvpBuaSFToDi#lrW57X9G&Cuuz2yRJG z>i5zUb3Q^W(bB>19kGzQt|s%Roz-Dx9~ za@K0mdp<9F3w`6Z{WvY-hRWk?S~G+?DR5o-gd!a~J!1be}VUVu$U}x^1 zvawY$Spj?L&8h1rahE=f>X49DW`y$9MBNW=@Ctj~%(-7uhs>`ZaZ0N#iSbLwkbhC( zLl$Fr>?zd3g_nE$RoUrmS+c7jxg+Dv&xIeAW2U~(r@gW2ons*qU7@yQXg zgYwUrbjha}B_n)0j^!{ly!FfWd*;u|eD9{q`H3%9*w~X~MJ{%XrF*oG0Li#-*1zbj zukyw-^fy7@u>R>5D_%ku;Zs(+ZC_tYTYgNcYRRvQ)Cf%PH?+BzLS6YI0TbM0avcu) zOfwyDD+_mHbxHki%B*e-;@Zv{y%kfZ`;knK6oLprb5FWE;M0#K_xBs~S`nZv6WEDeF?j7FcHXl(%sox3c&7KQUaeht(mG z;ZKTv602dckgc+FCbyxshXdv6aVIU0h}WLaLKe-ctJpjvyVK*77an{K5*oOpWmxNm zBWRhI^(!hZAP!x4cBuFwI;C3d&qvqas51|!4mvcvu&Ea;!~9{mnjsk3res?^=^mDM z>voP_g!JKY;>_TC=4#0=SW}&0##r6x;-g=^fpZqdQiF+Txq-%y8B1iI(e=9lUQQ8v z20|J-^?B_V6OUVmuv?@cRwujk)C2fYQ4jF@l*IAw$qR|uOeMp#vi$+5e0wbtulmfd z!Kbdd4va7{(697*p=b8Z-Sx;b!?~ks`I;V?-);zFm9KC3)9Rngw8|To>iEf-W_&}} z>{$3bJ*EEgJtJduqM{M*ahw%wT`GJ#SMpw+rO{>=8TKs>>Mpx;J6zS1ki7KEm?AuO zitICQKFSx%5WnWDVTuf^5Awpn&Lkfs8z@rdUK5DsEw0gxg=uCTIL_PSVs(G{;U5p) zD8kcBCXimlTXoYlSH5SDTPqT&LDYa2U@3deCU82WWFPP78f;vzK1(HSm1i3b=7RZ| z8u_^dxA?+a+_LyV-99D0jm_TRV*BP!oPQ_gMr~TaVo_cq=lz(*eSwu_uVyDM4T;~a zWx0Il-BgQ@04qK=^*&|;F&ozyz3Kt2wRIZ*rnPAJk;1vKKH>%H;2a|VTEG$%IonJt zikLQx01O$WtU8)ffzp``hsNlXAjkJ_`h1dqLSXRdGEyP@ZKy(zd1;3a8E<8Z;hqiq zoP!nl(M_%r$(GG;Be6Azl!AQs!!BaE3ppHc>f=UOZN-SyGemZ|OW?@ikux3ievD|{ z>Xp-kHLdBIhQ9N**hN{)WA2STZOl<3-B6_vx%Wo3!2*b)_7MwoWTFv{&!# zphp#u)-1 zjq{#-xEO?Ttqskmqjb_1vR83mKpu9Xc;TMJd2@AXbi%{R?uZdhUp)~+OUV6-bqQhR z{sp*1tc81EcG|NCCb!jTr__~hC(vo;DZ>g^dzP1q4TEIV2exIdjVK^!WWus*HnKOc z_(eM)k-lcZ88+jO1UFUVGZskt6 z1Y{Q%)~Cy6A=EE?OhNlu$=F5dc4MLr?m!vaG1tc@ZAuO8U6WD?-+R=<$fss`u53Iq zKTutSPV>3vC;Zu=1$?JV)U}EzI!rdhH7^8r@`B>K4tojpi$9G$a1Zt<9bVZ`7xr@+ z@47VovI@%2tsTKFD=~P<489DM!8?YZJvQ#$uuQjN+@^Pv-tH#WJAvd&^!r$zRo;lj zoC=R~it#R4HZS5-YQGE+Q?@1LZ+x~Atrmr2hQHcUzLPyk#f2HQg$4U}<{+~Lkm-Gb zS)diO+6SP$^-*O@ETuoxV1-`09Gj0SMLEAKwx0q?C#h}q+6}q%gKjtqPbdAkALZj< zjFM=zq-eI};dSq#=r^U;7qP!wG)*@L=};p-%d<`qh4CYu1mDuoZL6Anfzj4totQ3X z3H5;|`l^`(fmMn;Ij`hthh}+HaMfqJ8O?H9yY}o`r86Z21uXdw)UuN;6FvnRL0UEo zlqZ>bqzmS!{S}b3FpzDg5>R*I0W$a}jGFD^GSywzW!4hfR+B*6m(zVvs526i*W)Bg zVC9rT0?Od`d@NI<^FPNi+M+#*Ut7R_sKK<%TZIBfJ+ItnBJSI+pKc{4XJ?|iu8&?n zVv9TXAwJ)IVs8)2A8d7Yd%pE~iHqIso{lp-gStEIy6)oZqHVbdg#{s5E2#29=#_D% zq{aZNsQ)r3LMmxKSIz{rpkIwQ&YAHC{BYYcs{3g zHNM`(`?V4E4_1ZD$4v>2ndtLC<>#Z`*1l#olVs(1!*aj3vpUlCP@-RhWBEhjku!C} z=Y75SiBD#>1nYDmD{W}YsyJfWUYzt=lRTJ-pYZMPWSo9$wryrjbUu(N?UJbmRJy9=L7CJ!0et zy(Uc*&yjD|;yF7AtyU9IUo+B2@oy43?oI88KE*n9T`jkXn*UX5Q+;6JBJcc2P2KtK zx(dnka^KoFwI}6V@|c`{$7k3$>t^tL1G?@z;K>fMp9ijEzNJJB*yp!BU<61|zH|~;zI)v#az?*Q#INnB zQOx>&ju>Aa4XNg@@_aVL`sFD;D(2!p|6$d%gY|R~2-3NzZbh7nF!q;2KJ=}DTmBUc zihVk=5?<(ChmeKBw<*FSOMbjDt=qzuugORju>Xh6d9N&^iZmg7ghj z%wV@9*0SNRIs;h!8m~z=zpj`E-Q96MmGqI+CnB-rJDBbRwaxo!GyNygXH-!axsn^O zto_G#$u3h}4kw?ak1DBN`D*5xm#`&~Z*sm}@uu`2f8hbmDqInc=e%l2m=*%~EX2>l zE^7Bt-ZQ%NURc=afVuXcEhV2$o2hDjoqKD*b$9iWi zi-6rkV?Yq7!W?E#W!M_URqa2Q{yPpM?6%?m634RU4gRa=`+vC-_TM1}Ce(~K1pK#M z!h{+&GVC9nbhpDs4amWN=vieepeNWrHU=@25gOnpj-TLm{q8$^DuHJc=yZzz&%@&b zXed^vi=Dp?J)T6|^LwP6?&X-6O=bV#D=~?`ACdaqeBspfzh6b`f9h~mk3O!6PqSez zS+`_w#Hk?6T~G^~%L7&?!1-AXF&5#yONAlmV-F~c_AQR)+Y_&wCOsS1euf!jTT>Rc z#TNBga~n7LVsB0a{Dkk56z2(+x?JpuMYOwIm%?p$tla^hNip|&bDShqlzAd`K(rCs zr6!SjZspn8COM`U^>mt_h^xRHRWg$~8x=ln9D4lGO4REX&7qX-+18T_({qXKo6FWM zi+;Mh>0t}m7hUTxTG`vwow=*cUNTiwXMyqH*+yn~SW8Dd)ljDf+w3zapdTr)7wei* z(}JT0y&8Km9*O|XEPf~9IXl(z{Z=MMp5}jEpT9Y=_*a3TMka!GOQ=MO;%2N@D ziMYE}tOs$_Oq=zD;FcphjL{auotcMTqj=$=Z9?ZgRi4l)6zXj z{Tl^r=lIn(pQi;%kG@N;q6Td|joT0u68xs=XAUesFrPA&`ej?8eM&Y?7La2JRJg|b zb-wN|-ia$?ak(v;fxZuKJ~W@h>2_#ds4`5MQfeQeMEd%}N5A7w_98+a_GKprh9{V3 zpJdzBxAo1RFaCltaC>o#ba7|tdgCmr^R;>tVb(^#!d>PQE2VEo5M3z{7Z0Ba1<}X% zZa(qz%)2M;(Di%dEj`oqj)gl4BTbc#*2=u>|Ka>BBe}|j=y#hd5chj9Uu`p$Uh>-^ z;ZifLZ#U{DlL9`~NE)?l>Ftm#DwZ_2(_S>+UHGff>(j^NhEFEGk`3UTyq_99ujDL5 z#cV=6%{1!^ji=2Z)-uqb0yDy~YQ6nLsR)ncZ$w;STfmIaNfmLno8T&!RG#cZl2j3E+8PJ8cXg+3%jhQdyh=t& z-pTFHeGK2Ebh}=i}$9IrQY6SjRYZ7rFo?PnMP<#zFU~R}d zXPHElW=}Fw*QSEjb3F?oYH}9iJ}p^m(Ce6qm5S-1$8rmrwzS$k)SXtLj0}dS;h&|6 zb7BiAJbsk?!U2l@s9~hQOND)=>}D`0p3;b=!C#3S#V*ImJ=zU9?{=DkTIwiKzH>@n zmF|Ao(?b0fKfBVXRTBO)`mYIh2qHWiby466e=srfixt(hYc_5CYVqmDkwwv+Wr3To z@jK0U^~=WT^rMuHgKV#g+JGjm?sVWXHIlpOgVr_}>IF>(tWS;Ytd{F$UY?p`ie*7h z&^ts^r}W~f;(%#;ip{q08RE86`rPB4iz)7jaw$Q1@C%OvcZAN~w*NgFuv$@Vd*?@! zkBtS%2(qR_L{pOoC{f`nfB5@coby#GHgQD$#1Wx2E7<2Q>6XrQ+KiYD z&lq}C8fVJM{zL75%(nlTLooaDgx=}~AUiOkj{R-ANvHv|^)u9l4clB2_^NSS-IF}5 zx%N%iGteG14rl?Mb|E!A@Hj^WTe}->3<~H~24;?*D)=q^ToQYAy1EBA^tI@oqo4*U z@#XQ$7eK=T{ilxXMh{n`E9gLA>9ci01g)k`sEwcPLBsLEEkGmr3)xEXWWR3gBcR;; o{CWg_N7;QOiIpC?u|Bx7Tj5rbcth&sDfTmN-!RZF)v^o!Uq bool: - return True - -def sync_checker(bot: Bot, event: Event) -> bool: - return True - -def check(arg1, arg2): - - async def _checker(bot: Bot, event: Event) -> bool: - return bool(arg1 + arg2) - - return Permission(_checker) -``` - -`Permission` 和 `PermissionChecker` 之间可以使用 `或 |` 互相组合： - -```python -from nonebot.permission import Permission - -Permission(async_checker1) | sync_checker | async_checker2 -``` - -同样地，如果想用 `Permission(*checkers)` 包裹构造 `Permission` ，函数必须是异步的；但是在利用 `或 |` 符号连接构造时， `Nonebot` 会自动包裹同步函数为异步函数。 diff --git a/archive/2.0.0a16/advanced/publish-plugin.md b/archive/2.0.0a16/advanced/publish-plugin.md deleted file mode 100644 index 34b0fa1b..00000000 --- a/archive/2.0.0a16/advanced/publish-plugin.md +++ /dev/null @@ -1,49 +0,0 @@ -# 发布插件 - -## 前注 - -本章节仅包含插件发布流程指导，插件开发请查阅 **[创建插件](../guide/creating-a-plugin.md)** 章节与 **[Plugin API 文档](../api/plugin.md)** 。 - -## 插件发布流程 - -### 发布到 PyPI - -您可以选择任意自己喜欢的方式将您的插件发布到 **[PyPI](https://pypi.org/)** ，如使用 **[setuptools](https://pypi.org/project/setuptools/)** 或 **[poetry](https://pypi.org/project/poetry/)** 进行 PyPI 发布。 - -发布时，请您为自己的插件取一个清晰易懂的名字。通常而言，一款 NoneBot2 插件名称使用 `nonebot-plugin-` 作为前缀(如`nonebot-plugin-foo`)，以 `nonebot_plugin_` 作为导入名的前缀(如`nonebot_plugin_foo`)，这并非是强制规范, 而是为了防止与其他 PyPI 包产生冲突, 所以我们推荐您在没有特殊需求的情况下这样做。 - -发布后，请确保您的插件已能公开的从 PyPI 访问到，请检查您的插件在 PyPI 的地址：`https://pypi.org/project/<您的Nonebot2插件项目名>` - -### 托管您的插件源代码 - -将插件源代码及相关构建文件（如`pyproject.toml`或`setup.py`等与 PyPI 包构建相关的文件）托管在公开代码仓。 - -请确保您的代码仓地址能够被正确的访问，检查您的插件在代码仓的地址，如 `https://github.com/<您的Github用户名>/<您的插件Github项目名>` 。 - -### 申请发布到 Nonebot2 插件商店 - -完成在 PyPI 的插件发布流程与源代码托管流程后，请您前往 **[NoneBot2 商店](https://v2.nonebot.dev/store.html)** 页面，切换到插件页签，点击 **发布插件** 按钮。 - -![插件发布界面](./images/plugin_store_publish.png) - -如图所示，在弹出的插件信息提交表单内，填入您所要发布的相应插件信息。 - -![插件信息填写](./images/plugin_store_publish_2.png) - -完成填写后，请点击 **发布** 按钮，这将自动在 **[NoneBot2](https://github.com/nonebot/nonebot2)** 代码仓内创建发布您的插件的对应 Issue。 - -### 等待插件发布处理 - -您的插件发布 Issue 创建后，将会经过*Nonebot2 Publish Bot*的检查，以确保插件信息正确无误。 - -之后，NoneBot2 的维护者们将会对插件进行进一步的检查，以确保用户能够正常安装并使用该插件。 - -完成这些步骤后，您的插件将会被合并到 **[NoneBot2 商店](https://v2.nonebot.dev/store.html)** ，而您也将成为 **[NoneBot2 贡献者](https://github.com/nonebot/nonebot2/graphs/contributors)** 的一员。 - -## 完成 - -恭喜您，经过上述的发布流程，您的插件已经成功发布到 Nonebot2 商店了。 - -此时，您可以在 **[NoneBot2 商店](https://v2.nonebot.dev/store.html)** 的插件页签查找到您的插件。同时，欢迎您成为 **[NoneBot2 贡献者](https://github.com/nonebot/nonebot2/graphs/contributors)** ！ - -**Congratulations!** diff --git a/archive/2.0.0a16/advanced/runtime-hook.md b/archive/2.0.0a16/advanced/runtime-hook.md deleted file mode 100644 index faeaa88e..00000000 --- a/archive/2.0.0a16/advanced/runtime-hook.md +++ /dev/null @@ -1,163 +0,0 @@ -# 钩子函数 - -[`钩子编程`](https://zh.wikipedia.org/wiki/%E9%92%A9%E5%AD%90%E7%BC%96%E7%A8%8B) - -> 钩子编程（hooking），也称作“挂钩”，是计算机程序设计术语，指通过拦截软件模块间的函数调用、消息传递、事件传递来修改或扩展操作系统、应用程序或其他软件组件的行为的各种技术。处理被拦截的函数调用、事件、消息的代码，被称为钩子（hook）。 - -在 `nonebot2` 中有一系列预定义的钩子函数，分为两类：`全局钩子函数` 和 `事件钩子函数` ，这些钩子函数可以用装饰器的形式来使用。 - -## 全局钩子函数 - -全局钩子函数是指 `nonebot2` 针对其本身运行过程的钩子函数。 - -这些钩子函数是由其后端驱动 `driver`来运行的，故需要先获得全局 `driver` 对象： - -```python -from nonebot import get_driver - - -driver=get_driver() -``` - -共分为六种函数： - -### 启动准备 - -这个钩子函数会在 `nonebot2` 启动时运行。 - -```python -@driver.on_startup -async def do_something(): - pass -``` - -### 终止处理 - -这个钩子函数会在 `nonebot2` 终止时运行。 - -```python -@driver.on_shutdown -async def do_something(): - pass -``` - -### bot 连接处理 - -这个钩子函数会在 `bot` 通过 `websocket` 连接到 `nonebot2` 时运行。 - -```python -@driver.on_bot_connect -async def do_something(bot: Bot): - pass -``` - -### bot 断开处理 - -这个钩子函数会在 `bot` 断开与 `nonebot2` 的 `websocket` 连接时运行。 - -```python -@driver.on_bot_disconnect -async def do_something(bot: Bot): - pass -``` - -### bot api 调用钩子 - -这个钩子函数会在 `Bot` 调用 API 时运行。 - -```python -from nonebot.adapters import Bot - -@Bot.on_calling_api -async def handle_api_call(bot: Bot, api: str, data: Dict[str, Any]): - pass -``` - -### bot api 调用后钩子 - -这个钩子函数会在 `Bot` 调用 API 后运行。 - -```python -from nonebot.adapters import Bot - -@Bot.on_called_api -async def handle_api_result(bot: Bot, exception: Optional[Exception], api: str, data: Dict[str, Any], result: Any): - pass -``` - -## 事件处理钩子 - -这些钩子函数指的是影响 `nonebot2` 进行 `事件处理` 的函数。 - -:::tip 提示 - -关于 `事件处理` 的流程，可以在[这里](./README.md)查阅。 - -::: - -:::warning 注意 - -1.在事件处理钩子函数中，与 `matcher` 运行状态相关的函数将不可用，如 `matcher.finish()` - -2.如果需要在事件处理钩子函数中打断整个对话的执行，请参考以下范例： - -```python -from nonebot.exception import IgnoredException - - -@event_preprocessor -async def do_something(bot: Bot, event: Event, state: T_State): - raise IgnoredException("reason") -``` - -::: - -共分为四种函数： - -### 事件预处理 - -这个钩子函数会在 `Event` 上报到 `nonebot2` 时运行 - -```python -from nonebot.message import event_preprocessor - -@event_preprocessor -async def do_something(bot: Bot, event: Event, state: T_State): - pass -``` - -### 事件后处理 - -这个钩子函数会在 `nonebot2` 处理 `Event` 后运行 - -```python -from nonebot.message import event_postprocessor - -@event_postprocessor -async def do_something(bot: Bot, event: Event, state: T_State): - pass -``` - -### 运行预处理 - -这个钩子函数会在 `nonebot2`运行 `matcher` 前运行。 - -```python -from nonebot.message import run_preprocessor - -@run_preprocessor -async def do_something(matcher: Matcher, bot: Bot, event: Event, state: T_State): - pass -``` - -### 运行后处理 - -这个钩子函数会在 `nonebot2`运行 `matcher` 后运行。 - -```python -from nonebot.message import run_postprocessor - -@run_postprocessor -async def do_something(matcher: Matcher, exception: Optional[Exception], bot: Bot, event: Event, state: T_State): - pass -``` diff --git a/archive/2.0.0a16/advanced/scheduler.md b/archive/2.0.0a16/advanced/scheduler.md deleted file mode 100644 index 9b979fea..00000000 --- a/archive/2.0.0a16/advanced/scheduler.md +++ /dev/null @@ -1,135 +0,0 @@ -# 定时任务 - -[`APScheduler`](https://apscheduler.readthedocs.io/en/3.x/) —— Advanced Python Scheduler - -> Advanced Python Scheduler (APScheduler) is a Python library that lets you schedule your Python code to be executed later, either just once or periodically. You can add new jobs or remove old ones on the fly as you please. If you store your jobs in a database, they will also survive scheduler restarts and maintain their state. When the scheduler is restarted, it will then run all the jobs it should have run while it was offline. - -## 从 NoneBot v1 迁移 - -`APScheduler` 作为 `nonebot` v1 的可选依赖，为众多 bot 提供了方便的定时任务功能。`nonebot2` 已将 `APScheduler` 独立为 `nonebot_plugin_apscheduler` 插件，你可以在 [商店](https://v2.nonebot.dev/store.html) 中找到它。 - -相比于 `nonebot` v1，`nonebot` v2 只需要安装插件并修改 `scheduler` 的导入方式即可完成迁移。 - -## 安装插件 - -### 通过 nb-cli - -如正在使用 `nb-cli` 构建项目，你可以从插件市场复制安装命令或手动输入以下命令以添加 `nonebot_plugin_apscheduler`。 - -```bash -nb plugin install nonebot_plugin_apscheduler -``` - -:::tip 提示 -`nb-cli` 默认通过 `pypi` 安装，你可以添加命令参数 `-i [mirror]` 或 `--index [mirror]` 以使用镜像源安装。 -::: - -### 通过 poetry - -执行以下命令以添加 `nonebot_plugin_apscheduler` - -```bash -poetry add nonebot-plugin-apscheduler -``` - -:::tip 提示 -由于稍后我们将使用 `nonebot.require()` 方法进行导入，所以无需额外的 `nonebot.load_plugin()` -::: - -## 快速上手 - -1. 在需要设置定时任务的插件中，通过 `nonebot.require` 从 `nonebot_plugin_apscheduler` 导入 `scheduler` 对象 - -2. 在该对象的基础上，根据 `APScheduler` 的使用方法进一步配置定时任务 - -将上述步骤归纳为最小实现的代码如下： - -```python -from nonebot import require - -scheduler = require("nonebot_plugin_apscheduler").scheduler - -@scheduler.scheduled_job("cron", hour="*/2", id="xxx", args=[1], kwargs={"arg2": 2}) -async def run_every_2_hour(arg1, arg2): - pass - -scheduler.add_job(run_every_day_from_program_start, "interval", days=1, id="xxx") -``` - -## 分步进行 - -### 导入 scheduler 对象 - -为了使插件能够实现定时任务，需要先将 `scheduler` 对象导入插件。 - -`nonebot2` 提供了 `nonebot.require` 方法来实现导入其他插件的内容，此处我们使用这个方法来导入 `scheduler` 对象。 - -`nonebot` 使用的 `scheduler` 对象为 `AsyncScheduler` 。 - -> 使用该方法传入的插件本身也需要有对应实现，关于该方法的更多介绍可以参阅 [这里](./export-and-require.md) - -```python -from nonebot import require - -scheduler = require("nonebot_plugin_apscheduler").scheduler -``` - -### 编写定时任务 - -由于本部分为标准的通过 `APScheduler` 配置定时任务，有关指南请参阅 [APScheduler 官方文档](https://apscheduler.readthedocs.io/en/3.x/userguide.html#adding-jobs)。 - -### 配置插件选项 - -根据项目的 `.env` 文件设置，向 `.env.*` 或 `bot.py` 文件添加 `nonebot_plugin_apscheduler` 的可选配置项 - -:::warning 注意 -`.env.*` 文件的编写应遵循 nonebot2 对 `.env.*` 文件的编写要求 -::: - -#### `apscheduler_autostart` - -类型：`bool` - -默认值：`True` - -是否自动启动 `APScheduler`。 - -对于大多数情况，我们需要在 `nonebot2` 项目被启动时启动定时任务，则此处设为 `true` - -##### 在 `.env` 中添加 - -```bash -APSCHEDULER_AUTOSTART=true -``` - -##### 在 `bot.py` 中添加 - -```python -nonebot.init(apscheduler_autostart=True) -``` - -#### `apscheduler_config` - -类型：`dict` - -默认值：`{"apscheduler.timezone": "Asia/Shanghai"}` - -`APScheduler` 相关配置。修改/增加其中配置项需要确保 `prefix: apscheduler`。 - -对于 `APScheduler` 的相关配置，请参阅 [scheduler-config](https://apscheduler.readthedocs.io/en/3.x/userguide.html#scheduler-config) 和 [BaseScheduler](https://apscheduler.readthedocs.io/en/3.x/modules/schedulers/base.html#apscheduler.schedulers.base.BaseScheduler) - -> 官方文档在绝大多数时候能提供最准确和最具时效性的指南 - -##### 在 `.env` 中添加 - -```bash -APSCHEDULER_CONFIG={"apscheduler.timezone": "Asia/Shanghai"} -``` - -##### 在 `bot.py` 中添加 - -```python -nonebot.init(apscheduler_config={ - "apscheduler.timezone": "Asia/Shanghai" -}) -``` diff --git a/archive/2.0.0a16/api/README.md b/archive/2.0.0a16/api/README.md deleted file mode 100644 index 38fac915..00000000 --- a/archive/2.0.0a16/api/README.md +++ /dev/null @@ -1,67 +0,0 @@ -# NoneBot Api Reference - - -* **模块索引** - - - * [nonebot](nonebot.html) - - - * [nonebot.config](config.html) - - - * [nonebot.plugin](plugin.html) - - - * [nonebot.message](message.html) - - - * [nonebot.matcher](matcher.html) - - - * [nonebot.handler](handler.html) - - - * [nonebot.rule](rule.html) - - - * [nonebot.permission](permission.html) - - - * [nonebot.log](log.html) - - - * [nonebot.utils](utils.html) - - - * [nonebot.typing](typing.html) - - - * [nonebot.exception](exception.html) - - - * [nonebot.drivers](drivers/) - - - * [nonebot.drivers.fastapi](drivers/fastapi.html) - - - * [nonebot.drivers.quart](drivers/quart.html) - - - * [nonebot.drivers.aiohttp](drivers/aiohttp.html) - - - * [nonebot.adapters](adapters/) - - - * [nonebot.adapters.cqhttp](adapters/cqhttp.html) - - - * [nonebot.adapters.ding](adapters/ding.html) - - - * [nonebot.adapters.mirai](adapters/mirai.html) - - - * [nonebot.adapters.feishu](adapters/feishu.html) diff --git a/archive/2.0.0a16/api/adapters/README.md b/archive/2.0.0a16/api/adapters/README.md deleted file mode 100644 index 3c1bcc8b..00000000 --- a/archive/2.0.0a16/api/adapters/README.md +++ /dev/null @@ -1,558 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.adapters 模块 - -## 协议适配基类 - -各协议请继承以下基类，并使用 `driver.register_adapter` 注册适配器 - - -## _class_ `Bot` - -基类：`abc.ABC` - -Bot 基类。用于处理上报消息，并提供 API 调用接口。 - - -### `driver` - -Driver 对象 - - -### `config` - -Config 配置对象 - - -### `_calling_api_hook` - - -* **类型** - - `Set[T_CallingAPIHook]` - - - -* **说明** - - call_api 时执行的函数 - - - -### `_called_api_hook` - - -* **类型** - - `Set[T_CalledAPIHook]` - - - -* **说明** - - call_api 后执行的函数 - - - -### `__init__(self_id, request)` - - -* **参数** - - - * `self_id: str`: 机器人 ID - - - * `request: HTTPConnection`: request 连接对象 - - - -### `self_id` - -机器人 ID - - -### `request` - -连接信息 - - -### _abstract property_ `type` - -Adapter 类型 - - -### _classmethod_ `register(driver, config, **kwargs)` - - -* **说明** - - `register` 方法会在 `driver.register_adapter` 时被调用，用于初始化相关配置 - - - -### _abstract async classmethod_ `check_permission(driver, request)` - - -* **说明** - - 检查连接请求是否合法的函数，如果合法则返回当前连接 `唯一标识符`，通常为机器人 ID；如果不合法则抛出 `RequestDenied` 异常。 - - - -* **参数** - - - * `driver: Driver`: Driver 对象 - - - * `request: HTTPConnection`: request 请求详情 - - - -* **返回** - - - * `Optional[str]`: 连接唯一标识符，`None` 代表连接不合法 - - - * `Optional[HTTPResponse]`: HTTP 上报响应 - - - -### _abstract async_ `handle_message(message)` - - -* **说明** - - 处理上报消息的函数，转换为 `Event` 事件后调用 `nonebot.message.handle_event` 进一步处理事件。 - - - -* **参数** - - - * `message: bytes`: 收到的上报消息 - - - -### _abstract async_ `_call_api(api, **data)` - - -* **说明** - - `adapter` 实际调用 api 的逻辑实现函数，实现该方法以调用 api。 - - - -* **参数** - - - * `api: str`: API 名称 - - - * `**data`: API 数据 - - - -### _async_ `call_api(api, **data)` - - -* **说明** - - 调用机器人 API 接口，可以通过该函数或直接通过 bot 属性进行调用 - - - -* **参数** - - - * `api: str`: API 名称 - - - * `**data`: API 数据 - - - -* **示例** - - -```python -await bot.call_api("send_msg", message="hello world") -await bot.send_msg(message="hello world") -``` - - -### _abstract async_ `send(event, message, **kwargs)` - - -* **说明** - - 调用机器人基础发送消息接口 - - - -* **参数** - - - * `event: Event`: 上报事件 - - - * `message: Union[str, Message, MessageSegment]`: 要发送的消息 - - - * `**kwargs` - - - -### _classmethod_ `on_calling_api(func)` - - -* **说明** - - 调用 api 预处理。 - - - -* **参数** - - - * `bot: Bot`: 当前 bot 对象 - - - * `api: str`: 调用的 api 名称 - - - * `data: Dict[str, Any]`: api 调用的参数字典 - - - -### _classmethod_ `on_called_api(func)` - - -* **说明** - - 调用 api 后处理。 - - - -* **参数** - - - * `bot: Bot`: 当前 bot 对象 - - - * `exception: Optional[Exception]`: 调用 api 时发生的错误 - - - * `api: str`: 调用的 api 名称 - - - * `data: Dict[str, Any]`: api 调用的参数字典 - - - * `result: Any`: api 调用的返回 - - - -## _class_ `MessageSegment` - -基类：`Mapping`, `abc.ABC`, `Generic`[`nonebot.adapters._message.TM`] - -消息段基类 - - -### `type` - - -* 类型: `str` - - -* 说明: 消息段类型 - - -### `data` - - -* 类型: `Dict[str, Union[str, list]]` - - -* 说明: 消息段数据 - - -## _class_ `Message` - -基类：`List`[`nonebot.adapters._message.TMS`], `abc.ABC` - -消息数组 - - -### `__init__(message=None, *args, **kwargs)` - - -* **参数** - - - * `message: Union[str, list, dict, MessageSegment, Message, Any]`: 消息内容 - - - -### _classmethod_ `template(format_string)` - - -* **说明** - - 根据创建消息模板, 用法和 `str.format` 大致相同, 但是可以输出消息对象, 并且支持以 `Message` 对象作为消息模板 - - - -* **示例** - - -```python ->>> Message.template("{} {}").format("hello", "world") -Message(MessageSegment(type='text', data={'text': 'hello world'})) ->>> Message.template("{} {}").format(MessageSegment.image("file///..."), "world") -Message(MessageSegment(type='image', data={'file': 'file///...'}), MessageSegment(type='text', data={'text': 'world'})) ->>> Message.template( -... MessageSegment.text('test {event.user_id}') + MessageSegment.face(233) + -... MessageSegment.text('test {event.message}')).format(event={'user_id':123456, 'message':'hello world'} -... ) -Message(MessageSegment(type='text', data={'text': 'test 123456'}), - MessageSegment(type='face', data={'face': 233}), - MessageSegment(type='text', data={'text': 'test hello world'})) -``` - - -* **参数** - - - * `format_string: str`: 格式化字符串 - - - -* **返回** - - - * `MessageFormatter[TM]`: 消息格式化器 - - - -### `append(obj)` - - -* **说明** - - 添加一个消息段到消息数组末尾 - - - -* **参数** - - - * `obj: Union[str, MessageSegment]`: 要添加的消息段 - - - -### `extend(obj)` - - -* **说明** - - 拼接一个消息数组或多个消息段到消息数组末尾 - - - -* **参数** - - - * `obj: Union[Message, Iterable[MessageSegment]]`: 要添加的消息数组 - - - -### `extract_plain_text()` - - -* **说明** - - 提取消息内纯文本消息 - - - -## _class_ `Event` - -基类：`abc.ABC`, `pydantic.main.BaseModel` - -Event 基类。提供获取关键信息的方法，其余信息可直接获取。 - - -### _abstract_ `get_type()` - - -* **说明** - - 获取事件类型的方法，类型通常为 NoneBot 内置的四种类型。 - - - -* **返回** - - - * `Literal["message", "notice", "request", "meta_event"]` - - - * 其他自定义 `str` - - - -### _abstract_ `get_event_name()` - - -* **说明** - - 获取事件名称的方法。 - - - -* **返回** - - - * `str` - - - -### _abstract_ `get_event_description()` - - -* **说明** - - 获取事件描述的方法，通常为事件具体内容。 - - - -* **返回** - - - * `str` - - - -### `get_log_string()` - - -* **说明** - - 获取事件日志信息的方法，通常你不需要修改这个方法，只有当希望 NoneBot 隐藏该事件日志时，可以抛出 `NoLogException` 异常。 - - - -* **返回** - - - * `str` - - - -* **异常** - - - * `NoLogException` - - - -### _abstract_ `get_user_id()` - - -* **说明** - - 获取事件主体 id 的方法，通常是用户 id 。 - - - -* **返回** - - - * `str` - - - -### _abstract_ `get_session_id()` - - -* **说明** - - 获取会话 id 的方法，用于判断当前事件属于哪一个会话，通常是用户 id、群组 id 组合。 - - - -* **返回** - - - * `str` - - - -### _abstract_ `get_message()` - - -* **说明** - - 获取事件消息内容的方法。 - - - -* **返回** - - - * `Message` - - - -### `get_plaintext()` - - -* **说明** - - 获取消息纯文本的方法，通常不需要修改，默认通过 `get_message().extract_plain_text` 获取。 - - - -* **返回** - - - * `str` - - - -### _abstract_ `is_tome()` - - -* **说明** - - 获取事件是否与机器人有关的方法。 - - - -* **返回** - - - * `bool` - - - -## _class_ `MessageTemplate` - -基类：`string.Formatter`, `Generic`[`nonebot.adapters._template.TM`] - -消息模板格式化实现类 - - -### `format(*args, **kwargs)` - - -* **说明** - - 根据模板和参数生成消息对象 diff --git a/archive/2.0.0a16/api/adapters/cqhttp.md b/archive/2.0.0a16/api/adapters/cqhttp.md deleted file mode 100644 index 7c73f1a7..00000000 --- a/archive/2.0.0a16/api/adapters/cqhttp.md +++ /dev/null @@ -1,686 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.adapters.cqhttp 模块 - -## CQHTTP (OneBot) v11 协议适配 - -协议详情请看: [CQHTTP](https://github.com/howmanybots/onebot/blob/master/README.md) | [OneBot](https://github.com/howmanybots/onebot/blob/master/README.md) - -# NoneBot.adapters.cqhttp.config 模块 - - -## _class_ `Config` - -CQHTTP 配置类 - - -* **配置项** - - - * `access_token` / `cqhttp_access_token`: CQHTTP 协议授权令牌 - - - * `secret` / `cqhttp_secret`: CQHTTP HTTP 上报数据签名口令 - - - * `ws_urls` / `cqhttp_ws_urls`: CQHTTP 正向 Websocket 连接 Bot ID、目标 URL 字典 - - -# NoneBot.adapters.cqhttp.utils 模块 - - -## `escape(s, *, escape_comma=True)` - - -* **说明** - - 对字符串进行 CQ 码转义。 - - - -* **参数** - - - * `s: str`: 需要转义的字符串 - - - * `escape_comma: bool`: 是否转义逗号（`,`）。 - - - -## `unescape(s)` - - -* **说明** - - 对字符串进行 CQ 码去转义。 - - - -* **参数** - - - * `s: str`: 需要转义的字符串 - - -# NoneBot.adapters.cqhttp.exception 模块 - - -## _exception_ `ActionFailed` - -基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed), `nonebot.adapters.cqhttp.exception.CQHTTPAdapterException` - - -* **说明** - - API 请求返回错误信息。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - - -## _exception_ `NetworkError` - -基类：[`nonebot.exception.NetworkError`](../exception.md#nonebot.exception.NetworkError), `nonebot.adapters.cqhttp.exception.CQHTTPAdapterException` - - -* **说明** - - 网络错误。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - -# NoneBot.adapters.cqhttp.bot 模块 - - -## _async_ `_check_reply(bot, event)` - - -* **说明** - - 检查消息中存在的回复，去除并赋值 `event.reply`, `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_check_at_me(bot, event)` - - -* **说明** - - 检查消息开头或结尾是否存在 @机器人，去除并赋值 `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_check_nickname(bot, event)` - - -* **说明** - - 检查消息开头是否存在昵称，去除并赋值 `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_handle_api_result(result)` - - -* **说明** - - 处理 API 请求返回值。 - - - -* **参数** - - - * `result: Optional[Dict[str, Any]]`: API 返回数据 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `ActionFailed`: API 调用失败 - - - -## _class_ `Bot` - -基类：[`nonebot.adapters._bot.Bot`](README.md#nonebot.adapters._bot.Bot) - -CQHTTP 协议 Bot 适配。继承属性参考 [BaseBot](./#class-basebot) 。 - - -### _property_ `type` - - -* 返回: `"cqhttp"` - - -### _async classmethod_ `check_permission(driver, request)` - - -* **说明** - - CQHTTP (OneBot) 协议鉴权。参考 [鉴权](https://github.com/howmanybots/onebot/blob/master/v11/specs/communication/authorization.md) - - - -### _async_ `handle_message(message)` - - -* **说明** - - 调用 [_check_reply](#async-check-reply-bot-event), [_check_at_me](#check-at-me-bot-event), [_check_nickname](#check-nickname-bot-event) 处理事件并转换为 [Event](#class-event) - - - -### _async_ `call_api(api, **data)` - - -* **说明** - - 调用 CQHTTP 协议 API - - - -* **参数** - - - * `api: str`: API 名称 - - - * `**data: Any`: API 参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - - -### _async_ `send(event, message, at_sender=False, **kwargs)` - - -* **说明** - - 根据 `event` 向触发事件的主体发送消息。 - - - -* **参数** - - - * `event: Event`: Event 对象 - - - * `message: Union[str, Message, MessageSegment]`: 要发送的消息 - - - * `at_sender: bool`: 是否 @ 事件主体 - - - * `**kwargs`: 覆盖默认参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `ValueError`: 缺少 `user_id`, `group_id` - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - -# NoneBot.adapters.cqhttp.message 模块 - - -## _class_ `MessageSegment` - -基类：[`nonebot.adapters._message.MessageSegment`](README.md#nonebot.adapters._message.MessageSegment)[`Message`] - -CQHTTP 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 - - -### _classmethod_ `get_message_class()` - - -### `is_text()` - - -### _static_ `anonymous(ignore_failure=None)` - - -### _static_ `at(user_id)` - - -### _static_ `contact(type_, id)` - - -### _static_ `contact_group(group_id)` - - -### _static_ `contact_user(user_id)` - - -### _static_ `dice()` - - -### _static_ `face(id_)` - - -### _static_ `forward(id_)` - - -### _static_ `image(file, type_=None, cache=True, proxy=True, timeout=None)` - - -### _static_ `json(data)` - - -### _static_ `location(latitude, longitude, title=None, content=None)` - - -### _static_ `music(type_, id_)` - - -### _static_ `music_custom(url, audio, title, content=None, img_url=None)` - - -### _static_ `node(id_)` - - -### _static_ `node_custom(user_id, nickname, content)` - - -### _static_ `poke(type_, id_)` - - -### _static_ `record(file, magic=None, cache=None, proxy=None, timeout=None)` - - -### _static_ `reply(id_)` - - -### _static_ `rps()` - - -### _static_ `shake()` - - -### _static_ `share(url='', title='', content=None, image=None)` - - -### _static_ `text(text)` - - -### _static_ `video(file, cache=None, proxy=None, timeout=None)` - - -### _static_ `xml(data)` - - -### `type` - - -* 类型: `str` - - -* 说明: 消息段类型 - - -### `data` - - -* 类型: `Dict[str, Union[str, list]]` - - -* 说明: 消息段数据 - - -## _class_ `Message` - -基类：[`nonebot.adapters._message.Message`](README.md#nonebot.adapters._message.Message)[`nonebot.adapters.cqhttp.message.MessageSegment`] - -CQHTTP 协议 Message 适配。 - - -### _classmethod_ `get_segment_class()` - - -### `extract_plain_text()` - -# NoneBot.adapters.cqhttp.permission 模块 - - -## `PRIVATE` - - -* **说明**: 匹配任意私聊消息类型事件 - - -## `PRIVATE_FRIEND` - - -* **说明**: 匹配任意好友私聊消息类型事件 - - -## `PRIVATE_GROUP` - - -* **说明**: 匹配任意群临时私聊消息类型事件 - - -## `PRIVATE_OTHER` - - -* **说明**: 匹配任意其他私聊消息类型事件 - - -## `GROUP` - - -* **说明**: 匹配任意群聊消息类型事件 - - -## `GROUP_MEMBER` - - -* **说明**: 匹配任意群员群聊消息类型事件 - -:::warning 警告 -该权限通过 event.sender 进行判断且不包含管理员以及群主！ -::: - - -## `GROUP_ADMIN` - - -* **说明**: 匹配任意群管理员群聊消息类型事件 - - -## `GROUP_OWNER` - - -* **说明**: 匹配任意群主群聊消息类型事件 - -# NoneBot.adapters.cqhttp.event 模块 - - -## _class_ `Event` - -基类：[`nonebot.adapters._event.Event`](README.md#nonebot.adapters._event.Event) - -CQHTTP 协议事件，字段与 CQHTTP 一致。各事件字段参考 [CQHTTP 文档](https://github.com/howmanybots/onebot/blob/master/README.md) - - -## _class_ `MessageEvent` - -基类：`nonebot.adapters.cqhttp.event.Event` - -消息事件 - - -### `to_me` - - -* **说明** - - 消息是否与机器人有关 - - - -* **类型** - - `bool` - - - -### `reply` - - -* **说明** - - 消息中提取的回复消息，内容为 `get_msg` API 返回结果 - - - -* **类型** - - `Optional[Reply]` - - - -## _class_ `PrivateMessageEvent` - -基类：`nonebot.adapters.cqhttp.event.MessageEvent` - -私聊消息 - - -## _class_ `GroupMessageEvent` - -基类：`nonebot.adapters.cqhttp.event.MessageEvent` - -群消息 - - -## _class_ `NoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.Event` - -通知事件 - - -## _class_ `GroupUploadNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群文件上传事件 - - -## _class_ `GroupAdminNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群管理员变动 - - -## _class_ `GroupDecreaseNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群成员减少事件 - - -## _class_ `GroupIncreaseNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群成员增加事件 - - -## _class_ `GroupBanNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群禁言事件 - - -## _class_ `FriendAddNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -好友添加事件 - - -## _class_ `GroupRecallNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -群消息撤回事件 - - -## _class_ `FriendRecallNoticeEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -好友消息撤回事件 - - -## _class_ `NotifyEvent` - -基类：`nonebot.adapters.cqhttp.event.NoticeEvent` - -提醒事件 - - -## _class_ `PokeNotifyEvent` - -基类：`nonebot.adapters.cqhttp.event.NotifyEvent` - -戳一戳提醒事件 - - -## _class_ `LuckyKingNotifyEvent` - -基类：`nonebot.adapters.cqhttp.event.NotifyEvent` - -群红包运气王提醒事件 - - -## _class_ `HonorNotifyEvent` - -基类：`nonebot.adapters.cqhttp.event.NotifyEvent` - -群荣誉变更提醒事件 - - -## _class_ `RequestEvent` - -基类：`nonebot.adapters.cqhttp.event.Event` - -请求事件 - - -## _class_ `FriendRequestEvent` - -基类：`nonebot.adapters.cqhttp.event.RequestEvent` - -加好友请求事件 - - -## _class_ `GroupRequestEvent` - -基类：`nonebot.adapters.cqhttp.event.RequestEvent` - -加群请求/邀请事件 - - -## _class_ `MetaEvent` - -基类：`nonebot.adapters.cqhttp.event.Event` - -元事件 - - -## _class_ `LifecycleMetaEvent` - -基类：`nonebot.adapters.cqhttp.event.MetaEvent` - -生命周期元事件 - - -## _class_ `HeartbeatMetaEvent` - -基类：`nonebot.adapters.cqhttp.event.MetaEvent` - -心跳元事件 - - -## `get_event_model(event_name)` - - -* **说明** - - 根据事件名获取对应 `Event Model` 及 `FallBack Event Model` 列表 - - - -* **返回** - - - * `List[Type[Event]]` diff --git a/archive/2.0.0a16/api/adapters/ding.md b/archive/2.0.0a16/api/adapters/ding.md deleted file mode 100644 index 34dd333a..00000000 --- a/archive/2.0.0a16/api/adapters/ding.md +++ /dev/null @@ -1,334 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.adapters.ding 模块 - -## 钉钉群机器人 协议适配 - -协议详情请看: [钉钉文档](https://ding-doc.dingtalk.com/document#/org-dev-guide/elzz1p) - -# NoneBot.adapters.ding.config 模块 - - -## _class_ `Config` - -钉钉配置类 - - -* **配置项** - - - * `access_token` / `ding_access_token`: 钉钉令牌 - - - * `secret` / `ding_secret`: 钉钉 HTTP 上报数据签名口令 - - -# NoneBot.adapters.ding.exception 模块 - - -## _exception_ `DingAdapterException` - -基类：[`nonebot.exception.AdapterException`](../exception.md#nonebot.exception.AdapterException) - - -* **说明** - - 钉钉 Adapter 错误基类 - - - -## _exception_ `ActionFailed` - -基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed), `nonebot.adapters.ding.exception.DingAdapterException` - - -* **说明** - - API 请求返回错误信息。 - - - -* **参数** - - - * `errcode: Optional[int]`: 错误码 - - - * `errmsg: Optional[str]`: 错误信息 - - - -## _exception_ `NetworkError` - -基类：[`nonebot.exception.NetworkError`](../exception.md#nonebot.exception.NetworkError), `nonebot.adapters.ding.exception.DingAdapterException` - - -* **说明** - - 网络错误。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - - -## _exception_ `SessionExpired` - -基类：`nonebot.adapters.ding.exception.ApiNotAvailable`, `nonebot.adapters.ding.exception.DingAdapterException` - - -* **说明** - - 发消息的 session 已经过期。 - - -# NoneBot.adapters.ding.bot 模块 - - -## _class_ `Bot` - -基类：[`nonebot.adapters._bot.Bot`](README.md#nonebot.adapters._bot.Bot) - -钉钉 协议 Bot 适配。继承属性参考 [BaseBot](./#class-basebot) 。 - - -### _property_ `type` - - -* 返回: `"ding"` - - -### _async classmethod_ `check_permission(driver, request)` - - -* **说明** - - 钉钉协议鉴权。参考 [鉴权](https://ding-doc.dingtalk.com/doc#/serverapi2/elzz1p) - - - -### _async_ `call_api(api, event=None, **data)` - - -* **说明** - - 调用 钉钉 协议 API - - - -* **参数** - - - * `api: str`: API 名称 - - - * `event: Optional[MessageEvent]`: Event 对象 - - - * `**data: Any`: API 参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - - -### _async_ `send(event, message, at_sender=False, webhook=None, secret=None, **kwargs)` - - -* **说明** - - 根据 `event` 向触发事件的主体发送消息。 - - - -* **参数** - - - * `event: Event`: Event 对象 - - - * `message: Union[str, Message, MessageSegment]`: 要发送的消息 - - - * `at_sender: bool`: 是否 @ 事件主体 - - - * `webhook: Optional[str]`: 该条消息将调用的 webhook 地址。不传则将使用 sessionWebhook，若其也不存在，该条消息不发送，使用自定义 webhook 时注意你设置的安全方式，如加关键词，IP地址，加签等等。 - - - * `secret: Optional[str]`: 如果你使用自定义的 webhook 地址，推荐使用加签方式对消息进行验证，将 机器人安全设置页面，加签一栏下面显示的SEC开头的字符串 传入这个参数即可。 - - - * `**kwargs`: 覆盖默认参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `ValueError`: 缺少 `user_id`, `group_id` - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - -# NoneBot.adapters.ding.message 模块 - - -## _class_ `MessageSegment` - -基类：[`nonebot.adapters._message.MessageSegment`](README.md#nonebot.adapters._message.MessageSegment)[`Message`] - -钉钉 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 - - -### _static_ `atAll()` - -@全体 - - -### _static_ `atMobiles(*mobileNumber)` - -@指定手机号人员 - - -### _static_ `atDingtalkIds(*dingtalkIds)` - -@指定 id，@ 默认会在消息段末尾。 -所以你可以在消息中使用 @{senderId} 占位，发送出去之后 @ 就会出现在占位的位置： -``python -message = MessageSegment.text(f"@{event.senderId}，你好") -message += MessageSegment.atDingtalkIds(event.senderId) -`` - - -### _static_ `text(text)` - -发送 `text` 类型消息 - - -### _static_ `image(picURL)` - -发送 `image` 类型消息 - - -### _static_ `extension(dict_)` - -标记 text 文本的 extension 属性，需要与 text 消息段相加。 - - -### _static_ `code(code_language, code)` - -发送 code 消息段 - - -### _static_ `markdown(title, text)` - -发送 `markdown` 类型消息 - - -### _static_ `actionCardSingleBtn(title, text, singleTitle, singleURL)` - -发送 `actionCardSingleBtn` 类型消息 - - -### _static_ `actionCardMultiBtns(title, text, btns, hideAvatar=False, btnOrientation='1')` - -发送 `actionCardMultiBtn` 类型消息 - - -* **参数** - - - * `btnOrientation`: 0：按钮竖直排列 1：按钮横向排列 - - - * `btns`: `[{ "title": title, "actionURL": actionURL }, ...]` - - - -### _static_ `feedCard(links)` - -发送 `feedCard` 类型消息 - - -* **参数** - - - * `links`: `[{ "title": xxx, "messageURL": xxx, "picURL": xxx }, ...]` - - - -## _class_ `Message` - -基类：[`nonebot.adapters._message.Message`](README.md#nonebot.adapters._message.Message)[`nonebot.adapters.ding.message.MessageSegment`] - -钉钉 协议 Message 适配。 - -# NoneBot.adapters.ding.event 模块 - - -## _class_ `Event` - -基类：[`nonebot.adapters._event.Event`](README.md#nonebot.adapters._event.Event) - -钉钉协议事件。各事件字段参考 [钉钉文档](https://ding-doc.dingtalk.com/document#/org-dev-guide/elzz1p) - - -## _class_ `ConversationType` - -基类：`str`, `enum.Enum` - -An enumeration. - - -## _class_ `MessageEvent` - -基类：`nonebot.adapters.ding.event.Event` - -消息事件 - - -## _class_ `PrivateMessageEvent` - -基类：`nonebot.adapters.ding.event.MessageEvent` - -私聊消息事件 - - -## _class_ `GroupMessageEvent` - -基类：`nonebot.adapters.ding.event.MessageEvent` - -群消息事件 diff --git a/archive/2.0.0a16/api/adapters/feishu.md b/archive/2.0.0a16/api/adapters/feishu.md deleted file mode 100644 index dbc1e3fe..00000000 --- a/archive/2.0.0a16/api/adapters/feishu.md +++ /dev/null @@ -1,249 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.adapters.feishu 模块 - -# NoneBot.adapters.feishu.config 模块 - - -## _class_ `Config` - -钉钉配置类 - - -* **配置项** - - - * `app_id` / `feishu_app_id`: 飞书开放平台后台“凭证与基础信息”处给出的 App ID - - - * `app_secret` / `feishu_app_secret`: 飞书开放平台后台“凭证与基础信息”处给出的 App Secret - - - * `encrypt_key` / `feishu_encrypt_key`: 飞书开放平台后台“事件订阅”处设置的 Encrypt Key - - - * `verification_token` / `feishu_verification_token`: 飞书开放平台后台“事件订阅”处设置的 Verification Token - - - * `tenant_access_token` / `feishu_tenant_access_token`: 请求飞书 API 后返回的租户密钥 - - - * `is_lark` / `feishu_is_lark`: 是否使用Lark（飞书海外版），默认为 false - - -# NoneBot.adapters.feishu.exception 模块 - - -## _exception_ `ActionFailed` - -基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed), `nonebot.adapters.feishu.exception.FeishuAdapterException` - - -* **说明** - - API 请求返回错误信息。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - - -## _exception_ `NetworkError` - -基类：[`nonebot.exception.NetworkError`](../exception.md#nonebot.exception.NetworkError), `nonebot.adapters.feishu.exception.FeishuAdapterException` - - -* **说明** - - 网络错误。 - - - -* **参数** - - - * `retcode: Optional[int]`: 错误码 - - -# NoneBot.adapters.feishu.bot 模块 - - -## `_check_at_me(bot, event)` - - -* **说明** - - 检查消息开头或结尾是否存在 @机器人，去除并赋值 `event.reply`, `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_check_nickname(bot, event)` - - -* **说明** - - 检查消息开头是否存在昵称，去除并赋值 `event.to_me` - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -## `_handle_api_result(result)` - - -* **说明** - - 处理 API 请求返回值。 - - - -* **参数** - - - * `result: Optional[Dict[str, Any]]`: API 返回数据 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `ActionFailed`: API 调用失败 - - - -## _class_ `Bot` - -基类：[`nonebot.adapters._bot.Bot`](README.md#nonebot.adapters._bot.Bot) - -飞书 协议 Bot 适配。继承属性参考 [BaseBot](./#class-basebot) 。 - - -### _async_ `handle_message(message)` - - -* **说明** - - 处理事件并转换为 [Event](#class-event) - - - -### _async_ `call_api(api, **data)` - - -* **说明** - - 调用 飞书 协议 API - - - -* **参数** - - - * `api: str`: API 名称 - - - * `**data: Any`: API 参数 - - - -* **返回** - - - * `Any`: API 调用返回数据 - - - -* **异常** - - - * `NetworkError`: 网络错误 - - - * `ActionFailed`: API 调用失败 - - -# NoneBot.adapters.feishu.message 模块 - - -## _class_ `MessageSegment` - -基类：[`nonebot.adapters._message.MessageSegment`](README.md#nonebot.adapters._message.MessageSegment)[`Message`] - -飞书 协议 MessageSegment 适配。具体方法参考协议消息段类型或源码。 - - -## _class_ `Message` - -基类：[`nonebot.adapters._message.Message`](README.md#nonebot.adapters._message.Message)[`nonebot.adapters.feishu.message.MessageSegment`] - -飞书 协议 Message 适配。 - - -## _class_ `MessageSerializer` - -基类：`object` - -飞书 协议 Message 序列化器。 - - -## _class_ `MessageDeserializer` - -基类：`object` - -飞书 协议 Message 反序列化器。 - -# NoneBot.adapters.feishu.event 模块 - - -## _class_ `Event` - -基类：[`nonebot.adapters._event.Event`](README.md#nonebot.adapters._event.Event) - -飞书协议事件。各事件字段参考 [飞书文档](https://open.feishu.cn/document/ukTMukTMukTM/uYDNxYjL2QTM24iN0EjN/event-list) - - -## `get_event_model(event_name)` - - -* **说明** - - 根据事件名获取对应 `Event Model` 及 `FallBack Event Model` 列表 - - - -* **返回** - - - * `List[Type[Event]]` diff --git a/archive/2.0.0a16/api/adapters/mirai.md b/archive/2.0.0a16/api/adapters/mirai.md deleted file mode 100644 index 87c8eca2..00000000 --- a/archive/2.0.0a16/api/adapters/mirai.md +++ /dev/null @@ -1,1901 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.adapters.mirai 模块 - -## Mirai-API-HTTP 协议适配 - -协议详情请看: [mirai-api-http 文档](https://github.com/project-mirai/mirai-api-http/tree/master/docs) - -::: tip -该Adapter目前仍然处在早期实验性阶段, 并未经过充分测试 - -如果你在使用过程中遇到了任何问题, 请前往 [Issue页面](https://github.com/nonebot/nonebot2/issues) 为我们提供反馈 -::: - -::: danger -Mirai-API-HTTP 的适配器以 [AGPLv3许可](https://opensource.org/licenses/AGPL-3.0) 单独开源 - -这意味着在使用该适配器时需要 **以该许可开源您的完整程序代码** -::: - -# NoneBot.adapters.mirai.config 模块 - - -## _class_ `Config` - -Mirai 配置类 - - -* **必填** - - - * `auth_key` / `mirai_auth_key`: mirai-api-http 的 auth_key - - - * `mirai_host`: mirai-api-http 的地址 - - - * `mirai_port`: mirai-api-http 的端口 - - -# NoneBot.adapters.mirai.bot 模块 - - -## _class_ `SessionManager` - -基类：`object` - -Bot会话管理器, 提供API主动调用接口 - - -### _async_ `post(path, *, params=None)` - - -* **说明** - - 以POST方式主动提交API请求 - - - -* **参数** - - - * `path: str`: 对应API路径 - - - * `params: Optional[Dict[str, Any]]`: 请求参数 (无需sessionKey) - - - -* **返回** - - - * `Dict[str, Any]`: API 返回值 - - - -### _async_ `request(path, *, params=None)` - - -* **说明** - - 以GET方式主动提交API请求 - - - -* **参数** - - - * `path: str`: 对应API路径 - - - * `params: Optional[Dict[str, Any]]`: 请求参数 (无需sessionKey) - - - -### _async_ `upload(path, *, params)` - - -* **说明** - - 以表单(`multipart/form-data`)形式主动提交API请求 - - - -* **参数** - - - * `path: str`: 对应API路径 - - - * `params: Dict[str, Any]`: 请求参数 (无需sessionKey) - - - -## _class_ `Bot` - -基类：[`nonebot.adapters._bot.Bot`](README.md#nonebot.adapters._bot.Bot) - -mirai-api-http 协议 Bot 适配。 - -::: warning -API中为了使代码更加整洁, 我们采用了与PEP8相符的命名规则取代Mirai原有的驼峰命名 - -部分字段可能与文档在符号上不一致 -::: - - -### _property_ `api` - -返回该Bot对象的会话管理实例以提供API主动调用 - - -### _async_ `call_api(api, **data)` - -::: danger -由于Mirai的HTTP API特殊性, 该API暂时无法实现 -::: - -::: tip -你可以使用 `MiraiBot.api` 中提供的调用方法来代替 -::: - - -### `send(event, message, at_sender=False)` - - -* **说明** - - 根据 `event` 向触发事件的主体发送信息 - - - -* **参数** - - - * `event: Event`: Event对象 - - - * `message: Union[MessageChain, MessageSegment, str]`: 要发送的消息 - - - * `at_sender: bool`: 是否 @ 事件主体 - - - -### `send_friend_message(target, message_chain)` - - -* **说明** - - 使用此方法向指定好友发送消息 - - - -* **参数** - - - * `target: int`: 发送消息目标好友的 QQ 号 - - - * `message_chain: MessageChain`: 消息链，是一个消息对象构成的数组 - - - -### `send_temp_message(qq, group, message_chain)` - - -* **说明** - - 使用此方法向临时会话对象发送消息 - - - -* **参数** - - - * `qq: int`: 临时会话对象 QQ 号 - - - * `group: int`: 临时会话群号 - - - * `message_chain: MessageChain`: 消息链，是一个消息对象构成的数组 - - - -### `send_group_message(group, message_chain, quote=None)` - - -* **说明** - - 使用此方法向指定群发送消息 - - - -* **参数** - - - * `group: int`: 发送消息目标群的群号 - - - * `message_chain: MessageChain`: 消息链，是一个消息对象构成的数组 - - - * `quote: Optional[int]`: 引用一条消息的 message_id 进行回复 - - - -### `recall(target)` - - -* **说明** - - 使用此方法撤回指定消息。对于bot发送的消息，有2分钟时间限制。对于撤回群聊中群员的消息，需要有相应权限 - - - -* **参数** - - - * `target: int`: 需要撤回的消息的message_id - - - -### `send_image_message(target, qq, group, urls)` - - -* **说明** - - 使用此方法向指定对象（群或好友）发送图片消息 - 除非需要通过此手段获取image_id，否则不推荐使用该接口 - - > 当qq和group同时存在时，表示发送临时会话图片，qq为临时会话对象QQ号，group为临时会话发起的群号 - - - -* **参数** - - - * `target: int`: 发送对象的QQ号或群号，可能存在歧义 - - - * `qq: int`: 发送对象的QQ号 - - - * `group: int`: 发送对象的群号 - - - * `urls: List[str]`: 是一个url字符串构成的数组 - - - -* **返回** - - - * `List[str]`: 一个包含图片imageId的数组 - - - -### `upload_image(type, img)` - - -* **说明** - - 使用此方法上传图片文件至服务器并返回Image_id - - - -* **参数** - - - * `type: str`: “friend” 或 “group” 或 “temp” - - - * `img: BytesIO`: 图片的BytesIO对象 - - - -### `upload_voice(type, voice)` - - -* **说明** - - 使用此方法上传语音文件至服务器并返回voice_id - - - -* **参数** - - - * `type: str`: 当前仅支持 “group” - - - * `voice: BytesIO`: 语音的BytesIO对象 - - - -### `fetch_message(count=10)` - - -* **说明** - - 使用此方法获取bot接收到的最老消息和最老各类事件 - (会从MiraiApiHttp消息记录中删除) - - - -* **参数** - - - * `count: int`: 获取消息和事件的数量 - - - -### `fetch_latest_message(count=10)` - - -* **说明** - - 使用此方法获取bot接收到的最新消息和最新各类事件 - (会从MiraiApiHttp消息记录中删除) - - - -* **参数** - - - * `count: int`: 获取消息和事件的数量 - - - -### `peek_message(count=10)` - - -* **说明** - - 使用此方法获取bot接收到的最老消息和最老各类事件 - (不会从MiraiApiHttp消息记录中删除) - - - -* **参数** - - - * `count: int`: 获取消息和事件的数量 - - - -### `peek_latest_message(count=10)` - - -* **说明** - - 使用此方法获取bot接收到的最新消息和最新各类事件 - (不会从MiraiApiHttp消息记录中删除) - - - -* **参数** - - - * `count: int`: 获取消息和事件的数量 - - - -### `messsage_from_id(id)` - - -* **说明** - - 通过messageId获取一条被缓存的消息 - 使用此方法获取bot接收到的消息和各类事件 - - - -* **参数** - - - * `id: int`: 获取消息的message_id - - - -### `count_message()` - - -* **说明** - - 使用此方法获取bot接收并缓存的消息总数，注意不包含被删除的 - - - -### `friend_list()` - - -* **说明** - - 使用此方法获取bot的好友列表 - - - -* **返回** - - - * `List[Dict[str, Any]]`: 返回的好友列表数据 - - - -### `group_list()` - - -* **说明** - - 使用此方法获取bot的群列表 - - - -* **返回** - - - * `List[Dict[str, Any]]`: 返回的群列表数据 - - - -### `member_list(target)` - - -* **说明** - - 使用此方法获取bot指定群种的成员列表 - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - -* **返回** - - - * `List[Dict[str, Any]]`: 返回的群成员列表数据 - - - -### `mute(target, member_id, time)` - - -* **说明** - - 使用此方法指定群禁言指定群员（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `member_id: int`: 指定群员QQ号 - - - * `time: int`: 禁言时长，单位为秒，最多30天 - - - -### `unmute(target, member_id)` - - -* **说明** - - 使用此方法指定群解除群成员禁言（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `member_id: int`: 指定群员QQ号 - - - -### `kick(target, member_id, msg)` - - -* **说明** - - 使用此方法移除指定群成员（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `member_id: int`: 指定群员QQ号 - - - * `msg: str`: 信息 - - - -### `quit(target)` - - -* **说明** - - 使用此方法使Bot退出群聊 - - - -* **参数** - - - * `target: int`: 退出的群号 - - - -### `mute_all(target)` - - -* **说明** - - 使用此方法令指定群进行全体禁言（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - -### `unmute_all(target)` - - -* **说明** - - 使用此方法令指定群解除全体禁言（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - -### `group_config(target)` - - -* **说明** - - 使用此方法获取群设置 - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - -* **返回** - - -```json -{ - "name": "群名称", - "announcement": "群公告", - "confessTalk": true, - "allowMemberInvite": true, - "autoApprove": true, - "anonymousChat": true -} -``` - - -### `modify_group_config(target, config)` - - -* **说明** - - 使用此方法修改群设置（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `config: Dict[str, Any]`: 群设置, 格式见 `group_config` 的返回值 - - - -### `member_info(target, member_id)` - - -* **说明** - - 使用此方法获取群员资料 - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `member_id: int`: 群员QQ号 - - - -* **返回** - - -```json -{ - "name": "群名片", - "specialTitle": "群头衔" -} -``` - - -### `modify_member_info(target, member_id, info)` - - -* **说明** - - 使用此方法修改群员资料（需要有相关权限） - - - -* **参数** - - - * `target: int`: 指定群的群号 - - - * `member_id: int`: 群员QQ号 - - - * `info: Dict[str, Any]`: 群员资料, 格式见 `member_info` 的返回值 - - -# NoneBot.adapters.mirai.message 模块 - - -## _class_ `MessageType` - -基类：`str`, `enum.Enum` - -消息类型枚举类 - - -## _class_ `MessageSegment` - -基类：[`nonebot.adapters._message.MessageSegment`](README.md#nonebot.adapters._message.MessageSegment)[`MessageChain`] - -Mirai-API-HTTP 协议 MessageSegment 适配。具体方法参考 [mirai-api-http 消息类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/MessageType.md) - - -### `as_dict()` - -导出可以被正常json序列化的结构体 - - -### _classmethod_ `quote(id, group_id, sender_id, target_id, origin)` - - -* **说明** - - 生成回复引用消息段 - - - -* **参数** - - - * `id: int`: 被引用回复的原消息的message_id - - - * `group_id: int`: 被引用回复的原消息所接收的群号，当为好友消息时为0 - - - * `sender_id: int`: 被引用回复的原消息的发送者的QQ号 - - - * `target_id: int`: 被引用回复的原消息的接收者者的QQ号（或群号） - - - * `origin: MessageChain`: 被引用回复的原消息的消息链对象 - - - -### _classmethod_ `at(target)` - - -* **说明** - - @某个人 - - - -* **参数** - - - * `target: int`: 群员QQ号 - - - -### _classmethod_ `at_all()` - - -* **说明** - - @全体成员 - - - -### _classmethod_ `face(face_id=None, name=None)` - - -* **说明** - - 发送QQ表情 - - - -* **参数** - - - * `face_id: Optional[int]`: QQ表情编号，可选，优先高于name - - - * `name: Optional[str]`: QQ表情拼音，可选 - - - -### _classmethod_ `plain(text)` - - -* **说明** - - 纯文本消息 - - - -* **参数** - - - * `text: str`: 文字消息 - - - -### _classmethod_ `image(image_id=None, url=None, path=None)` - - -* **说明** - - 图片消息 - - - -* **参数** - - - * `image_id: Optional[str]`: 图片的image_id，群图片与好友图片格式不同。不为空时将忽略url属性 - - - * `url: Optional[str]`: 图片的URL，发送时可作网络图片的链接 - - - * `path: Optional[str]`: 图片的路径，发送本地图片 - - - -### _classmethod_ `flash_image(image_id=None, url=None, path=None)` - - -* **说明** - - 闪照消息 - - - -* **参数** - - 同 `image` - - - -### _classmethod_ `voice(voice_id=None, url=None, path=None)` - - -* **说明** - - 语音消息 - - - -* **参数** - - - * `voice_id: Optional[str]`: 语音的voice_id，不为空时将忽略url属性 - - - * `url: Optional[str]`: 语音的URL，发送时可作网络语音的链接 - - - * `path: Optional[str]`: 语音的路径，发送本地语音 - - - -### _classmethod_ `xml(xml)` - - -* **说明** - - XML消息 - - - -* **参数** - - - * `xml: str`: XML文本 - - - -### _classmethod_ `json(json)` - - -* **说明** - - Json消息 - - - -* **参数** - - - * `json: str`: Json文本 - - - -### _classmethod_ `app(content)` - - -* **说明** - - 应用程序消息 - - - -* **参数** - - - * `content: str`: 内容 - - - -### _classmethod_ `poke(name)` - - -* **说明** - - 戳一戳消息 - - - -* **参数** - - - * `name: str`: 戳一戳的类型 - - - * `Poke`: 戳一戳 - - - * `ShowLove`: 比心 - - - * `Like`: 点赞 - - - * `Heartbroken`: 心碎 - - - * `SixSixSix`: 666 - - - * `FangDaZhao`: 放大招 - - - -## _class_ `MessageChain` - -基类：[`nonebot.adapters._message.Message`](README.md#nonebot.adapters._message.Message)[`nonebot.adapters.mirai.message.MessageSegment`] - -Mirai 协议 Message 适配 - -由于Mirai协议的Message实现较为特殊, 故使用MessageChain命名 - - -### `export()` - -导出为可以被正常json序列化的数组 - - -### `extract_first(*type)` - - -* **说明** - - 弹出该消息链的第一个消息 - - - -* **参数** - - - * \*type: MessageType: 指定的消息类型, 当指定后如类型不匹配不弹出 - - -# NoneBot.adapters.mirai.utils 模块 - - -## _exception_ `ActionFailed` - -基类：[`nonebot.exception.ActionFailed`](../exception.md#nonebot.exception.ActionFailed) - - -* **说明** - - API 请求成功返回数据，但 API 操作失败。 - - - -## _exception_ `InvalidArgument` - -基类：[`nonebot.exception.AdapterException`](../exception.md#nonebot.exception.AdapterException) - - -* **说明** - - 调用API的参数出错 - - - -## `catch_network_error(function)` - - -* **说明** - - 捕捉函数抛出的httpx网络异常并释放 `NetworkError` 异常 - - 处理返回数据, 在code不为0时释放 `ActionFailed` 异常 - - -::: warning -此装饰器只支持使用了httpx的异步函数 -::: - - -## `argument_validation(function)` - - -* **说明** - - 通过函数签名中的类型注解来对传入参数进行运行时校验 - - 会在参数出错时释放 `InvalidArgument` 异常 - - -# NoneBot.adapters.mirai.event 模块 - -::: warning -事件中为了使代码更加整洁, 我们采用了与PEP8相符的命名规则取代Mirai原有的驼峰命名 - -部分字段可能与文档在符号上不一致 -::: - - -## _class_ `Event` - -基类：[`nonebot.adapters._event.Event`](README.md#nonebot.adapters._event.Event) - -mirai-api-http 协议事件，字段与 mirai-api-http 一致。各事件字段参考 [mirai-api-http 事件类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/EventType.md) - - -### _classmethod_ `new(data)` - -此事件类的工厂函数, 能够通过事件数据选择合适的子类进行序列化 - - -### `normalize_dict(**kwargs)` - -返回可以被json正常反序列化的结构体 - - -## _class_ `UserPermission` - -基类：`str`, `enum.Enum` - - -* **说明** - - 用户权限枚举类 - - - * `OWNER`: 群主 - - - * `ADMINISTRATOR`: 群管理 - - - * `MEMBER`: 普通群成员 - - - -## _class_ `MessageEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -消息事件基类 - - -## _class_ `GroupMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -群消息事件 - - -## _class_ `FriendMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -好友消息事件 - - -## _class_ `TempMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -临时会话消息事件 - - -## _class_ `NoticeEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -通知事件基类 - - -## _class_ `MuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -禁言类事件基类 - - -## _class_ `BotMuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -Bot被禁言 - - -## _class_ `BotUnmuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -Bot被取消禁言 - - -## _class_ `MemberMuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -群成员被禁言事件（该成员不是Bot） - - -## _class_ `MemberUnmuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -群成员被取消禁言事件（该成员不是Bot） - - -## _class_ `BotJoinGroupEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -Bot加入了一个新群 - - -## _class_ `BotLeaveEventActive` - -基类：`nonebot.adapters.mirai.event.notice.BotJoinGroupEvent` - -Bot主动退出一个群 - - -## _class_ `BotLeaveEventKick` - -基类：`nonebot.adapters.mirai.event.notice.BotJoinGroupEvent` - -Bot被踢出一个群 - - -## _class_ `MemberJoinEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -新人入群的事件 - - -## _class_ `MemberLeaveEventKick` - -基类：`nonebot.adapters.mirai.event.notice.MemberJoinEvent` - -成员被踢出群（该成员不是Bot） - - -## _class_ `MemberLeaveEventQuit` - -基类：`nonebot.adapters.mirai.event.notice.MemberJoinEvent` - -成员主动离群（该成员不是Bot） - - -## _class_ `FriendRecallEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -好友消息撤回 - - -## _class_ `GroupRecallEvent` - -基类：`nonebot.adapters.mirai.event.notice.FriendRecallEvent` - -群消息撤回 - - -## _class_ `GroupStateChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -群变化事件基类 - - -## _class_ `GroupNameChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -某个群名改变 - - -## _class_ `GroupEntranceAnnouncementChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -某群入群公告改变 - - -## _class_ `GroupMuteAllEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -全员禁言 - - -## _class_ `GroupAllowAnonymousChatEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -匿名聊天 - - -## _class_ `GroupAllowConfessTalkEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -坦白说 - - -## _class_ `GroupAllowMemberInviteEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -允许群员邀请好友加群 - - -## _class_ `MemberStateChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -群成员变化事件基类 - - -## _class_ `MemberCardChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -群名片改动 - - -## _class_ `MemberSpecialTitleChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -群头衔改动（只有群主有操作限权） - - -## _class_ `BotGroupPermissionChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -Bot在群里的权限被改变 - - -## _class_ `MemberPermissionChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -成员权限改变的事件（该成员不是Bot） - - -## _class_ `RequestEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -请求事件基类 - - -## _class_ `NewFriendRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -添加好友申请 - - -### _async_ `approve(bot)` - - -* **说明** - - 通过此人的好友申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, operate=1, message='')` - - -* **说明** - - 拒绝此人的好友申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `operate: Literal[1, 2]`: 响应的操作类型 - - - * `1`: 拒绝添加好友 - - - * `2`: 拒绝添加好友并添加黑名单，不再接收该用户的好友申请 - - - * `message: str`: 回复的信息 - - - -## _class_ `MemberJoinRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -用户入群申请（Bot需要有管理员权限） - - -### _async_ `approve(bot)` - - -* **说明** - - 通过此人的加群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, operate=1, message='')` - - -* **说明** - - 拒绝(忽略)此人的加群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `operate: Literal[1, 2, 3, 4]`: 响应的操作类型 - - - * `1`: 拒绝入群 - - - * `2`: 忽略请求 - - - * `3`: 拒绝入群并添加黑名单，不再接收该用户的入群申请 - - - * `4`: 忽略入群并添加黑名单，不再接收该用户的入群申请 - - - * `message: str`: 回复的信息 - - - -## _class_ `BotInvitedJoinGroupRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -Bot被邀请入群申请 - - -### _async_ `approve(bot)` - - -* **说明** - - 通过这份被邀请入群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, message='')` - - -* **说明** - - 拒绝这份被邀请入群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `message: str`: 邀请消息 - - -# NoneBot.adapters.mirai.event.base 模块 - - -## _class_ `UserPermission` - -基类：`str`, `enum.Enum` - - -* **说明** - - 用户权限枚举类 - - - * `OWNER`: 群主 - - - * `ADMINISTRATOR`: 群管理 - - - * `MEMBER`: 普通群成员 - - - -## _class_ `NudgeSubjectKind` - -基类：`str`, `enum.Enum` - - -* **说明** - - 戳一戳类型枚举类 - - - * `Group`: 群 - - - * `Friend`: 好友 - - - -## _class_ `Event` - -基类：[`nonebot.adapters._event.Event`](README.md#nonebot.adapters._event.Event) - -mirai-api-http 协议事件，字段与 mirai-api-http 一致。各事件字段参考 [mirai-api-http 事件类型](https://github.com/project-mirai/mirai-api-http/blob/master/docs/EventType.md) - - -### _classmethod_ `new(data)` - -此事件类的工厂函数, 能够通过事件数据选择合适的子类进行序列化 - - -### `normalize_dict(**kwargs)` - -返回可以被json正常反序列化的结构体 - -# NoneBot.adapters.mirai.event.meta 模块 - - -## _class_ `MetaEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -元事件基类 - - -## _class_ `BotOnlineEvent` - -基类：`nonebot.adapters.mirai.event.meta.MetaEvent` - -Bot登录成功 - - -## _class_ `BotOfflineEventActive` - -基类：`nonebot.adapters.mirai.event.meta.MetaEvent` - -Bot主动离线 - - -## _class_ `BotOfflineEventForce` - -基类：`nonebot.adapters.mirai.event.meta.MetaEvent` - -Bot被挤下线 - - -## _class_ `BotOfflineEventDropped` - -基类：`nonebot.adapters.mirai.event.meta.MetaEvent` - -Bot被服务器断开或因网络问题而掉线 - - -## _class_ `BotReloginEvent` - -基类：`nonebot.adapters.mirai.event.meta.MetaEvent` - -Bot主动重新登录 - -# NoneBot.adapters.mirai.event.message 模块 - - -## _class_ `MessageEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -消息事件基类 - - -## _class_ `GroupMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -群消息事件 - - -## _class_ `FriendMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -好友消息事件 - - -## _class_ `TempMessage` - -基类：`nonebot.adapters.mirai.event.message.MessageEvent` - -临时会话消息事件 - -# NoneBot.adapters.mirai.event.notice 模块 - - -## _class_ `NoticeEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -通知事件基类 - - -## _class_ `MuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -禁言类事件基类 - - -## _class_ `BotMuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -Bot被禁言 - - -## _class_ `BotUnmuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -Bot被取消禁言 - - -## _class_ `MemberMuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -群成员被禁言事件（该成员不是Bot） - - -## _class_ `MemberUnmuteEvent` - -基类：`nonebot.adapters.mirai.event.notice.MuteEvent` - -群成员被取消禁言事件（该成员不是Bot） - - -## _class_ `BotJoinGroupEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -Bot加入了一个新群 - - -## _class_ `BotLeaveEventActive` - -基类：`nonebot.adapters.mirai.event.notice.BotJoinGroupEvent` - -Bot主动退出一个群 - - -## _class_ `BotLeaveEventKick` - -基类：`nonebot.adapters.mirai.event.notice.BotJoinGroupEvent` - -Bot被踢出一个群 - - -## _class_ `MemberJoinEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -新人入群的事件 - - -## _class_ `MemberLeaveEventKick` - -基类：`nonebot.adapters.mirai.event.notice.MemberJoinEvent` - -成员被踢出群（该成员不是Bot） - - -## _class_ `MemberLeaveEventQuit` - -基类：`nonebot.adapters.mirai.event.notice.MemberJoinEvent` - -成员主动离群（该成员不是Bot） - - -## _class_ `FriendRecallEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -好友消息撤回 - - -## _class_ `GroupRecallEvent` - -基类：`nonebot.adapters.mirai.event.notice.FriendRecallEvent` - -群消息撤回 - - -## _class_ `GroupStateChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -群变化事件基类 - - -## _class_ `GroupNameChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -某个群名改变 - - -## _class_ `GroupEntranceAnnouncementChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -某群入群公告改变 - - -## _class_ `GroupMuteAllEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -全员禁言 - - -## _class_ `GroupAllowAnonymousChatEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -匿名聊天 - - -## _class_ `GroupAllowConfessTalkEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -坦白说 - - -## _class_ `GroupAllowMemberInviteEvent` - -基类：`nonebot.adapters.mirai.event.notice.GroupStateChangeEvent` - -允许群员邀请好友加群 - - -## _class_ `MemberStateChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -群成员变化事件基类 - - -## _class_ `MemberCardChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -群名片改动 - - -## _class_ `MemberSpecialTitleChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -群头衔改动（只有群主有操作限权） - - -## _class_ `BotGroupPermissionChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -Bot在群里的权限被改变 - - -## _class_ `MemberPermissionChangeEvent` - -基类：`nonebot.adapters.mirai.event.notice.MemberStateChangeEvent` - -成员权限改变的事件（该成员不是Bot） - - -## _class_ `NudgeEvent` - -基类：`nonebot.adapters.mirai.event.notice.NoticeEvent` - -戳一戳触发事件 - -# NoneBot.adapters.mirai.event.request 模块 - - -## _class_ `RequestEvent` - -基类：`nonebot.adapters.mirai.event.base.Event` - -请求事件基类 - - -## _class_ `NewFriendRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -添加好友申请 - - -### _async_ `approve(bot)` - - -* **说明** - - 通过此人的好友申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, operate=1, message='')` - - -* **说明** - - 拒绝此人的好友申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `operate: Literal[1, 2]`: 响应的操作类型 - - - * `1`: 拒绝添加好友 - - - * `2`: 拒绝添加好友并添加黑名单，不再接收该用户的好友申请 - - - * `message: str`: 回复的信息 - - - -## _class_ `MemberJoinRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -用户入群申请（Bot需要有管理员权限） - - -### _async_ `approve(bot)` - - -* **说明** - - 通过此人的加群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, operate=1, message='')` - - -* **说明** - - 拒绝(忽略)此人的加群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `operate: Literal[1, 2, 3, 4]`: 响应的操作类型 - - - * `1`: 拒绝入群 - - - * `2`: 忽略请求 - - - * `3`: 拒绝入群并添加黑名单，不再接收该用户的入群申请 - - - * `4`: 忽略入群并添加黑名单，不再接收该用户的入群申请 - - - * `message: str`: 回复的信息 - - - -## _class_ `BotInvitedJoinGroupRequestEvent` - -基类：`nonebot.adapters.mirai.event.request.RequestEvent` - -Bot被邀请入群申请 - - -### _async_ `approve(bot)` - - -* **说明** - - 通过这份被邀请入群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - -### _async_ `reject(bot, message='')` - - -* **说明** - - 拒绝这份被邀请入群申请 - - - -* **参数** - - - * `bot: Bot`: 当前的 `Bot` 对象 - - - * `message: str`: 邀请消息 diff --git a/archive/2.0.0a16/api/config.md b/archive/2.0.0a16/api/config.md deleted file mode 100644 index cf7ef369..00000000 --- a/archive/2.0.0a16/api/config.md +++ /dev/null @@ -1,311 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.config 模块 - -## 配置 - -NoneBot 使用 [pydantic](https://pydantic-docs.helpmanual.io/) 以及 [python-dotenv](https://saurabh-kumar.com/python-dotenv/) 来读取配置。 - -配置项需符合特殊格式或 json 序列化格式。详情见 [pydantic Field Type](https://pydantic-docs.helpmanual.io/usage/types/) 文档。 - - -## _class_ `Env` - -基类：`nonebot.config.BaseConfig` - -运行环境配置。大小写不敏感。 - -将会从 `nonebot.init 参数` > `环境变量` > `.env 环境配置文件` 的优先级读取配置。 - - -### `environment` - - -* **类型**: `str` - - -* **默认值**: `"prod"` - - -* **说明** - - 当前环境名。 NoneBot 将从 `.env.{environment}` 文件中加载配置。 - - - -## _class_ `Config` - -基类：`nonebot.config.BaseConfig` - -NoneBot 主要配置。大小写不敏感。 - -除了 NoneBot 的配置项外，还可以自行添加配置项到 `.env.{environment}` 文件中。 -这些配置将会在 json 反序列化后一起带入 `Config` 类中。 - - -### `driver` - - -* **类型**: `str` - - -* **默认值**: `"nonebot.drivers.fastapi"` - - -* **说明** - - NoneBot 运行所使用的 `Driver` 。继承自 `nonebot.driver.BaseDriver` 。 - - 配置格式为 `[:]`，默认类名为 `Driver`。 - - - -### `host` - - -* **类型**: `IPvAnyAddress` - - -* **默认值**: `127.0.0.1` - - -* **说明** - - NoneBot 的 HTTP 和 WebSocket 服务端监听的 IP/主机名。 - - - -### `port` - - -* **类型**: `int` - - -* **默认值**: `8080` - - -* **说明** - - NoneBot 的 HTTP 和 WebSocket 服务端监听的端口。 - - - -### `debug` - - -* **类型**: `bool` - - -* **默认值**: `False` - - -* **说明** - - 是否以调试模式运行 NoneBot。 - - - -### `log_level` - - -* **类型**: `Union[int, str]` - - -* **默认值**: `None` - - -* **说明** - - 配置 NoneBot 日志输出等级，可以为 `int` 类型等级或等级名称，参考 [loguru 日志等级](https://loguru.readthedocs.io/en/stable/api/logger.html#levels)。 - - - -* **示例** - - -```default -LOG_LEVEL=25 -LOG_LEVEL=INFO -``` - - -### `api_root` - - -* **类型**: `Dict[str, str]` - - -* **默认值**: `{}` - - -* **说明** - - 以机器人 ID 为键，上报地址为值的字典，环境变量或文件中应使用 json 序列化。 - - - -* **示例** - - -```default -API_ROOT={"123456": "http://127.0.0.1:5700"} -``` - - -### `api_timeout` - - -* **类型**: `Optional[float]` - - -* **默认值**: `30.` - - -* **说明** - - API 请求超时时间，单位: 秒。 - - - -### `access_token` - - -* **类型**: `Optional[str]` - - -* **默认值**: `None` - - -* **说明** - - API 请求以及上报所需密钥，在请求头中携带。 - - - -* **示例** - - -```http -POST /cqhttp/ HTTP/1.1 -Authorization: Bearer kSLuTF2GC2Q4q4ugm3 -``` - - -### `secret` - - -* **类型**: `Optional[str]` - - -* **默认值**: `None` - - -* **说明** - - HTTP POST 形式上报所需签名，在请求头中携带。 - - - -* **示例** - - -```http -POST /cqhttp/ HTTP/1.1 -X-Signature: sha1=f9ddd4863ace61e64f462d41ca311e3d2c1176e2 -``` - - -### `superusers` - - -* **类型**: `Set[str]` - - -* **默认值**: `set()` - - -* **说明** - - 机器人超级用户。 - - - -* **示例** - - -```default -SUPERUSERS=["12345789"] -``` - - -### `nickname` - - -* **类型**: `Set[str]` - - -* **默认值**: `set()` - - -* **说明** - - 机器人昵称。 - - - -### `command_start` - - -* **类型**: `Set[str]` - - -* **默认值**: `{"/"}` - - -* **说明** - - 命令的起始标记，用于判断一条消息是不是命令。 - - - -### `command_sep` - - -* **类型**: `Set[str]` - - -* **默认值**: `{"."}` - - -* **说明** - - 命令的分隔标记，用于将文本形式的命令切分为元组（实际的命令名）。 - - - -### `session_expire_timeout` - - -* **类型**: `timedelta` - - -* **默认值**: `timedelta(minutes=2)` - - -* **说明** - - 等待用户回复的超时时间。 - - - -* **示例** - - -```default -SESSION_EXPIRE_TIMEOUT=120 # 单位: 秒 -SESSION_EXPIRE_TIMEOUT=[DD ][HH:MM]SS[.ffffff] -SESSION_EXPIRE_TIMEOUT=P[DD]DT[HH]H[MM]M[SS]S # ISO 8601 -``` diff --git a/archive/2.0.0a16/api/drivers/README.md b/archive/2.0.0a16/api/drivers/README.md deleted file mode 100644 index 9f8ee3ee..00000000 --- a/archive/2.0.0a16/api/drivers/README.md +++ /dev/null @@ -1,529 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.drivers 模块 - -## 后端驱动适配基类 - -各驱动请继承以下基类 - - -## _class_ `Driver` - -基类：`abc.ABC` - -Driver 基类。 - - -### `_adapters` - - -* **类型** - - `Dict[str, Type[Bot]]` - - - -* **说明** - - 已注册的适配器列表 - - - -### `_bot_connection_hook` - - -* **类型** - - `Set[T_BotConnectionHook]` - - - -* **说明** - - Bot 连接建立时执行的函数 - - - -### `_bot_disconnection_hook` - - -* **类型** - - `Set[T_BotDisconnectionHook]` - - - -* **说明** - - Bot 连接断开时执行的函数 - - - -### `__init__(env, config)` - - -* **参数** - - - * `env: Env`: 包含环境信息的 Env 对象 - - - * `config: Config`: 包含配置信息的 Config 对象 - - - -### `env` - - -* **类型** - - `str` - - - -* **说明** - - 环境名称 - - - -### `config` - - -* **类型** - - `Config` - - - -* **说明** - - 配置对象 - - - -### `_clients` - - -* **类型** - - `Dict[str, Bot]` - - - -* **说明** - - 已连接的 Bot - - - -### _property_ `bots` - - -* **类型** - - `Dict[str, Bot]` - - - -* **说明** - - 获取当前所有已连接的 Bot - - - -### `register_adapter(name, adapter, **kwargs)` - - -* **说明** - - 注册一个协议适配器 - - - -* **参数** - - - * `name: str`: 适配器名称，用于在连接时进行识别 - - - * `adapter: Type[Bot]`: 适配器 Class - - - * `**kwargs`: 其他传递给适配器的参数 - - - -### _abstract property_ `type` - -驱动类型名称 - - -### _abstract property_ `logger` - -驱动专属 logger 日志记录器 - - -### _abstract_ `run(*args, **kwargs)` - - -* **说明** - - 启动驱动框架 - - - -* **参数** - - - * `*args` - - - * `**kwargs` - - - -### _abstract_ `on_startup(func)` - -注册一个在驱动启动时运行的函数 - - -### _abstract_ `on_shutdown(func)` - -注册一个在驱动停止时运行的函数 - - -### `on_bot_connect(func)` - - -* **说明** - - 装饰一个函数使他在 bot 通过 WebSocket 连接成功时执行。 - - - -* **函数参数** - - - * `bot: Bot`: 当前连接上的 Bot 对象 - - - -### `on_bot_disconnect(func)` - - -* **说明** - - 装饰一个函数使他在 bot 通过 WebSocket 连接断开时执行。 - - - -* **函数参数** - - - * `bot: Bot`: 当前连接上的 Bot 对象 - - - -### `_bot_connect(bot)` - -在 WebSocket 连接成功后，调用该函数来注册 bot 对象 - - -### `_bot_disconnect(bot)` - -在 WebSocket 连接断开后，调用该函数来注销 bot 对象 - - -## _class_ `ForwardDriver` - -基类：`nonebot.drivers.Driver` - -Forward Driver 基类。将客户端框架封装，以满足适配器使用。 - - -### _abstract_ `setup_http_polling(setup)` - - -* **说明** - - 注册一个 HTTP 轮询连接，如果传入一个函数，则该函数会在每次连接时被调用 - - - -* **参数** - - - * `setup: Union[HTTPPollingSetup, Callable[[], Awaitable[HTTPPollingSetup]]]` - - - -### _abstract_ `setup_websocket(setup)` - - -* **说明** - - 注册一个 WebSocket 连接，如果传入一个函数，则该函数会在每次重连时被调用 - - - -* **参数** - - - * `setup: Union[WebSocketSetup, Callable[[], Awaitable[WebSocketSetup]]]` - - - -## _class_ `ReverseDriver` - -基类：`nonebot.drivers.Driver` - -Reverse Driver 基类。将后端框架封装，以满足适配器使用。 - - -### _abstract property_ `server_app` - -驱动 APP 对象 - - -### _abstract property_ `asgi` - -驱动 ASGI 对象 - - -## _class_ `HTTPConnection` - -基类：`abc.ABC` - - -### `http_version` - -One of `"1.0"`, `"1.1"` or `"2"`. - - -### `scheme` - -URL scheme portion (likely `"http"` or `"https"`). - - -### `path` - -HTTP request target excluding any query string, -with percent-encoded sequences and UTF-8 byte sequences -decoded into characters. - - -### `query_string` - -URL portion after the `?`, percent-encoded. - - -### `headers` - -A dict of name-value pairs, -where name is the header name, and value is the header value. - -Order of header values must be preserved from the original HTTP request; -order of header names is not important. - -Header names must be lowercased. - - -### _abstract property_ `type` - -Connection type. - - -## _class_ `HTTPRequest` - -基类：`nonebot.drivers.HTTPConnection` - -HTTP 请求封装。参考 [asgi http scope](https://asgi.readthedocs.io/en/latest/specs/www.html#http-connection-scope)。 - - -### `method` - -The HTTP method name, uppercased. - - -### `body` - -Body of the request. - -Optional; if missing defaults to `b""`. - - -### _property_ `type` - -Always `http` - - -## _class_ `HTTPResponse` - -基类：`object` - -HTTP 响应封装。参考 [asgi http scope](https://asgi.readthedocs.io/en/latest/specs/www.html#http-connection-scope)。 - - -### `status` - -HTTP status code. - - -### `body` - -HTTP body content. - -Optional; if missing defaults to `None`. - - -### `headers` - -A dict of name-value pairs, -where name is the header name, and value is the header value. - -Order must be preserved in the HTTP response. - -Header names must be lowercased. - -Optional; if missing defaults to an empty dict. - - -### _property_ `type` - -Always `http` - - -## _class_ `WebSocket` - -基类：`nonebot.drivers.HTTPConnection`, `abc.ABC` - -WebSocket 连接封装。参考 [asgi websocket scope](https://asgi.readthedocs.io/en/latest/specs/www.html#websocket-connection-scope)。 - - -### _property_ `type` - -Always `websocket` - - -### _abstract property_ `closed` - - -* **类型** - - `bool` - - - -* **说明** - - 连接是否已经关闭 - - - -### _abstract async_ `accept()` - -接受 WebSocket 连接请求 - - -### _abstract async_ `close(code)` - -关闭 WebSocket 连接请求 - - -### _abstract async_ `receive()` - -接收一条 WebSocket text 信息 - - -### _abstract async_ `receive_bytes()` - -接收一条 WebSocket binary 信息 - - -### _abstract async_ `send(data)` - -发送一条 WebSocket text 信息 - - -### _abstract async_ `send_bytes(data)` - -发送一条 WebSocket binary 信息 - - -## _class_ `HTTPPollingSetup` - -基类：`object` - - -### `adapter` - -协议适配器名称 - - -### `self_id` - -机器人 ID - - -### `url` - -URL - - -### `method` - -HTTP method - - -### `body` - -HTTP body - - -### `headers` - -HTTP headers - - -### `http_version` - -HTTP version - - -### `poll_interval` - -HTTP 轮询间隔 - - -## _class_ `WebSocketSetup` - -基类：`object` - - -### `adapter` - -协议适配器名称 - - -### `self_id` - -机器人 ID - - -### `url` - -URL - - -### `headers` - -HTTP headers - - -### `reconnect_interval` - -WebSocket 重连间隔 diff --git a/archive/2.0.0a16/api/drivers/aiohttp.md b/archive/2.0.0a16/api/drivers/aiohttp.md deleted file mode 100644 index 4159d44e..00000000 --- a/archive/2.0.0a16/api/drivers/aiohttp.md +++ /dev/null @@ -1,101 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.drivers.aiohttp 模块 - -## AIOHTTP 驱动适配 - -本驱动仅支持客户端连接 - - -## _class_ `Driver` - -基类：[`nonebot.drivers.ForwardDriver`](README.md#nonebot.drivers.ForwardDriver) - -AIOHTTP 驱动框架 - - -### _property_ `type` - -驱动名称: `aiohttp` - - -### _property_ `logger` - -aiohttp driver 使用的 logger - - -### `on_startup(func)` - - -* **说明** - - 注册一个启动时执行的函数 - - - -* **参数** - - - * `func: Callable[[], Awaitable[None]]` - - - -### `on_shutdown(func)` - - -* **说明** - - 注册一个停止时执行的函数 - - - -* **参数** - - - * `func: Callable[[], Awaitable[None]]` - - - -### `setup_http_polling(setup)` - - -* **说明** - - 注册一个 HTTP 轮询连接，如果传入一个函数，则该函数会在每次连接时被调用 - - - -* **参数** - - - * `setup: Union[HTTPPollingSetup, Callable[[], Awaitable[HTTPPollingSetup]]]` - - - -### `setup_websocket(setup)` - - -* **说明** - - 注册一个 WebSocket 连接，如果传入一个函数，则该函数会在每次重连时被调用 - - - -* **参数** - - - * `setup: Union[WebSocketSetup, Callable[[], Awaitable[WebSocketSetup]]]` - - - -### `run(*args, **kwargs)` - -启动 aiohttp driver - - -## _class_ `WebSocket` - -基类：[`nonebot.drivers.WebSocket`](README.md#nonebot.drivers.WebSocket) diff --git a/archive/2.0.0a16/api/drivers/fastapi.md b/archive/2.0.0a16/api/drivers/fastapi.md deleted file mode 100644 index 7bc06ae1..00000000 --- a/archive/2.0.0a16/api/drivers/fastapi.md +++ /dev/null @@ -1,234 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.drivers.fastapi 模块 - -## FastAPI 驱动适配 - -本驱动同时支持服务端以及客户端连接 - -后端使用方法请参考: [FastAPI 文档](https://fastapi.tiangolo.com/) - - -## _class_ `Config` - -基类：`pydantic.env_settings.BaseSettings` - -FastAPI 驱动框架设置，详情参考 FastAPI 文档 - - -### `fastapi_openapi_url` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - `openapi.json` 地址，默认为 `None` 即关闭 - - - -### `fastapi_docs_url` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - `swagger` 地址，默认为 `None` 即关闭 - - - -### `fastapi_redoc_url` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - `redoc` 地址，默认为 `None` 即关闭 - - - -### `fastapi_reload` - - -* **类型** - - `Optional[bool]` - - - -* **说明** - - 开启/关闭冷重载，默认会在配置了 app 的 debug 模式启用 - - - -### `fastapi_reload_dirs` - - -* **类型** - - `Optional[List[str]]` - - - -* **说明** - - 重载监控文件夹列表，默认为 uvicorn 默认值 - - - -### `fastapi_reload_delay` - - -* **类型** - - `Optional[float]` - - - -* **说明** - - 重载延迟，默认为 uvicorn 默认值 - - - -### `fastapi_reload_includes` - - -* **类型** - - `Optional[List[str]]` - - - -* **说明** - - 要监听的文件列表，支持 glob pattern，默认为 uvicorn 默认值 - - - -### `fastapi_reload_excludes` - - -* **类型** - - `Optional[List[str]]` - - - -* **说明** - - 不要监听的文件列表，支持 glob pattern，默认为 uvicorn 默认值 - - - -## _class_ `Driver` - -基类：[`nonebot.drivers.ReverseDriver`](README.md#nonebot.drivers.ReverseDriver), [`nonebot.drivers.ForwardDriver`](README.md#nonebot.drivers.ForwardDriver) - -FastAPI 驱动框架 - - -* **上报地址** - - - * `/{adapter name}/`: HTTP POST 上报 - - - * `/{adapter name}/http/`: HTTP POST 上报 - - - * `/{adapter name}/ws`: WebSocket 上报 - - - * `/{adapter name}/ws/`: WebSocket 上报 - - - -### _property_ `type` - -驱动名称: `fastapi` - - -### _property_ `server_app` - -`FastAPI APP` 对象 - - -### _property_ `asgi` - -`FastAPI APP` 对象 - - -### _property_ `logger` - -fastapi 使用的 logger - - -### `on_startup(func)` - -参考文档: [Events](https://fastapi.tiangolo.com/advanced/events/#startup-event) - - -### `on_shutdown(func)` - -参考文档: [Events](https://fastapi.tiangolo.com/advanced/events/#startup-event) - - -### `setup_http_polling(setup)` - - -* **说明** - - 注册一个 HTTP 轮询连接，如果传入一个函数，则该函数会在每次连接时被调用 - - - -* **参数** - - - * `setup: Union[HTTPPollingSetup, Callable[[], Awaitable[HTTPPollingSetup]]]` - - - -### `setup_websocket(setup)` - - -* **说明** - - 注册一个 WebSocket 连接，如果传入一个函数，则该函数会在每次重连时被调用 - - - -* **参数** - - - * `setup: Union[WebSocketSetup, Callable[[], Awaitable[WebSocketSetup]]]` - - - -### `run(host=None, port=None, *, app=None, **kwargs)` - -使用 `uvicorn` 启动 FastAPI - - -## _class_ `WebSocket` - -基类：[`nonebot.drivers.WebSocket`](README.md#nonebot.drivers.WebSocket) diff --git a/archive/2.0.0a16/api/drivers/quart.md b/archive/2.0.0a16/api/drivers/quart.md deleted file mode 100644 index 546b5a3f..00000000 --- a/archive/2.0.0a16/api/drivers/quart.md +++ /dev/null @@ -1,149 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.drivers.quart 模块 - -## Quart 驱动适配 - -后端使用方法请参考: [Quart 文档](https://pgjones.gitlab.io/quart/index.html) - - -## _class_ `Config` - -基类：`pydantic.env_settings.BaseSettings` - -Quart 驱动框架设置 - - -### `quart_reload` - - -* **类型** - - `Optional[bool]` - - - -* **说明** - - 开启/关闭冷重载，默认会在配置了 app 的 debug 模式启用 - - - -### `quart_reload_dirs` - - -* **类型** - - `Optional[List[str]]` - - - -* **说明** - - 重载监控文件夹列表，默认为 uvicorn 默认值 - - - -### `quart_reload_delay` - - -* **类型** - - `Optional[float]` - - - -* **说明** - - 重载延迟，默认为 uvicorn 默认值 - - - -### `quart_reload_includes` - - -* **类型** - - `Optional[List[str]]` - - - -* **说明** - - 要监听的文件列表，支持 glob pattern，默认为 uvicorn 默认值 - - - -### `quart_reload_excludes` - - -* **类型** - - `Optional[List[str]]` - - - -* **说明** - - 不要监听的文件列表，支持 glob pattern，默认为 uvicorn 默认值 - - - -## _class_ `Driver` - -基类：[`nonebot.drivers.ReverseDriver`](README.md#nonebot.drivers.ReverseDriver) - -Quart 驱动框架 - - -* **上报地址** - - - * `/{adapter name}/http`: HTTP POST 上报 - - - * `/{adapter name}/ws`: WebSocket 上报 - - - -### _property_ `type` - -驱动名称: `quart` - - -### _property_ `server_app` - -`Quart` 对象 - - -### _property_ `asgi` - -`Quart` 对象 - - -### _property_ `logger` - -Quart 使用的 logger - - -### `on_startup(func)` - -参考文档: [Startup and Shutdown](https://pgjones.gitlab.io/quart/how_to_guides/startup_shutdown.html) - - -### `on_shutdown(func)` - -参考文档: [Startup and Shutdown](https://pgjones.gitlab.io/quart/how_to_guides/startup_shutdown.html) - - -### `run(host=None, port=None, *, app=None, **kwargs)` - -使用 `uvicorn` 启动 Quart - - -## _class_ `WebSocket` - -基类：[`nonebot.drivers.WebSocket`](README.md#nonebot.drivers.WebSocket) diff --git a/archive/2.0.0a16/api/exception.md b/archive/2.0.0a16/api/exception.md deleted file mode 100644 index f48a493b..00000000 --- a/archive/2.0.0a16/api/exception.md +++ /dev/null @@ -1,193 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.exception 模块 - -## 异常 - -下列文档中的异常是所有 NoneBot 运行时可能会抛出的。 -这些异常并非所有需要用户处理，在 NoneBot 内部运行时被捕获，并进行对应操作。 - - -## _exception_ `NoneBotException` - -基类：`Exception` - - -* **说明** - - 所有 NoneBot 发生的异常基类。 - - - -## _exception_ `IgnoredException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 应该忽略该事件。可由 PreProcessor 抛出。 - - - -* **参数** - - - * `reason`: 忽略事件的原因 - - - -## _exception_ `ParserExit` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - `shell command` 处理消息失败时返回的异常 - - - -* **参数** - - - * `status` - - - * `message` - - - -## _exception_ `PausedException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 结束当前 `Handler` 并等待下一条消息后继续下一个 `Handler`。 - 可用于用户输入新信息。 - - - -* **用法** - - 可以在 `Handler` 中通过 `Matcher.pause()` 抛出。 - - - -## _exception_ `RejectedException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 结束当前 `Handler` 并等待下一条消息后重新运行当前 `Handler`。 - 可用于用户重新输入。 - - - -* **用法** - - 可以在 `Handler` 中通过 `Matcher.reject()` 抛出。 - - - -## _exception_ `FinishedException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 结束当前 `Handler` 且后续 `Handler` 不再被运行。 - 可用于结束用户会话。 - - - -* **用法** - - 可以在 `Handler` 中通过 `Matcher.finish()` 抛出。 - - - -## _exception_ `StopPropagation` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 指示 NoneBot 终止事件向下层传播。 - - - -* **用法** - - 在 `Matcher.block == True` 时抛出。 - - - -## _exception_ `AdapterException` - -基类：`nonebot.exception.NoneBotException` - - -* **说明** - - 代表 `Adapter` 抛出的异常，所有的 `Adapter` 都要在内部继承自这个 `Exception` - - - -* **参数** - - - * `adapter_name: str`: 标识 adapter - - - -## _exception_ `NoLogException` - -基类：`Exception` - - -* **说明** - - 指示 NoneBot 对当前 `Event` 进行处理但不显示 Log 信息，可在 `get_log_string` 时抛出 - - - -## _exception_ `ApiNotAvailable` - -基类：`nonebot.exception.AdapterException` - - -* **说明** - - 在 API 连接不可用时抛出。 - - - -## _exception_ `NetworkError` - -基类：`nonebot.exception.AdapterException` - - -* **说明** - - 在网络出现问题时抛出，如: API 请求地址不正确, API 请求无返回或返回状态非正常等。 - - - -## _exception_ `ActionFailed` - -基类：`nonebot.exception.AdapterException` - - -* **说明** - - API 请求成功返回数据，但 API 操作失败。 diff --git a/archive/2.0.0a16/api/handler.md b/archive/2.0.0a16/api/handler.md deleted file mode 100644 index dc2ab74f..00000000 --- a/archive/2.0.0a16/api/handler.md +++ /dev/null @@ -1,111 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.handler 模块 - -## 事件处理函数 - -该模块实现事件处理函数的封装，以实现动态参数等功能。 - - -## _class_ `Handler` - -基类：`object` - -事件处理函数类 - - -### `__init__(func)` - -装饰事件处理函数以便根据动态参数运行 - - -### `func` - - -* **类型** - - `T_Handler` - - - -* **说明** - - 事件处理函数 - - - -### `signature` - - -* **类型** - - `inspect.Signature` - - - -* **说明** - - 事件处理函数签名 - - - -### _property_ `bot_type` - - -* **类型** - - `Union[Type["Bot"], inspect.Parameter.empty]` - - - -* **说明** - - 事件处理函数接受的 Bot 对象类型 - - - -### _property_ `event_type` - - -* **类型** - - `Optional[Union[Type[Event], inspect.Parameter.empty]]` - - - -* **说明** - - 事件处理函数接受的 event 类型 / 不需要 event 参数 - - - -### _property_ `state_type` - - -* **类型** - - `Optional[Union[T_State, inspect.Parameter.empty]]` - - - -* **说明** - - 事件处理函数是否接受 state 参数 - - - -### _property_ `matcher_type` - - -* **类型** - - `Optional[Union[Type["Matcher"], inspect.Parameter.empty]]` - - - -* **说明** - - 事件处理函数是否接受 matcher 参数 diff --git a/archive/2.0.0a16/api/log.md b/archive/2.0.0a16/api/log.md deleted file mode 100644 index e6096cff..00000000 --- a/archive/2.0.0a16/api/log.md +++ /dev/null @@ -1,42 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.log 模块 - -## 日志 - -NoneBot 使用 [loguru](https://github.com/Delgan/loguru) 来记录日志信息。 - -自定义 logger 请参考 [loguru](https://github.com/Delgan/loguru) 文档。 - - -## `logger` - - -* **说明** - - NoneBot 日志记录器对象。 - - - -* **默认信息** - - - * 格式: `[%(asctime)s %(name)s] %(levelname)s: %(message)s` - - - * 等级: `DEBUG` / `INFO` ，根据 config 配置改变 - - - * 输出: 输出至 stdout - - - -* **用法** - - -```python -from nonebot.log import logger -``` diff --git a/archive/2.0.0a16/api/matcher.md b/archive/2.0.0a16/api/matcher.md deleted file mode 100644 index 5ebb8d3f..00000000 --- a/archive/2.0.0a16/api/matcher.md +++ /dev/null @@ -1,586 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.matcher 模块 - -## 事件响应器 - -该模块实现事件响应器的创建与运行，并提供一些快捷方法来帮助用户更好的与机器人进行对话 。 - - -## `matchers` - - -* **类型** - - `Dict[int, List[Type[Matcher]]]` - - - -* **说明** - - 用于存储当前所有的事件响应器 - - - -## _class_ `Matcher` - -基类：`object` - -事件响应器类 - - -### `module` - - -* **类型** - - `Optional[ModuleType]` - - - -* **说明** - - 事件响应器所在模块 - - - -### `plugin_name` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - 事件响应器所在插件名 - - - -### `module_name` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - 事件响应器所在模块名 - - - -### `module_prefix` - - -* **类型** - - `Optional[str]` - - - -* **说明** - - 事件响应器所在模块前缀 - - - -### `type` - - -* **类型** - - `str` - - - -* **说明** - - 事件响应器类型 - - - -### `rule` - - -* **类型** - - `Rule` - - - -* **说明** - - 事件响应器匹配规则 - - - -### `permission` - - -* **类型** - - `Permission` - - - -* **说明** - - 事件响应器触发权限 - - - -### `priority` - - -* **类型** - - `int` - - - -* **说明** - - 事件响应器优先级 - - - -### `block` - - -* **类型** - - `bool` - - - -* **说明** - - 事件响应器是否阻止事件传播 - - - -### `temp` - - -* **类型** - - `bool` - - - -* **说明** - - 事件响应器是否为临时 - - - -### `expire_time` - - -* **类型** - - `Optional[datetime]` - - - -* **说明** - - 事件响应器过期时间点 - - - -### `_default_state` - - -* **类型** - - `T_State` - - - -* **说明** - - 事件响应器默认状态 - - - -### `_default_state_factory` - - -* **类型** - - `Optional[T_State]` - - - -* **说明** - - 事件响应器默认工厂函数 - - - -### `_default_parser` - - -* **类型** - - `Optional[T_ArgsParser]` - - - -* **说明** - - 事件响应器默认参数解析函数 - - - -### `_default_type_updater` - - -* **类型** - - `Optional[T_TypeUpdater]` - - - -* **说明** - - 事件响应器类型更新函数 - - - -### `_default_permission_updater` - - -* **类型** - - `Optional[T_PermissionUpdater]` - - - -* **说明** - - 事件响应器权限更新函数 - - - -### `__init__()` - -实例化 Matcher 以便运行 - - -### `handlers` - - -* **类型** - - `List[Handler]` - - - -* **说明** - - 事件响应器拥有的事件处理函数列表 - - - -### _classmethod_ `new(type_='', rule=None, permission=None, handlers=None, temp=False, priority=1, block=False, *, module=None, expire_time=None, default_state=None, default_state_factory=None, default_parser=None, default_type_updater=None, default_permission_updater=None)` - - -* **说明** - - 创建一个新的事件响应器，并存储至 [matchers](#matchers) - - - -* **参数** - - - * `type_: str`: 事件响应器类型，与 `event.get_type()` 一致时触发，空字符串表示任意 - - - * `rule: Optional[Rule]`: 匹配规则 - - - * `permission: Optional[Permission]`: 权限 - - - * `handlers: Optional[List[T_Handler]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器，即触发一次后删除 - - - * `priority: int`: 响应优先级 - - - * `block: bool`: 是否阻止事件向更低优先级的响应器传播 - - - * `module: Optional[str]`: 事件响应器所在模块名称 - - - * `default_state: Optional[T_State]`: 默认状态 `state` - - - * `default_state_factory: Optional[T_StateFactory]`: 默认状态 `state` 的工厂函数 - - - * `expire_time: Optional[datetime]`: 事件响应器最终有效时间点，过时即被删除 - - - -* **返回** - - - * `Type[Matcher]`: 新的事件响应器类 - - - -### _async classmethod_ `check_perm(bot, event)` - - -* **说明** - - 检查是否满足触发权限 - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: 上报事件 - - - -* **返回** - - - * `bool`: 是否满足权限 - - - -### _async classmethod_ `check_rule(bot, event, state)` - - -* **说明** - - 检查是否满足匹配规则 - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: 上报事件 - - - * `state: T_State`: 当前状态 - - - -* **返回** - - - * `bool`: 是否满足匹配规则 - - - -### _classmethod_ `args_parser(func)` - - -* **说明** - - 装饰一个函数来更改当前事件响应器的默认参数解析函数 - - - -* **参数** - - - * `func: T_ArgsParser`: 参数解析函数 - - - -### _classmethod_ `type_updater(func)` - - -* **说明** - - 装饰一个函数来更改当前事件响应器的默认响应事件类型更新函数 - - - -* **参数** - - - * `func: T_TypeUpdater`: 响应事件类型更新函数 - - - -### _classmethod_ `permission_updater(func)` - - -* **说明** - - 装饰一个函数来更改当前事件响应器的默认会话权限更新函数 - - - -* **参数** - - - * `func: T_PermissionUpdater`: 会话权限更新函数 - - - -### _classmethod_ `handle()` - - -* **说明** - - 装饰一个函数来向事件响应器直接添加一个处理函数 - - - -* **参数** - - - * 无 - - - -### _classmethod_ `receive()` - - -* **说明** - - 装饰一个函数来指示 NoneBot 在接收用户新的一条消息后继续运行该函数 - - - -* **参数** - - - * 无 - - - -### _classmethod_ `got(key, prompt=None, args_parser=None)` - - -* **说明** - - 装饰一个函数来指示 NoneBot 当要获取的 `key` 不存在时接收用户新的一条消息并经过 `ArgsParser` 处理后再运行该函数，如果 `key` 已存在则直接继续运行 - - - -* **参数** - - - * `key: str`: 参数名 - - - * `prompt: Optional[Union[str, Message, MessageSegment, MessageFormatter]]`: 在参数不存在时向用户发送的消息 - - - * `args_parser: Optional[T_ArgsParser]`: 可选参数解析函数，空则使用默认解析函数 - - - -### _async classmethod_ `send(message, **kwargs)` - - -* **说明** - - 发送一条消息给当前交互用户 - - - -* **参数** - - - * `message: Union[str, Message, MessageSegment]`: 消息内容 - - - * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api - - - -### _async classmethod_ `finish(message=None, **kwargs)` - - -* **说明** - - 发送一条消息给当前交互用户并结束当前事件响应器 - - - -* **参数** - - - * `message: Union[str, Message, MessageSegment]`: 消息内容 - - - * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api - - - -### _async classmethod_ `pause(prompt=None, **kwargs)` - - -* **说明** - - 发送一条消息给当前交互用户并暂停事件响应器，在接收用户新的一条消息后继续下一个处理函数 - - - -* **参数** - - - * `prompt: Union[str, Message, MessageSegment]`: 消息内容 - - - * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api - - - -### _async classmethod_ `reject(prompt=None, **kwargs)` - - -* **说明** - - 发送一条消息给当前交互用户并暂停事件响应器，在接收用户新的一条消息后重新运行当前处理函数 - - - -* **参数** - - - * `prompt: Union[str, Message, MessageSegment]`: 消息内容 - - - * `**kwargs`: 其他传递给 `bot.send` 的参数，请参考对应 adapter 的 bot 对象 api - - - -### `stop_propagation()` - - -* **说明** - - 阻止事件传播 diff --git a/archive/2.0.0a16/api/message.md b/archive/2.0.0a16/api/message.md deleted file mode 100644 index 5bd6c332..00000000 --- a/archive/2.0.0a16/api/message.md +++ /dev/null @@ -1,143 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.message 模块 - -## 事件处理 - -NoneBot 内部处理并按优先级分发事件给所有事件响应器，提供了多个插槽以进行事件的预处理等。 - - -## `event_preprocessor(func)` - - -* **说明** - - 事件预处理。装饰一个函数，使它在每次接收到事件并分发给各响应器之前执行。 - - - -* **参数** - - 事件预处理函数接收三个参数。 - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前 State - - - -## `event_postprocessor(func)` - - -* **说明** - - 事件后处理。装饰一个函数，使它在每次接收到事件并分发给各响应器之后执行。 - - - -* **参数** - - 事件后处理函数接收三个参数。 - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前事件运行前 State - - - -## `run_preprocessor(func)` - - -* **说明** - - 运行预处理。装饰一个函数，使它在每次事件响应器运行前执行。 - - - -* **参数** - - 运行预处理函数接收四个参数。 - - - * `matcher: Matcher`: 当前要运行的事件响应器 - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前 State - - - -## `run_postprocessor(func)` - - -* **说明** - - 运行后处理。装饰一个函数，使它在每次事件响应器运行后执行。 - - - -* **参数** - - 运行后处理函数接收五个参数。 - - - * `matcher: Matcher`: 运行完毕的事件响应器 - - - * `exception: Optional[Exception]`: 事件响应器运行错误（如果存在） - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前 State - - - -## _async_ `handle_event(bot, event)` - - -* **说明** - - 处理一个事件。调用该函数以实现分发事件。 - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -* **示例** - - -```python -import asyncio -asyncio.create_task(handle_event(bot, event)) -``` diff --git a/archive/2.0.0a16/api/nonebot.md b/archive/2.0.0a16/api/nonebot.md deleted file mode 100644 index b7384bf6..00000000 --- a/archive/2.0.0a16/api/nonebot.md +++ /dev/null @@ -1,324 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot 模块 - -## 快捷导入 - -为方便使用，`nonebot` 模块从子模块导入了部分内容 - - -* `on_message` => `nonebot.plugin.on_message` - - -* `on_notice` => `nonebot.plugin.on_notice` - - -* `on_request` => `nonebot.plugin.on_request` - - -* `on_metaevent` => `nonebot.plugin.on_metaevent` - - -* `on_startswith` => `nonebot.plugin.on_startswith` - - -* `on_endswith` => `nonebot.plugin.on_endswith` - - -* `on_keyword` => `nonebot.plugin.on_keyword` - - -* `on_command` => `nonebot.plugin.on_command` - - -* `on_shell_command` => `nonebot.plugin.on_shell_command` - - -* `on_regex` => `nonebot.plugin.on_regex` - - -* `CommandGroup` => `nonebot.plugin.CommandGroup` - - -* `Matchergroup` => `nonebot.plugin.MatcherGroup` - - -* `load_plugin` => `nonebot.plugin.load_plugin` - - -* `load_plugins` => `nonebot.plugin.load_plugins` - - -* `load_all_plugins` => `nonebot.plugin.load_all_plugins` - - -* `load_from_json` => `nonebot.plugin.load_from_json` - - -* `load_from_toml` => `nonebot.plugin.load_from_toml` - - -* `load_builtin_plugins` => `nonebot.plugin.load_builtin_plugins` - - -* `get_plugin` => `nonebot.plugin.get_plugin` - - -* `get_loaded_plugins` => `nonebot.plugin.get_loaded_plugins` - - -* `export` => `nonebot.plugin.export` - - -* `require` => `nonebot.plugin.require` - - -## `get_driver()` - - -* **说明** - - 获取全局 Driver 对象。可用于在计划任务的回调中获取当前 Driver 对象。 - - - -* **返回** - - - * `Driver`: 全局 Driver 对象 - - - -* **异常** - - - * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) - - - -* **用法** - - -```python -driver = nonebot.get_driver() -``` - - -## `get_app()` - - -* **说明** - - 获取全局 Driver 对应 Server App 对象。 - - - -* **返回** - - - * `Any`: Server App 对象 - - - -* **异常** - - - * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) - - - -* **用法** - - -```python -app = nonebot.get_app() -``` - - -## `get_asgi()` - - -* **说明** - - 获取全局 Driver 对应 Asgi 对象。 - - - -* **返回** - - - * `Any`: Asgi 对象 - - - -* **异常** - - - * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) - - - -* **用法** - - -```python -asgi = nonebot.get_asgi() -``` - - -## `get_bot(self_id=None)` - - -* **说明** - - 当提供 self_id 时，此函数是 get_bots()[self_id] 的简写；当不提供时，返回一个 Bot。 - - - -* **参数** - - - * `self_id: Optional[str]`: 用来识别 Bot 的 ID - - - -* **返回** - - - * `Bot`: Bot 对象 - - - -* **异常** - - - * `KeyError`: 对应 ID 的 Bot 不存在 - - - * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) - - - * `ValueError`: 没有传入 ID 且没有 Bot 可用 - - - -* **用法** - - -```python -assert nonebot.get_bot('12345') == nonebot.get_bots()['12345'] - -another_unspecified_bot = nonebot.get_bot() -``` - - -## `get_bots()` - - -* **说明** - - 获取所有通过 ws 连接 NoneBot 的 Bot 对象。 - - - -* **返回** - - - * `Dict[str, Bot]`: 一个以字符串 ID 为键，Bot 对象为值的字典 - - - -* **异常** - - - * `ValueError`: 全局 Driver 对象尚未初始化 (nonebot.init 尚未调用) - - - -* **用法** - - -```python -bots = nonebot.get_bots() -``` - - -## `init(*, _env_file=None, **kwargs)` - - -* **说明** - - 初始化 NoneBot 以及 全局 Driver 对象。 - - NoneBot 将会从 .env 文件中读取环境信息，并使用相应的 env 文件配置。 - - 你也可以传入自定义的 _env_file 来指定 NoneBot 从该文件读取配置。 - - - -* **参数** - - - * `_env_file: Optional[str]`: 配置文件名，默认从 .env.{env_name} 中读取配置 - - - * `**kwargs`: 任意变量，将会存储到 Config 对象里 - - - -* **返回** - - - * `None` - - - -* **用法** - - -```python -nonebot.init(database=Database(...)) -``` - - -## `run(host=None, port=None, *args, **kwargs)` - - -* **说明** - - 启动 NoneBot，即运行全局 Driver 对象。 - - - -* **参数** - - - * `host: Optional[str]`: 主机名／IP，若不传入则使用配置文件中指定的值 - - - * `port: Optional[int]`: 端口，若不传入则使用配置文件中指定的值 - - - * `*args`: 传入 Driver.run 的位置参数 - - - * `**kwargs`: 传入 Driver.run 的命名参数 - - - -* **返回** - - - * `None` - - - -* **用法** - - -```python -nonebot.run(host="127.0.0.1", port=8080) -``` diff --git a/archive/2.0.0a16/api/permission.md b/archive/2.0.0a16/api/permission.md deleted file mode 100644 index e99b7e8b..00000000 --- a/archive/2.0.0a16/api/permission.md +++ /dev/null @@ -1,137 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.permission 模块 - -## 权限 - -每个 `Matcher` 拥有一个 `Permission` ，其中是 **异步** `PermissionChecker` 的集合，只要有一个 `PermissionChecker` 检查结果为 `True` 时就会继续运行。 - -:::tip 提示 -`PermissionChecker` 既可以是 async function 也可以是 sync function -::: - - -## _class_ `Permission` - -基类：`object` - - -* **说明** - - `Matcher` 规则类，当事件传递时，在 `Matcher` 运行前进行检查。 - - - -* **示例** - - -```python -Permission(async_function) | sync_function -# 等价于 -from nonebot.utils import run_sync -Permission(async_function, run_sync(sync_function)) -``` - - -### `__init__(*checkers)` - - -* **参数** - - - * `*checkers: Callable[[Bot, Event], Awaitable[bool]]`: **异步** PermissionChecker - - - -### `checkers` - - -* **说明** - - 存储 `PermissionChecker` - - - -* **类型** - - - * `Set[Callable[[Bot, Event], Awaitable[bool]]]` - - - -### _async_ `__call__(bot, event)` - - -* **说明** - - 检查是否满足某个权限 - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - -* **返回** - - - * `bool` - - - -## `MESSAGE` - - -* **说明**: 匹配任意 `message` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 message type 的 Matcher。 - - -## `NOTICE` - - -* **说明**: 匹配任意 `notice` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 notice type 的 Matcher。 - - -## `REQUEST` - - -* **说明**: 匹配任意 `request` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 request type 的 Matcher。 - - -## `METAEVENT` - - -* **说明**: 匹配任意 `meta_event` 类型事件，仅在需要同时捕获不同类型事件时使用。优先使用 meta_event type 的 Matcher。 - - -## `USER(*user, perm=None)` - - -* **说明** - - `event` 的 `session_id` 在白名单内且满足 perm - - - -* **参数** - - - * `*user: str`: 白名单 - - - * `perm: Optional[Permission]`: 需要同时满足的权限 - - - -## `SUPERUSER` - - -* **说明**: 匹配任意超级用户消息类型事件 diff --git a/archive/2.0.0a16/api/plugin.md b/archive/2.0.0a16/api/plugin.md deleted file mode 100644 index c51c93b2..00000000 --- a/archive/2.0.0a16/api/plugin.md +++ /dev/null @@ -1,1492 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.plugin 模块 - -## 插件 - -为 NoneBot 插件开发提供便携的定义函数。 - - -## `plugins` - - -* **类型** - - `Dict[str, Plugin]` - - - -* **说明** - - 已加载的插件 - - - -## _class_ `Plugin` - -基类：`object` - -存储插件信息 - - -### `name` - - -* **类型**: `str` - - -* **说明**: 插件名称，使用 文件/文件夹 名称作为插件名 - - -### `module` - - -* **类型**: `ModuleType` - - -* **说明**: 插件模块对象 - - -### _property_ `export` - - -* **类型**: `Export` - - -* **说明**: 插件内定义的导出内容 - - -### _property_ `matcher` - - -* **类型**: `Set[Type[Matcher]]` - - -* **说明**: 插件内定义的 `Matcher` - - -## `on(type='', rule=None, permission=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` - - -* **说明** - - 注册一个基础事件响应器，可自定义类型。 - - - -* **参数** - - - * `type: str`: 事件响应器类型 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_metaevent(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` - - -* **说明** - - 注册一个元事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_message(rule=None, permission=None, *, handlers=None, temp=False, priority=1, block=True, state=None, state_factory=None)` - - -* **说明** - - 注册一个消息事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_notice(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` - - -* **说明** - - 注册一个通知事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_request(rule=None, *, handlers=None, temp=False, priority=1, block=False, state=None, state_factory=None)` - - -* **说明** - - 注册一个请求事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_startswith(msg, rule=None, ignorecase=False, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容开头时响应。 - - - -* **参数** - - - * `msg: Union[str, Tuple[str, ...]]`: 指定消息开头内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `ignorecase: bool`: 是否忽略大小写 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_endswith(msg, rule=None, ignorecase=False, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容结尾时响应。 - - - -* **参数** - - - * `msg: Union[str, Tuple[str, ...]]`: 指定消息结尾内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `ignorecase: bool`: 是否忽略大小写 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_keyword(keywords, rule=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息纯文本部分包含关键词时响应。 - - - -* **参数** - - - * `keywords: Set[str]`: 关键词列表 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_command(cmd, rule=None, aliases=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息以指定命令开头时响应。 - - 命令匹配规则参考: [命令形式匹配](rule.html#command-command) - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_shell_command(cmd, rule=None, aliases=None, parser=None, **kwargs)` - - -* **说明** - - 注册一个支持 `shell_like` 解析参数的命令消息事件响应器。 - - 与普通的 `on_command` 不同的是，在添加 `parser` 参数时, 响应器会自动处理消息。 - - 并将用户输入的原始参数列表保存在 `state["argv"]`, `parser` 处理的参数保存在 `state["args"]` 中 - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 - - - * `parser: Optional[ArgumentParser]`: `nonebot.rule.ArgumentParser` 对象 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `on_regex(pattern, flags=0, rule=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息匹配正则表达式时响应。 - - 命令匹配规则参考: [正则匹配](rule.html#regex-regex-flags-0) - - - -* **参数** - - - * `pattern: str`: 正则表达式 - - - * `flags: Union[int, re.RegexFlag]`: 正则匹配标志 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## _class_ `CommandGroup` - -基类：`object` - -命令组，用于声明一组有相同名称前缀的命令。 - - -### `__init__(cmd, **kwargs)` - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 - - - * `**kwargs`: 其他传递给 `on_command` 的参数默认值，参考 [on_command](#on-command-cmd-rule-none-aliases-none-kwargs) - - - -### `basecmd` - - -* **类型**: `Tuple[str, ...]` - - -* **说明**: 命令前缀 - - -### `base_kwargs` - - -* **类型**: `Dict[str, Any]` - - -* **说明**: 其他传递给 `on_command` 的参数默认值 - - -### `command(cmd, **kwargs)` - - -* **说明** - - 注册一个新的命令。 - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 - - - * `**kwargs`: 其他传递给 `on_command` 的参数，将会覆盖命令组默认值 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `shell_command(cmd, **kwargs)` - - -* **说明** - - 注册一个新的命令。 - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 命令前缀 - - - * `**kwargs`: 其他传递给 `on_shell_command` 的参数，将会覆盖命令组默认值 - - - -* **返回** - - - * `Type[Matcher]` - - - -## _class_ `MatcherGroup` - -基类：`object` - -事件响应器组合，统一管理。为 `Matcher` 创建提供默认属性。 - - -### `__init__(**kwargs)` - - -* **说明** - - 创建一个事件响应器组合，参数为默认值，与 `on` 一致 - - - -### `matchers` - - -* **类型** - - `List[Type[Matcher]]` - - - -* **说明** - - 组内事件响应器列表 - - - -### `base_kwargs` - - -* **类型**: `Dict[str, Any]` - - -* **说明**: 其他传递给 `on` 的参数默认值 - - -### `on(**kwargs)` - - -* **说明** - - 注册一个基础事件响应器，可自定义类型。 - - - -* **参数** - - - * `type: str`: 事件响应器类型 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_metaevent(**kwargs)` - - -* **说明** - - 注册一个元事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_message(**kwargs)` - - -* **说明** - - 注册一个消息事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_notice(**kwargs)` - - -* **说明** - - 注册一个通知事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_request(**kwargs)` - - -* **说明** - - 注册一个请求事件响应器。 - - - -* **参数** - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_startswith(msg, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容开头时响应。 - - - -* **参数** - - - * `msg: Union[str, Tuple[str, ...]]`: 指定消息开头内容 - - - * `ignorecase: bool`: 是否忽略大小写 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_endswith(msg, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息的\*\*文本部分\*\*以指定内容结尾时响应。 - - - -* **参数** - - - * `msg: Union[str, Tuple[str, ...]]`: 指定消息结尾内容 - - - * `ignorecase: bool`: 是否忽略大小写 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_keyword(keywords, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息纯文本部分包含关键词时响应。 - - - -* **参数** - - - * `keywords: Set[str]`: 关键词列表 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_command(cmd, aliases=None, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息以指定命令开头时响应。 - - 命令匹配规则参考: [命令形式匹配](rule.html#command-command) - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 - - - * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_shell_command(cmd, aliases=None, parser=None, **kwargs)` - - -* **说明** - - 注册一个支持 `shell_like` 解析参数的命令消息事件响应器。 - - 与普通的 `on_command` 不同的是，在添加 `parser` 参数时, 响应器会自动处理消息。 - - 并将用户输入的原始参数列表保存在 `state["argv"]`, `parser` 处理的参数保存在 `state["args"]` 中 - - - -* **参数** - - - * `cmd: Union[str, Tuple[str, ...]]`: 指定命令内容 - - - * `aliases: Optional[Set[Union[str, Tuple[str, ...]]]]`: 命令别名 - - - * `parser: Optional[ArgumentParser]`: `nonebot.rule.ArgumentParser` 对象 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -### `on_regex(pattern, flags=0, **kwargs)` - - -* **说明** - - 注册一个消息事件响应器，并且当消息匹配正则表达式时响应。 - - 命令匹配规则参考: [正则匹配](rule.html#regex-regex-flags-0) - - - -* **参数** - - - * `pattern: str`: 正则表达式 - - - * `flags: Union[int, re.RegexFlag]`: 正则匹配标志 - - - * `rule: Optional[Union[Rule, T_RuleChecker]]`: 事件响应规则 - - - * `permission: Optional[Permission]`: 事件响应权限 - - - * `handlers: Optional[List[Union[T_Handler, Handler]]]`: 事件处理函数列表 - - - * `temp: bool`: 是否为临时事件响应器（仅执行一次） - - - * `priority: int`: 事件响应器优先级 - - - * `block: bool`: 是否阻止事件向更低优先级传递 - - - * `state: Optional[T_State]`: 默认 state - - - * `state_factory: Optional[T_StateFactory]`: 默认 state 的工厂函数 - - - -* **返回** - - - * `Type[Matcher]` - - - -## `load_plugin(module_path)` - - -* **说明** - - 使用 `PluginManager` 加载单个插件，可以是本地插件或是通过 `pip` 安装的插件。 - - - -* **参数** - - - * `module_path: str`: 插件名称 `path.to.your.plugin` - - - -* **返回** - - - * `Optional[Plugin]` - - - -## `load_plugins(*plugin_dir)` - - -* **说明** - - 导入目录下多个插件，以 `_` 开头的插件不会被导入！ - - - -* **参数** - - - * `*plugin_dir: str`: 插件路径 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `load_all_plugins(module_path, plugin_dir)` - - -* **说明** - - 导入指定列表中的插件以及指定目录下多个插件，以 `_` 开头的插件不会被导入！ - - - -* **参数** - - - * `module_path: Set[str]`: 指定插件集合 - - - * `plugin_dir: Set[str]`: 指定插件路径集合 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `load_from_json(file_path, encoding='utf-8')` - - -* **说明** - - 导入指定 json 文件中的 `plugins` 以及 `plugin_dirs` 下多个插件，以 `_` 开头的插件不会被导入！ - - - -* **参数** - - - * `file_path: str`: 指定 json 文件路径 - - - * `encoding: str`: 指定 json 文件编码 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `load_from_toml(file_path, encoding='utf-8')` - - -* **说明** - - 导入指定 toml 文件 `[nonebot.plugins]` 中的 `plugins` 以及 `plugin_dirs` 下多个插件， - 以 `_` 开头的插件不会被导入！ - - - -* **参数** - - - * `file_path: str`: 指定 toml 文件路径 - - - * `encoding: str`: 指定 toml 文件编码 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `load_builtin_plugins(name='echo')` - - -* **说明** - - 导入 NoneBot 内置插件 - - - -* **返回** - - - * `Plugin` - - - -## `get_plugin(name)` - - -* **说明** - - 获取当前导入的某个插件。 - - - -* **参数** - - - * `name: str`: 插件名，与 `load_plugin` 参数一致。如果为 `load_plugins` 导入的插件，则为文件(夹)名。 - - - -* **返回** - - - * `Optional[Plugin]` - - - -## `get_loaded_plugins()` - - -* **说明** - - 获取当前已导入的所有插件。 - - - -* **返回** - - - * `Set[Plugin]` - - - -## `require(name)` - - -* **说明** - - 获取一个插件的导出内容 - - - -* **参数** - - - * `name: str`: 插件名，与 `load_plugin` 参数一致。如果为 `load_plugins` 导入的插件，则为文件(夹)名。 - - - -* **返回** - - - * `Optional[Export]` - - - -## _class_ `Export` - -基类：`dict` - - -* **说明** - - 插件导出内容以使得其他插件可以获得。 - - - -* **示例** - - -```python -nonebot.export().default = "bar" - -@nonebot.export() -def some_function(): - pass - -# this doesn't work before python 3.9 -# use -# export = nonebot.export(); @export.sub -# instead -# See also PEP-614: https://www.python.org/dev/peps/pep-0614/ -@nonebot.export().sub -def something_else(): - pass -``` - - -## `export()` - - -* **说明** - - 获取插件的导出内容对象 - - - -* **返回** - - - * `Export` diff --git a/archive/2.0.0a16/api/rule.md b/archive/2.0.0a16/api/rule.md deleted file mode 100644 index 0ee615df..00000000 --- a/archive/2.0.0a16/api/rule.md +++ /dev/null @@ -1,266 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.rule 模块 - -## 规则 - -每个事件响应器 `Matcher` 拥有一个匹配规则 `Rule` ，其中是 **异步** `RuleChecker` 的集合，只有当所有 `RuleChecker` 检查结果为 `True` 时继续运行。 - -:::tip 提示 -`RuleChecker` 既可以是 async function 也可以是 sync function，但在最终会被 `nonebot.utils.run_sync` 转换为 async function -::: - - -## _class_ `Rule` - -基类：`object` - - -* **说明** - - `Matcher` 规则类，当事件传递时，在 `Matcher` 运行前进行检查。 - - - -* **示例** - - -```python -Rule(async_function) & sync_function -# 等价于 -from nonebot.utils import run_sync -Rule(async_function, run_sync(sync_function)) -``` - - -### `__init__(*checkers)` - - -* **参数** - - - * `*checkers: Callable[[Bot, Event, T_State], Awaitable[bool]]`: **异步** RuleChecker - - - -### `checkers` - - -* **说明** - - 存储 `RuleChecker` - - - -* **类型** - - - * `Set[Callable[[Bot, Event, T_State], Awaitable[bool]]]` - - - -### _async_ `__call__(bot, event, state)` - - -* **说明** - - 检查是否符合所有规则 - - - -* **参数** - - - * `bot: Bot`: Bot 对象 - - - * `event: Event`: Event 对象 - - - * `state: T_State`: 当前 State - - - -* **返回** - - - * `bool` - - - -## `startswith(msg, ignorecase=False)` - - -* **说明** - - 匹配消息开头 - - - -* **参数** - - - * `msg: str`: 消息开头字符串 - - - -## `endswith(msg, ignorecase=False)` - - -* **说明** - - 匹配消息结尾 - - - -* **参数** - - - * `msg: str`: 消息结尾字符串 - - - -## `keyword(*keywords)` - - -* **说明** - - 匹配消息关键词 - - - -* **参数** - - - * `*keywords: str`: 关键词 - - - -## `command(*cmds)` - - -* **说明** - - 命令形式匹配，根据配置里提供的 `command_start`, `command_sep` 判断消息是否为命令。 - - 可以通过 `state["_prefix"]["command"]` 获取匹配成功的命令（例：`("test",)`），通过 `state["_prefix"]["raw_command"]` 获取匹配成功的原始命令文本（例：`"/test"`）。 - - - -* **参数** - - - * `*cmds: Union[str, Tuple[str, ...]]`: 命令内容 - - - -* **示例** - - 使用默认 `command_start`, `command_sep` 配置 - - 命令 `("test",)` 可以匹配：`/test` 开头的消息 - 命令 `("test", "sub")` 可以匹配”`/test.sub` 开头的消息 - - -:::tip 提示 -命令内容与后续消息间无需空格！ -::: - - -## _class_ `ArgumentParser` - -基类：`argparse.ArgumentParser` - - -* **说明** - - `shell_like` 命令参数解析器，解析出错时不会退出程序。 - - - -## `shell_command(*cmds, parser=None)` - - -* **说明** - - 支持 `shell_like` 解析参数的命令形式匹配，根据配置里提供的 `command_start`, `command_sep` 判断消息是否为命令。 - - 可以通过 `state["_prefix"]["command"]` 获取匹配成功的命令（例：`("test",)`），通过 `state["_prefix"]["raw_command"]` 获取匹配成功的原始命令文本（例：`"/test"`）。 - - 可以通过 `state["argv"]` 获取用户输入的原始参数列表 - - 添加 `parser` 参数后, 可以自动处理消息并将结果保存在 `state["args"]` 中。 - - - -* **参数** - - - * `*cmds: Union[str, Tuple[str, ...]]`: 命令内容 - - - * `parser: Optional[ArgumentParser]`: `nonebot.rule.ArgumentParser` 对象 - - - -* **示例** - - 使用默认 `command_start`, `command_sep` 配置，更多示例参考 `argparse` 标准库文档。 - - -```python -from nonebot.rule import ArgumentParser - -parser = ArgumentParser() -parser.add_argument("-a", action="store_true") - -rule = shell_command("ls", parser=parser) -``` - -:::tip 提示 -命令内容与后续消息间无需空格！ -::: - - -## `regex(regex, flags=0)` - - -* **说明** - - 根据正则表达式进行匹配。 - - 可以通过 `state["_matched"]` `state["_matched_groups"]` `state["_matched_dict"]` - 获取正则表达式匹配成功的文本。 - - - -* **参数** - - - * `regex: str`: 正则表达式 - - - * `flags: Union[int, re.RegexFlag]`: 正则标志 - - -:::tip 提示 -正则表达式匹配使用 search 而非 match，如需从头匹配请使用 `r"^xxx"` 来确保匹配开头 -::: - - -## `to_me()` - - -* **说明** - - 通过 `event.is_tome()` 判断事件是否与机器人有关 - - - -* **参数** - - - * 无 diff --git a/archive/2.0.0a16/api/typing.md b/archive/2.0.0a16/api/typing.md deleted file mode 100644 index 6d339e12..00000000 --- a/archive/2.0.0a16/api/typing.md +++ /dev/null @@ -1,278 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.typing 模块 - -## 类型 - -下面的文档中，「类型」部分使用 Python 的 Type Hint 语法，见 [PEP 484](https://www.python.org/dev/peps/pep-0484/)、[PEP 526](https://www.python.org/dev/peps/pep-0526/) 和 [typing](https://docs.python.org/3/library/typing.html)。 - -除了 Python 内置的类型，下面还出现了如下 NoneBot 自定类型，实际上它们是 Python 内置类型的别名。 - -以下类型均可从 nonebot.typing 模块导入。 - - -## `T_State` - - -* **类型** - - `Dict[Any, Any]` - - - -* **说明** - - 事件处理状态 State 类型 - - - - -## `T_StateFactory` - - -* **类型** - - `Callable[[Bot, Event], Awaitable[T_State]]` - - - -* **说明** - - 事件处理状态 State 类工厂函数 - - - - -## `T_BotConnectionHook` - - -* **类型** - - `Callable[[Bot], Awaitable[None]]` - - - -* **说明** - - Bot 连接建立时执行的函数 - - - - -## `T_BotDisconnectionHook` - - -* **类型** - - `Callable[[Bot], Awaitable[None]]` - - - -* **说明** - - Bot 连接断开时执行的函数 - - - - -## `T_CallingAPIHook` - - -* **类型** - - `Callable[[Bot, str, Dict[str, Any]], Awaitable[None]]` - - - -* **说明** - - `bot.call_api` 时执行的函数 - - - - -## `T_CalledAPIHook` - - -* **类型** - - `Callable[[Bot, Optional[Exception], str, Dict[str, Any], Any], Awaitable[None]]` - - - -* **说明** - - `bot.call_api` 后执行的函数，参数分别为 bot, exception, api, data, result - - - - -## `T_EventPreProcessor` - - -* **类型** - - `Callable[[Bot, Event, T_State], Awaitable[None]]` - - - -* **说明** - - 事件预处理函数 EventPreProcessor 类型 - - - - -## `T_EventPostProcessor` - - -* **类型** - - `Callable[[Bot, Event, T_State], Awaitable[None]]` - - - -* **说明** - - 事件预处理函数 EventPostProcessor 类型 - - - - -## `T_RunPreProcessor` - - -* **类型** - - `Callable[[Matcher, Bot, Event, T_State], Awaitable[None]]` - - - -* **说明** - - 事件响应器运行前预处理函数 RunPreProcessor 类型 - - - - -## `T_RunPostProcessor` - - -* **类型** - - `Callable[[Matcher, Optional[Exception], Bot, Event, T_State], Awaitable[None]]` - - - -* **说明** - - 事件响应器运行前预处理函数 RunPostProcessor 类型，第二个参数为运行时产生的错误（如果存在） - - - - -## `T_RuleChecker` - - -* **类型** - - `Callable[[Bot, Event, T_State], Union[bool, Awaitable[bool]]]` - - - -* **说明** - - RuleChecker 即判断是否响应事件的处理函数。 - - - - -## `T_PermissionChecker` - - -* **类型** - - `Callable[[Bot, Event], Union[bool, Awaitable[bool]]]` - - - -* **说明** - - RuleChecker 即判断是否响应消息的处理函数。 - - - - -## `T_Handler` - - -* **类型** - - - * `Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - * `Callable[[Bot, Event], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - * `Callable[[Bot, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - * `Callable[[Bot], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - -* **说明** - - Handler 即事件的处理函数。 - - - - -## `T_ArgsParser` - - -* **类型** - - `Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` - - - -* **说明** - - ArgsParser 即消息参数解析函数，在 Matcher.got 获取参数时被运行。 - - - - -## `T_TypeUpdater` - - -* **类型** - - `Callable[[Bot, Event, T_State, str], Awaitable[str]]` - - - -* **说明** - - TypeUpdater 在 Matcher.pause, Matcher.reject 时被运行，用于更新响应的事件类型。默认会更新为 `message`。 - - - - -## `T_PermissionUpdater` - - -* **类型** - - `Callable[[Bot, Event, T_State, Permission], Awaitable[Permission]]` - - - -* **说明** - - PermissionUpdater 在 Matcher.pause, Matcher.reject 时被运行，用于更新会话对象权限。默认会更新为当前事件的触发对象。 diff --git a/archive/2.0.0a16/api/utils.md b/archive/2.0.0a16/api/utils.md deleted file mode 100644 index 8584f390..00000000 --- a/archive/2.0.0a16/api/utils.md +++ /dev/null @@ -1,85 +0,0 @@ ---- -contentSidebar: true -sidebarDepth: 0 ---- - -# NoneBot.utils 模块 - - -## `escape_tag(s)` - - -* **说明** - - 用于记录带颜色日志时转义 `` 类型特殊标签 - - - -* **参数** - - - * `s: str`: 需要转义的字符串 - - - -* **返回** - - - * `str` - - - -## `run_sync(func)` - - -* **说明** - - 一个用于包装 sync function 为 async function 的装饰器 - - - -* **参数** - - - * `func: Callable[..., Any]`: 被装饰的同步函数 - - - -* **返回** - - - * `Callable[..., Awaitable[Any]]` - - - -## _class_ `DataclassEncoder` - -基类：`json.encoder.JSONEncoder` - - -* **说明** - - 在JSON序列化 `Message` (List[Dataclass]) 时使用的 `JSONEncoder` - - - -## `logger_wrapper(logger_name)` - - -* **说明** - - -用于打印 adapter 的日志。 - - -* **Log 参数** - - - -* `level: Literal['WARNING', 'DEBUG', 'INFO']`: 日志等级 - - -* `message: str`: 日志信息 - - -* `exception: Optional[Exception]`: 异常信息 diff --git a/archive/2.0.0a16/guide/README.md b/archive/2.0.0a16/guide/README.md deleted file mode 100644 index b737031e..00000000 --- a/archive/2.0.0a16/guide/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# 概览 - - - -:::tip 提示 -初次使用时可能会觉得这里的概览过于枯燥，可以先简单略读之后直接前往 [安装](./installation.md) 查看安装方法，并进行后续的基础使用教程。 -::: - -NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人收到的事件进行解析和处理，并以插件化的形式，按优先级分发给事件所对应的事件响应器，来完成具体的功能。 - -除了起到解析事件的作用，NoneBot 还为插件提供了大量实用的预设操作和权限控制机制。对于命令处理，它更是提供了完善且易用的会话机制和内部调用机制，以分别适应命令的连续交互和插件内部功能复用等需求。 - -得益于 Python 的 [asyncio](https://docs.python.org/3/library/asyncio.html) 机制，NoneBot 处理事件的吞吐量有了很大的保障，再配合 WebSocket 通信方式（也是最建议的通信方式），NoneBot 的性能可以达到 HTTP 通信方式的两倍以上，相较于传统同步 I/O 的 HTTP 通信，更是有质的飞跃。 - -需要注意的是，NoneBot 仅支持 **Python 3.7.3 以上版本** - -## 特色 - -NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义**，并且可以作为插件进行**替换/添加**！ - -- 提供使用简易的脚手架 -- 提供丰富的官方插件 -- 提供可添加/替换的驱动以及协议选项 -- 基于异步 I/O -- 同时支持 HTTP 和反向 WebSocket 通信方式 -- 支持多个机器人账号负载均衡 -- 提供直观的交互式会话接口 -- 提供可自定义的权限控制机制 -- 多种方式渲染要发送的消息内容，使对话足够自然 diff --git a/archive/2.0.0a16/guide/basic-configuration.md b/archive/2.0.0a16/guide/basic-configuration.md deleted file mode 100644 index 4bb33f4f..00000000 --- a/archive/2.0.0a16/guide/basic-configuration.md +++ /dev/null @@ -1,86 +0,0 @@ -# 基本配置 - -到目前为止我们还在使用 NoneBot 的默认行为，在开始编写自己的插件之前，我们先尝试在配置文件上动动手脚，让 NoneBot 表现出不同的行为。 - -在上一章节中，我们创建了默认的项目结构，其中 `.env` 和 `.env.*` 均为项目的配置文件，下面将介绍几种 NoneBot 配置方式。 - -:::danger 警告 -请勿将敏感信息写入配置文件并提交至开源仓库！ -::: - -## .env 文件 - -NoneBot 在启动时将会从系统环境变量或者 `.env` 文件中寻找变量 `ENVIRONMENT` (大小写不敏感)，默认值为 `prod`。 -这将引导 NoneBot 从系统环境变量或者 `.env.{ENVIRONMENT}` 文件中进一步加载具体配置。 - -`.env` 文件是基础环境配置文件，该文件中的配置项在不同环境下都会被加载，但会被 `.env.{ENVIRONMENT}` 文件中的配置所覆盖。 - -现在，我们在 `.env` 文件中写入当前环境信息： - -```bash -# .env -ENVIRONMENT=dev -CUSTOM_CONFIG=common config # 这个配置项在任何环境中都会被加载 -``` - -如你所想，之后 NoneBot 就会从 `.env.dev` 文件中加载环境变量。 - -## .env.\* 文件 - -NoneBot 使用 [pydantic](https://pydantic-docs.helpmanual.io/) 进行配置管理，会从 `.env.{ENVIRONMENT}` 文件中获悉环境配置。 - -可以在 NoneBot 初始化时指定加载某个环境配置文件: `nonebot.init(_env_file=".env.dev")`，这将忽略你在 `.env` 中设置的 `ENVIRONMENT` 。 - -:::warning 提示 -由于 `pydantic` 使用 JSON 解析配置项，请确保配置项值为 JSON 格式的数据。如： - -```bash -list=["123456789", "987654321", 1] -test={"hello": "world"} -``` - -如果配置项值解析失败将作为字符串处理。 -::: - -示例及说明： - -```bash -HOST=0.0.0.0 # 配置 NoneBot 监听的 IP/主机名 -PORT=8080 # 配置 NoneBot 监听的端口 -DEBUG=true # 开启 debug 模式 **请勿在生产环境开启** -SUPERUSERS=["123456789", "987654321"] # 配置 NoneBot 超级用户 -NICKNAME=["awesome", "bot"] # 配置机器人的昵称 -COMMAND_START=["/", ""] # 配置命令起始字符 -COMMAND_SEP=["."] # 配置命令分割字符 - -# Custom Configs -CUSTOM_CONFIG1="config in env file" -CUSTOM_CONFIG2= # 留空则从系统环境变量读取，如不存在则为空字符串 -``` - -详细的配置项参考 [Config Reference](../api/config.md) 。 - -## 系统环境变量 - -如果在系统环境变量中定义了配置，则一样会被读取。 - -## bot.py 文件 - -配置项也可以在 NoneBot 初始化时传入。此处可以传入任意合法 Python 变量。当然也可以在初始化完成后修改或新增。 - -示例： - -```python -# bot.py -import nonebot - -nonebot.init(custom_config3="config on init") - -config = nonebot.get_driver().config -config.custom_config3 = "changed after init" -config.custom_config4 = "new config after init" -``` - -## 优先级 - -`bot.py` 文件( `nonebot.init` ) > 系统环境变量 > `.env` `.env.*` 文件 diff --git a/archive/2.0.0a16/guide/cqhttp-guide.md b/archive/2.0.0a16/guide/cqhttp-guide.md deleted file mode 100644 index bfe69246..00000000 --- a/archive/2.0.0a16/guide/cqhttp-guide.md +++ /dev/null @@ -1,117 +0,0 @@ -# CQHTTP 协议使用指南 - -## 安装 NoneBot CQHTTP 适配器 - -```bash -pip install nonebot-adapter-cqhttp -``` - -## 配置 CQHTTP 协议端（以 QQ 为例） - -单纯运行 NoneBot 实例并不会产生任何效果，因为此刻 QQ 这边还不知道 NoneBot 的存在，也就无法把消息发送给它，因此现在需要使用一个无头 QQ 来把消息等事件上报给 NoneBot。 - -QQ 协议端举例: - -- [go-cqhttp](https://github.com/Mrs4s/go-cqhttp) (基于 [MiraiGo](https://github.com/Mrs4s/MiraiGo)) -- [onebot-kotlin](https://github.com/yyuueexxiinngg/onebot-kotlin) -- [Mirai](https://github.com/mamoe/mirai) + [onebot-mirai](https://github.com/yyuueexxiinngg/onebot-kotlin) -- [Mirai](https://github.com/mamoe/mirai) + [Mirai Native](https://github.com/iTXTech/mirai-native) + [CQHTTP](https://github.com/richardchien/coolq-http-api) -- [node-onebot](https://github.com/takayama-lily/node-onebot) (基于 [abot](https://github.com/takayama-lily/abot), [OICQ](https://github.com/takayama-lily/oicq)) - -这里以 [go-cqhttp](https://github.com/Mrs4s/go-cqhttp) 为例 - -1. 下载 go-cqhttp 对应平台的 release 文件，[点此前往](https://github.com/Mrs4s/go-cqhttp/releases) -2. 运行 exe 文件或者使用 `./go-cqhttp` 启动 -3. 生成默认配置文件并修改默认配置 - -### 选项 1 反向 WebSocket 连接 - -```yml{2,3,6,10} -account: - uin: 机器人QQ号 - password: "机器人密码" - -message: - post-format: array - -servers: - - ws-reverse: - universal: ws://127.0.0.1:8080/cqhttp/ws -``` - -其中 `ws://127.0.0.1:8080/cqhttp/ws` 中的 `127.0.0.1` 和 `8080` 应分别对应 nonebot 配置的 HOST 和 PORT。 - -`cqhttp` 是前述 `register_adapter` 时传入的第一个参数，代表设置的 `CQHTTPBot` 适配器的路径，你可以对不同的适配器设置不同路径以作区别。 - -### 选项 2 HTTP POST 上报 - -```yml{2,3,6,11} -account: - uin: 机器人QQ号 - password: "机器人密码" - -message: - post-format: array - -servers: - - http: - post: - - url: "http://127.0.0.1:8080/cqhttp/http" - secret: "" -``` - -其中 `ws://127.0.0.1:8080/cqhttp/http` 中的 `127.0.0.1` 和 `8080` 应分别对应 nonebot 配置的 HOST 和 PORT。 - -`cqhttp` 是前述 `register_adapter` 时传入的第一个参数，代表设置的 `CQHTTPBot` 适配器的路径，你可以对不同的适配器设置不同路径以作区别。 - -### 选项 3 正向 WebSocket 连接 - -```yml{2,3,6,10,11} -account: - uin: 机器人QQ号 - password: "机器人密码" - -message: - post-format: array - -servers: - - ws: - host: 127.0.0.1 - port: 6700 -``` - -NoneBot 配置 - -```dotenv -CQHTTP_WS_URLS={"机器人QQ号": "ws://127.0.0.1:6700/"} -``` - -其中 `ws://127.0.0.1:6700/` 中的 `127.0.0.1` 和 `6700` 应分别对应 go-cqhttp 配置的 HOST 和 PORT。 - -正向连接可以选择支持客户端连接方式的 `Driver` 来进行连接，请根据需求进行选择： - -- `nonebot.drivers.fastapi`: 同时支持正向和反向 -- `nonebot.drivers.aiohttp`: 仅支持正向 - -## 历史性的第一次对话 - -一旦新的配置文件正确生效之后，NoneBot 所在的控制台（如果正在运行的话）应该会输出类似下面的内容（两条访问日志）： - -```default -09-14 21:31:16 [INFO] uvicorn | ('127.0.0.1', 12345) - "WebSocket /cqhttp/ws" [accepted] -09-14 21:31:16 [INFO] nonebot | WebSocket Connection from CQHTTP Bot 你的QQ号 Accepted! -``` - -这表示 CQHTTP 协议端已经成功地使用 CQHTTP 协议连接上了 NoneBot。 - -现在，尝试向你的机器人账号发送如下内容： - -```default -/echo 你好，世界 -``` - -到这里如果一切 OK，你应该会收到机器人给你回复了 `你好，世界`。这一历史性的对话标志着你已经成功地运行了一个 NoneBot 的最小实例，开始了编写更强大的 QQ 机器人的创意之旅！ - - - - diff --git a/archive/2.0.0a16/guide/creating-a-handler.md b/archive/2.0.0a16/guide/creating-a-handler.md deleted file mode 100644 index f11c1463..00000000 --- a/archive/2.0.0a16/guide/creating-a-handler.md +++ /dev/null @@ -1,197 +0,0 @@ -# 事件处理 - -在上一章中，我们已经注册了事件响应器，现在我们可以正式编写事件处理逻辑了！ - -## [事件处理函数](../api/typing.md#handler) - -```python{1,2,8,9} -@weather.handle() -async def handle_first_receive(bot: Bot, event: Event, state: T_State): - args = str(event.get_message()).strip() # 首次发送命令时跟随的参数，例：/天气 上海，则args为上海 - if args: - state["city"] = args # 如果用户发送了参数则直接赋值 - - -@weather.got("city", prompt="你想查询哪个城市的天气呢？") -async def handle_city(bot: Bot, event: Event, state: T_State): - city = state["city"] - if city not in ["上海", "北京"]: - await weather.reject("你想查询的城市暂不支持，请重新输入！") - city_weather = await get_weather(city) - await weather.finish(city_weather) -``` - -在之前的样例中，我们定义了两个函数 `handle_first_receive`, `handle_city`，他们被事件响应器的装饰器装饰从而成为事件响应器的事件处理函数。 - -:::tip 提示 -在事件响应器中，事件处理函数是**顺序**执行的！ -::: - -### 添加一个事件处理函数 - -事件响应器提供了三种装饰事件处理函数的装饰器，分别是： - -1. [handle()](../api/matcher.md#classmethod-handle) -2. [receive()](../api/matcher.md#classmethod-receive) -3. [got(key, prompt, args_parser)](../api/matcher.md#classmethod-got-key-prompt-none-args-parser-none) - -#### handle() - -简单的为事件响应器添加一个事件处理函数，这个函数将会在上一个处理函数正常返回执行完毕后立即执行。 - -#### receive() - -指示 NoneBot 接收一条新的用户消息后继续执行该处理函数。此时函数将会接收到新的消息而非前一条消息，之前相关信息可以存储在 state 中。 - -特别地，当装饰的函数前没有其他事件处理函数，那么 `receive()` 不会接收一条新的消息而是直接使用第一条接收到的消息。 - -#### got(key, prompt, args_parser) - -指示 NoneBot 当 `state` 中不存在 `key` 时向用户发送 `prompt` 等待用户回复并赋值给 `state[key]`。 - -`prompt` 可以为 `str`, `Message`, `MessageSegment`，若为空则不会向用户发送，若不为空则会在 format 之后发送，即 `prompt.format(**state)`，注意对 `{}` 进行转义。示例： - -```python -@matcher.receive() -async def handle(bot: Bot, event: Event, state: T_State): - state["key"] = "hello" - - -@matcher.got("key2", prompt="{key}!") -async def handle2(bot: Bot, event: Event, state: T_State): - pass -``` - -`args_parser` 为参数处理函数，在这里传入一个新的函数以覆盖默认的参数处理。详情参照 [args_parser](#参数处理函数-args-parser) - -特别的，这些装饰器都可以套娃使用： - -```python -@matcher.got("key1") -@matcher.got("key2") -async def handle(bot: Bot, event: Event, state: T_State): - pass -``` - -### 事件处理函数参数 - -事件处理函数类型为： - -- `Callable[[Bot, Event, T_State, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, Event, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, T_State, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, Event], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot], Union[Awaitable[None], Awaitable[NoReturn]]]` - -简单说就是：除了 `bot` 参数，其他都是可选的。 - -以下函数都是合法的事件处理函数（仅列举常用的）： - -```python -async def handle(bot: Bot, event: Event, state: T_State): - pass - -async def handle(bot: Bot, event: Event, state: T_State, matcher: Matcher): - pass - -async def handle(bot: Bot, event: Event): - pass - -async def handle(bot: Bot, state: T_State): - pass - -async def handle(bot: Bot): - pass -``` - -:::danger 警告 -函数的参数名固定不能修改！ -::: - -参数分别为： - -1. [nonebot.adapters.Bot](../api/adapters/#class-bot): 即事件上报连接对应的 Bot 对象，为 BaseBot 的子类。特别注意，此处的类型注释可以替换为指定的 Bot 类型，例如：`nonebot.adapters.cqhttp.Bot`，只有在上报事件的 Bot 类型与类型注释相符时才会执行该处理函数！可用于多平台进行不同的处理。 -2. [nonebot.adapters.Event](../api/adapters/#class-event): 即上报事件对象，可以获取到上报的所有信息。 -3. [state](../api/typing.md#t-state): 状态字典，可以存储任意的信息，其中还包含一些特殊的值以获取 NoneBot 内部处理时的一些信息，如： - -- `state["_current_key"]`: 存储当前 `got` 获取的参数名 -- `state["_prefix"]`, `state["_suffix"]`: 存储当前 TRIE 匹配的前缀/后缀，可以通过该值获取用户命令的原始命令 - -:::tip 提示 -NoneBot 会对不同类型的参数进行不同的操作，详情查看 [事件处理函数重载](../advanced/overloaded-handlers.md) -::: - -### 参数处理函数 args_parser - -在使用 `got` 获取用户输入参数时，需要对用户的消息进行处理以转换为我们所需要的信息。在默认情况下，NoneBot 会把用户的消息字符串原封不动的赋值给 `state[key]` 。可以通过以下两种方式修改默认处理逻辑： - -- `@matcher.args_parser` 装饰器：直接装饰一个函数作为参数处理器 -- `got(key, prompt, args_parser)`：直接把函数作为参数传入 - -参数处理函数类型为：`Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]`，即： - -```python -async def parser(bot: Bot, event: Event, state: T_State): - state[state["_current_key"]] = str(event.get_message()) -``` - -特别的，`state["_current_key"]` 中存储了当前获取的参数名 - -### 逻辑控制 - -NoneBot 也为事件处理函数提供了一些便捷的逻辑控制函数： - -#### `matcher.send` - -这个函数用于发送一条消息给当前交互的用户。~~其实这并不是一个逻辑控制函数，只是不知道放在哪里……~~ - -#### `matcher.pause` - -这个函数用于结束当前事件处理函数，强制接收一条新的消息再运行**下一个消息处理函数**。 - -#### `matcher.reject` - -这个函数用于结束当前事件处理函数，强制接收一条新的消息再**再次运行当前消息处理函数**。常用于用户输入信息不符合预期。 - -#### `matcher.finish` - -这个函数用于直接结束当前事件处理。 - -以上三个函数都拥有一个参数 `message` / `prompt`，用于向用户发送一条消息。以及 `**kwargs` 直接传递给 `bot.send` 的额外参数。 - -## 常用事件处理结构 - -```python -matcher = on_command("test") - -# 修改默认参数处理 -@matcher.args_parser -async def parse(bot: Bot, event: Event, state: T_State): - print(state["_current_key"], ":", str(event.get_message())) - state[state["_current_key"]] = str(event.get_message()) - -@matcher.handle() -async def first_receive(bot: Bot, event: Event, state: T_State): - # 获取用户原始命令，如：/test - print(state["_prefix"]["raw_command"]) - # 处理用户输入参数，如：/test arg1 arg2 - raw_args = str(event.get_message()).strip() - if raw_args: - arg_list = raw_args.split() - # 将参数存入state以阻止后续再向用户询问参数 - state["arg1"] = arg_list[0] - - -@matcher.got("arg1", prompt="参数？") -async def arg_handle(bot: Bot, event: Event, state: T_State): - # 在这里对参数进行验证 - if state["arg1"] not in ["allow", "list"]: - await matcher.reject("参数不正确！请重新输入") - # 发送一些信息 - await bot.send(event, "message") - await matcher.send("message") - await matcher.finish("message") -``` diff --git a/archive/2.0.0a16/guide/creating-a-matcher.md b/archive/2.0.0a16/guide/creating-a-matcher.md deleted file mode 100644 index 61a5143d..00000000 --- a/archive/2.0.0a16/guide/creating-a-matcher.md +++ /dev/null @@ -1,148 +0,0 @@ -# 注册事件响应器 - -好了，现在插件已经创建完毕，我们可以开始编写实际代码了，下面将以一个简易单文件天气查询插件为例。 - -在插件目录下 `weather.py` 中添加如下代码： - -```python -from nonebot import on_command -from nonebot.rule import to_me -from nonebot.typing import T_State -from nonebot.adapters import Bot, Event - -weather = on_command("天气", rule=to_me(), priority=5) - - -@weather.handle() -async def handle_first_receive(bot: Bot, event: Event, state: T_State): - args = str(event.get_message()).strip() # 首次发送命令时跟随的参数，例：/天气 上海，则args为上海 - if args: - state["city"] = args # 如果用户发送了参数则直接赋值 - - -@weather.got("city", prompt="你想查询哪个城市的天气呢？") -async def handle_city(bot: Bot, event: Event, state: T_State): - city = state["city"] - if city not in ["上海", "北京"]: - await weather.reject("你想查询的城市暂不支持，请重新输入！") - city_weather = await get_weather(city) - await weather.finish(city_weather) - - -async def get_weather(city: str): - return f"{city}的天气是..." -``` - -为了简单起见，我们在这里的例子中没有接入真实的天气数据，但要接入也非常简单，你可以使用中国天气网、和风天气等网站提供的 API。 - -接下来我们来说明这段代码是如何工作的。 - -:::tip 提示 -从这里开始，你需要对 Python 的 asyncio 编程有所了解，因为 NoneBot 是完全基于 asyncio 的，具体可以参考 [廖雪峰的 Python 教程](https://www.liaoxuefeng.com/wiki/1016959663602400/1017959540289152) -::: - -## [事件响应器](../api/matcher.md) - -```python{5} -from nonebot import on_command -from nonebot.rule import to_me -from nonebot.permission import Permission - -weather = on_command("天气", rule=to_me(), permission=Permission(), priority=5) -``` - -在上方代码中，我们注册了一个事件响应器 `Matcher`，它由几个部分组成： - -1. `on_command` 注册一个消息类型的命令处理器 -2. `"天气"` 指定 command 参数 - 命令名 -3. `rule` 补充事件响应器的匹配规则 -4. `priority` 事件响应器优先级 -5. `block` 是否阻止事件传递 - -其他详细配置可以参考 API 文档，下面我们详细说明各个部分： - -### 事件响应器类型 type - -事件响应器类型其实就是对应事件的类型 `Event.get_type()` ，NoneBot 提供了一个基础类型事件响应器 `on()` 以及一些其他内置的事件响应器。 - -以下所有类型的事件响应器都是由 `on(type, rule)` 的形式进行了简化封装。 - -- `on("事件类型")`: 基础事件响应器，第一个参数为事件类型，空字符串表示不限 -- `on_metaevent()` ~ `on("meta_event")`: 元事件响应器 -- `on_message()` ~ `on("message")`: 消息事件响应器 -- `on_request()` ~ `on("request")`: 请求事件响应器 -- `on_notice()` ~ `on("notice")`: 通知事件响应器 -- `on_startswith(str)` ~ `on("message", startswith(str))`: 消息开头匹配响应器，参考 [startswith](../api/rule.md#startswith-msg) -- `on_endswith(str)` ~ `on("message", endswith(str))`: 消息结尾匹配响应器，参考 [endswith](../api/rule.md#endswith-msg) -- `on_keyword(set)` ~ `on("message", keyword(str))`: 消息关键词匹配响应器，参考 [keyword](../api/rule.md#keyword-keywords) -- `on_command(str|tuple)` ~ `on("message", command(str|tuple))`: 命令响应器，参考 [command](../api/rule.md#command-cmds) -- `on_regex(pattern_str)` ~ `on("message", regex(pattern_str))`: 正则匹配处理器，参考 [regex](../api/rule.md#regex-regex-flags-0) - -### 匹配规则 rule - -事件响应器的匹配规则即 `Rule`，详细内容在下方介绍。[直达](#自定义-rule) - -### 优先级 priority - -事件响应器的优先级代表事件响应器的执行顺序，同一优先级的事件响应器会 **同时执行！**，优先级数字**越小**越先响应！优先级请从 `1` 开始排序！ - -:::tip 提示 -使用 `nonebot-plugin-test` 可以在网页端查看当前所有事件响应器的执行流程，有助理解事件响应流程！ - -```bash -nb plugin install nonebot_plugin_test -``` - -::: - -### 阻断 block - -当有任意事件响应器发出了阻止事件传递信号时，该事件将不再会传递给下一优先级，直接结束处理。 - -NoneBot 内置的事件响应器中，所有 `message` 类的事件响应器默认会阻断事件传递，其他则不会。 - -在部分情况中，可以使用 `matcher.stop_propagation()` 方法动态阻止事件传播，该方法需要 `handler` 在参数中获取 `matcher` 实例后调用方法。 - -## 自定义 rule - -rule 的出现使得 nonebot 对事件的响应可以非常自由，nonebot 内置了一些规则： - -- [startswith(msg)](../api/rule.md#startswith-msg) -- [endswith(msg)](../api/rule.md#endswith-msg) -- [keyword(\*keywords)](../api/rule.md#keyword-keywords) -- [command(\*cmds)](../api/rule.md#command-cmds) -- [regex(regex, flag)](../api/rule.md#regex-regex-flags-0) - -以上规则都是返回类型为 `Rule` 的函数，`Rule` 由非负个 `RuleChecker` 组成，当所有 `RuleChecker` 返回 `True` 时匹配成功。这些 `Rule`, `RuleChecker` 的形式如下： - -```python -from nonebot.rule import Rule -from nonebot.typing import T_State - -async def async_checker(bot: Bot, event: Event, state: T_State) -> bool: - return True - -def sync_checker(bot: Bot, event: Event, state: T_State) -> bool: - return True - -def check(arg1, arg2): - - async def _checker(bot: Bot, event: Event, state: T_State) -> bool: - return bool(arg1 + arg2) - - return Rule(_checker) -``` - -`Rule` 和 `RuleChecker` 之间可以使用 `与 &` 互相组合： - -```python -from nonebot.rule import Rule - -Rule(async_checker1) & sync_checker & async_checker2 -``` - -**_请勿将事件处理的逻辑写入 `rule` 中，这会使得事件处理返回奇怪的响应。_** - -:::danger 警告 -`Rule(*checkers)` 只接受 async function，或使用 `nonebot.utils.run_sync` 自行包裹 sync function。在使用 `与 &` 时，NoneBot 会自动包裹 sync function -::: diff --git a/archive/2.0.0a16/guide/creating-a-plugin.md b/archive/2.0.0a16/guide/creating-a-plugin.md deleted file mode 100644 index f5deb009..00000000 --- a/archive/2.0.0a16/guide/creating-a-plugin.md +++ /dev/null @@ -1,119 +0,0 @@ -# 创建插件 - -如果之前使用 `nb-cli` 生成了项目结构，那我们已经有了一个空的插件目录 `Awesome-Bot/awesome_bot/plugins`，并且它已在 `bot.py` 中被加载，我们现在可以开始创建插件了！ - -使用 `nb-cli` 创建包形式插件，或自行创建文件(夹) - -```bash -nb plugin new -``` - -下面分别对两种通常的插件形式做具体介绍 - -## 单文件形式 - -在插件目录下创建名为 `foo.py` 的 Python 文件，暂时留空，此时目录结构如下： - - -:::vue -AweSome-Bot -├── awesome_bot -│ └── plugins -│ └── `foo.py` -├── .env -├── .env.dev -├── .env.prod -├── .gitignore -├── bot.py -├── docker-compose.yml -├── Dockerfile -├── pyproject.toml -└── README.md -::: - - -这个时候它已经可以被称为一个插件了，尽管它还什么都没做。 - -## 包形式(推荐) - -在插件目录下创建文件夹 `foo`，并在该文件夹下创建文件 `__init__.py`，此时目录结构如下： - - -:::vue -AweSome-Bot -├── awesome_bot -│ └── plugins -│ └── `foo` -│ └── `__init__.py` -├── .env -├── .env.dev -├── .env.prod -├── .gitignore -├── bot.py -├── docker-compose.yml -├── Dockerfile -├── pyproject.toml -└── README.md -::: - - -这个时候 `foo` 就是一个合法的 Python 包了，同时也是合法的 NoneBot 插件，插件内容可以在 `__init__.py` 中编写。 - -### 推荐结构(仅供参考) - - -:::vue -foo -├── `__init__.py` -├── `config.py` -├── `data_source.py` -└── `model.py` -::: - - -#### \_\_init\_\_.py - -在该文件中编写各类事件响应及处理逻辑。 - -#### config.py - -在该文件中使用 `pydantic` 定义插件所需要的配置项以及类型。 - -示例： - -```python -from pydantic import BaseSettings - - -class Config(BaseSettings): - - # plugin custom config - plugin_setting: str = "default" - - class Config: - extra = "ignore" -``` - -并在 `__init__.py` 文件中添加以下行 - -```python -import nonebot -from .config import Config - -global_config = nonebot.get_driver().config -plugin_config = Config(**global_config.dict()) -``` - -此时就可以通过 `plugin_config.plugin_setting` 获取到插件所需要的配置项了。 - -#### data_source.py - -在该文件中编写数据获取函数。 - -:::warning 警告 -数据获取应尽量使用**异步**处理！例如使用 [httpx](https://www.python-httpx.org/) 而非 [requests](https://requests.readthedocs.io/en/master/) -::: - -#### model.py - -在该文件中编写数据库模型。 diff --git a/archive/2.0.0a16/guide/creating-a-project.md b/archive/2.0.0a16/guide/creating-a-project.md deleted file mode 100644 index 2b3fbce0..00000000 --- a/archive/2.0.0a16/guide/creating-a-project.md +++ /dev/null @@ -1,58 +0,0 @@ -# 创建一个完整的项目 - -上一章中我们已经运行了一个简单的 NoneBot 实例，在这一章，我们将从零开始一个完整的项目。 - -## 目录结构 - -可以使用 `nb-cli` 或者自行创建完整的项目目录： - -```bash -nb create -``` - - -:::vue -AweSome-Bot -├── `awesome_bot` _(**或是 src**)_ -│ └── `plugins` -├── `.env` _(**可选的**)_ -├── `.env.dev` _(**可选的**)_ -├── `.env.prod` _(**可选的**)_ -├── .gitignore -├── `bot.py` -├── docker-compose.yml -├── Dockerfile -├── `pyproject.toml` -└── README.md -::: - - -- `awesome_bot/plugins` 或 `src/plugins`: 用于存放编写的 bot 插件 -- `.env`, `.env.dev`, `.env.prod`: 各环境配置文件 -- `bot.py`: bot 入口文件 -- `pyproject.toml`: 项目依赖管理文件，默认使用 [poetry](https://python-poetry.org/) - -## 启动 Bot - -:::warning 提示 -如果您使用如 `VSCode` / `PyCharm` 等 IDE 启动 nonebot，请检查 IDE 当前工作空间目录是否与当前侧边栏打开目录一致。 - -- 注意：在二者不一致的环境下可能导致 nonebot 读取配置文件和插件等不符合预期 - -::: - -通过 `nb-cli` - -```bash -nb run [--file=bot.py] [--app=app] -``` - -或 - -```bash -python bot.py -``` - -:::tip 提示 -如果在 bot 入口文件内定义了 asgi server， `nb-cli` 将会为你启动**冷重载模式**（当文件发生变动时自动重启 NoneBot 实例） -::: diff --git a/archive/2.0.0a16/guide/ding-guide.md b/archive/2.0.0a16/guide/ding-guide.md deleted file mode 100644 index 46295ee8..00000000 --- a/archive/2.0.0a16/guide/ding-guide.md +++ /dev/null @@ -1,181 +0,0 @@ -# 钉钉机器人使用指南 - -基于企业机器人的 outgoing（回调）机制，用户@机器人之后，钉钉会将消息内容 POST 到开发者的消息接收地址。开发者解析出消息内容、发送者身份，根据企业的业务逻辑，组装响应的消息内容返回，钉钉会将响应内容发送到群里。 - -::: warning 只有企业内部机器人支持接收消息 -普通的机器人尚不支持应答机制，该机制指的是群里成员在聊天@机器人的时候，钉钉回调指定的服务地址，即 Outgoing 机器人。 -::: - -首先你需要有钉钉机器人的相关概念，请参阅相关文档： - -- [群机器人概述](https://developers.dingtalk.com/document/app/overview-of-group-robots) -- [开发企业内部机器人](https://developers.dingtalk.com/document/app/develop-enterprise-internal-robots) - -钉钉官方机器人教程（Java）： - -- [开发一个钉钉机器人](https://developers.dingtalk.com/document/tutorial/create-a-robot) - -## 安装 NoneBot 钉钉 适配器 - -```bash -pip install nonebot-adapter-ding -``` - -## 关于 DingAdapter 的说明 - -你需要显式的注册 ding 这个适配器： - -```python{2,6} -import nonebot -from nonebot.adapters.ding import Bot as DingBot - -nonebot.init() -driver = nonebot.get_driver() -driver.register_adapter("ding", DingBot) -nonebot.load_builtin_plugins() - -if __name__ == "__main__": - nonebot.run() -``` - -注册适配器的目的是将 `/ding` 这个路径挂载到程序上，并且和 DingBot 适配器关联起来。之后钉钉把收到的消息回调到 `http://xx.xxx.xxx.xxx:{port}/ding` 时，Nonebot 才知道要用什么适配器去处理该消息。 - -## 第一个命令 - -因为 Nonebot 可以根据你的命令处理函数的类型注解来选择使用什么 Adapter 进行处理，所以你如果需要使用钉钉相关的功能，你的 handler 中 `bot` 类型的注解需要是 DingBot 及其父类。 - -对于 Event 来说也是如此，Event 也可以根据标注来判断，比如一个 handler 的 event 标注位 `PrivateMessageEvent`，那这个 handler 只会处理私聊消息。 - -举个栗子： - -```python -test = on_command("test", to_me()) - - -@test.handle() -async def test_handler1(bot: DingBot, event: PrivateMessageEvent): - await test.finish("PrivateMessageEvent") - - -@test.handle() -async def test_handler2(bot: DingBot, event: GroupMessageEvent): - await test.finish("GroupMessageEvent") -``` - -这样 Nonebot 就会根据不同的类型注解使用不同的 handler 来处理消息。 - -可以查看 Nonebot 官方的这个例子：，更详细的了解一个 Bot 的结构。 - -## 多种消息格式 - -发送 markdown 消息： - -```python -@markdown.handle() -async def markdown_handler(bot: DingBot): - message = MessageSegment.markdown( - "Hello, This is NoneBot", - "#### NoneBot \n> Nonebot 是一款高性能的 Python 机器人框架\n> ![screenshot](https://v2.nonebot.dev/logo.png)\n> [GitHub 仓库地址](https://github.com/nonebot/nonebot2) \n" - ) - await markdown.finish(message) -``` - -可以按自己的需要发送原生的格式消息（需要使用 `MessageSegment` 包裹，可以很方便的实现 @ 等操作）： - -```python -@raw.handle() -async def raw_handler(bot: DingBot, event: MessageEvent): - message = MessageSegment.raw({ - "msgtype": "text", - "text": { - "content": f"@{event.senderId}，你好" - }, - }) - message += MessageSegment.atDingtalkIds(event.senderId) - await raw.send(message) -``` - -其他消息格式请查看 [钉钉适配器的 MessageSegment](https://github.com/nonebot/nonebot2/blob/dev/nonebot/adapters/ding/message.py#L8)，里面封装了很多有关消息的方法，比如 `code`、`image`、`feedCard` 等。 - -## 发送到特定群聊 - -钉钉也支持通过 Webhook 的方式直接将消息推送到某个群聊([参考链接](https://developers.dingtalk.com/document/app/custom-robot-access/title-zob-eyu-qse))，你可以在机器人的设置中看到当前群的 Webhook 地址。 - -![机器人所在群的 Webhook 地址](./images/ding/webhook.png) - -获取到 Webhook 地址后，用户可以向这个地址发起 HTTP POST 请求，即可实现给该钉钉群发送消息。 - -对于这种通过 Webhook 推送的消息，钉钉需要开发者进行安全方面的设置（目前有 3 种安全设置方式，请根据需要选择一种），如下： - -1. **自定义关键词：** 最多可以设置 10 个关键词，消息中至少包含其中 1 个关键词才可以发送成功。 - 例如添加了一个自定义关键词：监控报警，则这个机器人所发送的消息，必须包含监控报警这个词，才能发送成功。 -2. **加签：** 发送请求时带上验签的值，可以在机器人设置里看到密钥。 - ![加签密钥](./images/ding/jiaqian.png) -3. **IP 地址（段）：** 设定后，只有来自 IP 地址范围内的请求才会被正常处理。支持两种设置方式：IP 地址和 IP 地址段，暂不支持 IPv6 地址白名单。 - -如果你选择 1/3 两种安全设置，你需要自己确认当前网络和发送的消息能被钉钉接受，然后使用 `bot.send` 的时候将 webhook 地址传入 webhook 参数即可。 - -如我设置了 `打卡` 为关键词： - -```python -message = MessageSegment.text("打卡成功：XXXXXX") -await hello.send( - message, - webhook= - "https://oapi.dingtalk.com/robot/send?access_token=XXXXXXXXXXXXXX", -) -``` - -对于第二种加签方式，你可以在 `bot.send` 的时候把 `secret` 参数传进去，Nonebot 内部会自动帮你计算发送该消息的签名并发送，如： - -这里的 `secret` 参数就是加签选项给出的那个密钥。 - -```python -message = MessageSegment.raw({ - "msgtype": "text", - "text": { - "content": 'hello from webhook,一定要注意安全方式的鉴权哦，否则可能发送失败的' - }, -}) -message += MessageSegment.atDingtalkIds(event.senderId) -await hello.send( - message, - webhook="https://oapi.dingtalk.com/robot/send?access_token=XXXXXXXXXXXXXX", - secret="SECXXXXXXXXXXXXXXXXXXXXXXXXX", -) -``` - -然后就可以发送成功了。 - -![测试 Webhook 发送](images/ding/test_webhook.png) - -## 创建机器人并连接 - -在钉钉官方文档 [「开发企业内部机器人 -> 步骤一：创建机器人应用」](https://developers.dingtalk.com/document/app/develop-enterprise-internal-robots/title-ufs-4gh-poh) 中有详细介绍，这里就省去创建的步骤，介绍一下如何连接上程序。 - -### 本地开发机器人 - -在本地开发机器人的时候可能没有公网 IP，钉钉官方给我们提供一个 [内网穿透工具](https://developers.dingtalk.com/document/resourcedownload/http-intranet-penetration?pnamespace=app)，方便开发测试。 - -::: tip -究其根源这是一个魔改版的 ngrok，钉钉提供了一个服务器。 - -本工具不保证稳定性，仅适用于开发测试阶段，禁止当作公网域名使用。如线上应用使用本工具造成稳定性问题，后果由自己承担。如使用本工具传播违法不良信息，钉钉将追究法律责任。 -::: - -官方文档里已经讲了如何使用。我们再以 Windows（终端使用 Powershell） 为例，来演示一下。 - -1. 将仓库 clone 到本地，打开 `windows_64` 文件夹。 -2. 执行 `.\ding.exe -config="./ding.cfg" -subdomain=rcnb 8080` 就可以将 8080 端口暴露到公网中。 - 你访问 都会映射到 。 - -假设我们的机器人监听的端口是 `2333`，并且已经注册了钉钉适配器。那我们就执行 `.\ding.exe -config="./ding.cfg" -subdomain=rcnb 2333`，然后在机器人的后台设置 POST 的地址：`http://rcnb.vaiwan.com/ding`。 -这样钉钉接收到消息之后就会 POST 消息到 `http://rcnb.vaiwan.com/ding` 上，然后这个服务会把消息再转发到我们本地的开发服务器上。 - -### 生产模式 - -生产模式你的机器需要有一个公网 IP，然后到机器人的后台设置 POST 的地址就好了。 - -## 示例 - -关于钉钉机器人能做啥，你可以查看 `https://github.com/nonebot/nonebot2/blob/dev/tests/test_plugins/test_ding.py`，里面有一些例子。 diff --git a/archive/2.0.0a16/guide/end-or-start.md b/archive/2.0.0a16/guide/end-or-start.md deleted file mode 100644 index aa072c3d..00000000 --- a/archive/2.0.0a16/guide/end-or-start.md +++ /dev/null @@ -1,8 +0,0 @@ -# 结语 - -至此，相信你已经能够写出一个基础的插件了。这里给出几个小提示： - -- 请千万注意事件处理器的优先级设定 -- 在匹配规则中请勿使用耗时极长的函数 - -如果「指南」还不能满足你，前往 [进阶](../advanced/README.md) 查看更多的功能信息。 diff --git a/archive/2.0.0a16/guide/feishu-guide.md b/archive/2.0.0a16/guide/feishu-guide.md deleted file mode 100644 index b58aca83..00000000 --- a/archive/2.0.0a16/guide/feishu-guide.md +++ /dev/null @@ -1,102 +0,0 @@ -# 飞书机器人使用指南 - -基于飞书开放平台事件回调与 API 进行机器人适配，目前仅适配企业自建应用。 - -## 安装 NoneBot 飞书 适配器 - -```bash -pip install nonebot-adapter-feishu -``` - -## 创建应用与启用应用“机器人”能力 - -::: tip -此部分可参考[飞书开放平台-快速开发机器人-创建应用](https://open.feishu.cn/document/home/develop-a-bot-in-5-minutes/create-an-app)部分的文档。 - -::: - -## 开启应用权限 - -应用拥有所需权限后，才能调用飞书接口获取相关信息。如果需要用到所有飞书平台的 API，请开启所有应用权限。 - -在仅群聊功能的情况下，需要为应用开启用户、消息、通讯录和群聊权限组所有权限。 - -## 配置飞书事件订阅 - -::: tip - -在添加事件订阅时请注意，带有**（历史版本）**字样的事件的格式为**不受支持的旧版事件格式**，请使用对应的**新版事件（不带历史版本字样）作为替代**。 - -::: - -目前，飞书适配器支持以下事件： -| 事件名称 | 事件描述| -| ---- | ---- | -|接收消息|机器人接收到用户发送的消息。| -|消息已读|用户阅读机器人发送的单聊消息。| -|群解散|群组被解散。| -|群配置更改|群组配置被修改后触发此事件，包含：群主转移、群基本信息修改、群权限修改。| -|机器人进群|机器人被添加至群聊。| -|机器人被移出群|机器人被移出群聊。| -|用户进群|新用户进群。| -|撤销拉用户进群|撤销拉用户进群。| -|用户被移出群|用户主动退群或被移出群聊。| - -## 在 NoneBot 配置中添加相应配置 - -在 `.env` 文件中添加以下配置 - -``` -APP_ID= -APP_SECRET= -VERIFICATION_TOKEN= -``` - -复制所创建应用**“凭证和基础信息”**中的 **App ID** 、 **App Secret** 和 **“事件订阅”** 中的 **Verification Token** ，替换上面相应的配置的值。 - -此外，对于飞书平台的事件订阅加密机制，飞书适配器也提供 `ENCRYPT_KEY` 配置项。 - -``` -ENCRYPT_KEY= -``` - -当此项不为空时，飞书适配器会认为用户启用了加密机制，并对事件上报中的密文进行解密。 - -对于[Lark(飞书平台海外版)](https://www.larksuite.com) 的用户，飞书适配器也提供**实验性**支持，仅需要在配置文件中添加 `IS_LARK=true` 即可。 - -``` -IS_LARK=true -``` - -## 注册飞书适配器 - -在 `bot.py` 中添加： - -```python -from nonebot.adapters.feishu import Bot as FeishuBot - -driver.register_adapter("feishu", FeishuBot) -``` - -## 编写一个适用于飞书适配器的插件并加载 - -插件代码范例： - -```python -from nonebot.plugin import on_command -from nonebot.typing import T_State -from nonebot.adapters.feishu import Bot as FeishuBot, MessageEvent - -helper = on_command("say") - - -@helper.handle() -async def feishu_helper(bot: FeishuBot, event: MessageEvent, state: T_State): - message = event.get_message() - await helper.finish(message, at_sender=True) -``` - -以上代码注册了一个对飞书平台适用的`say`指令，并会提取`/say`之后的内容发送到事件所对应的群或私聊。 - -大功告成！现在可以试试向机器人发送类似`/say Hello, Feishu!`的消息进行测试了。 - diff --git a/archive/2.0.0a16/guide/getting-started.md b/archive/2.0.0a16/guide/getting-started.md deleted file mode 100644 index f5e61215..00000000 --- a/archive/2.0.0a16/guide/getting-started.md +++ /dev/null @@ -1,87 +0,0 @@ -# 开始使用 - -一切都安装成功后，你就已经做好了进行简单配置以运行一个最小的 NoneBot 实例的准备工作。 - -## 最小实例 - -如果你已经按照推荐方式安装了 `nb-cli`，使用它创建一个空项目： - -```bash -nb create -``` - -根据引导进行项目配置，完成后会在当前目录下创建一个项目目录，项目目录内包含 `bot.py`。 - -如果未安装 `nb-cli`，使用你最熟悉的编辑器或 IDE，创建一个名为 `bot.py` 的文件，内容如下（这里以 CQHTTP 适配器为例）： - -```python{4,6,7,10} -import nonebot -from nonebot.adapters.cqhttp import Bot as CQHTTPBot - -nonebot.init() -driver = nonebot.get_driver() -driver.register_adapter("cqhttp", CQHTTPBot) -nonebot.load_builtin_plugins() - -if __name__ == "__main__": - nonebot.run() -``` - -## 解读 - -在上方 `bot.py` 中，这几行高亮代码将依次： - -1. 使用默认配置初始化 NoneBot -2. 加载 NoneBot 内置的 CQHTTP 协议适配组件 - `register_adapter` 的第一个参数我们传入了一个字符串，该字符串将会在后文 [配置 CQHTTP 协议端](#配置-cqhttp-协议端-以-qq-为例) 时使用。 -3. 加载 NoneBot 内置的插件 -4. 在地址 `127.0.0.1:8080` 运行 NoneBot - -在命令行使用如下命令即可运行这个 NoneBot 实例： - -```bash -# nb-cli -nb run -# 其他 -python bot.py -``` - -运行后会产生如下日志： - -```plain -09-14 21:02:00 [INFO] nonebot | Succeeded to import "nonebot.plugins.base" -09-14 21:02:00 [INFO] nonebot | Running NoneBot... -09-14 21:02:00 [INFO] uvicorn | Started server process [1234] -09-14 21:02:00 [INFO] uvicorn | Waiting for application startup. -09-14 21:02:00 [INFO] uvicorn | Application startup complete. -09-14 21:02:00 [INFO] uvicorn | Uvicorn running on http://127.0.0.1:8080 (Press CTRL+C to quit) -``` - -## 配置协议端上报 - -在 `bot.py` 文件中使用 `register_adapter` 注册协议适配之后即可配置协议端来完成与 NoneBot 的通信，详细配置方法参考： - -- [配置 CQHTTP](./cqhttp-guide.md) -- [配置钉钉](./ding-guide.md) -- [配置 mirai-api-http](./mirai-guide.md) - -NoneBot 接受的上报地址与 `Driver` 有关，默认使用的 `FastAPI Driver` 所接受的上报地址有： - -- `/{adapter name}/`: HTTP POST 上报 -- `/{adapter name}/http/`: HTTP POST 上报 -- `/{adapter name}/ws`: WebSocket 上报 -- `/{adapter name}/ws/`: WebSocket 上报 - -:::warning 注意 -如果到这一步你没有在 NoneBot 看到连接成功日志，比较常见的出错点包括： - -- NoneBot 监听 `0.0.0.0`，然后在协议端上报配置中填了 `ws://0.0.0.0:8080/***/ws` -- 在 Docker 容器内运行协议端，并通过 `127.0.0.1` 访问宿主机上的 NoneBot -- 想从公网访问，但没有修改云服务商的安全组策略或系统防火墙 -- NoneBot 所监听的端口存在冲突，已被其它程序占用 -- 弄混了 NoneBot 的 `host`、`port` 参数与协议端上报配置中的 `host`、`port` 参数 -- `ws://` 错填为 `http://` -- 协议端或 NoneBot 启动时遭到外星武器干扰 - -请尝试重启协议端 NoneBot、更换端口、修改防火墙、重启系统、仔细阅读前面的文档及提示、更新协议端 和 NoneBot 到最新版本等方式来解决。 -::: diff --git a/archive/2.0.0a16/guide/images/Handle-Event.png b/archive/2.0.0a16/guide/images/Handle-Event.png deleted file mode 100644 index 6546632c62c9dfee7d4f8e0ad5d2a7a082929542..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126466 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 z zHuSyaZaZg}!X+LOdpdDN1$Z}?6&M}49`qn#(3rlv@b%lwihqvI-~aemLjCpZ&D+2ZIHJa223EOs;i^^ZDOwjQv#&s+;z1{>NxD6k zelzS3FqMxVGt6j1>>e&U8=;_{^1EZg6rgRJP2*|WT=oG!i0)lX<1aFNy$4p}L0btE zE!Z)A;D;QIOBlfOVkt&%XrZy+D>xqs0n=s(# zGuY~rH$UX$C})DEv~SZte!O+)___Dbn-9};0tf(r$bp9Mp(^fW)ry(+j~8}e^xl(`K$8C~ z8$5d%Xj0gZdL|aY5nTJg5fTODf%T9qX!XY?X8pi_&sELeQwal8VK-o>bwU`8*i*H< zIZ?0wYru!{faU$Hjea%Sq;2~LT9bL&zZ_^Qp`*S2-|P=4p6wq$@%*n`fPc{$|1Apt zEeiiba{uKN{p*ka<0Lq5e;{7ORG8MO7Y{mSBYJfW3$9hu`VOzm=fPVmX3_*wWjsme z{EI!DzKk7W6SaJc2Y)Q=4_Im8bs?1Xx6&Gzf%@a^?Bm^d_!=|9|h|KRKp@Y zFakvPnUqX#&-kQxjR)Vg;FHKJEZGJ&P0`?wRa%$z1unAUi;CU+5_B{O06ZcMSTK5n z$y^F=ll`r?I`Vg4 z9;CnXdK*;6f6BT84tl3Je73eJbiJ3>8sM~w{kym|FXb;LuFDOq@V&EdFNOayU;9vdIb&$v(!(*047j$2w(?gRCQt!}mI= z*L!?!zuWhByM6!t{DtG3^L&i!aXqf^348D3Ba{fDVi?D(zo ze$s&fC=Sa0dGJFWTu^U)&2l}XGhw}-LDln$GJbt)^%=9@Km;K(*>CXlV?bqE+>5^| z&g0iRs^mux?+Djyh73bx{e`b1JEgUW42q|y1@Yk{k6ejX9*YND2E*?X_sg+Jkwmv+ zZL6wXVuqi8Z2ySy!!NvbTiV^8mhL~9*f%{d_n33K%YCtI8j7JVpmM?f+}(DkJ}`wz zqGqVGz(^H2`k(An_}nHGuKc)8w>jo%g9M9R#X{-9)S89Tp$X`!UGN0+4QpE##)mYi^enXd_#;qv zq(+ZIBP$+}U%m@?g!1kVfhvb+`+eT+JDzfPWr^|9U;FtC@n)d-z5Tt7)v8c00OJ@v zHKS!mrGeUy#+L?dcc#iwt?w{{-IwaB+)r`BXrcm&9~g}g3;eTtjCY}^%7em8fXUM6 zAT9>=&RN22;p)lj>G;k{!y8}&86i{-ZmD_49-Iw;Mpc3WJ_fIL;-s$3Y?fmkBlXYTVXzEG1f)4pP>6tif87>@CHT= zr+EvgihK}Udvou7J`RiNWRR%M*j!I;X{8TGj=lD?+dj%4=TOQ6RoiEc`ad=tg}0*dX)1Ry}9%ADqe-%jf%keUFh{%0c%_ z3;Qf4gu2i6z41QT)&Go~a5{f6W&DKaw4P_lH>;oDKiPiUV8ah@|2}qMr0|&INSVVl zjUxN;8e&T|yMD64>#Q;!{apw1y+v9~f;&T@o3kH&2vhEtRhlTk#I|ZU?MOcmPwkjh zVCxm;C31=S;?`4Ryxfbd5ov6}mz+?i*$!6*=BmE=l;8{F!XjUYdmnZi9`qS>8YgTY&iym!GDK5lm% z|Gg|X!T!t-X4LyP173z@8BX`t%;)?5&C+DK0hnWrfP?XWSZiOwOr=deM*Gh8b*k+-6fa#4ozI}!<4^Q_umA*gmjI&a%!e8H{md|lthU+tJ9v% zD031kL~-%0KEe+=9d)JguQRxv$U1>!E^Vku#keQEkMH4 znfrHbWc*+hn@vJ&Pi3ayw>UM<1H>b}FW?~zd;fuVqA*D@*b *}eYX-4FxSv>JU5 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

*N@WS@+EN$Q;{@LQ)Z!7WSW2|_;9z|pPtZ1U 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 VK6&fZIU5*&z|+;wWt~$(698!sxRL+> diff --git a/archive/2.0.0a16/guide/images/ding/jiaqian.png b/archive/2.0.0a16/guide/images/ding/jiaqian.png deleted file mode 100644 index 8895d6c6d866cd6049642da40dccebdfb94429bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102378 zcmeGEWl$X5)&>j%!9BP`@SwrnLI@VzA!v}`!QCymLvVM8;4;B2xVuBJ!5M6rckUz4 zc}{ZISKp8K&s+6ORafuo-o5wIYpuO{_k=4eN@Jjspu)hwV93h6Q-y&+aD{<^=SPNv zUZIY~MT3Ds-L{mJRF;*Lq*8XYH@CDggMpC=PfkTrPaG!jKY+}T!s1X<(OuKaF!(1; zO1>-%Dh;NMQ-1qFqC0eC8?_phnmV_7v;1pd1v8bk1dFzc%_5UY5d;vnkOV zOTP<-dsn;<7VRuf2)c(YAO^JGNyD9buHiUUp95 zw3=qx(|ky!MxhpdGj5sqWR|H$PgEsnj7xqPS<3iNb2X`Nq0GzQN zhav5IeoAAd?6^^BqHr{GGc&W;E9{>AubuEPsN}|)BRSs1;C{b|X|dFd;@#mkdiXPj z1X<43R>;Bpll}0B`iK5EQiwW?7!mKx5$pXxob{4PEQ)EQqW#p*!C-hadU+<6*aBtLgT0?LdNVF&LMZgc@@U&RHt5Sj(MALVI*WqVr02><{qu@ z#4@Me-OSEAAP4eYA!^!y8l*CiVEUf%6d^4@u9Jm9u2nOJZ2YkC<%r0K14QW$9LNX( z{wOBm^l>jp?2WfnTr@@+EZRL`~szByO?ME`y))lo@g4 z{1fuHWzb*e?oH~J5;27^<*g}`UvoK=3BJ$|Y|DLAX6Huk3=r*Q{DwYbtiOntjnQDl zO9m(1i?+$_&XI{k_=9u{wFOZWnXlVollh#y1<4mBHWwx$*d!NSd7hDAgb+VQ?p;xS zVQF$HwYoq#;+(&gluNE%o~N>8snTbb^icEsswv=HeUoPn-|0ipd%XozR^qoRDT>J!1P!h_$&Y(Rh(F{1pb- zdhLDyfAE^D)aoyao*-j}&GhJO34ht*XH$$}?z0^v@5>rk>$}+z-IjIt=@1cx$@xmS zv#>dOfplJS&UZ0!Q2?(Ih|(R6t+}QpMo%qQr*Ns%L;9+LKyB2JS+e3?h0bvuukMPfSN1K= zY1Z;VW0?80Mcc&g7)!c`>HZ6H?Lk!rRf{yms&S31m--@W;`-r0*R_T=Nl$bU`%dRh z&Q3MYpa*UrC7*cTv}a2&;Rg)*jI`lOqwG(Zq`!#Zi5bydNu5ceNYaT1h^jekxV>%O zahnhqkt7p0l46h^lZFwq^HuZt8ohmEoQAB>l;-@+`wb6QG?%``vW=iovE=~AC|3oa zm#HELh||!<;FIqPoOO5oQ0=0zLoZH~b3LA}rj9{#U{z+-J58a=HgjY1)^VJP^0YZy zg(h>o1MLMp(DECbx3=?(+$$aFw!%UVuEQrWOB*&>He9x#MbYnS&1g+}pBAh@1MAb- z7KUbiD*@Zso3$f({acL%$pt?gN_IpT($&7r2$r~()Qq!@s~#X8NDzKXHBGfjwIj&F z?_U1V_AA2S#zBA2v*#u;qakDU^y>;Ga2`kuL|R4K|2FpW=Mq=RMDJwKaotM6VB%rg z$$f!EY-#}ELdC#wS#vz!hF1;9sR=5B@0ZV~JXl$&r2H#rGcd3u4f%yf)-*#JeUkn?zY^{<2Wl$N41kJu3 zjIIoL4TJVmFOU!@0#&=O)MIC-X9Kunzq48fy=6CU{UWo=T#nbNh$Xj?{QQbW_>>@d`kAjpQ>#)tx!dJU=w2sXv$*PYxLnk7ziZP%93~jj-E}ThX)AxD z+n>Om3+T^&A#q_^@LA0VH{|N^O|$L{&o*>REzygzuTbBi|#w8 znb{*#fd)dw!_|u`Pz`k#{|N4E3!hquXZEsa5fAeZ(o zX+QRdE~n1khtp#K{zW7k;R-=2q2JPvl`r>5?UYQuL@VFg>YNg)NGE+kgGl~*>(6_-Lfb5j0kCnYDCWo z&K*~Xoot@9w9a^0^s=q#_qU5e7#}Xyfj`z1c#3)U8W)!{mo2IC2ohdf~C1MzUnBi0A)72Wy zE9vFf`WW6PlS}y6^E%U?elUE@zYVk4nOGO)JNtNWA9qE_4*!vVr5niaGqtlFE^n6_ zV`#2#*R}0kbXYz!_h})sn*7)qXwwFC?A!}Ij-Ia;&@Zv`ToZO0J(~|%$z0I_{_LD_ z;oApx0txKwM`4-?%HIYvX5{p9T4Y<*}nVzl6)~$F`dXC=Rj{JAFH~a^8#h zEDj!f-M62B*ue-Bj1wa{$6__4wUqoEL~q=8`kx5F>~!qXVW^P2+t?$m{Tko<-pAOA z-iuyvO;OF@x{Z6qjq8TcpxY_UOB$thi%v?g^0mtG&a+ab5_!&!s2HXGB?72uyP|(# z-u~4FMYLITv}}ti@Ex=NTg1$C)E^l>GJcsbFsFzxefNprn_%%o`#=;pNH~MnIf?^f zZWF2hFEf~6gBM0#bkoz+&t*gHRDlt{)?iOIbIBk$I^{v&LiT#X>2zTVQZH*vm}+?c z8oE!P3K~CsGPI62rG%SI5n5V^jik67_@)H&OKZQmd1)^QFl;&jDItM~23??&b#EN_ z!DUsE@d=FSkU*1O8#8TLa|Hz$CTJTO1|F6K1_9cFg&v}?r2o@?56cMi;vd(ciE@}F z4E(?PC_>MF{o`4|v3z^h>XgdS!wp?%vwj?z+@_FxeJ=)1O5D1^rzh-tJ71-X} zQ_m79`2{%v16%29J5K5$L}-RfL`1}qL93@TtvOq`m33}z&VE$g$7TGr+hneUqK@VI z6T*mUvtm{~XFUK1dA6)Uf-dQ@o#0}b@gVC$GYH%!;CE8rR8eo5e6?hHFe5u&Srl_X zH?dw<$7Mugae%4#Q-9^=VxpN7n0b@UnmxO+WL2>BaLu6d%`}E;--%`ECz+AI!+(+9)-JwPOWafec0T5)9MTb~q zFc=}`86)d3b9%wD*1(zl_#b2bH4w}{hgWuhlR?L~&~Bsi=IBpr?OW>7S2rP=9I#ZG zC?j_gi1Jlz54CPI z$wdF>u>YPx{57_?31dk6lhDV452W*s341+iVrgBq60Eo{J$aRK06vm461yT7J;)Z& z&=)|NY2Cz!5Dfnx`u;gkvW&l-CS6Zq=|6zn%W48zq0b!;aw6&zKHYbWpvKo zJ3H2Pk)p4P)MXM{pagL0oK*j5AWIcYn zhHI53ApfYQfMd;_Yun9LYPDm!ozdRe;`-tI>_*O$;Q%to*M8LRXxrKT2tE5G>f3Qt z+JOwtN@;+HxJ?!@heP9mH`mt}lh#sl`|Ty#`0ks|8$`5vCd2(`t7 zNy!D`{&rr4X0~qH)~g&!J7Uk~FRrJ*yhWFYc~^*eCUhoT?3P~Ze1rSo%h!8vnqa2a zxNNloXl(ej-`aCvM*QD8`5`C?6Kh#xw6m=dnyPYxAe)XMgbv7@e#dbQWkLqtEsvP@{df^nz%SdLZlyh zHUJLv;FR@JWy}ZADfhv-LT1)-NwYOIG9dVLC0#eK0ZH~?dQWB{uJLUgo~eX}#!)J< zJLk|QdnKXMb6X>^P;khLVd8YSon910t6P*A33HYv-PeJ=hdxv?C|29^rw<(JtyJt7^$M27433<&|9?q1oYuDx;l@pNovOdt-E`L8< zZFPFYBq!mP!O$c0VIh9?zaIWqQ(Fk$6g4-yUA029D$}6T_wlq@Hjy4I==(HVhN5*f zQr(v>i;h9cdoov{1)>l+nw7oZ({c@A#QJYFL8*ZWD5uI*1k-2OP!|NK6ugfn<1pFk z2}$-!;fW(!{%*U{?sn#Sx~yS`!HDrU4>!KgwOecRdAL@Y49W?`$lx@SqswmA4$qTM zWqW~${&~H_gDyKG{~x&W-=etFNB(ZVVW2B{O6mLU{J17r16Bb}+jTm;dEL|cI;37U z{>2~jDN7>Tv}}cfA8xEynrzMHnr*@*j9)p+jghJ7loXQv?wL?*D}Mo7hMr;D+rj5Q!NfVsPlDkeUtfSqYpR7TIcX&n7<P1ze(~&Xxy!>4@I#-*}6D!_a!U86SmEsiAE(_K~_ zn>|eOzqJPC%nC6eB212vmSeU`tH#_YH|6gn6D2+;hhBZGS?NiJ@i%mjQ7JpT%#FjB z95WJU{X0q!;p2$PyA^U#{}?4web0JB zV;&EL!V%$52CT%P43MnCm;Yy$f0J8!59QnHS!5UW-&g)K^qfDG0iG5Vb=W`jt9*q* z#WDNjHH7~s1Ld$#2CTl|mi{Zc|1YWK?&CuFz6ZrI|7VteldJv$%D~(vz49ON&R=|t z0m}E)*(wq@PO;BBSSuKe zqGAGn+TmQ>4?$**leV2(B~j2w4K718xtQ@rZ;anVp4Wp70X`bjXMb$6^?Z*8Me>zL zH@D}&5FDQGt3_&I`(x=3q^YcWq9>^@b=O1V$ENM9ArP2h`3(x`CcxiN@sh=0DeM# zm!YyPO6A8^$IhF1y_uurvr--r`Nk0dl%9MRuK+>{z*!|g|6*Q}U|Xw#Mno8FS&RPP4xgKZ5=AZq%&-TXP8VHif*%J>q{h-} zJ#UWKyPh0JlFIxRjURb!my<9%U35$)^^?Y(H#TYv>zxm!g8bsAFH zxWe-^MhUtHE?F}@y3HD`=PqOQlLh;8Fa_xeoWRlYIJ%)JN&=vKDqqvM25*Kv#^1%P zZ4D2N)Rczgly8iVIW-V(ZbToi8!Tr^D(uqfjH>2p1v5XBrxFFXKtmqZhR?A_s)5h) zg*51-%K--587q2|D&%&8ZNst=_?Fd_l2M<=tDuQRw}bY;mG|xca;(3a;ykpIjn=8q zi~!8(eOH4^U+Nj65n9_dSs)F{a(61kr})X(hJzo@UhR#ILV#SdAyG-_Ov8zMi>5x5jSmoN4qA zjaDIFAI=B?`=z6ZbhORB{zB8cKGv$LHeppSrlk!ex33v#kbiEtAmBNJfq(&!>uZgK1%u`uvv^|Ch|b$#(* zG2!uYxR>d7NPS|1f4DiV&_R%nAxl;=i|aZ++*B%=_?CBcbFw6P@0aTN+{K`eL>Jml z;chzn%i(2Z35B0}&KTd+Kuy@wmnjWCs|Y04X8ZQ3ss#g*;j%gX=X1Y$yUCfWWx)Ep zm{_mvg1+mW#N+*Fj^E8Gh97|8@kgd!v0{$Ohka&tlCOPnxKyOS`Lj9_T)o`+_Il}5 zL4yY3H39^&DhQ{S(9jRmzaU9Hv5^B>FNkdjf1-&I+IiaW)hp~I<+bPi1=J(qv%-Ut z5UtxRyuArF@C8@lGi#cj&85Vgt{^%o?f=Y;Rx4JZ6g(khwOOw48oWKdG(&3w9e3*d z&ywmtwgJr<^z2$g=y8a+Ty3&?>!b!JYJWz zrfOcK*FYt6%J-4@iw9&!DOL#lWTb)Sw`li6s77R_%KCtlfy8pLw%ec`h$qT>aLKm; zb{`Kp0jhuqX3KYhmRt~T1b1Y|W#7_=i){7DH9168x#4WLoUb9ZDjm0Pvc#0f9K%_ZM(I;}%tu1`V}wQ#vNf220aoB8`+q znt*_PSftL3mbBsz2k=3bF(azInU5Hy3WxQ1GuFz{wiSZ;%>U=kYlGvK85MMWZJ;x-1%FkX1O9p z4x8zQ6`;`B8^@n5;fcjx_cisdEvNaVCkH{I53?5JKaF*Wz)?C4($V4Lrtw#CFAE0t zSI6J~j!dP`@OT>z=L|vMJG5w0KHXX)WB!LvH#L59bG3MMh#n%sz7TS#t@Z{;XHnOK zA8)!&0-dP87KwUa-Y=x9yoGxgYX^lRr)mSgl{JCphL^wdFi#Bk{PeP`t5&wgAj7_E zX~EEsCLA_dqPYb+JY<-n)=UhXIC*~8z@Fv&bE`_X30dr7Vcj!T?9-k=NjCPnfsx0V zh?{M@$}t>qpnm$qWtE#KvZl`OnFBP_q!Jb@+7`M!oY9+GH_w25piGv)meVqs?9Xw6 zVrlkMZ@t;5ee3bFkX?tI-qZEeCj0Z_^Pui}rB-Yfq*mY2TE{O&^yJ5B^J^x8UJFB? z$UbEP#oON!(NY8WLU!-lLyH-UpURCrSJI3RG)zH$6>_>Jiw=*r%_r^mZeo~ThdB`7 za_deS10@4vuP?E~gCYCPA-eDmtzX_Z$OK?F9U7b5e2HNi*%_Ni(y z8@|o-QMMu9&!{#k$ivhORZo{0XE6dUMgjSY2>%_IVc_P1{jWom)E?f(Qmi>0q4{d4 z5X(uKeB-iM?;gzNbzWp|yExiH!U@vkJ6!@p)x{4@nz$p&YS?X7ixMkItrp4~-(y{a zB*Us=YS{MUwrB?N5~GEGcf|8{Tq04EV0!?Sk8z|g7TOCy z-(P_L&|IZ(tSL?Q-SCdU%6Ej&0IcOcI$bmx`YhZrv>4qT0K)VX);9km`JKmrizeaG z^#kAV0hi};#PWYeUTTCcH(D!Ya+g7U+-%=4m9ugOr?V%snWZr;F#H%l7p z5y29D7*b=uyHaDaU?E6k4WdsLKDpz%UA8@dMiFTKnDGS#Aq8vQJ_qx3gz_@rrE$_r>ga8|B;y2X8pweAoKP>4Cs561roXGsmMM6gTS$(WKZ|ck0%~aDq&W) zBe|L0Xh_d{N>U`EpQq($L%oTX{#X?9B>4+{p3L>u5Ig$y>GHJv^$JMz?pvN1MvY<3 zIys*~D=52NPWkR21EK+XF4>|9lGnEHyipX~uXR!ssxuCHcpk6^Phzi4HZ) z5%|z@pL7mZcfEDkoGOtCItPuX3E7|Aq38lv>wF?HGLXXXw6$x`o8t=xnIvcEquX6h z$#%UDhmjVzVcvaVLHpevU;0d}7n z$QUg9xpOW*cLC8gGV9 z;FjQicTH?w}F!OaVXq@3>B-EC^4O!k*$hehksQ~|L>`P3g-W$@xSBv|4HNj6={^}Z>k>8RpFjQ5AI|i+(VE^ z|B)@#zK0LRAT546U2d$85e2m6(OA2w{yA4_Fu*FEShWeO{@7k@KiFciSyk^flTKr3%aVbEJ1r4HzSqu&3& z7!$uoZmF(#Au_?du|@W;iyp?E+1kKL65elPxJ$Z;zsXN556r+RhSM z)da1pI3dpp!?_&IsuXEeYO7q8D@OlovE7P%Cua4G^|2Z}Y};tPFh6~{H;T4vtksHg zXJkEBuF(Pyd}}O##FWe$f+xwsX-^Xg3Qa zafOt!{e!(i-X%f!}06DrWb>c<)de(=MDEjyW`%7PJ=m*)vS!q8nq8IDxu!C*IX68 z#vvM9MYod#8+vfN@;9aX+v-Do#tj|*a>SR=(y9bsWcgboeJbdifv|8~h6kqJwl5+d zU;KlkBwpA#4Vg})3$ z4TyIW{6p}q5%^|d!+j^3CzQr1)NC|G_TE66Eo$^1kQJaxO+^adZx|<)jeZ@`VJC$O zE%zTL(8+V3cUjGqQ^!*48N(gTkI)u=cntXqKK%1>2Kp)8v2LdCE-8|(*O6=ze3FaN#lP*`~OMf|FhDN3;Xf?V!U#=-vC&S-@nfich>AN zKC;&eV%OVdF--T;y47UQ?u=%IR>oakh))lA zqeQU=_E7R*!WqIdlw3RArshc_ZyoldM*z5^)vB5$c>UAkty^DnorRrq`gdnun+z_= z+9{s{Sx{s!P6gJSBs6h%B&#^d@-UHgP<8^|f$K8Z_mD;g+9a}q*=G& zMT29zy%?~|H;2osykXByN9f8Xt}EweG=ss~S&3){tJugmzhz;AV~CnpXOy8&G`5vjoMw${DqDS%zN@6^EVf0z zV~H#pXitdDMT$kTx;lo?O{?mfmw5Bk;e&EHVAJ=pTIj*c+La|eXSFC#F}cjulx5%d zxoyEhnv``GK&2CErZ_XNnC02ctEW8r-ZqQiG%y;7MJd<|sJqQ!dy}y3z;lQmxD574 zSWZ8ZaYxF`S_gP0KXyAA1P#PkX<*FMh^;7Vrz!PEp~SFAr#Jnyi_zNRDSIVk+>*S} z=q4bf+c@v!cQ-T&oI*%8=$s~gZfqFM>kjQe>lJk(WIccO*6l(ER=x%bDaq=WM{$6> z85~yGpUobRxW8DDP-2kK$9pNSn*Hg}Vx>}U(f6ZYGCa@8c% zf3Z7Bm!wI>QrJt38+ppcYik+e{Z!vDmmTj&+ugF!g}YR$;Un825_{7;SS>us zgk8~yc=p!2vB9&*uFY+?h&W`yV1xWQTFA`i$v$?sg)yty&c|)Z#3D$LSQ@{T^GFC( z!rq~e$;|1sXF47jpoN=S3l_$NRc}zdS7_LyUwBd28=>}?U zMVZapD5e9@y>^8UDIesCLYOT}_=Jbi!34F#`vnl1hpnns%48pRq0a>;(ZGaPCdL zH5*TQ0)5+c2epH;C`Gvs0blXjy~Ql1;3QMQ@84lA;Fiw!gxc;bbfwo>+$Jr$gjv{3 zsk!y_ug4%EkgnCN*SBxB;RJP%Vk3vx3cYVu0vKxNi zuv#bCsn9em%=o<+t^p~>LdnIjRV{5+qFz*$(Zgb6$NQ?O!6v*sRbSF9%JA-+i)ODS z(D~Q_!B+V+oqL4*DP2c{cKWJuyv2)ZUo~O<87lW-jC|U z0?*~AY-WQiJD<;fI60kE=PNjs9EWQxU3iI(bxr4wxB6}y1fS~AKW+P-2XYy)lX?(H zHdft8i`;T1+EolpqZRhC-cq{(#Gf5c9XGs(rX=-%&bK1jV&?4*hWhO~55a;czy(O1 zn|Fz1LVxVD0ehp{4}rsmvI+V|yTff~G1gA@)?G~B{!1Hxp=a#)oP{*#%Fn|q=ezks zv5$r*pK*nJKP}=-!NAkzsZ)dt$!NT3exrL{LHxmqdUKvF^OqS5B?pG+di1Wbq4!y9 zpd6Q3x6Af2=yow@%FZDd(nTbu2Fax?mjxIdKMINYr9I;>w#Q`Wln6~R?Z=k#G$$m358;AzRg z1UL*M{E?TW`}k~SY)-!OFI!8@hNM7K4NF z|Dj7?>s=<~(6V5QCS==_`vdJKYH<|Dr+t&CwqxG&@fOK06i&)y;&Qh;sr4x>{>B-~ z?~D2to(j6*1`J22TfVoUZItHrm4*AhI|S=x&Bd`JA03re1Xm$-Su+EN z9|hm|_Ft*OuBM(jS|~(V*Q&o5ywCuKvCHTvLpF|ElZBocKwI*iiT2lm_U1_C)`h%= z4be6NN!;&Ah_^M_8K=6?F%0hSwOAt890MyUI>6)T_}Kc_+`BkO4NGCzPJtH|BBSH%hDa6h9j#h~<1QOM11pYvPNJxE(F5%ZWJg`@?QTyzd1HA}I?O}P zGCs?1Om&oFpXOK0?XSp(vP`q;mUZf8--qH>6Ia{7&&G2d(pJ&8BuXz6ioccIJ{{6e z5Og_8wry6rv?d-gHHXMG(Cg%EC^0F#U8j&{uodrdQQVh#b{NEPqU;oQ%Ah&OIwv^0 zJUGcdx{v3G&k>%$TZwLS&#=iD*QrS9GGFgLC~C&5+r{+Yi=yW5VQYX;0HxW@M3}-^ zp7Hkp)w!8uXuheU*DvB}l;&(Mo7SX90v~@M&}R)j(A=LY`23_X4Eo4kS-Y}Uho(fH zTwU&KPUbclVi%+T@U?GFGG^mGK1alLhhzVM8qYZN=)NL&;VjWlp>1|3;j&V9i`*d` z6xP?$`R=}?I?@!SCVeUEc~6d>n=p>(I`TF)U_6Oqy%jW4LFcslTE0sj|YFZU&G#a;|q0*l;3piPEZHnyF< z(vU`PAKSk?@dTvAZ6pHp9siwpx`{970NP3os=- zV(Om5JtatI6S>WGcF`J4^KgZYBDTt7)N0Gm21fR>2P`FHq=*qJK0Wo#apsI)Xjrbv z>eC-XKpP?@ol$8OGVsI6tL*EufRA3&D;>DiSBOtj^CdBje0$gf{K6$~Nt@l;*wZz46S?^@@zGfajB8IeGKl z@JX0Fkr?7#W{51Gxi4)&Y&oWi+p=fj5kY9e<1UZl@wkBWD8716a?6R^{VpQA#C3TP z4(iGDT{8PS+YiN24##|Q1eMQ?iiJv=0Ss@{!#1o{=4G=x#FjxU76>?quP-vzIaktT z(uL(NUT+_W#BotYJ}!#@Q|%F?we5AVvfKIsS}KtacTzh={k{m|A=}5t^`x@hUSojN zw)uK|7amT@@a)hkG?#EGgm;M_ZRlKkr$V9{QrIFe+J>giHaSumPEFFA5?Zj^56D8q z&K27mYwMzz?{haNn#ZdxR!-z_%Fr>i><3dJ^EDp2$&<`A*yv%IXDi$NvF(Dck7eVM zgkB{Z1iKgV`_LV1KcL$Hew=P6g9%t7J#+c! zzC*&YP;R?l!x{5=Nz@}L^aA1>$RHVY!>8=cdGLs}qg5D6Ttqy?<~dKxg%k6=cNVuD zoRr&GjqO8F#2!zpwEHDcdGN3w&@QF#(ESSr4>Z0haSS9+^$A5UEqh#%Rq>u_j4m7Db}C;d(r#F=~g^W zNe+JQkMuda(SirRtcn|oQ}#bJh_(V1X@5vtL3E#wpN}OhRgY{44JkqQdVBN*2FjN% zak;tU!{jA&*4bYoWoqO?XI7lIZwx5HyWvouo+FwSl|CtfGC2tZmgK)fB`R9i$AzNoO`s&XeAe zJA@(x?FTlXY$s@ex{fOHbrzexonu*?RW4;&*{4i9pBW_lS(;V198P^seA{mFr*dCP z{L!Tqo*OIYV}?0Z(kzDR+nCnrE*x59ajHaU&Owhg|JR;(`dmYxNKAZD-Q$r+^#>SQ zj?(ZA3+c02y-Q3f0u{QmzT*yM23FUD!|X~jsO|fd-e?3Gc$+kQAX@j*WIg##?%4JI zOIuQ9k&c>)mG`W{#CsLhVe%yV<3~)|*cvFd;&)H9* zjt2#9Me5$mI|MA96~Qh+*U<~h3u;DVpfhRq!?UDIrekPN0#6um;Oz$MS{r)ISSxmH zMsscGXYKG}Fq<5^%zfXRo9}Wb+xckRzP-7M@lA^rni4x`CpU zi_4)<=akp_wDC0MlQSEC4KV(_=Ye7~rd~#L!SshXh2joe=@w4ujoPaItu2R6kOfdrV756IkAP^ z7Xds-L5;BMeM5PM*+R~>2%V90t}dz<#5bK63k1aDrLUhh7=BtXoV>}=iEeBvmX><| zUNDO=oL994v2lS4ysM)mC1V)3og22X$`_&Nd5*qc z0zo(7YeN+~^e_NqIVN#DAfctY50JMaMc{i~o(_)Tj^wRTxIwv5 zh||%DT;(dU9-je>3bfGk={{@6~m3c*-PfL2{X`Ruiz` zGny%sNa`e&``u6^nq$_M5%9tT?>(0N6r1l>ffenLf>Mp_N3h4n?i;Qg2K@;w3_KFc zlh`RO12O6c2du}t!r+XbCOFni5(A;AzORVQ_8hOMJs<+$Tj)B;hSQTN4Uh9v;A8hy zwG9g03_J(BD)Aj!0M1{#!?&?uQn3Oy!u<#C@n_`KJ}@h14h+okk8@$Bsfh9D;g=4_ znikV{g#u=oDIUe#Zt-+5Owj=l-U$uTx2_lxs<@_ms5P=^}P3}&SI@IUJOQ#7~5^-gRyOk^|ZCH1(>qOYnOQjSz4_raivy)f*16)>6bfcq=AU} z$@2vOgqM?7*m6?lXynF`z&H?&N!kIqiw@9m!%N)h!n5?Isx)E?ry$t_Z$m9Ei zipi&mjD$Y&{{7X1-TJUc)EKt?YRz%UYaRDHoD!W1@v6zXd4W_z4flkh>Q1vNsthWZ ztDkGHOZb!dD=MqG-9mNb9vhl}=De16IE!VtE7ophPU+ORm3Aan{`PGxW@ND}j;>sf z(bZ>QeKG>UP}vR4ZV}uhFn(uDuTwnmy-{9km)uh#?`xqd2oD0ufFR-o6{Jb1Hh7uh zRSPmBN1Cve`eks*&df5OABwT^7IqMEPneBjRtw*XdGx>IzCoG8oiC}>D9MzzE?`FU zkexUxp-T`lFMZtH*d`Rtd`^IuE`K@~$~YCm-u5!_rFzBT{y@BZgFJzCo2Mt{V)G#$E@8R)BWcQL$N0)eE=s=UGmG0H$de97 zCpk6yrxZ}OqK4qLmVH&)Gi!8?cLU91;}@&NcT;@AVn!0R`eI}Cc0!+x0ti<>;Jsi- z?F-<%ZXm+mc`or_+hJIbTi8*`)_k};Ub*YBEuKAbELF%)B5oMg5HEViLZk-IjT=$C z9N%fmq~krJ+t_;wwTk9msP_EzafnyP?E4+q$!H> zq4|WurKKs|W%@l}E<{ty??`(?Nd5Wc{E6l<)3#4;Ln#*lEjhK)>?!DKg_u{ZjXrPk zTV7~j(Dz~9?9g%5+f4J~>N*KOgAaQgKE`IVMe|~1#V>xPzv+pZeZ?rCUE56%IbA{_ zHESZyGi4;t(n!2VdSJIp2>I*qXY%3f`HVi^1UVt$qmmujw~!$cTX29GbA zm{aw<<)o&p=eo&)<}@;%D{KUv*=^?iX{v@vX^+D#hh#2}gzU{R91i(+{36yItezqW zd-#^kUwVNotwqb>+8j_4ks7n1tHL%)Owu-|7-d zql;V*!FzA9S5KuH%A$Jy6bj9&0!6nR41q#^Vwl48D>(f1~i>Lv)4VpOmySJN0BhTwbC;qu+Tk(91a{c`2yIeZSeg5&7dg>(#;P@6|^6mRoR+YA8*>PvE=E?1mNRF8~d3UD+3Fuhi@Dlx2p;<-Y7T8 zagbbLw@{ySNmSX?ttI3DaoL|Z-?0p@T^A?B5stzuCvZ5U)7a#ylQ*d^JP#znaNKB7 zW4JFnsvaC>`M3Ej(-;p^NysL)=ow*jF5em%HA^uH3`-Yh7BZ%E zZn#Tj=TZUK+N02q$L2Y|C?W-@GUUc|Ml+0xNF>f#c74wa>g>K@l8H3w0WEQ~T23QdPnr@- zySp5Wm^pVT$FCi0JbE{(9Xx>b(L!&*XB5 zoKx{~^3l7&kCwPi3<=Gq#wY6m1mCxB9uxI})D8E8NRZfjmENlTk}r!Pyv7z=cph(3 z*rUN<(?rEtb&Z>*#|8uVhCNxLH^=2OA;U%tZ;S=F{{3G7E(&wN7@uZRH_X!Y6gj|kmbp|Rw! zTN>$*o2w|$f))&aUeakN1L>6ljOLn`FaemTF!$5s`?;^!flfe-m5#;SHu&^+PpL!0 zr{oJB8@?Y^Kw}U_cOF67z{ek-SHK zzm&DT6ROu;+{7MlRg35$;~6i#ewjF3-H#IYl(I{H95=gEh)eF~JJZHu;tpgYrlVhO z&fFxwZT>nK=2LuKe+TC1)QJG(LJr1j*O&b$>KFwov^@2Y&T47IIGgqPK!#YqtkdSL zsa>oW)xUq@BPaE`Q+P0Gi&Z~ z4K!P5z-wQukU; zQDK0b4!+GPxmJ|=Fw`oNC7BZ_pUoXEarTuvhWvJ+w^EDV_14}KO{s5UMm?y#k}(A* zd@gufcl+$UXCM+2cT?eH^U%PyJAE>>_3-Yp7Byg+2AVi~f-;#yf1JtvKx}z9Grr0! z%dowo=RbNgTFmWx?*z=iqCbdaY6=a%je>qaX;Acj*K{)u%vCf0EtJJHljUIe9rM_L z3n_1Sj&qP_)393EO-+hJY4rcY-a9`>{snQr8{5vtwr$%^Hr`BZXJcCvV}p&Yjcwbu zv$1*S`=ILHTes@|1J6%0HB&S5ne#cPPoH;pzdENGo=!0q4vPBD8w#Ii&N2o6bq;~U zhk9Qjmh(`)+XoOO^@q|-FjnUHy5ei)u%i8v+Ka%_>lN}`yEKqUKMh|YbN+e>W1f0; zv8r2i&WXE|^KW5GI{rR9Q24dbKFrkS0UyDZgXl+jt zM_as%-NltI}8&BHuu!ddQk%egxBNwiwic)Wqo@SBT_+gQN1>uyHOY$ zn>OQ55~!R}PR43uzcPqoNGs&!yUXTqT@!M(QL=dbSB;CVJH~z@=`1=-fw?k)R~wVF zMuTZ(F|#_JI5xMJU2<<+v-dxX3H}MZ#?5CZp+Wd7mK_IlvD-OrX?%01K{yj!(=M&# zhjmMJ8AhDP(YD0U-A5rr0_Qzn=c4|fu#*qCr=l5@9l{1SuL^N)Aq*f(JExJ@MH_3* zsxe1WD-_UWRUE3-Yc zBAd~Cf3Dj0gcAdH^!Bw>n0W7>7jr`nFW2{rb~~|$SRNr2n2JcK! z3`_X|@uo+=qXfMh47Z+NP$-(usnz2D65E*tx802AC~dXB#_oCe7%K_VMotO=&W8bivNA(1DQ=1itFkNo4YhmhJTjk^;jPB&r5LRjx>wh0hZ=L-uBi1D4aq;YZ z>QHP-a_8gekY}ZxPZNTa(PsV{WTX~fHKD0I$UJ~-(nz!M&snF zQQ6=|*)SCEbjiK8gH?xi2F>oiUh+X zt#m_>THtq~Ssz&&fVK)I7wnVyrb2!U4C(qJIhh@W*ro_O-B;8c#X;1(yOoptEwFal z9G!t>Ns6Yj^l>JPZ9b@thdw0Kmlbi7-wxOogaX!jMlA{)a#-mW@SWcoc1QAJLR$4X z7SO3DLpA(#UH~>|w%gw{Tt32$hmHF_t6lX3;=T5r5ZguppuAL9ra~Y>v(qsRDQMW* zNLB?c;3cjH471)XA2CP4W_Q5`FEk>ECH12u>|n*Yz4Nl1l&W8UJdG3H zR^N>;e|9LnGHN}WWKFXHFi5|Uqc`&cCi788c;U@3Am!pg^6TlQOEoU|Vt4@b9DsPM z#fx%*W){0HJ+$>g^`|yb`YfDwG#Bt7D8IU9jYgDT3JKu9_QI59p|D65tPuJf zkYw@su6w#T0^HN1mE>EA6u?#&DbB(#z0vl6Rw+K(YI?Jt7*^{P$B=?lcTQJqB=eLFI9VANLp+gNB+}%fG!j+$RyFVZ9r1@oTp!Mk zM?)yL#kYnXoo?E)T}5Hg*59i4V%V^hY0PZ(YG~H9plkZYv)rb@mbvnAvd~oi!tYW) zrl>4u#7SLdSvEhE#a+)=MCd)pd3l`Ge$1c&&50lWb?l3cc({aNC&1FedHW-ST@b(7 z?LtLR#yO|HhlV#Phjr7&O7P=JCUZ%;n0Zze{+($)jPQ{?+E;kA_$aV@Opo-0?m25x zich9{GJ5k%+iPCO^;fHFr(dq34e(ay26I-NSMz0N0(lGi0ccQ=hw7$^X{`|`SqOgN zoZebV4a~p_AzwIa&lk0l97o{WMf>hI$e-Ydkwc}TbaA|OzU9%y{%+I2HNC{?O7@U^ zK#CQeku(z3T}+saX`nWwazvk4W)D}4eA=F5G#c}Tb?FpszyVj*I}Oq7iR@O?iVbn>UE((c+8%>{{{|jtP1YXP(aMlXWzkp*SWCt)6j}2VUQs zsK&$){m57qlQVVndzRrVYhE-AMfk}KDfeG(72K996CU_tSU?{(kv9OaB-Q)(Kq&L~ z0to_=w)s^WR@(cC8hsu+}S3cKrTL z$fwBoXZMTY3-5%ZRKNRD4%yeV^Cp8vi+$9g@p3BlG)Iakt>S;5@LRnL?^a(OCWpMo zBA91oh_J5qEhf#@XfR5m`n<7TDU+6@IOaq#+E}YeH$=%mss^t#f3MLA)O7v}PTBF% z(%Lg3W!&z|7-z85Kqy#aE}W7U!uJmpmO{f;?%sUbPv8#G7$oflx z94Y7#ZGHIha_~{?WJl`#y=z(@roer0j&EO^MJOU_ zeD70g<>kwDT90KUszU7TQ%hnNtCsD-kxW zmkm-b12ltaw|%P#!Osc68mWVJ&#woI2*~=@Z<)r!)t6G7rB+P*qw#rm;_)Z`&fH77 zKHG8C_#oYP9LrynZjUUacJW(dBXZ6FKJgoInSDG5pT>l|##T(J9N5LfKuIq71V22I zMWuPhf+s&!ynP!?6MVg`*~ZNl-%k%QJ=x~l8=s@vKmR7zN77K4g&9?MxGV}UOHg!A zPI4vANR1aoVP!CCXot?EWt+`gf7&ESLG`1GwZb!5fp}rHmTo?+&D|m@^=Qt2htWJ`g^hwhUBg*66ZdqFN7oTDSlx;@yqX z*I$hIVxe=pjW*{3&wfxl1H5Qtfb9OLw3eCiN0t9<;~++v{BElrIp#h;8>%5md^tE$ z=DwroIp{-N1*+zB(Lf!y%ceF_`A-a)^fB{^DdA!Bs)+%=Fj{?NFY@I%oD>p`C_uT) zia)01u-Rzo50i1tz)E69VF!9iqsV9(^EQXJJ}ufoJ0mD*8oLeu1yY(;EsSwlY{Cvl>qYDh(y5 z2&>4oxm63c@(%Kmm$#%KgkCz5EJ-gUDv|5V+XY|ySRxqLx;Oq!)?{J=TwooVU#;?} zT;-$@T-IQCKtcPAA8@Ruz>oA{b>?txLU;7Irhsr{DYHuDv~r{j$ZoRmm!8GLy6Pd; zyZypKbJL|r%P7qUv^!4+!3wqpCnw=8w$Na$r^LvNi1*iCI=y%4Jvo> zy6>xAVl1a$Nm0<67X2BJUdWZnA=7Rsc*XHD-nBiGJ(~kb8!NUrQ^b#kH#PDf(-E#I z!ej+0RZj-{J--^&*&7O#OD{Jtw6m6)R^8Vu8~Ss+O0o$j#1-AiB9WV3!ep{whmRD9 zuS(A?4LBdFDF^Pi=LO#VKgU!tJMnWUAToY#GKC*^AiKRy_EP_=`(qS-xSGnqwRt-3 zF?97#^THJKx~0kW5qI)rIV<2X^0u_TJbaKBSWHe6H_fk1(>-C)G1=t7QSnFPDq#tA zLBgJS46jlO2OS%GHa6dFP&dK&AdY}cn{bmk36ATm5>NAxp8ASi^84hQRv7&3pQF8- zrmtv8J=sqC>aGfpT!65Y2@K4KBZEP*m!-AhtiP+RH4$K)u1Eys;LpoV;8(4#^ONAB ztt>})@*XSwOOu#$&`3_cR!z?cDU~eu`Uvj<_$h)`I+NVIt^a!z62u6igpx=kF`I8c zV@~21zvUqilvlt3il}fPq=KH|%k~iaJ*|%!by*o~UljKKH3gbJ(~>pw*~0siH2~7&#FLJ@j|Gf;Cl98|6`=5mthOQ`)5kC!2GkU z<55umLD@{@dRBha-LMeZSrb zbFFsWARu~SjQ^6(;|w=z|0A$lul57{VL6eFdq!5+cN1Q92QD_D!lm>&(3)6UZA_PM zg`oYAC-z6?cqfnojuuPIa>&mM@sdc+uMpt*QtXb56{XAh&imuK2 zHlh|Dk8XhQDG4ea*4K|yvs_WUAVM;-MZP|vorsH~ z9oMd4RQ_?37BKh0oC7H6M#J(GjAL_ zJaBC;#UEcxWnVCka?aFQ1Mt#{FSn^{R(KSu9x5R)oP3*mRGY`=7mI7&UZS5xj}ITW zwXT#KW-3NCNobqi6^H2<^rsk(;y@!|r&Sv~owgbBwiB8|^)=6843(rWCG4p*&)QOe z#h0(C6xpjO1HQQJVL{`=hlFi~DI*q1<*mKW%@#)90EHCi`xKahoz7w@xqJC2qltov8myEiA$h$hch#n`eJKkb%WWhTU5 zI2n1g`i0-HKF|iiGY5B;j_pV3&cL6E9p!dKZjGfK?8(c&>p_7nmY_}!`YxqVzADo4 zi7S|X0?N}f>#qDC(L~jr=C{LIYTR$-5R7w$_)qvB^MwJu8)UOT#|+c_yVx&W3d(7} zS19W___}20@XiL|#Jo;@TGqSFR{GuFtLoBST2qp`hpBU|M2%J?dUpXG zhkhG2!_fCj`cKl-1Tneb@=+Y;`M2*;(}|cK~aS*BeTn+DNwn8Q3kcw zPEiM$7G0_B@3`uT*bqVm=0v7|OP&SUg;M^x?pbP++rI`vY$a7!`LIG~V+Z3q+1w{h zGS$V8u#RS^)1xvM{5_ruaDHR|V=v~I(uCj*DuVErpw02EI4Hq}@=u>#E_s)R)yq|(7l&hKKELEwOzWF%<8s<& zu|Dgj_LVAy3{s?b_Cgi`~HiCJ;%@e0w(R2z~|McQm3n_Ok1?mvBZO$oB3ns zaQ8#e^5+*&6@|*m5lfBLZnnMw<@VBF%@R{3Ko}xiGt?dH6v0J`QD;TP-A@4EHARN7 z*2G75QOK*Rae9FtIDUQ)=SShynAKl`ZSfS0(}66wP}?A%&aIBHq!S-w6B<9-y5T9_ z$||qo2&zpOYQ+395=C9WOnq>^i=FE)moy(23Z*g;JX3@E#-0_|Ocbdv$=9A7s@Uvi zEB8X^v%h}NlH^1ui;Q}w*u*J)PVy@ww~F8^{!5o@CG*>#U$Tgw zp(ANO$P>=Mkq9q7k6AI&6~1mUyF?3$GXs_sl3g#UWm!{ zarDd3ifTM3WL_9FK6z=Gq0RbGyq7U>If%u5wCkt_X$7c=Nz!He=DpyDWQj#rE0vvs zO$t-Rc*(`<)a_XlX?!agh7pVIMlFiLckbMPWzFrcC2>T$4#~8{TW>@}?6Ny9G+}YT)D^8|MGJ4Hccy)^auLagKItAFE-S7ttGw^-snqQe# zNz_c)b5RpTnpR)As#>2ELK`7#xhs4X>un2uk~_-iGn+V3bc;BrQi{{2;PoIH=ivLd zw3p7HI$mM_GBN;|2{n*y&KF^lE0}pgry|3HZzD$aqt*wS6`T+y`Q`?KBv(dj#erUdq zdS9;awe=hyD-Rl`G*c>gW`o`ORziogLKe#JjMAlGLU-Gq9820na zLW_mU^Wpl}7ilN6j+*wrg&#qUF`*%NL71p6NGi;0dxS$1-^F~11e-HEevWvXHzcrG zas7y#Fx!IUD_0VHVX=vi{k>G>pi8lBsR<3LDKn{{Qy0XTyef@E{Gd2@%|JSjEdNv3 zDxCcO>2*^wV*`@o_yK>ZLK~SXQc}Whvstsd_vg{tU6qZ~$!gnz7 zeoe|31yXdq)J(cD3qSgpyu2@Ki76YO?mS^( ze0jrU7ql||vnkN^JftZkA>>uRP4K*!6V8HJdUcz>%{H~OOn$9qXP3b6rNl%yTA`nh z{}>^SQl=&C@8b?Dp+L-?y7I}aqX9MjPO&TW>In5a+H?9L1G!Ui(;kp_=A z^t!~?6I*!zee+_wx(bxhH+qsO^s2bdG3G^cgQ^|x{Faz_Ln@xkI11h3FY0`Y!ApMT z{ctLB={?_B`L^NN*&hO4$)Hlg+p(Q(-*-Cka-Bj@Xg-UHlr5Vg7fa^zVk9w_^l(}A zsCaooemkFNn>|a*UrbZM!k7 zZ+po%??>;!(^K3u`Z}0q5S;V(pawV)8qVyL+uBQ)cNL&^%bw!50@yx?d7mQELr6_b zv>l_CtoXR+Trc-f?a3&vh9BPAVwj{-hRT9DRDP}EpjDS5aVYMeqNNO z)ju&sRVo|g3<7xs6$Dx!q+;+(e|MafE4PewCVhyZlPtVEaw4Uht$xztp)xjwf)@2z zgW}hsLD#@M=h!0I0znKYoyh-hNqa#A3jB{e#8m2n0#bS>cFbwHde@O!1tqiE*^3`r zTyW;MmRUXZn?s`V-1;J`t9ouRDER0?14dfWOZbh4^1x=Lw%LypsH{xZ{7*B?0>g^7 zO15oSqOh3Frad~#h@BH;_@DjeTmg6#RnTm)Z82iyy#LhDg9le^mKmvTilTs9{FL4P zhD)>x1*(W%NQKOL#)NPNiBf&dU(r^|qRU0H<7S8mf@j1+4x&dK+=k7J9l}N%GanasE|P( zg%Dl^ZIWZPJq(lbK!QHE5{=FYX}(_xw-pt5F=xy#lNUIyZ%W;QKaB;P)AtVOS6k<9 zbt$49%nDbDJ0`q7O{cfdMq2un&zxSc;)n?Jw9PX5^ulsM+0&DQ3_ME9OyHt&km7Jl zY}n|zMpq#=jE{yCUN|mFDZY2h z%?;iQ$eYkQp1WcFLQwnpc`10DzCjgv&_;fdF{^E$-R5Kz+h6kfmGf)uXc}Fq>lw&M z_U!e(&H06gOn9h-ze_hHoj`GF9(wE=?ng!)VV1h|d%{^|e(wN*j`T$~5h1L@M$1Yq z73(*L$}y<)5WrVrG*MegoZU80h5f9hibXCvmPXfYme@R(W+zINZsv! ze*6~i#ng87juCkm6uH79Q?h=(qFM(h_{@f{gNQj&_`x4Rng!!c59K91&aiYPa@cx zD?saU+V#CU-uWrpWr>dCnx34Hoer7rn)goItN@YYJ_p+gjxSQzKjvk2BiS|nfUxR~ zsGc=)Nem?ne2QMDAS8@cyi@Bp8J_J}6!k2fE;Jw-dm$Y-5?SK;pQ20$tyL>LMr!rM8d#I8v6a!J#EwGs&Os7*MbI5D1tr zL_mzr$pHLv&V&uWncnzb>D5k{5s}(FA_SyUOeHV-bV;Co601-;n%K6s7kpp)InXkZa>miBfQ9qH!$aXM`T>f9HP4`MefXwE&OW^rG>hf z`fq>vgIzy|Okbx(QI>^wpQN;b(IC(5_?lGjvF*tNQ(asY*Q~2#RJy+bs;GX=yF7gu z{&&ICU~U|BBmK6KuJLHT_@|r+0&^%g-Tqr{P0Nh?pc-od(bs<2>v0x3r>l&!>Jf+^ zX>}L*dDC)$t@}<(B7ZWP>;}Z6Nd&1P&S;J>NchQDJ^OL|OxsLN{~PM5(g0@}gd)ke zU>o$(p2+zIUM2`RCK~YchhXME;+;-2tiZFeVPsx90;9KQVY=GL|3)Q=Ad!<$2RXla zEY!*uwV~2ve!G&KEgkufSwlh{$PiqS-MaEW0XF|HkP|!zc0&^p{`>#+@_#5QOli=3 z=TSQN|DsosfOd}{&lR};4^op8=*%6pFTwPGCwTlX4%GkovH$0I<^7*w{9pK=|1&}U z|JIoXWgw`D$uWc9YCT}SMA@j#)oQBKHblgYoCUZj)QX z2D+v8XlffYZu`BJr4YCF)pWgDAOH6F+zCb@Ti319g{ZbbuC?BNB=<~Gc;r*|1IbQe^ck6_?`??Q-|FUJj)}+6$ zU1J&onWv}QuyY6WuBWGinb$^(6R7P-wC%zfmbSjr%^;3+)47B+q1!?_>rb-vkHy|# z80jvSXdGr_XQkhKnjX86)H$$C|1ti1gP?k?cSAv6q=QQ2dq3N^I@bA=@1SKbY&p6R zYC{HbAiNp`*ivTSbBNV(+t#L^^0!&7j%VQA3oU9!Hcb4Ah!Irw>AsD?Nt0vNnRgwz zlaKeNtT7b0-X2H(#dWpCDTwp(KWK1ye5j=cgmj{WAj3aL!Qy%{1L7Vom8nxZzkmqW zOR1o~Celq7HCryzf}p`Z`*mK06OBcgKD2)W!XgraF70f?Jgq6Uc_K&fhj?Ba=)oJC zr;$%a`0Kra?f!hZW@MZ}MenA4!R1GtsbsVLCO)UN#=Ginc3U@8T-A@}OB^Gg*-r1L zYf|1c&Z+kWb>-i`&dPY7tP9#|;stIa*e;sZ?O$#+HXlKdeqT@v9rQuHCR^Qi-L99T z?*_|G!-P1z5`2Ng&S`@<;v@4#q_0c{ zZ5yDE@Tm^R5q{-%-UTF;^Sxb9O)*JINJ?T#4pv93@DCBS4-H@|aztk8{FyBsEumtS zEEux9pj=!*_rB<)cOPVOuOp3sS8JYlVt_$O;|ExnK)YvH_(A@lJPo)L(sd z91HqC_Y*&E`+q%GZh=T}5kmJAi?UtrS6jbTCqSb!DjtCb8c{mEZz<$bF(T-D=190K zB&$@(ty$rO?zmsh^PrKrF@wmF8i=!N-gK|1YKnR&#lpQ{KBS8w z6R?U9?N9`v!hJ!*Yl-b=4OBk;*SzgFCrh1=f88d@KM1e?YgQ6x)BCD3nlpX!H7C{$ zqxk6P%CI_vTG-O-U^BHiwT+gswQTbJ2X`6m)9S#+ifn5ghRfucXIvl!07uPG1ShJM7hv|w;DBH%8-0QCOs!hekvB!PI4*VP%G0yhH~%XV; zse5Mm4C<`pxu&vZ5>9ygfsKje(~+VLqBqBKEB%g>{Ag>8#8D(6P1Z8-PIVh56nocWj_YqjZ>pQttUb#$ zpoy6eBZh`X#adcr)kh1G#e)~v6Rg!cYk1ZzS$Bz2{INLDa=d&zL!hVna*uZhj0E2< z8XQ_dlh8c@%M(p3YqfcPW+q@>$-*Chlz?_JnxBN1cf$wiTTVsRGa1?~| zDjs0=D}xOcXZ?-M=3;QnA`Ep0xtkP!f>C!Af7yyN=$k=M@ zdzANpUvTr;d7k^_Y5kLHz9HYfYe?bh((MDMG0Tdt{g&3cxsct>Wd_jj`{dzXw`3aCilpVh_%h0{qfeD-4&2pOWpDd!<*f0w= zMHS0B=ufc5!%zN6=VmJ1-E}v`udo?j!juz@5uF>^py#;wZ4x#c)Nf4LxsMnw1{N9l z=C1@lW*qNP`hRPBB!N^Q#EECcAG8s9rQaBMF}y$$=R9K7iBAW2$BGhMxGfuSKTm{w z+vy3vWIZtO*i5MfcO`RWGDO{q3r6OnAyEAIeyMTmm;XeHMBuUEBmlu-?mF@A!e|N) zZ>=yOhbn#japj+j3u##4h)sPfk&i>*|9_4mSs-%Tnd8X^wOz=YoGDQ)DE ziGP(GR@GJAdB}Tz=EgWsA_h)NDk~V6f#5AbsprV-HQ@RDPpU|hGAQ=1E%GWcBENYv zQ*3vgR&f8T56ew^?#?xz>8wc`hOIi0u$4QgHVgM3RX1yCnf`z6_k#qxh-R0+q!2G#W9Ezf%;@F8IN5>mIv9N-`{$_v<=)Axz=riIUGS=#GW|?A^KJaE0?GCd0uvmee9a&SPMqAdKu z@l{Xd?_Mp0k{g``Ul+s#z~yAR2YCenxuCO-fP#JJgI4i2!Xx!VY2g}y=T4yT*UPjx z<=*m@-xL4dqcZ=$zh>-za6JiA^{mUxC;{(=WV)W@Y7Z&(;xj6+COty)R{~$8Zj^va z*m43fh+RZ^=1z{NZ_H3vBwc*F-#U;>sW%wj-KTs(#?G;?wVM> z@vvgZyl!Z(UX1h>V}f9QS)={N!3Hn?6K=i4M`3ZBjiK!sFXPUBL!_IL;wULSNAnT% zW7)R99Yt7ig^_I>PAuWu&iDp9ant+W_l8m<34Uyf|E7rXB|6R17x=L~b7vbQ1xq}d zaVuCgLf}#iy>K6I%gxIz*p%{^D3bc#3!??ba@cqKh=Crt*yP_NWHT_?c&U;Uf@H-$ zvV1b$lwp{E547K_gQ{`H_pe&^k>90?+oK1;DgN!W*Uv!v*NdN`0I|)h2qY*8)YNkgwE%AH(a5rrnV0rfIsS>Ma$n|W0okhW+4iet0S%fMJ({Hg8|>s z=R<>`gGm8xO3(*iFher&n8XnX&Ny0r4RU2e#d+=y03>zbPl+gN@cDS4W;OsG{4YQe z`WdtyG^YS5$g_g2G4%A)$qtjLPlIuE>N6eo3h>B*LacUvICpDzO zWQlMR!!>=EDF^FjcTIsJF9YSPTf9ia5r1x&s5^MJz62R~cL=pTd^Z13+G-k}ZC3oe zK}tf|Zu$QCf_Ou6)puYoLU^*Jg0rmOA;={iG}QQN;f>|IzDjE9V_=?1!Mce(PS0h; zBtHNt|9u2_J>t!H6=%0;AwwQbcq>ey*z!~2?(E~NZd%n@uy*ffuT{|K!O_Ncj(w)X z8h)Ir(P5j#`RC(;22=B0InsB;5&OTck6~$9$okBJsnNOFYwh0VC7SQ^9K=nW=m`Ok zZRlYB!|ijM^)=|}Abvk$2<9b&goVUAz#rtHV`LC~(OA@gomur4I^nXZfxDD5><;D1 ziuKIyozvHJ0D(ji<|V#e4N=@cfleLX5lAzyo_>>CE-rCXWAv04>kY&)*+|k-6bKk( z3S0iB67P_udBLy=eWp+4-fy;R>>@lJphLq%OFew>;?As0xk!x;SX?wGs2haYg|96( zQxt-9AgwM5j%&u4E%sy>c*7*Au&^M5WvclG=QF!nao5dj`ppn4dA@kd=B#l-xQiDL6e*&NKz77(xKF>X&!9OA6wRM|xO8e43l1I__zmCcAP4=fzhGcW zk(Dh@8=~fYcngt+*y#Tg#$80{OP+T4v;`ct7Oc!u`}qx1aV|u z3W2s#lo2G`dDK@aTku>Jb5?K%8q=|U6k(qsJPSv@DS?jxaFp-iBk8DmK))bg0wtc^ zkc01-$VHzYqso5h)_+7$yU1AT(80zjm&j2S0u2N5l6(|-5*H~2qTbg~$5DyQgMc(Y zGfdFM2H!$2fIc@rYo0Ylry`8#4L$D~mN2ez*v!Q)9onBrp1`u?oZ&X!8r(0O<~r4< z{9Nfo;k(z{`29S4<*%BLVmc7>!QMC%Hg1v~uz5+R$4u`m{JJM&-f71f7T&|(N^Dzw znvB1Jg8v>drTmVa_S?AW$TcMU{o*jqf)iK%vu)>qq$LA7?=2?wAkL8^$2|k}oXQUiPqFGGQzvj;KeIe|>DjD#V3+u)~KlL1`8tK^QtjU3+opGRhmC<#@c0 zBaou?Z92-hu=eh*MrFfZ{I4ekvz(^i!Dnxt5*SStUnYSiDpHUpuW8p9L66G3hsg`G z&nYR)@j|aOM6_F+aRg-#BExM@B&<8~?1n%s)TSQV4Zz;ks9`U}H-h4)0z!`B1EFLX zVjq@pnTQCO?_@@5ZE6B_>^Kp@#*5#)q;y~tI-HC}fAqF8Hr%Du_ajBMvy;d>xdCGm z5QD%Cxyz-k>(G}Elb_3}yuS;+)cR92XRUy3DQ-OD4kX$N^B-Q1qXx-Et&*0XJS-bo zEJDyhOxsz8S&qm%kpoV!0@ST`=aY+ZdDy5#g7A$9t{heYI>0nd^>3&>>@~b zKJsZLh-!&p!`d;WxRrjC5>pB8h8hYB5Zntb#<)4B<7Ig|ne^9!UJ~ydRHY z66YV9ODs6bmPN^|2r4&6b-jm@3h6=>{HwvNbb>ui~soxDy(U*k-n%oUDA ztZ@haS3MRij-sHqe#9UeEZKQwgHmraI@rymgI`kCNaRJ^Shs5m%r_pWb)1UIWJ1Rq zzu8z4$Lo}m=;&0uTlGrs1#+&NOvkk7$NRcZ-D-yqt zbECVS5bE#+#4^uP&!u1#A(;~iR>hEYOjB#qw^arff91Aef8pi(i*QEy`>E_&Nsm*o1#gB6vqFpYmpod zP>tVDn6Eva7HXH>r_S>qeEnyo5=68~@&;zGE`h$uJso1-zEDdNX)OuH(dTzeGFIQJH3Lz@vc~A2qVT~X&i!&p!_sdy;jBRCiF&Cr)(eSjK1Gu6$5ul)-gNfe*MqE-4 z+5e)yg8x&`5#|ihLv28{KL?%u6@kJn`TILQw+@*olnQ-Jid5&Kzk9lMXTv zXK4r|r}9KsXoDk&{up~k)lM@*pP>U%sb_fZ!N?he_Kfy)#Yoc+mjmkZ2qlW*)loSj zeFE8ki{8s_l{sql`rqa5&LFsC;B?jAQQU9MLs>aVyDUU>CqZoT->*}K12 zwn}`YOi$0`=sCL$(CRl?C$PvcDo&g9)A ziPpO_NbPnH&5@&A`5l)p7{HX7=c%*Lz)T5K-TyI<$aa`LwcCC?YJwa5{)Tp|K%E29 zFp3O(2_&U5@42Fp1fJ;z-vdo8Qq+k%FtJ^Cv|)~g8A4&z=UZ515G5!fBS}M8SS;e$ zgPoG0p#RetqH2>MMIMQPl`+j zB+MsTCE%v34;}`8>qUc5+O#ANO=1Wc7roYs|JMh-&=124y?i0a zGmOT>m>N=NNZ)){M1QLWmuH$pDv5}lEex;Tc^LuK6A>RduW_9oF^C*KAKSD3U)c8y z_PTXD2xhc7?qbfU=`14^Xu&{F{)A&_L|oJ@23L5)m(m}JPl@3n!!g=BphFdNAma)C zL4e3wbh{gw;0)e#q@`#&t(H#>pu6@V^&ogal7tj!4;=N zgIJ*OflRwhJ%nxjc)w=91r4UGy4?)|qg%y&m65+lSqd`4>hn^b6kpT+7*g3@KjVj)`Bi>wcdNx%6Ft|v_4p+ufTVz8VGyq* z?zfJ|7=$_~v}i%lK=D7%;UOY{UlwO%g3VbVTeM6bU@_%x59)TvyXAZ#NW^yd-Jye( zNdm>D57bV#6PX}oMM&3pO4w6qbSx@acPvnSpbzpO__zC7q|)9s1~ytfZy1dY@-Dke zs|H!vwcE)|zU)_q`GvHMB{VXYEK;zGB%o_Jj(R9Y@C_6Ao0OKdu#d0rGR!q*5lpAw zq8~pW-o!lJ`FZD@Z8EM4^~ihN_VHoWj`b_#rlI(^3IbKgo%i=2sWhmLXmNX2MVXW~ z*8*v}<{28nURU%lY}XTL!MOY=5GZh*h!`k%C|pDKfBCQFR(Er5|K82rbf8%VALq7l zl<~cU$mIlr&h5z_?2A->hk=NOeCW7zCLIp~8KbW85%`vlQ1gQIQ4~5qC&AGnHp$0= z$4b{6;TD)Q;QqE=Qw>$z1*49SibZ@xa+1Q6`!RO+Fp4wNmk5GM9C8#)-Y18@V=CNj zdl)nZmVKHY=iIGmXlaHNTr8`o81096j5d+ zPH_2P?P@WOmBjak(h-Hf&<{8x(8WJht#!=f2fl>|NsChoS<{4A9qcSWTx|<~B|BEl z?SICXZX*SEUHaLd^rJpwuZLG7fT1 zatG8*oLRC1R+A#B4mpNomXZ8N4ZLoiOI~(}xJ@EY%`D1f>!Xg2;(9T&#i1S8up)gmo>=9Koz@cqAoUCgWBW4v!DB@gM_Jp17jMbVV)r(0STwI zJ7U2qAU$)H!7#exSN2pl!*&Zumfn;68NABOl0O-Ra)DY=KT4G~(bcPDA2{k$2&u;M zElCqj0P$dI=S8~T`l(k2xk}BwcJvnJ5*#Y$xP_P+Ky-9~C7*_d^PC_O!h?ShZ?++N ziox%i43mz;usR>2fm~?2Q+HrwO20=J6SSm5-^+*ZTo6_u0f!Zh4JWG!kH3q){q^~T zwkFpNwIMgBjF|1EJ{JUypk?^!!=Cg7g`&z^H)+TGKx!87080@@z*_vUIqiZY#OkY_ z^X{UP)=SM?P19}iWAbPm;9si*lAo=}y8A(j5y4->eXa4dR|sIm{Bx}pzsk|siAxqP z+C9{qppsqLc}`U{zYztq?B3{s_WyGBvEY(l{UfS*h~7ZA$W;}b2hNPrtQFF~7lW;K z-M&4A9rZ|FS1y6LX)>9g7Da|6jZKV3$osa4F4`AKb;E3V_yGwWqLt|9&oLRq1^?I6 z5*nP4%y3xiS7or2-T%~8MCN#l6kS*{Nga6ABU+Ox2_9BAIURF!Q#_D{z?d)=_+rS_ z*ON$oD)QoTF$=DTvU^#1D|3W-V5uY7*PVy3#aT_hOL{Z#-UpH_M^N#aN=JnGj%^&N zT4|>3oIhk%SpQ0NC^+XL935wPP8(&ZOzF@8!fnv5Fhb~xPkxqyNYSv?BqR~Z@b~N- zB+lU_f=AXx6M85E$RSN2ao~LbL)na{3^$eqy9uiGY0F!jx5p$p95pgHA#kX-(X>3& zw4b{A7!-Cn#3C1@vqLS^0lRO={fMC;@3<|4Vfeq;d#k9pvaM}6Na0R!D_nxRdvFa2 z?jGFT3MaU`28j?nxVr`o65I(E+~wPJpYF~%@6|uXf7v$-lB#0wy=tzt=A4f#LUO@( z=7Q#`#^GW7ufgdEWJ;?&76_%m6b&dl{U0(|90H0YdQH~PQ$H>HG!*z}R(_`T#4uie z4H=;yCE|8HpswDZsd(f{?C(FCwsAy;3Vj%B&}$5c`y68LK0j_{+JDRF4w#oB z=5^!W@C@xObR8x$l=+7DG=T`o`Jjzx5Kujm3oCVPzkZ*6O+ji~C+Y(~w51w&g7*b1 zkp=iRB!mH& z+{vQJD+geZgaWU4=W{2CBbR(T@L`1|#WGsvOhPQjN9}@$JhkWhRvwI}==p*1Nx{0G zJ{Y<@Gs0917BeD%LYsTB--@YZ$^tad%9;-ObAo-;imcVOYy9fIBV9&gFFzK1&FgM2 zjy08Se%LfWkn+5Os!TCOnx6bUTy8h)Qbf`MC70vivH`hryMPieus2@BU__xC3o&^|)Qc;yb!GKW-9!+}%|- zbBIf9H&=HCJF*Of_adLoNUqRt7QhkZmq+3*k{zDGB2dXJak*KE?jq4^th=gGX}t|3 z?4Mvr;agdv#Uay&CnYEC+>nPXs4!O2wJ|jR8uws462$JnoF*nGhCK*KP10iu*Pu8a z1QOF<_(SclSc1{LUQUEr<}ZqeGvEu6U#@*9_(;L0&3g3=apgFk323|~_&_-0R!;{@ zzVt0?P3c)Y4zY{GHqQsP9`$SxH;`W%G}$(Ehr}xTdfU8U==v1-9gj1xm(4VyGmN)r zRx1tZCn@renpZ$70W@impr}L3oJ#gfV7GjsdEtf)IUtYiFzCci{p7qjMZPvwtx(hi z!YYnZS1+$<_mv|y)56JhLCa}}tFFOj2#%pC@9VR(UaDLw``@TdP)n6y`e!yM5|jHp z?0{C+*(eF|+Sh$Sb-}OQ96!}&ImX||V8GNyi-OuUP$u9KhhgK^3o)smz&VqWVe@MZ zQyiECD7Nh#(2TyfZKWoRQnyx*vV;`51IY-Tfi6PtTmXkZHL@(3inBP3AdkA#iYOMm z7=pws8E2cx<`k=i-<(;S+XU&-()w?YJE`B6I+?Yu=kI?30d#9_aJ4KtLP zcd?s{x{ZM);I9>TkOPs1TUfL^0FT=~Fag15syyE#R}#+0tx@I@#a?9sU%#yKp0}x1 zJPA=Gr7$sT?G{ykUL}vAjYDeAj9K3Ks~za&hWS!)>;rue6u?q!iFjY9vIkd(3Y4)C zax$b=Y-U)0oNWFuB$81|9xcwGNZA2;ymK2B7UCfHBj-FEkJD;)@6d$Qu9M?QOxXB& z8mp0bYu;Uk6h9!>0AyW{Osk{!u0%7t29HAm#ry8(g)P&TrUr<$>HQ)zgnx8IKWIVA zp>TQck<`QT<3Xj|BnFa}WK`I4t8cKlPHR+;F9NM=h302D5}%s7Sy(@Qi{elJ{wnNh zP{Ckzp!Kep+B%`Sls*D-D$^IxEvjrx5o#D^8a<3c<~+=Xf&?E#n(zi{^tuPn0L4${ zBtv0py%EE>os;nd$%OW`_gJ17@AiQCLCUcw2A&GfQM^op^l~^pZCYU7vkf>jP^cOA zP#f`N?Lv~!#ca@5{NVSAH*Al^!PN-j%U#Y4o^qx)Jwer`{3DC}DgnUdZiinflSOGM0yt#tWlnp;T%j0KdI@@Sn^yvn zkDh6*Mp=A&&1Y~qZ!aQfN)e~=c!OQFP>BL%a5>B|%DCfNVMsJ&)XsZQ+SH3`*osM; zJ7_#qaSB!0oOOqMg`#k=Wlf+Ey!O^vz15xV{`G5%&+B@RVo<9Z zJ^=st32cSadj<)>R(pYPa+_k%MS-ve9mid-I|~lr4(4VR%5kY2v`MkgEt_D=66)j! zlj%<0nIm9aC+EX`1Q~@tga5GR4vG&Hc`qET@=a>r+Hq3iAXV^ojq zu$;ulkfuFq(h!%eK7T3D3YC3C#97rcqgL|sgUlv~zubqFjj0Jg9)L2Roul$($^an@ z48G=D3egb2koV(W?Fvn)F>YMgjNK=^E;!>?EF7*iXLE31-g-O$mA z?W+7^LgRRAH(=65)%Q}Egc7-)p`O`n{Z?q5K7pU`nfqJ^UWr|G#Y>YC2*fd9G>F=T zEG_O4woc>pD%<))bq(d#R>?~^Tie|wHKL||!&UGMNS^7dd02fYK&BRdE@3s-Q%~QZ zV_@C7y1B(8Y<(MHzS-kGW3ym0SJOE}PC@f+`71mkxZI-^@#EUycINbM?xNN8KKBc5 zM)qX|ZJ5+>4I^6lAMWyf8N+#*A!;UrI`IQ%0MEeIJETuKc_PeARfEgz>( z_Q%#~t9_KwTp(nRPlCDQIMN>&chB#XIfmnlQ!p%dg5*8kQaX2@Zzham0U`a@y#Uw}t^RVeh zR?~$o=W0g8RF4YZb_0uROg|P@tX<8x)Ey^vq8)~E$Ef(M9tAft=+IR+Netz=m%-0u z76YYkB%VVqdW>eDhRZKWcn#`uI2z7YC9y7$1F?Y4oQ$KD=e;0xUGoGIqKOV&o|N>T0atf z>WNn!o)546#n)e(RhILX`8cpkz-(>L-K+vBEyHwcmRBHJxSZjDLepm^e6Sp>$wr41 z$Dn(^yg^Jq=8y zeCuWh%FjTMT)9PuI9OjaA~v57w@&Y5HLdHy9H6+H?N@R zXC<@?*5YNTCFPHwz0c2!axe}%!CZV-T2<3F)n;ZV{pa+vkKA#80Za5e-XYCZAz43#kIcM1xy#Q0J*jOoG>Z2urq zYQNe=MOKQ^R4%CJ9w#i7aTRx!%UNPK$lf4w+G10;<^@Apfow|E?DQA2$(5=nrDI=qRtVopCPqS7CoL)I3!`#zs)sQE;4n0_T8YyAS|kgNVn))?Cc{Lw z0?lN##b^kw_6MChI~=wTn1AP3PZP;-8UeqD)p|kjGYRyUFJBI7jvN%RL=CP0ZYHf# zmL|O~)Vs7!usNH4q6!HBfBiG}_>rOB{<_l}qw)yG5I|5LM!)TD02LEbj>d}K>*d;)PN_Mvb z4+Do%f80yteYT_eku=A#mw-|_rupt<=yKL176JpGVvoy%_-1X0rA=@<%lYQ)XCnVG zKWW z;|33%-s$(?2uhKwovv760uiImLfOQh$idsWz@y5a5mmf?1mW%I-JE%z)9q2>YlF@~ zrH&SC;mbr(8pMkLEO*&Y8SC@Qd--!xcRRNCkGCb`qm#-aEfl{N0ioZZd|fw|{N28V zhMFEzE+1d3m^~##7>V-GNmErrYMnx7sl7=7C8+UKdd97+Ls0H zj=G+{%ai-l;^Ja@wPL~hv&kp*;*+{4f!2ZbiAjsMzY!yF7#^AIkI=WCq^6XvIO;ra zTQ^dtTL8zi)qtn(XWOlVKs;cMO{1{Urux3m!KJ}0Rp0)Ae6f*>hGRil6y@)+y&NlwZbo@GQCo8R5l(_l0K6h)x_rrUSb>5aUiI+r4 z*|xQF=56;Ek$7MKnPF5aj!!KoX>F3A#ip6~#Q=YS2TuS>rd7@v78LOh+0JbNpg2~x z@WBcohVkx*vfG9nZyn(fo{x$My*VAA&3%&Rou8ir@^s8Y>>KFG{9vjizP@n$j)*5^ z@xy8EW1cT-Wy6#3P9FB7G4MqC)?dCFQ&%282}o5rjTJw&w`*v>Ekb6l2T!+MtwoAl z12POiPYQ4g)GHI<08x4mpbO1K;S%{-n0VNFYnN3vTe{epHrgwE(am8HLuAmnIsdEm zao~e8kFNaz^(~8jW0CYWGbD`E3!%@WB-@SQI0|Q<{3rQ`?bTJ+e*22mP$Dd1M?j|S zzfQE=k3O3(q{O=m_n7j2?0Ab}`~KmwZQJps_0<+nTYBRf@D+H^=($(A{k&a%^xIWA zdGU+B98P>`glD<=uyK!Oxpg*5SZ&F=yhW~Uijxv8JQvT;$1*mrT|=Bo-|J_Q;k!wH zU>LA7IE}jz{4&D5jVk~>r?9ldGfe(YK!!*{80L?OfY88yx!{bbNMQ-8d`9`Ate&Dx zsfV|3Qsj1@qZ`u?)i@gT&zcIc!k}AmR$piTk);PM&-e$JeOs;Vjdi=HUoE zG)!F)ycccPBldDch6#u zVqh`+1cNS!Ax-UdWLqNQ{!btW@&a145_dh1RDJQRqVWR zyxy|3R7sT>qfC1E4{I-2T28$7hC7h6Ccac+su?Jz1z_VaDP(b8w}z4G7&Vw-5DvCU z3NDKGAO_EQ=fLKC_mD<7-xe=4;RS@gY8o4M>^$EV1RyZOyCpFcm8&007*5-&*y-BX zr@^8}N<`JiW({3an8G(<;u zd)V~L;Nc|oNs0KF?7tdHS6siF3V*L5qn;oXAp1~L8!$i?_%EO>? zrZ&M3!Oi(%5i2~w7g^tS5ES2S_d-jo^aYPmbw4*|c3bk?ev&CfO3Odr;l@)$3a2LY zmied3G)zIHV;g2~+|5bz-f9@md$VWk2TK)78gb3zL?L{xVBU2;^i%Ta!$3pD)mk;X zk&-@t0b>85`i*usYxNYgBIMZ?*~3v7XRj^T56T@>2`lsziO{8n6IRcUrIXOF$O>&fnU+4o|08i zd*Eqp6P31}8|E=@KV5Y%_KQ=N9KXYt6ePygJj;Ie5Be=|=vK>@ktLcRu%Hex_33WJ zk@(l}D@K56IA61M>MmviACl`U(Z>rFVv~|QTl6tl=6mp)-3MQc?orKJnNM-nejpP&-I?L=njE)NGH;s{peF2xFCD^cDe zO+Gu&J}40eYT~@d^X-onF*e0Pcuc4fBY*A=oUVh@b#)Vv%F)ISfLco7^*%em^HjBMTB!Y#(s=D zFDif03b#HI_c%iA5w`1zmui+ix@b&QE90}Jk`TNLAfrP^UCO@5uLESL<*bdQjs)~_ z)QtZ%JGh@_2Tl8K*28A~a7yMTsbA^&52C%Y7B&ut^u~{hu8A~X_fNYPPFZU7s-!Q6 zw$??%IZ}cx*586D;ylSWx%1dD92Mni;YmFV zQ}x`gznA;O4z<53|2LH9?A zhFj7>-z!YKmE{{D_fZ?R8ruj-r$xzu$gp$JwW0$Ypyv9H&Bo*Hm#L{XhLH2@mbU^e zP}YxoRYENMAQ5ETFbdqbKaeTGioEAqaGSR+J!a;}BA*pASdqMOm^BKcW>Q02B02qB zxcOdW*m6xb#3xRYIgf>vhsY;wD#C~Q9mHSD+`xec32k*X&MB6fsL-3P^4)E=`&`aR zV&Oex2n9hEFxXLQzHOE6^*_gv_CC+B&twX{$Z6AvBa-sv=g&F0#xqFhHj4f}ul#{P zxe~}(dUV&^SY97>(;XZakkcOHK1Y$2AwZASP0BSU{~nc1sL9fP$YjzRC2Kb)$}vHf zz{>TBv>Cdz0nCH+7OW<oq!M?_!-NCZ5%gINB*dB98wWU z^-E(1?tLCXKD?+Q6sVj*7|?v1!AE!P$)Y@u{Bku|q@}^-wy*i4Pqq7D18+x=>8Iy| zp6Dio_TqH3O6s5OAWshVZvL~J;R_?~%#k<*hnBB8eX*l0mwqG$salN>-6r!V!fqQ~ zj6(W6{vjnw;)E-|{9bh@KVWB-o&agL7lYfgnZU_oA&0hOBuxS(U6(<>lNaA`wDx3N z$Sy1mg`g9&sDjZwDJ%zGQ%$DTA73Hzl7B$lcYus`k>Al(HIY-q{b2H!5GKa)>ZidJ zc{q;k!dXwES;EA`CBG9`zRzRR*f2PeK0@3sen5R7&E^BVh}6Oo43<4^7dJEp?{RfF zr-1pjgY0A0H(0mqY2Ux{o$fM&r3C~hOOS*QUE{fK0D$M+CqBYJ!c9fEGnRMMj?TOC zOlf7Z9oWE`IST((N{i{C*Wfz?h1ta8O?9wveG~Ce8#0=lvNn>FDOm zbw!JGsfUNE=39L7Rp=I^d)X~p5N5iuL<+ngnWk;WQP5g|qy9$4G3>=pEMp2Qli3KE z>_FxHfZvm&26@p4qr(&X$K5ZF^}yQl_}$-orV%H_TIis3I`Ki%|D=3gglQbQEjvPZ z3Rd@0Q<2Zqj?zrXIkZx^tzBUy!@4X&qg|IySVW(Pes4}Yp*oGPyQKr!c#)SQ1+;i& z8Hat0I);GY#(O@cHs^Wx%m49K_;x?&vnU2^)0m#$^=2g-$QYxZn0%phM`|2wYx=+t zHAbq&S&aG?4eh^@XL7ux7sF9EWtzsv!1;6-F-1RPQ8^|qL9w-b(S_ouc&An z3D)F4UL77s^}SJ0u4lFL(b1JSk!Xe)0OK82t5i*#WYLPQjRM(e`S9Kv4xY6vQfOQV zR5HXBRbi#1Mvy%}?g#j52UR)ZFPh4iPucaT1>5>mVhofoBs>7H=@2H6juQ-FV)9_| z@Rygt8MwIK#E^<7TZ~%H+8Y*AAc4XoSwjB)Sf9WCaFN@}rpJ+T=GQ%bU54)(R_4 zM3fWAntu$+vwWqpsAQyQ_$XP!w^cowj875W@J2MME1&6fm-pzP*0e-Q_;NQ7<50T)V+QOp=Q;>ne;jo^gfnotEF5pPgL+gx#sdR%(YhAgA<4J=ue5(V24 zQuSBK58FJ!Jdx;CV6JXPUBKrDA*tE;^~q8t={qlV+K`LmWueOj?07ah5=n_XL7Hutk~R1L8+^d9BzqmP{4Xl?z?{>L`k zCD&im9HW#_rskhVhBy_Kys`Lc9v{r_xhFG+sj=Q=*$01A6(kdX78o>QuQ8BCE>C^ zhYW)g&|vnBX(tLaG@P9>D<3;x6i8!RWC$A9vaaHLS zy=uS%hZG8$%7B>LW>$*GHpymGUMvmEo*9js-|$2wY>*sLUfTT~lN;izmV&n@xbK;; z1||E#E5KndSPVuZ(7<@npm?z8%Y-Zj)R4p zbMH6K1vD_kN_SLo@qYQBy|y-G^RI7;FP-8;s!Ot_oQ98g&^9k`0cN2B7n)i~AE~#E zUtljw>s6qvs+$#+8`xF-ZqVRB%pebLIUt&9EnlVGU(^^p+jNF>gatvQ4>Ao$5l}DQ zRWm?z>nBsS#NHA?l%vJg-z~i>x1^I{l^v&QQ!Euz4Bs>kQRLBe{|N;~#uyLs+5tk#= zcERCN(G{6Fu5@4J$q>SH#_MDN2gRr!XvG~vA+#UHjac!t0@O_hh=Yhs{$;HH9i=N@ z!l*NX0R>llrVXxOG@iZ(WGZ>!CeZAa{40ZE=LuhJT`4hv{Dd#mfvuuQk+Wvau)$;7?c%Q!68yk|<2MNJXnZ9IvNN3(JKgY~S~*3j`f|peXYm_fWvfKf z&Hy&#T%G;0sjpvp6pE2L_oGTxsQEy7(a^rAR-;(CzO5|vRYkTWqAvvQAS1)P*T0bz zQXyp3A^VW~c(*-pykfqtw|-4YP?1CD`9U-N2#VX3eElcic2*DvkTJ13t)w1Q0N%%A{W|s8754z zHoMW47K=R2G+F+kKC#vTb^^mpC(f&lyeKwr%0%Kq~D&z1At!32*@dyv~pU`4RE^xIy8PTL1ZWDzAK%34_aCg$!R=lNwRQ@!b zLps;@LTf3Wy}TzQ&q+JfOxUqJaf6;wPR?&rY>mr^C3FKh*+!)zDx*D9o*$;RazoqW zq?@kiy8=iVFRaOmjjfjme`Cc#ww0=|kt2Hx)|%_E#~k9+?CVy-?iK*_YAKeuAQa;;%A|(Y28Q>k7rt5OQrFVC}>Ih`|Ro zS2Q;4O-^%2m_0VCR$!#m1ZS+M+^^xa(OF;%q$EwUx5GWZmp83;*Ur8?`GUk$yz*m)m2VFTz; zhV2#36sLwxVpFt&NFBQ|rQ<|G_F=L*;cyGBnNAn5Ml>bFT)J>|Y&xKe+U_=4Y|g8I zG$qxN3=K!YSRDPjA}#Rpc``%>eq!uZOcnA+O}=dRX1&`U!ophURbgD~w=KVo$vF@< zuVZaXs)t=DT7}d?d}g@=HJ@!!9h1on0`_L*O6;{9-*{n^^X|&3Nfv?LZs*SdQEM6q z;;cED+(JnqJq@knKzOQ>y4!~+vYx7=rw*w?OM*|%bFY4=C!0*bib$_G+evChHP!wa zGL#gDzk`2Gc+?~(k1~Xw^_IJ7cy+dP4R)5Ps7gQ%;~TaUHN}zd?fi0?M_7;;a|bC> z{;(IF@W6g-wZnLYD#!}7$8`mie`$bwXSSj~vR%7Yv2Otm_pD(M05GIoATXyI`0HaP(smBUbXayjkJSo8Bk<726G`0n$0KIlAU6*Ng z3~&H{ySy0h1mh4?A?5X+!Q;DAviIa@!dHe9vQ@r}@6_$Z5`mPnhFECLZL^5) z^fj#{!EY*vTdTUv-bO&Z31Kpqm_Tw%TA2aQv8`pU)z<%ag87{ipmzw>X8&OS1_K%V zLyLV0Gyz4nX44N%$T?e)8c64M%ChDjtYR^?$xBC+wt|rnchN-d9I$4pWA2{-h_=sW z%t?lup3-5p<2QQ?PPam!_2(%&b(#prnpOU7fmjm0G}Xs9dr2biVlGB5oa3Ki3IS2f zax1)Y3P2leG>Hf?{Ag}PjlsCRjrl+)KJktop2P*C5{`F!UvnS^%haFhCICM-rc4+N z9r#_DkrQl5mm?pJEhg)K16Uqj^@%u<2V(Mb!g4Cspl`@@VvjxVw~+0{WtWb7%PxZg z`zD{4>N0W_FQS*aOk5PZ$#qJ=hWIZpfD@CiTN&09QDs$EpC!G~0WI@i=>0Gh^ttm2 zp?(22mSG397FIfyq=8{h+?DATIwnc~qD&d=G|5q&-}Q@$&upT)XpLbT@e8!jml0@* zn>jDm(&Ln4e6DP?wanppL2N~f%1-0b=_%eLGtP@&XXs|HvM;4#$R58J4kSu9tMUdL zjaj{5X_Uzg+}57^j(C)^%1{lQVt+;+M%>xVuMOjfT9m!*BsJ0+TfeiRCTSq5B^tGE zptM203^=vM^6%2QpmwtdqRrCKm>M$mG0wf2bqO6K$C4@z1Zz@vOi=0P0$t|EcQ48e z$tB(fNxm5iSWWbS7$gIAaRz$_X6fg(mr^_%8gx6z`2^Bk^c{?NNY-?(G!UWC5a?Wj zG?Lq2WY_|2(a)vE#41S127k||c3rUH^Df;0VLX-rgQMY%#Bd0rgj3IHov<*B0M}6} zKW2|buCH6#bLw)U$z)y_)6iwWiuWjHOEY(_FNW2gxzCh-{zrTV+A5{)Jz$Myh;;=3 zPaW?K^I^|7>`WPXZFpbXyd}6CcrmS`TWrOcgpf)}*@b5i<9&Y46NLQy_Gq*Im}kig zFCXbkh+DR%+s~qDhX~2w?}$kI{SJ$+Gs$z9lFZu0haQ4>n`p7wAH7dPRR(ULo85J- z&jfPj^Vq@s&s_?GFq`c0 z{qyjK5&MupSpDm{D?~>#kNIJwgUxi`6!3YA(-NszGdFBOw0FnYN2L|IHY42TnHd?H z($OE{GrS8E1wAySu2veah;sdIegY+vGk~GN#)hOJn+C=`gQkt1d%eXG(PS>!bWlq) zzm7`4PF1h7;b+43auzE#r8}`4NOd=ZUvc~#EcWVu5ru{x7w%XbKL4EsI!iS-#&bWy zqBVmxe=)33`toqEyn2gWUcaf2 z;OK_5DA~pW>#HB9tk~A=L>Y}P0O0fh=m`4lP=1 zO&=Y9cq~kj$BOGEGpOmL&`piAx|?P!i%5Nv0c(Z(Ucj~(mpETTz;G6Ilk zR9kB(Lca3mHN4`3%}RV*<+AQk^ReMNeOupW{foP?qMuRw zt9zg@V&ZNd7U8s?aWRj8*s250m7I5Oqz&x9ph;PB_%L}s?mWxVSqt(2r&spnj@I>d z#dfz7!V6!m)<~!sc(q!OteIHUgqhgGAet zOe&xKoUM|CvPYU}A&!S;2@fIS#rc@L3g~`0y6XT(m@M10nN6(f$u3L(>HP{};|+K+ z->YL<179voJhZ;}iV*!4FXl>*wxZPCHiz7hg8K}HrvYUp@G)PzhzOxSEe6}HcCS@# zE8jk)rYI={5A2Fx=cBSHW!{FPeRvjpT{AD-2K9=hfp%c1eThv>T2xHn;c6WojW~QQ zAUM@uu8HgHo!;Auh)ewfHhZ?ba09vvxs#ZqAW=VfiiFM+3{DksD$Q4_oi;xuN~!bh zEqQz@q}r!iZx3}!VTu$zU;n-7O`$!BDjH^DYCdCyt4->;K1<%?A<7UBn)^BE<<&1* zYTIFJKH|U0uY;YEHczW-jE0hYt8ebpO}rD8`dbTyPRfv*I+X7?)vU5ihXq1N9$-=A zjC06EzV|%5Qu_Iasl~qMaFw`G8iO{`v*{c+(5${7tBnY!w7+)WDPAb|qz}jN?W^*J zF<9WUY(tL=)K#@P zKFs`xA-|5^rRhJoFYwtsA!sSK8tMLZz{=z$A{dtOiO<6Ik?p_Vq=o^oY1J0s1jzsE za!*v1o!uw*zZ;U8$G>j*ZvqQMNeoCb|NYo+WA^Wm{Qn;%P>`)@t&Vmr?94rFr)sCN z?Y{%?KLalc0v5T~80Ontt}{*NZJvzt{MBT_`|HEK8bB>ip16DIYCrYM!ME#0Zqc6F z2*d4pB4Rohi*@tbcQlc>nO4>1?PfdoR-LPEX^}xjPsh3;eR`i7z@<3jpR)3a*#;q` z9aC9fFOOeceo)#9T%E&{vS41$Z_rpj6Ju#JTx>EhM{5=EKD8T>MZ-fKEnq>}5mKW@ z)hEjod*5%qyIT^0o;1#wp}hykG(n?xxAQG@JaL!s#K&_D88CY-TcWpR@_acMc{zys zGgIK?AyhHdM%x^c{x$CPWP01h&!r3B{KH9Q@`BZCWe%dt+y~c(-bS{>T`wBa)7zzT z1OEv1-TVJDHfD$$p25jn(}(grtqW{u0pur6VLwr`<)Wv~NVqib`p??_@Udc@TDv0QhR2PU zFZO-qyIzg)bh)kU z&v1K^Hf(as+4J_13Pl_RNLCyo2)_BZT^F-tGzkbv}66@9gP<-ADf>&$cbqu4RdXZ3)EV@~1l>)V^2X!~iA$G3-{ zi-%XOYklm$Pq($E3Hb%3)KgLEuNbgc+@25mI%`pfhIjwQjr${p-(k|N480ky4do|; zGA0l&VJ6L?hB7tb4%@*HF`+RZ!*pw`gm{D%rwnW9aQ>>6YgqE=RH)I&t59kq&hftt zCFUb(%}ThQ89Lu%$(jG)zxo+N|M;PP*vPsT?1^E-_LaJN<8BfZ)3h|CD^Ng6xn5GM zmmVBblRlP2{;(Dnr1S9b>Yj^o7agB7Q7gsiZu{H|ni>g-4s>Ic{NK|J*zSS@uq31{ zM_)k!Xd91sY;rVhk`w9H6yOrxJ*KJv@$`dxX7wErkNI>d^be zbz##VPfGzDJTd;f%!8|G%eaAq2Oz?HB{gd3dvNEx+x~j9=k`|W69R47Jd3n$?`FB_ z`)&-htTWA&g*XvK7w}`j?@Y}0m0r|OE>+v$Q4p(Wj14Q0|X6sVB z;e6ksn#_-jQjlD``SIS1JBZi#OF9MS+PF&lAq?fbm*+i^q{OfaMNCF571dnYVdZKM z%M43gFZL=Fwtu84nAG>>X4ug`KDPJ}|38~Op z29f`nHdHEn&>Rhs$sC^n-s4JyZ>Bgaw19M(v!}^r%mG3=X%C$IhTZk_Os4+y_xn3Y zXqZSAGa2XC>D9XJU$A24eOS4hc!R$7U#F47EF#o*9$j-lKSVefoag7y;Y*hqJ!F|y z-f2`7<`$w0Fwfk)7a$7tZ~M81x9k7t;T3ngz^_I-`^9;qgF{NS!28c56n@{jPY{PU zypsJhn3|9vQ^sLw3v3Ge1{YTMchR7&(>^6TY&77Q1DVQN(K-SgNrLWCJhfeQJzl>( zQOI4SsgdBx!#_cutKfe+~KDRI}$At?G}F=Q^YhtV4qcReYrPhABQN zLrh5$vg9fGE8Cshd&@)y8=4*1rAhy_#sK@x(=wCP_cq6xtMX$E$qQv)_MuM5z=$id zt3A=`R7zvSh%E)Q9PB)^3iD&vZcvDK%3!9-@YDqIhTm7CAwN)EF<_O zflN=Lek;3IM7QO}9%gPG8M`P-C#wAv*`tixJ@pT_dft;(IMYDN)+K}Lm6v@AgISll7h_yH z;@(FClYJ_P2}VLRP*s0)Z3*W?Sx@Vi_VN0blKc%;kQ+DH^i#I zL4U8v8iNxsmGaSH%^Yg-YQ?5P$^I)n28Q4R95A)4R1W00MKa>F3N#u>{7w>wvG7J@ zdfVO7#B#u?R5XXn)t(_C6IPu|b)3!YwRzPdlP?FbJ-4=)fIaU*^uhaf%XGId{fFW$ zyOsD>+2yYCd}+gFRI7r04>MK}3sZ%o`Gm{@h*InA|JiTM69IhO273RbL_~<8x~sj0 zS;gTsb|yOll=K%N%2nvMgcABe0!v?L?ZsPLRmPM$1|M7X{kwfpOA}U{r|wbjx2%_Z z+M|$*l#EFFqMNvF7urPYs?S{?ugp&aCE1?GbA9tHd&p*qB$n6fE&tzHJBA4iIY~a3 zat*a-$MvWg-cF8yp~{|fuDLLN?ws9RXC%C)Gq!t$2_F{%yqxo>C?8081!h&ppDO)^-6Rz$1yFn zr@Y12d)l_r#V9vx0V(sb?l=)~a{F%dNAvYmK8G!P<>|?neS+&IqdAt6DUysh(n0vs zG5GU6-KFqWhuI7!^n>q`#NBefPUycDYaa8aMFey7ZmW8mmd-Jm$V!<0HzE~*5^GrT z#`)w&UCZRw=iFOew;th!d3XCIr=QbmIsI5Y4hP>xPH{YugtGyMoBoO>*ljeuPogXB zN8{;{2K{y-6|T{(pcq^ta6Iy(=a+|E7PH)Y&T5BP{+j@8OrlGh4^0kxTO%o-MDCVC zv+Zp(?T;5&rmg4RUaP0_NJ{=*??0&_T*RSYW(_ILsx@(X!)lHP>^%&f>%{1nY<88i zdoL_FOzNE5=%t?>1ff5!!kUKgU*tER9}ExrBK;b|xH;+E8IGCZxv(k~@c&HknU?qL zuzvV$_Uqbu+yLjR?;m5wNznqk|GGV2zA=EA!+5OG8d|j;p+aR`Y#O;-x*C+~ z4woHq_2F|LN>`VniiqnrnztsR{W_&rt#+EgVefr?z0qh}mVIn_Z`zNdx-yYko!T;y z;s!~^^!~D-&G=os9;1QOuT6I7n5ahg*y`SM)Plt?|H(M5o7FYrpt!ue;?$|(x@l8} zD4ibbG@v4IH=a1$?Efqj2oM54!_BB2aZ!>o_14$Va< zIJ4^^h&}W94-^VF$~U6FcpV(}V&UqRZuRef+_z3+wc1HaA*T2#*otvk?(Kqf@V-lS z5+J*ldm9#FbGxW?O*)AT5@v^q>c5F~s95D;7cd=CDm)VaYZH0caDxw}tr*@At*E~8 zYF&JwLHc9~14wtYYUB9XQio89xNQJM@yDC1kW z2WSTEx;9euK5?8mMg^UR)7X-CwUNqXO!FJ#f6f4iPoaK#J6huw!q7NGR}qE!^M~;Z!*KFiMU$TA zDl5bYV|Ck~K%kG0^H)G`+N~=T)h8qK_HepHj5qJ?WU;}`L@Jim-Pxq_>098nWuH^U zHIO7TA*ZFNoT}=0I|OF?TlUZdx?%>W)>o@Hva$m}L-(4KSk$rk4me}6Jeb}0a{x3F zUEUu*L~TH?9tlY1ceUAoTgfvAp^*tIgys7AVW=DWKy7jyg2TBSh@)sMmzw$d&Tcfy zbb%8Z<=G`aS6YnbK*7LCs`2LVyY2$o1-}96R3AW1Q4$9n6ITZa&zG-yc>-+IVA zrbPWAy5CU{E|azcpD+c=@zW7eq7rdolH%xyJvZwA83tfLAhSsL#^JV;n!xRRK!ys% zy4&`Du;@${zMUJDQbT|hyjlq=gf$8;_dEZ**yxJPfstIlo#TxKC(O#U1{^L#!+Km9 z>l>97Oa&<5&Hx=3X8z7{n+QFiW~)D&kO$7CmGptsp+tH-0+JCx1atJHN;;p`3F?$p z2seZM`SAL$@8r1(;C;z_i9hOAsg6V!r)?;HnN?=Cj%c<2@+v_1F&sF9GMccb6TZVK zmN=Nj7(SYi3#kmRbSm!T$M{F=`C8jsfCw*E+jiU3hD?D#97`gQk_#YJ+#IhEyAE2$nd}D*pW`U<+|aIq;>kvMG&;|uI(zEEp6$w>|o zbBjUX6o&*5m>xJD`yz4*GP1MZL|BsJXn@5Hx$3zU@w zAZU5(9`yB~Kn$4R)*}&~P0pyhx=$%<$Wtb#TO)U-4Z#&kC`K#afiH!X`V?l`MYF=N zBZ*#3y;M_GQ?nllS+CK>6M+8G>Ecxo9HW<7yjirWOaYwgNpck~sgT9%2&}AnO>T<) zKXrbKkTph(>uRBI-)roU=p6Ks?~XoY(Jl>mnwYF9PMi5atnKHjLUMt{6y^W1_f>IS zZd<$3-JQ}c-Q6JF-60^|4HD7_(p^%E5<$948l*wGK{}*FIFsex-*&Hae}3oUyYa$5 zZ_PR8GsbvE9XQ|LIKM0Bj|xib1_e>vR%66hVbxpw=LMTg4oTVKFn zanAQ7Ao+t6lFM!XZTc^Dg6Ym^dLn4Tr|E~)!hebhx)p>3vanz-HDAmeMU35?hhwE$n24Z;+OG9nS!~Qpo693T-EZ^OiEDB23PX9De_>R z!9^0mPAuRN^BxscIsSa=NZ+vH6OF0$(MXZp)Kc(&pb{L*9UwJkE23J;K^F#O5iCxL zb~s(3@K=#uZGKD=%l&x4-YCdAd*Hnz#=gf`y4z0EDGYACu|a*IUvIHEw5Nq_>SuZ| zTUqgQz9TRY65Z4W+1{iB;d`~ydUrH)^WM-oUVhZo(PFswKc4E%_Az%xT{P%I-{c_Q z^CXTAsznvkfG(P4$w20SB{bEF@5=|7I8+e9Y@Vh-5={siL^Z8PM$?&Mi(s(>IzhYR zZU&4#?0y1=;TYsuYm<->RyJM}pT4IiqbcU_E9|Nidg-Af?V5jpkOTPIjaiCWnV>uB z&M%2ftN85^?Dr2lSuznUTj4f!b%DJtcyuC&TBa5};nqIrX4W%hnw+2H`iE0qm=E185~)Rd6cACJ?AMrN~+m)BK>8Pg96 zrIQG`&+6unWBJ;a%i~B|i-ReS+_eYwN=QRLmjDfv%UVSA0$q=f+pQ3_Gn$Fz13&8n zKWXf}jq^$x`MI!QKI*#ef60q0kQX*bvhorjFR~Hrq1Oh!Kh?uh;Zb+SvVCt(*Fm#E zYGj@HS}QbyF_+OkkYtyM^ZYp&59ss?`lp;i8f%a@0f*HXGK16JS8{gN&h-z^e_4w! z`~9iX>f!Ot22xULauBn2Ateb`mfXGwou~Bjd$EPCj|V<*;5CEdKul&lJM+N|c!YgT zANl#<1O&QjG)u3Io3qUYkzh%+G>J1X6Bu*TBv5Y76FKq^Nf_VUgw*3!|Kv-MOlO8>>~xK&aYz#4JqU{vDgd@ftP zkyxf?=w>DzgRIoIZ-nUQX(^T(*ay&Cw;6zCg}tcY_gy{LpGGM=FdV;(3?bb+9#< zNW28hfaT`oxH>vz>N7Cb1EE+DdI6V7=M+>jv!VsNFvJp87=4i{C)jF?aF?zatT-Y3hL!x#?On0|)Mv4eV7} zq3>#`Dkbh43z3LwQl=q%(r`FQI33ZTH{xmHZYJQg7bXrcl;>$*zTXF1A<6~q^Uwi1!^?P~J{x$qe2YYo zBQ^bI0uh>!eNb7c8%`4X{DSi5Yntqrq(+i-3BrHrLF((dkei`v3XCrOv6mX!Yh7@R z$QTxCg@H}43M@#0p+gV^^lSg*3tcBI?flc%tr2*qL#L7{8Us|cVnKwFNRoKTBU{Zo zs{c8sK;>w#2VXB~jg>Rzb$ZjVe$roXiLARUo9VXwYYg{~tlYX{b$X8->duy zApiGM{<)I>yDR?>1WW~eE=m{3J?}WoyXPVSU{sBH|2rHUoaB_0oL$d@Bl^ElQzc#0 z!NEaHObpaXW^mcg0zEKPQ*yI(GK)>8slfkJt8@cqw5s!#<_Q;URZnDsD$t*N5a1`) z7L;kJ{XQDa7-VY!HTQkm7Qlc77K?t-!QHYRbyXC5t|g;}M#Vnj^mA}Tf0R_Vsl#kg zR0EF>fU#O8@VmBlcP|>rn7L|6f1^v5I>cQ=UtgchJ7V&oPPz^N;IDMDPh0BT4`xGY z@uAn}Y{T3T7OWv*L)JPxPgct6#l=ZD?wHPxW#%{CXet#uc&Cx-m>`38lF55Ap$${<&W?uPT1Y&d7hPgS3w zXZ4d>vc?g)3@RVN{ie%zu3q8r_Ct1Eq)$b&;v4h!kFIb3y>=Tk=*S0~(Fu+tU>f9& zu8mL#7USrvurfsGYJz%kO(dQU$lW4Q-K6PMurw;Ekbe4b#`9g{&8?s3exok1^w+fu zR}B~#rK+?k?vlUvfsY1ZKR(;cv9<2SssHfofE)D1fO|2#}Yb4bvTKD0U_Jei% z?!4)H@TYcrIvdkj0M;{VKU4ivcYOZ@e(+hkS!sUSroYANU;l8?nndL9Fui#BPsHcWg4@pK9>`)u*Va#GNeb zYXccDBX6TkY0I#LgakR3)KqP6w+CQWCZ{C6 z3|m@SlB)$kq?tjRcxT~K35XsIpGpOGVt%*MNjqS0m2)c75TKF@>e$q8Y;4F~e11Js zHYv!Jybk!PWZdMJ`otmut&=W<+;%!PIT?2(wo8r9MRP-2*G`WQzmij?YAlDJUWPoe zeqgI({Py-X-C#@*taYb1nab_z%iS(TAEbY59FVESr&ZOTKmVt8FU5Nj5GfAd#D88h zUH`_GZMwdC`;Q$`VS!f45gdf1t4QsNPG$j#6>eZx^nzQY9Z{3Y6k$J(oM5(oqR zhY69#4uSg`7{=c|aTr%H5YiCS2Np4f_4$KY&hNJ3t_~Mm0VzXUVwHBD{L!ySF_W9% z6?Y~O&sZRZ&CXX0;N7Dki;9Yv(#DPXT6OALRBss*Eg#2=m6$$_J=eeAdd-x0{CeFg zWWVX}FF3=aV`B0H{SR)&P|AlqpRd00L*usoYBE=4Xa~>kaX7!T&B86T9vG4e^woHd&}|EC##qEC3=*!SIs-p59o^bV;g+)Z zN{#&@_d~^czT&0&L)3RbKpHyO;o4fvjUL60`)ujefW!|Dz-^ywD+N79XD8?uB{jp1iOU;dmF=QT1*FF5?i}EYQbGUpBv4kam>y90Hz0}D!}}fC z8k=vK+k@^bmwSr}RmlcD)(Gj( ztuU<+VDk%EY9~cr^JSO3-bY%WQjkuyIQNS=>r6IcOsp^cjLv>qu4z-RaLkw}2tB~i zrbQ#1j4K|d@GUy9i}6L&wl>3P;{9s)mUx5Iy=x^yq;seKCPHkh2X9+iV=an9l>^)?eIfjZ!5<)@gu03OS0 zZL%AVq10`sgK5GqXBN8~d5#rg_oMKM7JkxV!eCR&0+P1OnH$?7U5ojQ*rJ$4Qm z%59u<=r~>8W0Q_Q!BS=1;H0|ajrHAyI&>A|RxHa6}lYMa0yX5B;etEfPygJKhly@Ex4X=_ftT4}0wb z5R?P*aHo?DMhhixN@=dmcCISDf?cJ}77kPzGIbP)AtE=fvDB`mEBq*1*ZmDgy<%%b zAZ!7;+Z1pia93LJC2Y+Q>*DP{{5*+!h58Obt?+ryX}`$BdvvH_j@5vlM}sAq1%PM9 z0jFlM_>&pnnU&s%D9$$q72$%^cvaZey+tfHlb0`23>9wOsP%|#d5VqGV&90fVg`w1 z1{d`)=v|WQ*=3lQ4Sh=l7PwMkf81{wC=G`MJZT{4SBB}}2T;85iL`g!8F_gV(EzxY z98McGmu7mv`HlgjDC>fz`pJY+gxG)=lrl|$9%eibhfk!z*BFfc`s`B}DhWSyBE4G5 z*lYs*RF5Qg8N3o&s)a}^2QkdR@rEsNRJXv&8=#0g@GSDj zO55VWeng4Zz8VFchx(sW-`9!d1)&Otz`*mLnz6$Ke*EmP%zxW`c{LU129Ku>|6oVq zdUrpV3a?&@A8md%HxF!s9?5?n3N?sXEd>IzwP<$oY$AmYR#y#^-UtlP;!K87eXqiVv)JOvl4vI6)y<$IIDdJAVfgf(|injy*dv ztCcNS|BA1}7ry!wN4JYULe>0QW><0`M*`MW4b^S<3=eEbp$O33$=GAxO8M z*C(svh-$rf5$qan!V5aCK`>;43gI0EcFDyJHdC*F`UU3 z?L_7zTKMKYyd(idE)^+eBw2;%T8I$KEt8HTJ2{qWTxgO)u?aK`O;*||cj9}(!>)8E zt@A~NFS^xtp65Vk?f0;W?Eu%7Dl7ROcV??MH0kmP(_*E;(YRZ8&{6$iKP&!)mriPY z+G$Eh?bA7-VZlhqqD?FbOgCUm^jDY0& zN=|HXz8b1?#3uszx=MUl*J>6yjoN zPjTp&k*&sp9DG}agm4$1t3!gMlz@1t492_nzwIGsEU*2dREDTeu*(4j?w|(REaSCu zjv(J?2_Oc>oC=`z#Y*U(0PfFtSs8t&&a+to6DJ4(?X%NRbWyib$iVHxrKZG)XX6rk zyH@9=4E{oCR$VKJg0NP%(x~|S82)}k=Ayw!8etu65iAdRtRIMG-~4?rM{PifEjB7n!~aL_KWh zLFUpJfDzf2sfH=>Iz8G#^hOaKa^<+fJvzE!~4;Dr4ltacg z^-kKuZ;|kXL7$`vcD&S%0(zTweA(LZ>tBc*IeX*348>uWngi0x9r<|s4^Ml5CI}eq zAk(Er`t?X-M_$%bI>Sb9B$wK&wr@P2rF)qqgYv`zxBu8UVffv82BjmPNMW zwui_hAm+>l(1+~66{7YCp|-{|voI9fH5k%chCk2_Tp;Zm9G1(BCkE0h^&8%`mOqd$ zCTTrxG34l~XXe)fqbEwcD!}8)3U~?@#F!C*$Es^+`%e`BK2GCI0uy2H_(?8>a$B zuW077rB1EjyJe{wqs9qlP7w(BfHNy-tKujVq=STwjjhrFSQVYQ$)Vp2FgjEa7)O5d zT|qsYtmkaAe`@RO!)qkyYQUS!Fn3|$lsZ1Gp?B~&OVk+ltj(*_^S^I*h6UeFd|R+}knj!0INPRd;j@jp@G@vk{mHz4 z(&FO7Yk1KoGgJvVzFal9giZww*tOF=($^_CyjGBc&`M5{rV%eune1j3_VY-oAP*Utv5wlhyEiVfE zpVr8o=4-wEVnIOxP))~x0HEan)*CYu(}>fHa{lr{yx#;Qa7H3nSiOQi4w%eB8Nc_l z(b7X{mjI2lN4rtnB6;lQJDt(f0FSNKoJ3#^Q(Vd_LV@2A5IAlB?_L0%k~p$`3O1Gn z|3zNr0oK07^JHf@QzSpQqu}+K8E)m@f-j1Th)y#=)!vys@v}&Ksmf5Gxp$;;jrJo` z>n5*O`WaF$9^@A9>^MI?y8Kg6)DD-isPmS&GglGWl&rmz5)YQ^v|-{lpnoOz_n}RO zM`r?K+etGoaCGjvrUItv8pUcU~HA1BzJI%ZybbRTB!ZzJl29whdQl-2| zd8!%!{Qc`(Iz1rG!&S9$qf+qJX}41|Iz0eE;eGrzE%2Y1TB$K4kV$C5?{h+P56j|+ zc1Onjj3AK(fmd~-^|g{CAW8lOF(4QKZBC%GLgzK397@<^E6p7Gk&ynYICiP_lPqhx z`quvIxnOs9D@DJu2|GHD6M=LMJ9H;OP43SL?tf(L{Ea|lSKvysRY@(C|9Q%9WCE7} zG)AekAo(ZwM6>}Undf^8bZ^mGVG>Am5K2ql07VXn8q? zW}TOP&o$lT(%OB;R{+$W9(j8^ZS)Sd{k+oN_cdRC+%n_y-^uchPHjuPSCyjAIv*?Jve}^VyX)`IS!wo{k)jUW z7w|at0dy88Mkq;($D{kubVxXAc!`Bewbe;Go^ilY^1dUffQR6Kvc2cgO6FkGpm$CV z`;YWpVu zJlj+yM(vOK?JhsoAbznk1unkJ_PsiOp2YB|U%O(|VCrf_N>ax0Q=^C)1(9gUW6FIn zmDlGIU%67h-tPVV#6lr4uT#WN5TDszz*akQ)vh$`S9ITBqHhYVJK)*b*{OG2<-YwO zr@k{{H~=5<>4S`#cv1S4#oFb@MgmN9ipSB?C-+y9`VB{EzpjEkwJNiD9o&X-M-!1) z=;(Nz&n-;Fwhf1}Tdv-8Muaf35G{UwiDiZY4T*?^)Sb!iafrYDT-b$*@MV7YmW^iD z$>6)}7Gv+D7s73R_eCJb7P+j!udmD-DHZu})oSZB|Mph%pn=Cu1%H-y{gu^NdWZkd zF`|zh%{GZ&5S~+a7`BL9|25O}*wT8seh^)C;{UqzS?pZ?%l(egv5qRw!TGTh>FZ+0 zAzyd%l^G#SIM_phoZ5X8hmd>XhdxBY99N~3t)GW1;@*m!)%_chTl)FAT1-KKYopUd&5?iy zHJ=qN3(St5+Y7S!gjJWXE0-JdG`B6&*_@?2ZIH2nQwlfNby_? z%q%|M74-!gyubc2hiK%z+VW_0e^Aj{H7Y0KscI$?xbm*`fK>i0wI|TP&~5yyni+~Z z&sOY-n%q2vPY9e+Qc<9n6ZIL462VIQWi(~I+_kq}_rR_rT)}&yd%kEiJdhbVL9`B9gWByk=a;EQ{+qMcM)IiwSSvL@0S{A`n0ZL}?J<)-+4so8&bNYfS{n$7fZ@7Pelm4)`* za~5WXo$K%>hWqFA{=U~b^=30kc*d4rCC^VpwiDxm5Z2!oz)czD60{%97EOKH?B8WE z=)TEDV!_8Q*7o^Y>Aio^fMjC|Y#4sbcP|E`>YvukQ|N?A4Mb9B6tB8WLe*)L9?@z!q=mEa zj<#e(6nP)M?`^EU81?nDTuB>?gm@R4h0|ug%({Dw6ct!Ums{|Sn?L!$t+)8_$XILJ zXgYuTMqKJm@$W#j6F20`K;bM!)10T&KMOKZnZ)*EYRYh#iyD)z#S2_xw{;jH->fM1 zukZC60@P28mO}#Q4b4b%!b`r|oBKoLAYUl(Dr~)>J$3W{K))Y{zzCY4?|R?!8g^qT z67isF?Nh#YMm+jfj|$5b(|8)39|9*C?Q`6xo%pkS0(tj74Sl4d0q^o?*>$PtL#N-y z{%&L>t4eMZ2K>#zg?czDsn`0~u2xG6ICBE8$sCszu}f*KkA@=Vvj!AmSYM11&{<3x z;XaY(j2ru$NlmB+Z}!P+GwC){#5u{U(Ta@R?zXf~tc5NySncmxRH8Fdb61C-BjfKR+(J%R9d?)ENvH=3g zH?R%#DB<{ajK)X>cH(NNwX~Ryg1n6Dy8^zhwD`6M0wVO97FS#Vxkc2Dm2!3YmurXbbY9JY02&A~qf9u^>)C8rUx*|}vC4#qou|FqG z`-MKDkQHUCM4P6V)_55E-|!L!oSWBq-ccZKk}NuyPQn_7a|+#J73TnrhySZRz#I(g zXo?6wa@~2M_sPZGG(5G74< zUl_8v+*CvS@_}6ewsZDd6%YQt)VY|2NuFi$I&|cGP$-f-nTw{eP&9Z+eK12D z7~E#0G9O8oGdYESz-J0uFJNaxHH@zn2cO3g3rWY2J-S7Z-y~=D4Fs#l8fqa+h=BZe zkS{*e_%_-Lu24ai{9O;*$Lfcrli{fq6F*6p2#6V{+c4HZ-L(QiFEK>I zigzz%t#7_|iFwf_yqM}~uavu`9az5ZK#ap0+o=p)QaT*nx_dKTZ3SEvY~1Jl8e_6pTsPQpHkka&%^T6B@tREmI^Ce(m(Y~v%P*P&Q8cFZp^f!a(2}d<8faXx?b`Xi} zmT=#YWGYsf;Dx^fli!7X5V*ftC(XqtBNas2ywlx&k7VdK!D@ym#_e7gERD7Hq3Mr_zWw^s0Rf5*8ZsxB|43-gu&*0yeSgW(iI zM%<26 zZ&iZ3G}&Nb)*z`fcGuT>FH$u?t|qEMp$Ff8M40OEc!_|jbu`?z#`8ASozeR)#WULf zu`{6~U5(Y>d}VuiSP41Gs9E6p{kHd`r=N2)wsUpp#{U!n&R_syn}ll|M1yKE;Ab%k z<;TfjX4&CW7~pBvJ@=>2imw%RK5U;$v`b`no;i zqGR}i*29-a)Tw!ZxSM#CXp4&J7(IZHm~|&Ogm3Yjn{)(4TgS^WH=%`vZr^7o_#HIm zT^+-(!-(nYOqB}9e{m;ygn;`h3)*=~A*hEGtTk*l!=Y>=$|W5lO_J?D98GscCFK`~ z4&pl63z#}<`5tv9`0|xl`=GWGynu@Wgo)HMpep-vTTC#7I>|%srtCLyur<}xmKs%i z79HEk^Q%5~a0xV(D>tO4iC;UE?0n%!%Km}jotN!&ywLgr$%9E&^%LAeuE$ z^*r20%s@M|K9r@`?zXYHjvcrC+{?u>ZnVBp*$|t+;^2FgHh6|bOUV5izh2J^m;Q3= zw!;Zq`V>Rcl00s1B}-~9`x7!0$NU5(6NgXdF?o0#u_a6prHu9MCN$EGr3BPx>#tGj z@cbi&)l@#re35Rf?P0YUoHmnXmab!nfgEw90%JQQc8cuQq77?Ir@B4CHY9Jtx1B;l z@p*-0$!BLjDzhMtplETyUumhoVT%zy0ZNIIB;M8Nm!R7>kxUG6?ox4s=OE#p} zIQQB?Aw)i@22Zhs;b+-8q&%O~H)+EKOlC?_fqa2rIda?K> z{^2`8B-gJnRU!puV4zc%BiD>m4C97oo6bV+O@Hdypk~BnF&v|G6aKzhqV0A7{at+L zQ|dd!FKMBgl*c`<-}ch;MkAXuH$`w^bSra+m`Ed!t%qd{(z3_V=;X5BVSFI1YP)ku z(OzowW~>##w-#NL3MWNpClg5&K;?>X@KVLCU2CAQo_$$@7iW=x>WLAGBkZ<2ig5OJ z&;3LHXTA7ZKcQ&Plk7IWh*mf2xvTR?bHZd6fgu!eNv4>Ym%0(33sA`5UrG+6y(3`k zvY>#J7zt@K>rP{ZPRZi%AM*W~LVV-55DIB@@@U%?tO11uBDVLpd%n@Z3vgSj0lc1j zj>?L92(L6RZPFWcp)$3K1AkorS5zmbUn%`i6Jzu?&}xfgYy*jM>X$&xzR9s|<`Awe zS#Y&aAgcTeKVJjqhHxcKdOf|V+-x?1jorj3VQ3R;+w2d>n99e#runGpF2-iC- z3*T*EBujs^W~V@cXB`TGTnJCz7RRiIFY-aYFzH1h?0S|6a^mO_hUug;b7^mxlsl!7 z>BlWEAqWzT6_H%K>yY0`&IT`O<1P-G8cApx+ojx|TdyG6jX-9x|P#kE9hP9I;_6Rb-=CmB`73ZI*xFq%yQU&yG3?# zzeu8QbKApSZ)%YiO1V~dP$Y&09VYKu3NJ}n85f76C~&uG89Drw!82Dn9k=Sn(g-76 znmThr!4j-)cn-&<&qel`T9>&!NfiPnMhN8`=kr-0aqCpqK3~f9%SEk)sF_v53KNpi z<-u~|1IO~W8Qamh?sdn>qGI+^_){k~7 z7ZDC(hyx%p#i;xwe@=EO88NbrNUu?LnD!)k-`Y8fJxcy^;R_ z!8F+qptLrW{Go5I%z&pwmre8Tr(C-GG$VpP!)MGrOjtHId{i+(xp%eNS z_{KVu0O%kDEk1wOoyEXx_GC>e0KN<5GIQWq+A|?^NfX`sz-c3BeT*?;TTh$e434HL zv^r05CrFE_w$_H2fT)j0p0zdk3gL>9fxX4bkgtBLl#-4umE+$(oRO#ap?4KbL+Ehy zn=sbG3ph;=PJhlnI2}nT#b@lp)gh6n2FqK>mwk)+SjYS5ixs6~S70hO1_zrg$lBqy z{IKL3R!o#ry)LRNH2kpoQ~~i60H6LWx?$|jW!S#`6r_xVy!@rJ{|1H9t7^>erYc+D zT*dP-D5QcAe^hQYhWxB6C%SNoAi9dC@i2R4Vw8s9q?0#d&5hqc@CWs4ki|biP&-bS zh}`0FqL?VSb@rbNc(mw!=!VQDG@@ilC`)ZLo+zv*l1m8SVurE2WC|U{(6Q+mg z+6PeDE8ZWe-*95RRH{031Gz{rlHL;Uz3;snJ0lHJd@A& z7*Z{wF*$rNYPNFq^XpN)01@4VeC3bF(9;naFLYXCMuofS1x*!|o+rhMB5XR8V3nVC z*gjlQp*<3meLb{7Ni%jjDXn?9?=;3!I##`lK7Wg>_Rg$y4>ATdZ}p*E3ZaL_rCy4* zLc_`BAdIggO~bE$3g&rW`&wjXwD5&m*SSzrVCyG4R`HCvxYaS*&OSBN4&#(n))G4j zq**iB4kw9>$*1(9zj@s;qfYdm1tPs*NJI@Wlg*tMwY$t)s;m;D`@}V-7Q9H=6v0aHatK@61aH&LYl&6j?9czwb`u%gel&&}Lw@<3a#1}+i%Z4gH zZ|DqF-*lvJipgETVza~V^_ zpJJFY@SX?=Qz1|klEj4seVv@>xM_KTq_HZj>OsblLroe2DMlv{A^7kmh??8y`mpQn{r!#|HEgXfT1WG}85-$yoGi*hx(A!>m>;YR zdM~+ArxtdbkB9mF*bvu2DgF!b94Yyfkl8|KN<<586(mx@isM23Fy z9d02Q^GCrW*RhO?LF~jYv3l`zj?cWDQ5g+(wu|xAFckI%PK!tW9mCcH)uAfX%p9P? zb^-CT<6?>?f{*c1wm(Ghn5GWJ_@Y$}l~D-jrqC>?P_dV%JEbmvmKdapfSid|+z)ra ziC#(8*m?eQu>64fgs$ttShLCbXL7>KyCHo=Yk1A#D;3MN6nIRQxgA3EeeFp*Dc!B^;?S{fz1sN}9oKn0mb zsf7KR^jtL^n&xLyoS5pI-Y|H!(~nR;ZD|aW8YHK5=-uYygEYULb2Md#4tYSUpIX%E(<~D4Rh4TLQNK)#{=Qx5eG%gJhZz4n^C%fK{wr< z+(oN|`hy?8QVw4}o)@85pGtCEuzVw|lkAag0T1Q>3Rbcj zMk4&mUL7|xHc~;{^cZSQ(5U0@Y(M{`<9_d5V!c)$o>5Nc=S=RN4rnJG92{{AvE;P{dV&B1gNH4G&bY z$i(D^M!BL`zqZ!jez#tx%JZZlD7M#U(&2L$Tp^bF0f^7mr4_JJwew4Y(#IuLvmfiy_F$xpw z%5;SV4K43>0yf_IrQ}*bMBwv!rxDFQ@?nXUK)I|$Q8LAsTuS>=2!DM04uUsqqMmYw|};9O(p zJ-|vm+I1}CyAL}hM2RLZRXmt}k0B3*ZoD?gr_P7pqg=wqr_5c9PN-8GKq=(Z83M1g zDlF8{+LTRzRd||}y8zuwqQ*=h8z#@v9+5lfOQ(?;>~OUNBad$zU%WWp3bg~T!KrF? zR)b?F_HvrC0_p-at=Dshx7;Yeh)(dPsEE7L6dWsVZZZ}iavXK za~c~K*Fey%hDq>DM1B~TuPMb+qWnij4RhR0caC|}YPQOKk!qia1#GYW?eG;grX~IY zxqCXwx$74XrC%5&8g96CNGZM*T3kZ^u192e;%^Y*pEH8=K=@O;6tlz+2=pIu1e;@p zKPsiiF8pM|?Yy}?pf&EQz1|u1vJ^ZQpbdu`bL(z#-{*8*+M8R+7-hpc-#092)vBan zU(cQRVGwLJjq~GExdud*ZbNVpF1N$V5Nbr$@SA%O?X97qFc(_!vgMA30W|!46mAFp z*N>jb%&Ed0qnt;v1fec8F>O?%f)P+~sG6McZ>hysb?fT2$B##Z;j8)zV{{$IPgW}B zhivdJFXkNPIbE+>uUA-`3dFERz$8w@sJ6`%BD%!ypBSyqW2uyr;4iB8DCI@OM<WVO6XqDrg#3a-W4EB}2@JtRw6Y9!>_{IMj|A-4 zkMUds&3c}#4y6jG%P!AXTguDv*P^%I<30$a3cJfsoT8pEzZcyLnt;wk+kS9!c!>3v z^Z6{hysKO)arpux%CR-)@ez0H+D`TEJezhQC_%Y{zuC)gE&)wMpYwpTCY|q>OlJc`2OQM7_*>cD$bG= zVqY-eBPc?Vn)uaz{C&75okmdGN>^sGiN)g`RYJEP;>zq*^cj+RNn2MA$p{I2FbVxf zudO}Rlz4b;X4!#@E5BJ9y4W!cooZ`>_eg4K0#1kXY$@w`&{a~b!Md+bQuvKQ+$T22x-%dyVgTMb4+=)Pm# zti`t5ztSM(#fuGa&WESY7akM(2stWV#@k=jFB!9pJx&RDBfo8|Gad{{jMkH?M^FD+ z=Qb7|EzC{*7<7Bvp_}j+i4@(zTSK)yQ|_h;H1_X&y2_`#Q%xfzZPB1<$S%D%ZijRB z^Z28m93RE%k^MmUsvxp|hzGB9Z-EYrIqiB(_Yk7%?p-V)_sv04>i*%xHWHHQcVRI& zT*ACencc)>nC>`K5@B}NF~P8f3$Jt-jF2M)c-(3e$wlr;-P>H(L4~}0_3*28U1F8n zy{It3E~5@-tT{zg&Lr$q_wo5cr`e_32}~uD)SYUF=lP-f%8q9P&=6X0=UZ6%)Gx71 zwBtYfSuQ}vBL9k*wdxzH8IZau@EmnQ;~WaVK0%yB@NhDQrc5)!*oh%c+DYPqA#&Q< z$uT-(xpTf{TmBJ>$~w34J=A9YJj7lARz^!<4Y_In9{Uw;wGZSE@Ic9q991F5e z5aQ>}wz}C)Ww4E)9$sC)+21unR6D=8$l!Dkhuy)bcA?$W&ERnyN20&+)|1G%uk>}LbB|8af6a7*g)vM(tM88mCVJbg4t zJgHET%!QiIkI}%DH_x8wi+DI1`S_PT1Ui9%+rxp@rVC~$3aJse-Dgl2!=N%C^6>ef z3tHFNRZr7Mj0xm4Eeq4_NW{kFu!0)gj`8Vufnk$KZt7$Bwzs4GXj6dzc^F5PM*%PG z5}~Wf!DQyoDeq|?#g=*YJs91f+TMLZR0$(M|24U-Qlz}HbAwp;e^cJ z!FP9>PL&HOd94^yF#D&=YX}iNa?P7}^Aw98w6}2FSYR*VwEvc7`B;$49^YPI^SEX8 zI1B|hlyWSua}xi+I^O)@*G$rnzl1>!2>OC)`Fiw$?k-EAK^maMxPtFx1Lw zt%YKgV_r)4y|F+&d#g$!|Fh1AC%$VfBL7J4|Frj&VNq>ixPmmOLk|MdDJ|X7rGQBH z0HT0|f;2efAV^A=f(l4TNFyK&AT1yz9fEXs-8FbTN6)=K?{n{co_qK;Fq^&BUVE*t zzxU1Tqi=ZjMrz2N(RE{W^m=LwxUv6$05gmmS*V#8{VUc|BwZy^ih|^c?9*`V9u)T%|xz<%qmC1i7H?^N;_L-bKY#$ID9Q{`fPv3W>_6hFxuZ z_pg=@*2s?_2UA?Wl2`fXt)8OuqJRrCn+pLBz)wZ?YcR|AAVt6YP|WtXHk9-4q{C26 zkJ-F=AbJ1i|NQqT|Gky}HrVfH;{W%v0{4UVHvwrREdddBnnnUxm+)&62H=OGJUKae z1muHs@(l#;e|f2Z_W|-(ZP0ldB0CL8pT$b|I1tWMe7cWQfP8)03wnfQIx+xE zi~_~GKK8WCU-AkJ@|(>>fB~(OmU}55O13gm-VJ^x!`ezn$jR46E4M(eH_7-b+2A&H zgw|z#&||W>xd{y=%<|AK;ll8MYToILk+}6&SQTJ^9)b2COJ7P4Y&^?|3&tAkhW;Cv zDhzjT!ULdw4HkYy=8ZvXUh`t0r~VWG2+#9tAHF|3e813_<+~Y^p2A};lVmrgcy_vW zRttJ@xV@(E0m=vgam*DHuZ!?^kX9u5b&X^>3>=Oa-C;m z^ct`QUg*<-LS_}yOIXg4@Nm~dyQwSyCiAVr$>L4ZqXhu|5k@U0C|>jp`$eNT$?dh? zH>$~k4~g1D+}0-n49?t(x@XUxC1f{@&?46Xz;V8DwIH38w#sE*6rAFt&#kmC@+gC& z9sU175nV*Jx_X@APp(|on81wVGHxRXwG0FR#uyU5WD$rbv57rj0Dv{XT>#mzD*cjs ztt?n2)%_7sO$Wo*Wb>%jt_IgZ_W4Y z2x*VF>UFYYdgcA+=N(A`_*DR55j!dsv{~`NKm&d(Eu{sSp8r7KC5`LKiPxUo?=Z|a?H3XM@c8sDoW z-#(^TM&idCLJS2mukY7QLz-`z0McOqv8|a1&IAA}g2H`H4w=3_bHASA z2Dp_m;wL%jf&#=pDXOuUFSek7IRLWm@gl%=J*qo9;xFA~_-Eq6s2-ljOL{_}tJVd; zpKW_4>KDSA@VJ`$-0opGMv7Cw39)Biw|9m;eQBWDW-2u1+(+#?8l@}`z}J<^Can*T zjhL()#831Ej@XvumH}e%{igWZZ6<|>a`;!86_1zdPOn$H$@OKn1Ye<91xJyesdEFs zqf4#BuRz+|k5ihp)Fqn2o&x$v(eL^_NHr|-!re~*u2cRX z{b+PPV}4+RSBnvVxVFnXR7?dG7*{hJNkG-2?$u)1-l3PRVV*+rJAk6}4x(59ByhBq zekKlZJ!T>5Nsmu{WlO-ZW=2m8?|QE6k{<-j7=Uf@<79LDbS~N96a@gp@pe7F?wBdY zK%1Wj&WkTccDf!c1)1C51yu3JTiqqZ*36h#?g&gCY&aA74XHQ1DG`!~tnS}RZCf5P zTVJ+k9AbSjO!LWhZ*>eDC|D=vCbz){L^>#+SCuT!AZZ{22tq zDJL>V64?~PmMRd?$pfG`RG+i4gKjKO)TKK?mQxSF1dCrXXwmsWKfTk=Jq38i{ua!p zqW~WSS4h?pPED_L+^X)=P;hCxK!4B-G!_GbNVjbYNmY5C5P!affE%JukGJb7AfIM0 zAFiJq?M)P0;aA_~i>7~dY*S}-5E6S`_t7C|`DpaLPNfXG)_8#2?NgtJ2jd!T0R7Sp z1fS}$cQ;d{d?lSI*t8B|5bUy+d%AV86o zE_t988EO0yfVl$xofzdo(?HpE^ht;D`B7^0@VMmPXhq3 ze}e`Cs1-7tIZTbFmnGhv0)vHaXb$=zlYp^#J6kgo1rfg)hlXE+L*uAcGa15?Hu-b~ znh;Wt73m6idjV33(p1xow~s>g>h{)f6+N`6o+vCYdY$`hle>n=I+Tp_GnLu^4w(n* z_37Y#Hu;7G>G5PkWsG*!IR;X_nX= zXLOBSw6__;DR$~7aj@(mVK2KzWq79Olb$ zF-m39VHI!SZDP!zL%Di@%Ko9x7J4viKo)NP|thCmcU{VT%07^wc7a*O)*RbiZ8qmyDO0WEwH}zO}lXBZMRg>W6)6Cx9 zhDgOapA+`Zl$5EAP%an-HvXO0VV5C~&D+(d83-OLNeU@VRRus<0|c1)CU%Q6dVe)E z0X3hE>Th+)St&(C5@4V%0IsWi^4%`f=+VuX;d*9SkIV|Dh zKB*I8Tf?^p_F!cCIqe8@FUUQa@e-NKR5xoi6%|d{r+QESR8vXrCue#wLI^j98%S zXg6bOzmGdg-L4Fg2Hdc&{1P5ik1z#7d}e>uUx9V+KpoB+cwQPfobt3#Q^-J&<3$T% z$>XUjgP#%pg+riOnUDV^u(!-rsA({$j|$V%=N5tZa&1$>2o;7rrbE`N1-HhqD5~x+ zsQaog`VseWFt)BH<3x5sWM6ds%{@VT9o4ofe?wmx0D$bFZ^tDr*MGn{><1WY8N_Kd z8Rn(7B35lL02+P-NCnr0DB{f!& z`{2MAdSH&+DK?Q!Y6#(m)S92E>O546>5TX*i~P#0H=e zhl)D0Y6f-8;M+~_1H3Z!PU<2YdSdJ!ceh4QqgA;M055wQ^W$|wS@vu0vrzzzzoa)s zyAxs;K(YKpzyEQLFHes@F~!8q!b!kS4SS9?&L=tptc-gB=nD&>-v?gOUa?hv-Mx_Y zO9(zicOnLYebfMX2#^F17zzPgLi+J63xLmle?J&8c~e5leGbJE!P6+_yIj-)-E;)B zDC*veS`=x~?q%$O(Ch=CcyVb8uQY9bZ%?Gy5c1s;(lv2sieLIxx`aZgMnQ$45J|?j z()LDu&rUkL_j}`O?-I)EHS$yueq~hK`^R#mJq7WA=?R4a(2rcK_H=$X&sFISD2Zr{ z@xqcE^;pWEl8_6Q!nm%eFc`r|d9sT_;R29goq&p>p#-{6Xg3VN_R69*8}PXasD#(M z#MY>I%%l@uy}j&LbTLfv{rlV zU&u^wsQ2N1&-M2;e4e{@==8uAa7fa=)>uNo8$j|8mb*Sn+Hz}Qn#6oAS!13=H0 ziKBd}=)FF9lZ?b{48B*p_Ys)+5d)ECH}~Tt4}gSro1}T`2!PvP0nED?P8{AZxmjvD z>Z6s9S<+1aT?_$U_WhQY`y%~fmvxe67XxlY?}ag1t|N)nF_>sU1qk_<7~23@F-Uq@Au})|E@QY=b2iS%TfmZl_+W_rlsfpaw@P;+W963z)e#Any-Q z8WdPizVl)el>i$b=LIBCSsz^%sz)6Ykr5+zXO91GsfaqSplg1JRR<&>i?yEyA3u0^ zt>b0_5Y5-AdGMcx3x!gD3AWZj&%}aCe+uve*p?f!=`E*ulOSENy-57bDi1^bh(hBF z*bip+&>Vyu#;GhbA(s(^h4wO$L~&;!>RuVWsaFyB0IeR19x7b?L$=|KJEff+ML`3^ za+0%;)x`J2<(>i$Pe3(81rJ~?n(Vvc{X|lgKo`FV&<-7(nAtXJdKWg$nC-HB?61J_ zzjT#9d)uD7?)VY222TJT6kGFwj{>hFX9gAP?KvfV3lD--Iq$Az5FoOfLlV=Qd}26K z>y1K!X?zkoY4z;*JSw@tcI+wt#A`w0#+1d91&J_wfNRndF*LdLJ>HZ#@S(7cr*iub zm*1EwvTwrK-^ZKy50P1NI$)RhK_*)$@WE~ z3p!k55McbGfli2%AnXK_707X-ByPkDGXK^9&y8r-{>q2Cl2-bubT~#{Q)Fh>z}>(8 z@bezD8e-rk--g)}|N8x}o6jmqBj^-U^K*Xw_pdKsK0%iuC@s76fFY?|%H9(Fe(?qPH(VUvuU$H=e-25j2!<3{ zw7bRh+nvD>rNj_ec4~g~zlID4Lq7UCoTT#4G*I)gVWCB8h#4{w|2ZTT7;-kdL?HI> zIiG*{dRrO*E0w7*|2d=x5d`*G)7qB(&!^8$1y8?X7pwN?kdGLFJ^bH-|F__O@0R~| z_G^oTx$~DP%O5VSrKM$SYpbZ( z0&)bDS=t7C7(fuwO;*NUfV+_EmD=@@^vg=7AVUBO2|`l@tL$-7 zIq)<=>E1h&OJGbJR(AgjfPDw%BX>N{GL4^_n%ddfDMJuj)GGg%VVkW5XGB8kzR90V z57z8kb%%wBuDqLi7YAu{RQ9}#hR&cM7a#_mmXhJM=Dx%W{XE(K%lNa@1QSAbr=_Ls zV{#{Q(IF$73i4p7fzWq|99DFUHXP((cof4lKCe1=xFv}{M3zDz{@0XU*djrkqbUEi zUn{q#i@tvBRc0_6CgNoPA6OXylCz z9J(Mi=NOfLIXWKXKnLwzyCd~49fS*>>wm}Pg%7Mg?nNFF-gkq80G}ddOBlrsJIOu}iaLS?L`H!AWgVS)=^d zDJq8_zy@3{`S$Hw+g#4;uGsy%xhch@1+X9$g6j`FnY;~Js}1sfxvHwF+Sp6W%i}w> zT0QlK3RI}tB=2IKKO&DEx&ki&Whpk{uMKg&m*D_1{n@K1Pu&q5OBpi|(bdkIk7iPB zi_;lniSsrZCWt-OF0rGFdKFEG7yCl16(>;TG}^SaguPX()wJe1TUNAqzm0C`qEY@M z_6MG&nc&)re-bv>3qKQ0h{6fxyvmRFg!dwz#Hlx84*+K-U0{V+{ZtEq*+<;Bs3=}5jv8m z`!nyoS8UbARzCE0eguTqt|Jf20s3=+bJ_Ny$b8CHS^3A6Ve9l;-6Xe++`q@Nq&oM4 z#J%D6yO`f@2)XYD_GQr8G?jp(|0O}aGP_|AGE^yd&wMWUi~xk!I8!-4iu#@&gQAWI ziW|%lTKq*`2b&&1jLt|s9qG41bj~W&&dS5H& z=f5#|T2N5Xa?O(?2um$la0NttQMp^!VXOF5*YN{^_wKh;RaFfp>yamW6K8-I1K`p> z?n)6!wkvLZn`~dzL}p0k@#7UCI-=u!?cpMd^ce0ME4=kq=wnW1W~N-w>>VJ08Kcu5 z%mGf!J&>(lx#qdNF;HGx%47JQE@-yrLVsi-=D%ObHz%$EBah3V`4+~Wn4iai&-eRkwh_U^RRl0RIbtWEn zOFTIJL`3OOvtbtByQTd84NWNXE?Du5d3<%9&4^tP?#*g2eD;B*uligg~2sUSS_(*N=^J_e*?k39LM4vp!K{POXuXi-EI(W=VG*QTSE zfN}{HdreW3C1}+ho|{t%US||(_d(-2+%9&Bga3XiFEMB=l;;IKaI~i+nuwXXvh4KQ zG!_s79i^Wgq_4TPh~drPOcDEPd_3N4R|j$5*<+9eFxjgb{J536HVW2$X7@A1cg6i^ zWWopJ#P%A!04n}%fJx3+3vs1(n}ma%wj3_Dnn2*LSNX{5*j*$@e!Dt%fF{PB*veX6 zPJsPD^-;cUuGjC!%TgEk70bJ0RsG`V7#l6e6)b{Uh$hTy-rGH>G!QQj-Rb8u5L8}I zvMo>!4mWk_*N!)SqCXq<>5VC1Pl^y*t=Lv}T63-4O2tv*FsTu4W2Nv^rWgDPI_pv*K-h}69WieC0 z++@5oBepkMXlQit*PdOt8Rm~*RX`F7jyg87T23bTIlu9TvhuFmm_Jxbx~=$-poW+I zxVpb(t6PdjH$r$C0e8m|BaSJukPo?dS(tVp1j-Sy^}E>l91Fr~1y!E;&CR+e>R!{t zgfK)&k*Ea`tYZ4v^|{Vua_ezWd$b$M{aT0yq#-vR9`Dtid55VW9DXQLyWBNWnZ}P2 zUM_6xO$iK1$RS*kBuUHB5iLs(gD7M0!MGG&P&^EIA}>0S74}rAE=$hR@{=E?(`H^t z*E1&e44tF3I^T|?eIOjPq2KmF4v0#Yb6U+(2^~_zVnu*J5K<5(g#?bK`5Z1lS2dj} zLVeV!_IU^1glaN6`E1U%8roNWuP5mG{Tu#PMC)Z< zPkI#^z>SfUm1Z!_%S%izLl8BkD0Qew1XGHC>^qletum??s>(Y!19phoAVGuxGtBE| z02FUf2k}`Z;2J%VQ{OG2lNATwP#e3_ex0HVvw&ot+S5d?hE|54XYqqaQG^0t5`)AR z&DjQxvIpQdkATP$MeNVta|CSWGk{#(^aYvLUHYrhk}`h3pTR^j5b|{1yHvWl(IhtP z!acmiHDDW7*Q@vnCExP~^)j|W&|aVn&vQD2WxCxxn)6Aq8c~tr9GHF2{)}(PNUkTF z&fDX9Y)Ob!^Lju+6k%)~U>2US_`sDxzkDf4O=rRKgqsX*5OL8a2S@EMK zWm&_eGx}}Fk*OR8U9$(^u}`lAs>^35*R-hxr$tVQzD@ZFy&9PZB4U9sQzjasAnpOw zP1G5RL#sEJ==Ys;-wbShtku!YTcMaFuvwYe5%>Aj8EZR{#8Iu*A19xQ>4Fk$A*$ld zc=$!D790~0)6I0R&DJ3w`r7&yjDSsnY=!XI5g&s)a%A+>7s-4;ZC%UfK+DFiA=r&4 zKf>y7BFSO$tvI}|4;YG^7kc;gq1qvA1Wt_Z(Hn%CGE9_}Emto&y$%d+1x@Jpk{^<3 zCVYyA|!dm*x3SGWy5lIDTpcn*Gv zKb>WfIsoMaqV_3*4-GiJLv9e#w?P!cIQHiUI9LsXi6~H6+#!Y=%^Y^sD`jUV6K5xY zrS0GZR0oj*=3W4OKrB;U~bHxB;1Nrdn^ppAk066buS&C7inC?aBuWlD08!se}YbAUKVtI zW*7!ps-FUx@{;(P?TCUcn^6C*3_aGPbWk0Mpbq9o7z3;7hU?hHgbl&Q&+5R zwEwcZ9b zZS;b1R5)z|T`<+7cFuC-yJw&hV-MH}(T`xRLBcTfrg_P|O1&{!5&gb&UW!+nn=u}@ zllXHs4QCnu7}W=y(-Y~dyA}bYu=&7-xhBVxp{_|#<9SQH`D+j(^^)XU7Hn0dTEOfb z58X|t+0RkD9Q5J)`(L%x$DCTIi%)iQQGKLw)H{=7-i>HMZoeXt!yG2=O~*DNw4rg6eq%27=w7XyA^ZdR?jU zv$^+-ej*^5n6XEeR&#cGgfB&QOLsHR=ZuKU;5O4vh>I7>Qs5IrvY||e*6OSN3(rud zL$o#=#yO6%O=40LLQPbFxzhb0N&he5z)AQ!4sc#|x^QB3aTHtHoVw3u3@cB=r5$2WgoTWbEP5t)oZ&kO z$9_9v5@%nL`}@A5)wpZ6|AdU=(2XVd7A@ITVXGa&MzU#j?Ta(`nlb!Hh}f+c1$rE$ z6eG%VY5VPZ!wz#%Q!_MYZejL_W5OD}8aJnfhTKOxKo~yPrc)s=1r}6`3DHK&7Fe)N zAk)1TI-CRs?9WR_!Q|fB-KO}*k_J&hSs*y5o*cde9IifIeEPKagpdUg|2azD>8hmy z)gUU}iWQg~#qPN0+Ut6i<{R;D&cmv_{xc{Y@`^YxS&?kKe{77JX2v=!J3@e=pzie0 z!E1)nN|C|z$*>hlf)aQs2{v(XXe9kEbTMS45ua=e0bfq64nrLj&|W^sJF zS4YDF%h&GsLtMF2LqG5~H@BUc9Wg#)?KJhCOnvc>QI`~HW~iAHc+b`Wp?uhU$DL3@1dKRy>d1vB}5jZ~f+IprHqXLmYUu*Bc#`c7~aM9xCT!#zZ!3W~F)90k&=>1q;4s%0#g2E%8 z4TR5L!BPwMH8)y6TBkw4xpP_+;caK^5TE}0``=*$rz`!WSkjg>l=*nj_e7WD%l>SP z`YG7{r6Elu^gkkXmI@m$A8p3h8CBdE2K1RRxx8ew;Yux|0S!eLi(=#nLRpVaq`c+6 zhoCspc%7%8J9t^tp^+=&c6NG~z}pIV6V-~9WUmx0+zay;o(drDeWGoWUMyl!)L~hy zz+}i1$9e0g@BWuy{2BsOK&rExw>HD+eHu;B`Tvoh8J{s(i+Lk(zv^1`ZKUar#eLbj ztBU)yaZ=}k|1nwgTK5C5S06u~{K$+5Umz_-aLWn6zR13iVFB{ z4h)bOOVzR=gm_V+{3B*8CpidR+ZuUzh}$hb4*If#AA2}7zi;43V{n?6ca7f&oGqE2 z89W&9^V$&D@5_zQBjbG%kC2wN6D*nu7i%7c`x)6XS-6H+`iFpgeA#6uWc)#eEwJfY zHT+5+y+5IAAaly|E)Y$Jt;%u`ZH%q?2+c{p){O9xSKN84mPm9%P9;JgK`rF)ac7{x zbIsVBB(2hRN7IeDxAhv?LTiEyY`*=j>~D4!JctmexrBl|ZCRLKV^u*9)b#5Nr6*PC zyFSslqq2TQj=L0^5um`Snfw$KAzq|_!Q{gVp*QZSE$dOx#TLJ5t_iV-kaz+@D6PVX z;)6a-qQDy}ZR1QAe^03Jv4ezkPq@~K3mM{zbXbGl{0N>sB9R0$o&DD7V^?j1DzD## zZ#E@ZuBrt*Qo2Z8xaGB5RcMPmJiwg3Y?V%=Wzsh14$L4^LG@BTqzb)N=sQOBVHtYa zg`HdMY_B%OcgXyggz|Il%fhI%dbXB4_?p%8mpJ9O96+UpeD~nAC5M()*^mlBuJ*jj zDFug^)_c290G51yfZ54^7}`zT{Npf#i9s`-LK-1xW4HhH#Wu*{yIuKRY@-YZb{xRB zjiyQX`xAltKZW?a{_FoC*?wSalR`-UJtDX*_Wyj_4?3?1w5qMw(`aH94gtrYs{NJ@I`z@6WnNeHb5O2b^8 zX8%+E3Gy$ac&sf&q*5l_0@BluC2CBdBc2M$h30Raih}`>s z4jD-UhCJRbjr&(r@+uxEzkulW{5d3;xD3I;f-UE-2-S^+se{A{x&)3A@ zG4}=3dQd=seYgRdx^xSShDSz{;fwF49dY>u1WL=w!mkS00LNIsV{UM5HA&RFsquY* zLD4$}bqzaa%x{JY%SFoVtzxC7g{F$klrMWxdsG7@F27Z93r`MV zez5r+pPVa9TDFFrnB{g}hX1|{DKBM3HV%KvadMMuowd=$a?L)}*?IX0jc&dzALaSf zJK`gc5&MhKjX+#tW@l$-1UG>z_SciG=~x6ggGq#&^0amc`C9|+({E$O&D?kKOQzaG zSQ~{_7i{+L+0deN%w2k5vV=s7gSqNSq4OR}T%(#H#~>e2$F`i!+3-NB62%&q+3AEAvG{gLS|FLjGJvYt*5)o)QM}e08|ef2%V({6v zjrcgc{9fd?=ge?643wWrk)*D55lK|{rv)k>*M3&4KX+Fb?mq4);{_kt4o#^=G^0X^nIfU zjwuKo-u8{4+KG3K7<(+E%9-T8Yr-&}_HnBG3JqysIsfyD>1@rcm0pujY_^#5NBVf)-W$M5FeyIPrVIuR7!v;ErGMy2bA(&FgU&muHKN&I)#^dc##{k$7!-zT(v7Nc!TYGL<>GXINh`f=8taK|Ct{eNC)QKVaXne2WzPxNb>sX9#RcRHPSVWKcoJPT~+fese&8-Pw6k$Exsvw-dmK9D_3N z)2S=IL%qGlAZu|AFLAQ={D4BA!}BN^c8lp>q&;02U?~EX6W|CjD*>qeokZPiwF$CHqmE7YT*3z ziuK8VoEhp4jAWjo1YD#GeE%EGk(?aPOUL0rJwv*0AZToOX`m`ITy$~0@rrsTZqeZk z*wr6FO6|2Z9x7-t0i_E8-ciB&YiA4mj+I4s7yYOx94kZPC!&ptXNArtx*O51W3RuL zykBy=XWpG(%Q~l@7%y4M!oEA}tbG56e}f%U zudiV*xkp09E-WV5S+L23=rK0MzD5Rr{JC0@J^|X~t1nFs9XQBWRm@5{1wBE|Dot>q zU)S^mggN7U!sLo2Wz=3MsW&SHL!Amc1xHA@_MkoRp~PuaBxj|3;#wf`1EQgna(cY0 zt81v2kMp%Dy#oJsC~UiZ(xMT^Xg$j+(;(SI|C>t3-jEw!#fikLDuBE zUO(QxvC2{<8Bcg?VWVKj&Rc9H$1z+uNpqx_QsUZzc@%!Uz7}sH()lImh03|-dQ}e8 zNZ%B_gHnx=q;Sg-#D_9oDBUfV5EO+k=t>OYMB)TmRtEzy&CEsGm8|q=6~s@-P29}w z0z@8u`!Mu@FYcMzyoy{9nEq+X<1Xb#myao~tHh1dKAz<4vb;OF=;yGRHCAY8*5$~l4u$n?;d+jA6eW-=&(Mf?2`%J5%_S6Zey1$E zKV~7*e(6RvLt~Cuc}q8qgv~R#{A&3F)B#^t$3wn1Ih#$*bs&a8pQU-C+%!-x340%$ z>`*K6k#l&7?j(V67bNx)t~&vx+9Vo|>MuLavadVYrIhe+uCrTc(WB$jXXFF=RS~rL zHPW0qPEjmS;f1Z;7k!Xb>#!p$<-=>yv|L*L(au2P`*f+4@pkW`74-}ur3-(jglFTb zUe^Xqi}!ov{lF;C+dmA$ooBki_Q0{TZ#!E4| zMKAroUpu<_eci&2aU-_w$tAmepBRJip(;)?xr&2ffsLoGE2FiY6>~X#y5bVPx4zPT z+-qvGO&#^Hdu)_cn$40yut1osh%CC_l%z>ev@El%E@I`?4(=gUw)gq-@xn;(2f}-Y z96t+NHBdEAE<Tyy60N z4v{h*&SksLVXOqaa%xjT>MnJzgS)0RR?bGxTW%#+4{$Dg{F#e;iH31_y7c3x-R;5( zS>l$M7)ATF#RfuxTL zbf5NGw$^u3NRp=iGRjY1=7!kLd^~^$$%|1Bb447h=S#eS^=W$31v&4uysl@NJ2_!9 zJzgqyH@2PAKvoe1&QK35EbyI|nZXZH0h4YY&Ff%u@fS;nal3(P1lThpUHCvO=y8;-!7MwxP1;1spwt<=%=sYTQ4qekoFdwaO5?d~m zol0zQCZXg-G~58iYQh$SQOV&p;b=IdT-9zvaryJhV;f`GRrYD6_ojj#VynGC?5(Yc zZLgSYxP7{d`23_1*Mew7f(5x|?3*4>xFjQa0KddlnYCo=N~sZ(uB(m;DSg=od+GT^ zivh}i+Tnr_20-txgH)INtu*i5VPKO9VX=`6u*={U1ez3j?&vXAO~oWeI%l2Vyf zqIVLz~7v)_F{?sfyT@-`vV)c|K-iv=!!_TShVX=#XoLP|MA7XE}^o&?Zs%orCNx zx}c1?+o+>0tpKDm-#4dsAcp`9l~Gg{Pe|_03=Ws`lPC5-Bgg2{fO1G+bbJRH+$SK} z%}ha$wUJ44!rI$H~BYA}3s*y>&9 zKejP#P*f&7^YgI%mBT+j3dMAVAP3f+E+rMhhU^9|R@P4VFyw(Kk-Fr8rJWRoE$=Eo z+-ae9HA;El-~hm6CeBJh4H>Ei1&h*7qoP`FnV!&sioOCu7t|obuFP$Cum7V;%2gJ1 z&vrxtjZ>?6s>QdYG}Et-=hos2^hu^@@{MXeHd>$|>k-7hXJ;1$mkcZDcC*wZTd0B` zn~L%E@-otiJf7?ir6(k2isn-+7x12Qp+2ipR}|mgo!7l~mfM7{yX~{^-gs@i()&y~ zUrOZO*I;`CkG2=JY@|Zkg)Z`&I8x_PNNHx^tn>BUVh0Wd+zx-a;*fPD2vy?)AcIVc zVDcRa2sWaH4+zjbez=fz1~5x%4i|GRy4yeQe!I@buAqQ~MHUfRrf?X#St1;pLHx$h zzyQYBgeqaO&X`rPf5B3XUQ|3o7h^b6eIn*+M>Ek=ZqTx$?wam26FoF)ZkB29ZU5bA zq}2N$vdf#Llw;x4GssxTUc@H3mY0urovxCJ%m`6>jV8HdF(}b?qi9~E2|QV^PvusP8}g)Wp(b=W#I#FsnNib3^dn56agXZpZsQ zq^;Y*!j*%_+MAc+$E&@}UeIF+8&ynvMsS1f#rg4Kei#`*Xvljeq-MOGTOJ;wPwI3^ z>}yo^sB<*5A?!R{hO)jvG0cj{4yZztw!lG(BfvU)fI7gQ6s_ALRx!5(MUK}SEna@A zA83*x0A;F0xmJ&IN=pR>Y*TnGnt|E=jr(y&))06;lxX*vXK;(M_o0Xp*q!h_)4P~q zdX0usZL+OJC#6uT+AKQSGagZVOVQRkWQdJv~U`G{kuQ3wLPBVllBFn$07 zU-GD~o$UROkDEpGubydtWaz3eUm!FrHvyh{#*}{|zQ^uiYr_yh{0$+kqXpKU_ zdDsRXhRY9%XeKE0+L*|uuPu|!qjn?!;O4Gbmw7=JN`ALUOfIvUWxGbMgaqr$fOub?}|BQB7_*&>(TI^Xc; z5f#+<(k@`IX7JX%Gd$3{4sELQtB=wots&x`~Upv9Rmo~Q7gXr_505+;3>cj znLWn*@<+WJm=iU)%c3xQ;NQcYf0#7_Ztgty)45+&)PLP&5tVpp(PaB)IMf%k^WbfZ z_@eRuk>~_*Ly+irB^s{scjflaDT;s!>CXrFFVBtHzn@3?r6{;dztdejRK(+-*?+DC z0kbaC3!T3b41ayq53*|6;hA@SyA-upY9?wO7cN{}RhGMXw+odvI7PoN`R5(8!@(V0 zsA6S+Br(7NF=6?lj~_plvKl2mXN;_2Y{kE^{iMluaE?6SmDpTPz;2v)sg5D)otQbI z)!ihppFz!Vpj;Z1_TNRtWS6Sx(@fXUTUC1p26XbDtxA5h)(kSBYM#UBt{*1-)fin@ASa3)4kDW!U(G7Oo|Aosn z*pXjAP9pJ1HtU}|la>bq{t6pSB@i0Nq0bjk1sX;Eyx?!t&+qUhFo$R1vCmnQbr=yN-+qQLczVF=cp7Xxv-d}L{7;CIr zHLCU=t7_IWpZUzWBNgQ(;9+oJfPjGDr6fg_fq=kCfPjGiK!JSq6kzqe0Rh46Sc!-z zN{NUNDLOltTiKcc0ZB$Cr$VYG4Pyixe$L_oqmU4h-%&_X2K<;3LH-$B8bTJYC@d?~ z6E?B~Qw2jpl2^4=77!1aAeR=%+EHAwUXC?qrMCtwJi_HML&2HMUBlXi6NHH9_a~h@9G|PchHkAaLgqLx` zD(THEON9cflG_Ls|2Vpa3CNQPF_aLGZ3A3v;Bp)H~V6f;yOe$kZ&lK`Zxu=)~x|v)Yu2Cvt zz<5Q3T$J8X;LM+;-%`vas7;Eb{gze6lH~{0O#e{b3j<3W3n*aWbM$i+EVZi8jz++w zH(jfp6h%pzeSkRSO}efDnVoCZ3Cz>%P%VyxP795!w9Y=m{yDSCt@AXq_YKVbY>XLTsj2bxJlbsi{P9%M`aR}I8NH+BoC z!xmzY5N8Agv?1{pF!7KuvjIp-@O&N;TJX3bO(|HrAl(uoLLg}#b{3FDH@GAC8jwe~ z$Q0;Hj|?N+Mz9i8kRuX!fsl4QzbS~8&;t_eO~_lmA{B~sKw>_tB;2>W{VDBIEb36| z{B=eAI~G?wZcx3Tw!BwG23DxfK>j|eG`LwKy(P39_aUPuF0u{yxCVHH-Xi>q>(&SPSRjx9K`2cG%w>5C&GSGbID{TThojesiAO9_tr$$W==pXt6M2P_zINRv>fK1asu zG}bW`S>j^6dQ2BM7XlZ^S%4Ry-xynyr2>{6DlZuApW21f%QN4yZk#+o_-yC{6M)8n7fNxqt}pEC088Rlh=h{YC+IF zu}Jb;sLs%tP(DzVA*Uh!y;MrEmg09r;;6Hc<&o%rAa=ZVNOyElB26Wo$;U|}C7*x7 z%oxpxDKi|SYGvC>J&;o-pzp=*`R%da_}%Ehgc?g<7n3RP{fPa+J)$*&IwFCd5fuv~ z5n5d*T_jy3wO>3!Lmg->Y^H*#d|SFdS2%Y%N30f9_N%O#TEnf#I{CzD-hLjLEh8ga zyG1)?1)>quI&}_W&grE1U7?KxTJ(Vdi0KV)o@&vkg02M4<$8 z7IB*AxDV$9Cl03;M~1D8Ro?oJQ4vlBB0OPu=?`ab%jgrYhzEpEnBl++Hav^{#8V!Z z%B+q`p4QLhQZI?ydJL6O0~(QX(Q>WRT6XPKWuKe}l=JMB!^Uv)8H={by>Z$MFVh21 ze9b{+N@a_5`N|2kY-ByYbwRzz3-|TKJA5(dzM`i*E%$9buInopvtUDQFWe*HghBM)(Mo!vh;a7xh8X+L(N5<#}!6fVY`JT*42&- zJ6;|q_u;d+#g8eB5DD`O&I`vHn;PB@KDaNauPKBt!-iRdx0wqs z#HF`6L?DhaS`+X3l=rM7!b|NoM{Grm9&i>>AVwF(jdahyLg}q?*N1hBB_``b%f|k# ziT*((%RtvkSK;mK3H@3Fr2$nGnl7^C&(fdHNYdN)Lx=3m+`S*FX|5iD%Rxo3^mKFj zX{}d#Bqt;n1%<6){F@I`hYA0*E zj4}DQA9u9wIvsA;HLRj-8W6)6L)v?;Kb6|b7&UxLj>fOYevLf0khu>}7g@{n%Tym| zA5=~Hw5j|{GU`W z*Bckz>vC+xZ2OH%D_JWRKE{u(Z+~8X*;hYo>~tDDMn2x30oJ}(O%zpK1WW|V-8*&` z_+J^$^x%fSAvCgTa-7+lvSJWIgrkQWyk))Ju9Ff=tN`lb*x!tAWbT<(Y6~bzzcpL6 zXf3VHCQi+`@jiL_l>4048rb=-d-QIJ&P&B6Wy&Kfpl9LmWP5o3l$&99r8t*0crADc zx7eNB;ODs1J$#P8#bf}}Uv?@ zcH!K)A9fnMP{pNJV(-1q>oR(|5W1SRs&O&aIqSx8aM5}3^CHLR%?I?6<+95^{?_o$ z=!0~uuwbwZFq(VB`|Ejpr+I+jFejA*@YLtI{p^w99ek2%awPXupc=P^ zkdq0E(Q~)|4fCCWoIxTS<}?2RaH4Tg?f=~O3MlWp?t8B;svg|1^(?=4-{cweI44CW zRoJlTBz#xAQ##%KP^eJA&)wx0Ak@17e=OQ5?_XSSAl@X1HH(dvYEixrr3ny*$jX4} z&h(S~o&^MS4gvJ%IqCgAL@>!A2pZ%wlG5i2+6f}B2{+)#3@Ah&)X;}~W`^YB*HAlA zP}I>n@Yz-#-Y1GyS@8Q$hC0ld3|<0U9~%UqDzJcRaubunMiUbQn*>urkf{`&Eve#&L@BHH5^{g=HYjc>`FWiu5m4#FVbskrYU7ECkI6R z)rJBB1I7UY|7rn$UHrhf|I-!+rUC-}ul_Hh9Bu^!_Rlf$U-y4};=itc%=zy-NFK=l z9sy302l~I;z<>TRbjx_i;p+zND5>QF1cX8Uj|*5znd}M(NDxR$R7lkm_$(VT3(vyu z!@|Sd-Q1%o^;B%;mxqjV@*4aAdolPdF|cr=067v-K4mdwelRpSF*FzyI|S}72`#jwPfzv*$SR6ZvAXo$t zG7*Sq02C7N|2!CSL$#EcAZrKzYv=zNVF)H^KD!D0w`pG^0tR+mA*7(5nllyKiC>l(0$9?N z5{m+W?{?s(M|aB%S7 zqLisMz?4>+Oe}PKd^9{1TG+Oo+ja2i~#SRwmG}~iiVFiHDC(HB%bQKj9rHyJ(C)-l6v9qgF8!;|z zOe04QkmW9p-{w1}Ve%#JHPXu5d2*(X?k3n~!bY!Z&xqASmDAX_riq0@4- z6K$5ufEL%_(I93rt;+3pHTB! zZ({G-$z`%JCqjY>6^>tP%TJ9WUz=uy*DF8CFvr2U92jtlQ&Cgv+6-s&5^^Pav|A;W zCSh1A#zutre)p~;y*zhc?Y--Tsn1QGgT~5FuFIPKw{v^-iiAZ#pxw1SELHu(?07)q z_YH@~J4N=eJU6h?tb@;~4kaI(KhlWH=mMRi+2ptMP6xv$Now@CkQi$>Pscpn5s?Y? zXz-r>CRdTI_4mQJVaMF{DqD)qhvqK11~N~jta%Qf=MnU4Pv7|{bhSq3v!&W#NJIp9 z_+xQ&W-R30IB+Ff5jly%=?Qnwm1#$^otubadqD-BFs7AF1KPb;z&#=YLL2RDQ-yJB zgbeNIftQAagoKAj^Nt2JI+Q)frDM%+y3swd--^Ei@^@ND=$~sD z?JDK^=bAnoKTm1>4~+d2bUqrOV&Y=f{4P7|&BxnrqG%=#k^nJr{0~dJhuO`(6KBhs zl(`JHtH0$^On(CR8TS`Ip{0(7E}2!+ikKhXcyie_#V+jenK2LBRest=`@V*Td7CB!hFK#NbxDP6%PrTO}KVNAkx{Ud< zb20Po9pGWDK&?GM^(r!3WfYSP_rwb%jUB1cZQW8N{hAw+{H46nY;iesG&Ex-Ly}<0 zi|k-yXJ=z~-EAYz+S1q4ED_Lbr`@!Flo9vy)Vj6K!;vaoep{70yP|AXFm7gBV&Rd{b1QI=!?xvN#Rj)Td3bKSPXgy_jSc5_kfcUSG6L$a0!~w1-5Wmd z4gn1m+VmY)z1PvQyZ-ZaaR)bb5@Y)?eSM()#t2qZiQR|HRviXgoS6QRzfQ1xty24h zz-@{LV10|U1G5P5W%ys`RF0>W0JLtd?i4#ryjar7USMzXqPh`57L3J7CW;H`&c8z9 zoiUK?Gux`LGwjnEFT;=#!jW|7pM432Pj9_sikQXoh6lyP6AKH^v$H#5cv?F3s|U{~ zEM^kPeyNRLBJK?gh(o>-w~$`jPxrrH#C;y0rK3C8IfNk&pP5rl`TbuFk$r z^#N$L>i!(w%5fjkLPEld4OysSB#|rdBBO$9Fy)S#*AFEQcqskw(26M+HSF z?~P)NMTfp+Xe(b!mc1NxHg|qx6WWGB|6f;5r^!B)GzxEp&&QpV(o5R9=|f5pwOo__ zStbygu%fW=_Vaz*KmjXjh8S&Q<@Hj6ksa+U1a>qTCQGwYyPvb5CqW{nk_j?=%Cn}> zq?QV$>9XTio{XUDMXlOeHfCO&pxJ}(<)}^N_@Ta4Piq!XJm6fa7Pd&--%+KJ z=X*^MmU}=Ma{ZBL6^as*H#=9PBWJd3SR^+rWk=g zC!D+H8mI(99+X#+wwM^}AS=0&XbSsHHz`U~3ZxG=4=M3?;?!R$qf>`eZaKJX24ivH zBo-GpV$83$AI?YGe>FON5D+TsP_m757W2H}+1W|ndXvMdWSR*d=$u`&W>F;0hPyQ` z7kT%{%a+@T0kLM^$M*Yo@e{U&&DG7D6vB@qiLRD=c4V)i#J9NSPWbDwSeX+ZNJN6R z-MFvi{zIGyxb|DD$~NHhJ=&|MLV39G=(KrzDiDLc{Qa1N&*P!%u})*Hw6?2|bMB9D zJZ){}xV4lI3VA2JOxmK28W|V&a4~_f${y51WZFbF+SGrn_8xT0AV_*H-KsovsMYaN z`(ew>mm$mCZ>tm3U0=495%x$OzkJlbpV!3>6U=Czv~8plS48x-O4>K= zZYWh~-Ll$Wn2b62{0^h)QLBoycHv3()6*;qRTkc$l8#PaN|=U0SFP&Dm2IgO!biF+ zj^5x@^(u`|0kPP2_FWHMpc;b!DNf?Dg{Ua%-!QTn%66j;9I?Ul8fC6OXl$d-?Di)! zZsd5s@^eOcwQ~8q-D(p)mopiGLdQj8H8wWE#?_w6voJyQ-tDu&`wPO^SkAfzV7w~V z&Q7XAtG@W7_7xH$$IIMA!e_M~)1bp*38xzvfv%F5~&sw}?mG_4XTf8MNL#`SB; z--L`GCi!^#P{QS0Gj8P`t%`Jec(@U__&LUlDdswb{*t@8;wuHpiJ&v+DAlGHo-5Gj zj_&iYZCNcg>m>;*XJ`=x^AK64=J%SztBMk4MZ?*Zxbk6=ga2URb@U}h$bzZ7%)01rw`)~k{!^U;Mjko1x$Lg^F~^sIW!&^iJ1dlplht%?^a7>@n&c;H8s+FWDRx z7dd`D&GxG>(AtDClqm4C?VX*w@EmgaU8;VeQe7VIu7c*5%k3U3X6(i-=m1qVJDnSE zU8JE>#o{8BU(&5$x=}kUboc~~WUpj^Qd}ss$<*jjS?bpBlN)dw7-<;MfB^l ztf|bKN5eRq6a475gc+8eJ2*o_>{C~T6q|_(HXD0Z>3jNjF`yu(y@(B;LGu7 z8k+yuM6RanC0uU^DZTMthFQc-tS%`jev?B(9x$L!r5!~ApRm(m>S`w4lMDILG@;qT z_SNSuKhPzt`+!d8npP%-pqjqPcG!66ta7y}TiRU2gtQO)!ebXz5LCo+KDd*( zBa=24!tV3JHDizRF#@T$hsN-DFM}lXwd_k$==B-g zR`~wWb!9o72qTT6PdAddc)0a?N#HwF@}zFy%k;oux53QHJD13re}ggd(_ym~KY!vM z&fz}DnwH&XEiBJwZvP_4$S-lMien_G7@xz>+dUx}ex1gL%yY=U-=Gq$FrU#fGb3*A z?nyHcGRihN0xKA%x{nF+otX2rC?49BwKJQ)dp532T?G^&mJKGfgOyU051Afq$i$C939)~@>+Bb7gp#bbD4M1+nk@QesV0r z{9iPa|FUn#IHUl^RS!df9}90@wz-hTY*T7{gcJxRf9 z4p#T~L~IrdW6JD_7z1FwEGMWE*Egbv{JpI#6N$=FZ8Z}f>fSW3u1&y}1=Z*Ed--Ce z4_tE})Xw}O{}oVFryS1QJ0juxQHTea!TX5@vh4fEW2eL0y2s_l`>ny7@tdRxVc_DD z1jq5fkn6dtyN6~NdbFsL9&M)VfnMA%+`_&-9d?Idv)N}^jQo{IPhD{-ryLfqRI*pP zzHVGdH8rg(cKv8hc`}p;Y$=i60HIjCWh(nuuA*TW?_MH!#YMG4Ko!vdm>iGT%ibz!VQYXW}^E}rOGnb3Hzd+H8uR~w!CoStuJiynpPRGfeogyk=I%j;ST{s*9k-rUDc}A zH8zrC#A>$zbKsgy_T@_wA-U?}b-cS$fF>Czbw~~mnB?u?^iH!ZHxS(%>BJqZhnf~^ z(`5oHlxfQUyoJH+H_PbR0Ax9la=gYwSc3f36CT0@djEL}1cf}=?>Pk|4>JmQjiyv` z=z6>lyLFYEPJ{awcnhOl4`){4V%XK=E(GwyEWVsO_+*+LAw8y6wYpkbnr?JFFWVvjfI9&h7O8qpjb$lx zI;%AwwTfgxt~P4(ik53NV{ujTT?&Eiy3;X%(|6rdSnlyL=jiJ)m}7t^zc4%3$*g{m z3AXif$Em?OM79~x2PwIFMcN%U_?1fH@OIUq?fzJzmfKJiUHds+iPakAU)@^foOrIQ z;^aEgky3yt5rMK<$V@@TYs8{R8B3VIuAt}^IT2%uECK@j&VZxA>3+|k02tZYMyC%Z zoi?lgRsW`jFRgAzg}iE0gq1>(^8KMy(d^RlZ#!I);ZxH3*B7Fzlh@cw{PT0kN%6^= z0Z9``bJ~Zl=W_=RaU7n~Umx?;-#eW=U+^vUWV_oVkLQ;(UET`;7wergTrZSCJNC`xIT;+t~SnJ)aXbwFQlk`#gPTkok?Z&L( zpHs5BD10A|K#k*5$`wD=e{t=Eg>3)X51Yjc{iS2%~fn@nW=))G>R zfGUV7HqKyAkvEq%ypVk(mm5emeK1wEjQN{)0(7Tnx7)gw|Gpl;rQ}_oRS<|}w4KBK zer(pX39u+Hqf8sa^15i1%Vc-J`CNLe(p%;9UDet2t{W4Vex}jCjvB}sKzLg+u7#@g zK0cX`?P0lab#u?=m8j&S^j%L<$lf0sxIaa&ZYIZLf){bTJvw6Z&^IV5fB*sJ9R89m z6miC5>$b9jNz4%W-mc_0I=yyTCJS=bqSVSst~uMH4UnP53KKZGp6vj)NR(Iu8$MAK7YiUg^S%B{|5na}Ypw%5RcrH*W3A@NnNyR|)R1Dn@; z`A37GCR!54_(@4J{wfT2%P0UH95z)}3_Q(i=*=fe%6jI}RJYtLALgun-vWBE`eq^R zS!JN(aG_Qu>++=xwz2iLQt}et#HKRnXcPM0441fHuHPPT{H{&tam#18TFK#pcKRFIx=wTI9_*C#-43QM{k6 zgV7bXNA6T^&C$V32;(ss){A-`dPG=);>{9J4Gm4*pqup;llj3u$U;Og7f2|*>yi-7 z$|h2)&P4Yvt+YP`%Hlx5VRCfh%FFA01~2?Y^BOO*q3?Rl zX`iaWp>G>%S8O<&+`N`gn}4k8{LHY?4^!~CJ5pkF#luu}rA`i0MR-Z}WHmm)+37}J zqw`9BxX77yMUW)+o6fdz-^4>px3RO*Ycf?DFBd0t#f)n6GQC`ThNVVd`UKA<8zJD& z#M!5XZQYby4Xch#F~90gaLuMc15=8kSb4`w5{9cAu~I(8K4AF*T)UtMmp zkw+!WF?C0c|2qmYumOXG>>{VoYAJi$)pIIJ1n;~N~Pn=kRg@8r@wa+z9Hck zeHoqm!vSLs%z2%~L{{zh&%peio~^fMN`b>+QmUR%)2##2W)53VkZ3`*oQ^qF35f8t zu^bkQ3snZ*UEfh=JW=QRIR_4XK0$}a`*E!f&+B5jObAFwby@+$@$%}nlN-X%MZi?q zONx$tV7EBwxi2vfD{F+m&esv2hFPulybq18OIPJACAz_70=fE4TAQ-)AP-n<|Dvv; zuzHfE15azqE=rzw4n|Y^GQzOc+ML`rdjqifil+Thx5&Uuo@b8Mu299zCK*M>$UVCW zj!@TUmToyTDMag?AKg=$BfIctJZlabGWG4NKA_WOTjEAdrb2`?C;c;je!NO?#gFBn z!NUJF5OTCfUTXBgB(NM#>@V@I2!+MSQ^F{-h>eMBYRqYEXS%!6*|;nAxzvfSvo1a6 zvpTu?b>a5nGzSqr#=juI_$itmTdbw%T0~Ni539Mo9Zo3TTCGZvJZ!3w)%-SJ?d@iw zRZ{CQGqK_Kde!a8;OI>MDCIKAJ0&m$Sj4zJknb9c>n8~_>a}KSrC@7gn300l6B3|}>#u{`+ZC?q=UsFfH`8}P75Vry$@3kg1rBp;U> zmx(z=U6JH+vmB#MpK^nZ&cMc~qhyPjI&LbrdQEJ*(Qk1JUX3zj?wqd6R5299z?eoi z6x6QGCWB$%1jgmeOR#-ss`o6c!nIan5IXVK#T5kmkc1YD%%{VUomP3?Q+d}tDhbuz ztkpad`Tp8`Z)2qX{Z?mFoPhI!&7X}7tx(2=1X-uXkk}cJ;2OK4+v@9o{{G0I)v*W9 z(dqxT_ws@0|I`=QBh=8F!Bdj{w4a3OX#_TX^ZD>j=<4D2KJT+}+k3=%?sxTmIVD%F zJ)d9@8*!a!@7;GbH3e#ODM4}v&(X0%De!T5J89rG&bG*V{|8mF>``*2aZw)@3 z9VdF+pvLhyaX(!aA$iPs`L43-$%{TUX_{Z>p|Qywg7jLFHE@^;m;kQ#w|J~0L1*># z?7lPXQ(0&<%N#vsxnSIpOX}*}eEtV%dy@ly%XbgPfH6DGjSJ^rx@>ovyiBajI8b4t z%N$bzrKc3y){`02=SiW`-wyM_GR>{q&P8B=E?Ti$*@dKwv@W__7N7!5>@vkLPIEwo_`X&rp)oY`TYu5 zB#;0c-KH=IJR2#puCi9XrXEoXBx|wfj7Me2p%;xta>FI?BxTV^5YP zxxou#T{|{p3=wo{-hvM;xN7K`y+kZfi=RDX6CWQO;0Qt7a+Ve0 zaT2=vgIbwj*-==&DlXV=mrtiFwrDYS!sB@5D5C=jQx+Rbp=5$hv5{V+?BwW3l{=nKg}-5}S)9zUU*2ZD%$;&+X~p4&+BgDheVy{z zu^WSQm2O4)w=^nJ;4xW1@q*2QZkyYxI@XF@6^&14&F@+_SJxbA6O(UPtrpd_wG(Y_ zr&EZh$%_V?d%JRO8JI7cg3&h3qfTH)=7U1a9o>b`DTT*sP$sZBbyn(Z==!W@HhTT` z^MEWXG|EG8ONSvtp}hqAa||)f`DbM@mIQ)x7F&(hvUV`!_lkAL8ZRpQNK8}xc*e@& zMsPCIRatitLl>l{reRqt(S%nJWFhq$B+7^$$EU4rk#qcWD%f1vlG}b^Mm+1w6GnU% zogorOAZ~*jPn}h6)=@kuN|sRCw+C}h*^i)~=`>ade+v%+pt7R6i&CqEEICeWv#on& zc;bwmWm4%x+%5#BOgNiB)1x{pHJ2k!!uafTD74i`$8fE2pC_73`jj+4fJH=Hxy+sY z$+ygnwmKpWo%#aMB>bGg`-j&+UYw7^xLog+YPZRPx(~-QDJ3f$Fy9=ZHQK-@4p_;8 zPGuWJ{7B>R4!CxPoj7KNgV?>zTr!MW!K9!E_XS7hMnt}HRd(kl!>a7L61x|UtYO^N zZB`h!Thn8{*t*{JY{2kvwU*g2)?glpX)DJMewkmI5#8kFgWy{?tIaY#l|7 z9zo8a4;a+7Ecg8Ctj@ROy!27E`=M#lQty=URF>muPqMTzv~Y=p0K48|^*3Tyv{}ct zvL0axm9NNAnJO736i**gv@k)Gw%BuDO5iL+C~+AzVCwHe@z?Ir0gpBj`ysc$E5-h_ z!C;(-F5Og*-VMtTSLHlOVuIDartT30D%o;4yyX)0CcVS0(@5NNW!IUP3q~Cs_NCSs z*&8i0k03ZrKV)}UY3kIZwG0b9SW`Shx{W}rCO6cfwOD1&^*mVCWX+N;KDZm_cD}m; z$JB+gdE1sCAi%}F&$~?RMvp?8D-Bi`lWHrwfTNr({>nnGWJH95mhupcm^yyKHF)67 zpOECo7Z{dc(|_e^^F>|$nuj0)5jBJX^VMgNwY9X;?4h+>iw&}X#{ z*M!~==smNPL~w)u2B38SD=7S}4URsSn5M~jGsK-b%Ein`7C}4ob(kO4bbkWSWQPzS4OEQr4O0f42U5a%$ki_M2#R9JXP&mX0 z4nhEce4cM1N{|$^`YH&pw55oF$1j?USBS;2u(PwXE{do!4@V>vLukrWL(xza>_{A4 z$>Pxv&Uc{Cru!A9MthoAKqS^)-tP0!D;AD`FZ{-(>RY62Z)KIf&S7C{$~wJZTo{^W zB0-|GbQEVsy7Kq=JP9G<;jZz4URV|%H}LGn;|5~+>R~H8vd8q_aB;gv0z?KS}esj(rRPf zc10h?ANCiAo&|9WhVR{};|Eis9p918%c2tn!kj7tn9Xr`4_w(zoP4QOsD8CsxkxiI z*HDwDLMLoH~Q7kNB7M7>M=VR}Y!QyPhfEOA_z4old*@vC~3szy&vm{f1i91mb?)=axe4it+ zceqvxW(M|r|8~l)eGlAI;k4yt4E8N1y?*Dx%-80$7`?xUKq8h|gRc-8rK`$_zGOU!Y+(FbuQr%E#XGH$f(6}t*If)h*)Gylny8HorHS$z*y37lO*&| z4mjBLmIMQQ1n`3Gt0V>fTEACzQ~h1)S!Pa5Z`<}Me>lBA){7)zYhlU~QBM_GEcMH@ z1>*@N_y`a)=~*NyMNTiU|5m)j84j&V=P`|;8og-O92q3qfDBA>rHmTC=B~(SLJ}2{ zeQv%KHVRL7=GGbyTNzF8gYp*2euLC|iZohHVz)(=qWN*kao!oPS!WTRW3WEUE{??x zw*Xt|Kws+jTU5Ee|M}=D4>z)f{^*4`x>GFXdeCU#fH<9t=G0Trf_ORO;C{DM*wH{( zi<7xyJLeDaTS?Lk*@^+JU)Ppu)enew9DSi{e=C&uA{2Sc7eBVYW!!xh%t|FMkbqby0Dan1xGD6Y zaTk>hj^o(BZ{Yr*R%HUI)jDeKBi_J$Z-5B}0cmo1uAm)G*~O8uD2D*)o4#2Qkbi!J@KgU5viR1LxbqMRyzL~5+)!}Jqxy6nP zwV2RhKq53}g2$U=NyxWQ#4Wa2w~`ec zGj4BddAZNWTWEIndQG{JrVBlkEe8FBaIc;2psn@NRQybfhF%7#dIv?-H9QV(?G|VF zjrmx)dF^T1;lW#0S9$sA2u;<{Pv!QRl@>O zK3oQO&+GB;1pxmvF|bc}RlG#a_|D&4^@n|l zX^pL6lwT)l%TXOI3%|EG>>K>MuFUuVLWtXVuXq>-&u|0B*Et?CcZc~DtTY*NZTGA5 z*bWNy!DKkTywoUHW5=#Nu}_t_(#(j`KGK)^VFnFf58k6ki?Ld;9PK>c8iqL z-G+^`8#Q|_wGF+-`@=Ha@uqjRS}do%4lA!DQ4Z!?2{&mLs8ZXePCuYO^%SW%=o{oGw)hqO>X%As{f? zYBmrr8l(ldxFqfUikv7g;X2wVEge;zN;xrRdM-_w-<%0@Sa_|9qicoi7e!fB*;Kib z_GFDj2$E9aSAJIjpi z{zPFSu~wC}NKs+^Aa^)Vv3L?^euWD-V*S?;q5F$=(uuqEPZE$;e#sOOP-wT{WZJMn zXpv${e{?F#)W+uwb#>euD<+Q4=W9){^Z`UZV4^0Z?rZ(j*{#S-^si`=mYzc-2)qR9 zT6h<%Gyrv(0(0Yxgl@2-i(p@PJVm$MG9eqUFj_0d6y%1uz)_MW?34X zSRpH1^!W;F5(Y4kkKbA>UTiOS6CBzFyCxH}jzpphCqWp-!U&g2C0J*{ zj*XnTODhVu4huRQ7cN}b+ebh|?4g-Z(2zMrQ*gYqxtxeL>2kZdSz(`sUBL39V?#Qc z1$8^Jp8o3;C;42}AKf=oy9P0dS-EO5HxD{y;oYOF|8v2MKOGw=2)Vop7WC8U)9- zHp1b^rmWk1Dd9r3v!!DZqNr|0qf{EUdt@J zEJD0yqh#K)sTA^{35C2*KPrmAC7nl1gNsP#)fs^dy;f=Z5Q}FA> z(w6Mc=1SU-r|7{z10O_6D7XjK6HU*+4P)#&JtG#`RgL$E=`r>(jOMwgv@ ze2r?8SFxrK*g(@(|K``~DGlQkl6YVDEy2I~C%iz8{M5c_hyuW%;ZbqfMipn^PH=F` z+#zehg^vK0Wo9BOdU5FLzQjV(uH(9GCp%j8hfknFd$xV#BcCg)J(mvck7J*RS^VU7!6RO83*|bxr(FoLwF$yB3*M-zL&7 zx&R64g$7;njF~z zCL0ZmKgIwz@Ek{Hh;H_9u9!~=^hOv@}AmL--E$notBsj_aOcCzJVf&Uiy6$kj z7ftYFvC#zz*Rfa-FzJ*95$1>_MZD>t)|*)({O%Oj0Tbz{YBco^GAqb337OUu5k_2oW>WWOE&`24<_ zN_(&xl}DCV+nxL=s^@jn&Rrq_(TV_ss43pKuf$bG5iZ*rPWQ-@+m7NwRT6 zXYv}nu$I4G7|3Zhu!$WeRJo{3jcv%8V5CEn8ak-drj)3v)sr~E5+2eoRM^PV6l*g< zunG)Rny4Grmp!%88s~JEE^3_d|FsPPrDwjxC7F@~af0SPV3ua`i{G%2qi;RI5cs_^~8G-lNrCj#zI1E&s_0LmaC0qRs}5{GvDW_YVHjBPpsEFziS%qr?*BZ&=$;ocdBx#8T~%vHv;W_T|Q8LxFJQ z`m8U`js$5K01_dk>RMBcp(13qK4uIc^+xn1uq)HsbB5du-k?-G2!(CBRQCSvsBlNA z27Yc5I^_aeNu31Cq$KS)=N*b0V>Py%V?nsaDd<9ddRO?;SPJ2USbY&jI8(dv+m?jt z^uJyaFJAWtM!Lf&KRwP_0)av2Y;2O&jL69~=C zQO8^=7bQymxn3FzcQ7VRUk4-05dK&8Ao$-8D#SqFR%cMc>BYpDSoei3o6It)$S~l* ziPDtNDm5$iU_*PReJOMTpXNu+(#9$TFc~t68{I}9a^m!dNehj&rqpTs?()evX?X1O zb#d4$00B4NWvr{!X4Zut*f&+g^>kp-s}v+N`R9;v@M|CC2Im5Xr1D{?Q3vo_}Fpj_(kDAr^&;L(0JrCirVm6%THB0?(9jM zZGNu@usEsRq;sV!cqi1SrC2m_x>_9lR}a8PCd^W7s+6O7+G?m7*f_3;H1QTp6l_B8Mv@ zVr(qGKCLp|CnI6IwdK5ZkuEyYPkL|K!BA-%on||}h0W@xcl#VdGrqPo)v(<05y0)x z=E0ZJ#NxIdZ!wV(%6j$?hw!wNE-PMM8h>9I*^ z+jD4ay+|J6gl&U61c<=iI&Q|j3?6RujYYu*PzAl+8_P!O&c2F>!Qq+J=u%;yL3*3G z24kJp%T(v6xwQ-X+1?JnD5Tq;6kI4s1~i&5qw}Rs6(!%g!NOA^&y9ZJh08}T;?__i zQ{I9W;^g!(cTUaat1)DfI2app+Oo_#jg98d?wrooum6951HcS$aK{{EIAmSlgQ{br z_UJe2;N-VNwiU(bCeQ38oLjW%kFCL%x3-bcI;$4~E20*R>u7tX2tI)o8WosdRZT6k z{z60oQK5X_k31akpYNZD=anV?7kh6N71y$bjYbGTf(Q3tAy{yigkT}KI|(k0yN2Ly z0fJj_r|||FcMUF$TX45V{*`mjIXgRNkNbGXefSycVU2Ejt*TkmYt}chYTp(|;;}1ZLcQa7 z(I6o)k)*_wfkSYxkv?-d9+oH=bTVY96gA&zM~{h;^_dW7ni-$OZVM#oF#d`G57@P# zB2x%J^SU(kZdTX6U&ArzWsNV?d81p?7m_~1#cX)qFgU~4)=!z%v~^Dtv|m$$u${FN z7m`~zYRdQ=N#9n0c#Zqoo3cn-r9ZcT^TdMYpUmgocjUFfwoMGr^`l*!jB>{E%gUbZ z{uc>VF4(+O37qzYDmqx&=X7X6LN`(f4muatYx=K0f8SbO#wy!=qf~4z=C3PO&iw;i z)ZlXv5$d~b+{M=KCQfSY=WCBQ*3O5Lk{GY6I2cIob=bJxKT6J@7WAGBi*w@U;Y$!Q zbB!6Vz=o!FK{0R|YfYW#g_i?|pV_V^l@hsC<7IgLkPtNcYV|bRS++TB2NMo?a`J?$E^y!sPmi9F|Ma{kp4FXm`Nma%3mpBqMn@RPJNFhU$ZKZ3 z?+>C&w~0r;e}|Nj%iR~B8AHf`Is}mj=+>8^+S4?t?j?cMP=ZI3`e}mVmAc3UkMk)% zW2vJD66&(2nBa{KHaOYdwo@g}H@Mnw5(NZr=p+@=x9V$2(6tR=t%7Ww3e@}7QQ``t zKNyR5ccFA1N2JcN&oCZW*z#`2XQy*LXWOX>CtkwjUVefz+-m!!{~3Z|?;a5`5zB34G)Ihr5;Q6kob(jJZU^Jr59d%_$?$6%fad4E;r;49*pcEpGv`n^|o)bWc zn}BF*<$OA7xx3}6tZ;m6yYf?6RrQ8UB~D>`;B~Z<=c)Sr$kI~j9=}2tV<5@CWobNk za35hbBFhBnzN@X8zXDF_k{Ty#&{a=U-$aIwFY=>yk^C7#BbhaGg2ZK=1ooFV-WA`* z9MPW4VV5w)lm#c4MD4Q>IySKWo_2VE|lFRII7+Et(cdpjE* zn>6J6_FA^D?DMq@Y=-jFr3Z|zm&{-7&5w!ByHDEbK|-`twXT%Gun&qEKu+T>abmue z!R^SSoWN)_87UtD z5RD6FIU}{6yN=JXqwP&sWamres+_g9Qr32_b_;rh5Q-igJCwq~fEtG>@~&UL3|#YP6U zF~^xVpOBpmyEZ;Hm3^D#c-UNczE1RGHg9Tus@$m>l(7_|Iu=93jY(7UP zFLoxR#{mu%7`!zWzHr8{y+60J^4e9F^SS?NlDEx9jDOdUI}h168eO$$(EC1eWG&dg z_rZ2JqMV;u=EHGHd8Ly0M%zdqF*ZwC`hpto2z@mJotSUrMaAOS+2+B%M>lnU)3_)G z%+sBV6VJlTTG2Qm^a^fuPoH)jvZLqB+_QTp3O^DMU`c_q@h{BA4}Oo%M04xOjc?K| z30cq}dCn-VkDk33Uu%9?TDfFr7LQy%sHp|v`8F}q#<)!6S-$)%^wAohn~$TTGX@5F zrrTAijyvlx{xcJ{`pmnB%5O!Ht2`=fPPd{hg;@Gx3fn2WAxMTGu!!wBOJZkC^AQUX zs+7cQK90tIyBYBjhMMjdOrth0u+4)zM`VlD8MBg-)Q%C`7wqayTe{GAI!YK?bogW4Pu?=ygc#SB?XEt0 zadG50FDx_!J8D=>7>=|{-4Z;#Q8mocHz(GvlhYjtw%R{$nqL&^fn9Ga8GoL7WQbMk z=Hb~$B$9uXvK9Kh!gi_|DRzb|ZHMe4y4!p9tUk}?GGKD`YC6(*(%bT0c<}Iie*Pl( zN#A_e05TDrWmqa4=At?4iiLD~dcL>Vgp-AL*5#rwGU6fq++}V}`vs9w_9LRg2&yMU z_mv`QMW&UVEB%?lpyv-H(wV630^6c%BF?kBBYqm!=aiu7vJp9owJjH_4&tIb7JY0w z!pX)%-EgJNwHYlCk<5f9(IEfQ{Pho8;+f>(bxboWVy+HOhnjx0%)OS;b0lUUAd-A% z;!so52~;5wAg`^nRW?eGO1?XCQ>lIg)>(7?Ds^$)SSOI$TQj%|LL~hMjcp&@VvS+* z+JMqGQ+ByyD4cDPAcQZ+F54)#X$r$ec($vpQP>{Y`D6DQ`SLN@e!8kX>BAxSm3t!Z zZB}Nr^=9|^*3_HXu}H7ex9651uiOgCnj=X%>*`&3r)=)K4Zm1x?UttfCur_%1wREZ zFa77^1m{zF==BgNphV8QC!}&85?l$Tz!KvIzgnsDZ+1SpJx$p$Saf zM;=bIfBCB`N?cMwYG%^GUT+!MCJTyWtbahkVMnJ~VnR_)vF=?Q8H zWl$@gZ+0X;*Z5Wka?dCyeOE%PTlVx3ga*-(Gzei`zh(2JFKRj|^UAPp>QlkDTHdjK zKCgZ+VWCGr&I9YK*K)OV^3`6-+UXjCv zYWO^s=`OtYmj?`7^gBXgBX3u3R)%gN9V<-zYPward)Js|Op0P>Q?k$zOl71~0V zgl`HYNbhqsn5hzp_Nq8vejFDNt!JZF62ZK&`Lf3(Q8QkJdHh1 z&S9qgRs!>bZqK@F_j3{;qc`4eMOWg32$G`)#GMG>6(@TV3$&p{a zo$T?nyEjn_WO)&Ot9bim=m@TBcf~m@)I_Gr{?$oM&G`wleSM5?p(>~P*o%-b_5KGlGOtDVX`mm+S>i1?aD(I>u>X$lpEGv-NGLs;G(i>h|505oR zXPQstg(tnE5&OC>FoWzZl8t>~Cl1bd4xp~04|ICNRut1sswfa_nn8mX66jlA+Z2Oy zn2o`mMe$ULG;gi*gt`djg} zO)2Jd!m?LQXs1hd1h>O6A@?{J{FH_fe$5_f@7xrDqd})*WgP%-IjF-0%_lJPTk)jZ zrn1ZOd@~9!>$XN+?S`0SQ_mG}mG$6OvwKGkX3q;gtrz9pw@Fhm74;K9X@qgy`%NJP z40>+8aY}b)T34;HO%|`apXt^7nz^H%mkx15bRH8J^8S=`eH&O0Ik*3q2wyRZ70?gu zD9qX`BH{Q*(4aelUi4+tGmd_b<;C|K!*HF7S38x&rJ+#E7+g7$FAuJ77MrxD3d>yQ z+*M2J&2M^T2Xl^dkwW{SjJG zS-lUwZp*Z~YvBnoK9^H@o43cFeK-1ktY`Cu=W&1Zr5WlxH#7Y4!8?QCspjQ9=yhl0 zt(P}tx@beSX2An0^UrXPhv_TBo2a=~Jz1D&ZcGUo$sr%jgD@mytf?&$UKJYgR;npB z`bfSE!ZsrFkyvwO)jLH_5hiObQ(d~Ud97Yzp543FMK^_CWIEF6N*zq&rS(#CXu$q* zf(aC?(X@wsfPg#d+hYm}iivIvb46hO%obn$a9PKVqh1y-6&k4!bFER*r}d0IWbh%CyJFk7ro zhk!7&8Y?`{`q*nXzUaR+O)<7rl)2|F1?`FmEFP0M?^t~e2BFh!5|wE zsj=Adkh8s_$(Z@#c5vPsBrFs`4hQd|V&1Jb;8czr={`t!F!fza9Z3hfc`10FJ<=$> z?v>jYOub#b%eeY<_<#=!nQCN2ByJ$ZeKL%EL2E&;=2e-s=h^puE<^>iS+;NxF?W@d zgUm=#B+MJXi`9OIeTSuayP=C_y8b@me$YfQsyMt=;-G1DC;du)^))A-U)d&?z;S@H z_Y&yf7T$GvnF=^^=?C}yCK)F?zPEuGOBS$Me(2GdJFUtrlF8j{-rad`;6c$a%LZ5i zW8ZTr;{JBT1ZumEHmo-6euubt+t!^~kuJQlJq%ti=uX$YXpw+A^!N681AN9X<$Orr zd=*LVb=u5Np>2IPbe}>+1i7>9SJm}Xdk`ty82`it|9wMldvzCHxOi-Va*n3>=em{H z=g?x+aea!u6J`ZW`Ko6VLzp)}{qzG(m)^_A)lXV|v5j*3v8Z%`!?!KGiuIY((PKJ= zJj*s}($c0b9I-4SL2KV%N#f(! zT_MZ;b9tJ0R$N>Y0yzWXIkkGb#`dL&tvZu~gQ0d? ztO3p_Hig{i_S|JAupU}Vio-RE+N?N8WdeU$obOVLXY<)o{{B*tYwL1CCX-C5m z8}TOsBH}z%T{|()wxPjc54b&f=iN#izRvYA@g|Fg?OMx19$6E441uwu#PC3o?$!16 zK-UG6oN%*yKbU=!QT^nYco?!(S&?~X!Y%N{YkceMEGM#Yv;W=}vc)@kx>-l=d225! zfzfnTc5l_&7y3B!uvL&>zc5cc5bAg$F$;0uWGQJHDu6ASEW*uo4D{^I&RlxxLlelS zn@Bfqt`}jqmyeS$WMQk#AifA8$dMVUx#LX!F!Z#WO=>t(l>nV)<9vs*T5rWXb0p3eF} zeIN}*OKP+2NAIRao}P!uyPnl-&$~+eS50qzJf+zuCe~=Tae<=|ozY}euxu|i19+VY zWd0pT`mi_R8=2Vy1l`hsw6&;jKZqTyAve%huh3 z6wl%Jx^)4n66){Sif54&gCjb2@GtH%HfnLFQUX;cP%+5E>L4e zxMf9(9zbEctd#`#{_T4Ef5mj zqidN$-az$M1as`_U+@9AHeu%LDROO#2zn)lT#=HFEGRJyAz$oAHn*PQg?D*`Ouc5* z;l`pVeOX?u@Md&qo$aTk(`1{9G>ePINyQ3U%DhN}fFio0$_-tS;+6G2!{Jkzf?T`U64 zh_upl7YT|FT8i&F)V$TFro(~r>1T%r;gK@OtYvlkj%eXJPy{~jiS43tZ~dv7t``?~ z$8^(yR^C&A!Z6^6jkitSQ2m)#yNm9`$x4g4eD_y7({k#qwI0g`7>l0#Ssl>R1E_!r zr_*hsL2&$3<4;oW+e|rKo8CB`Ca^%vGX*pwRG$(T0D!_127?_|g?2s~XZg~=&(C+G zOU_oLFg(EZK^b9_S1X<-oiXqxq(C%J4TUjo7U|LxI6@Y^{JKd-#*tr@gJ8>2#-XA)0i(K z(3&bU-VzhDRgF6BU^F=**2!rPSlQiE;>n?Zgf_;Jw)sa)rWIy@+v!0z;2q-PV`Sn- zox~=@c^M6A&bC@zb)GX_>Pq|vTP|a1$IXFkJ61xM!;tsxizDZ=R*A@~M{^2i)A$(P zAPd{4h^(1X43OrwkWd!rJpj8Wtal!=T0cK5*h*pn=m>$TwoQ-rTrRqVY zZ}~eu3T6|RVK-m;>W!xx-uT(u3uA}sxlL4G@^O<}H>8Cao;yT;cl=wW@ZA!^hvX+} z?Oy`8O09dw#4&l=N_Matju4Qdgj}VI7`GZ${R$`OhWUiP7@GN+%S{DzyAP7oOfPW6 z&Wuc-iH5ziNFpD0x<(Tc(B9FZXI5DbK~$TRLwcWX16t+m@Uva3GVrw*QuNCFJnzRF zOXg)aDS=r1F=%g2{6Ia~>oB~e3@s!xA2T8(I`3q7|K;9-%0lR))l@~ego(#e%%OiQ zvt3~;Zo;_XxqUZm*F2}ueMek1VKn-dVi!>T#w)Af>#5gj;XntTbu_ zF)3Ng<+(}vzroPaNs|{U#M}7re0yE;#KR`mG!oJ;18LhgUFP`#p8cEmnQ0I2T9cvY-B}gH!}s1^ zCf9fUN8V((o+2+q{@NS%Nl1FosOK@^H*h3T;9jG$;~%zj9lUM3Y~O|>s`WNKoiR=L zjG*7J+4dYc_G2>DN4VJZ_M{suC;ikZpwn}mFn%_?_L+>;7N*e8$&;J8!1nrrUQ6M! z8<(SteG&*fqQae`=HBzrzkIVRyfjSrx-|_-m|h6ualB47!Y}r@;I~;5VNONqUYSet z#6})wP}B1%+F%l5!Mwf)z*zN3I%fh7zAM$z)JyL-&D8<5=V1@WLc`56{m=^#6eaJT zzkT}_DU;eqK4#?YK@-88J~95hdz^bT#Em!Zeumhrsdbh@d4+=?KDfJU?|$3_ z_dJooA%PV?!X;1Ff6)bhMk3q8DluBcSYpXXXJ1E;(7ZpLBv!fe?VCDWUVd;u;q;Y| z39SGaGa-GzSiAxzpxjFKA^AMjcebjulskTOmLFclo+x}W(u5%dkI;M2IHtJ1Dks7Q zzhs{x6ca&s_n*sL@`0X%<`>R-qV$@?AM?C0T>RCy$~b%rlgqhXX1leNjI29rs1r_P znlYf9CEA#Ida#CWsFI)NM&C^1`MRnqHZy)~t*;eNg*AK}1f80Fi+D6vcah?T!TEf3`Wxdo|Tq%Kc6 zoh^omF+kB;KVT>~z$AhUf0SHlB*7lLUyS(KorEQ6hmzKL>03Jm-4$)eDitSlYPy@G zcQonQtfSrEtg;|!(Am!ole@IJDz9JDP$cR=ZycSlFdzQs^4UVFGBfP8RCV9qx97~R zK=#vZTGXUXqW);iufFT%TCKuJ&!6HCUu@=3$-dcq4q2Gf*GO|We0NytQFMISW4X${ z7;lowYD3jF|AFm(qNlycpAh^S-3D(TrNM}_vapwCg5D3pZ^{7e3)K=&S{Nw%_)X_H zoC-YpqsP+t6S&gu{$qC7ZPaKU@X>-$qF};%cY2mSndI7eg(x|{s~}s24;M7Ct|P5c zvh(AyZcO=aF5kPiZVwVqKI7jT5HWDa<8I$DtvVkvPX(FFrCxhzAEGF4nxPlbEd3Z05cs zOt?C(I?-=qL9W*u?)Jt{9F&Tlfz*JEZOfW{1LhP)E=!Ljvzx%qmQ?A4giv+Nelp4; za|PO|+QjFesX!JAaNA}#bd zKf(jNK#HQqiq8`QuSEQJKt(>@(GTi<1Lxr$|+IxvAust!`1e`=3v;I_ru z7#z0+SC|rxb@uLe#lN@V>AzIHMm1=gUDP!pMQH#HRm{V^h_`RYWK>Bzh-SM`)QfK# zIW1sek&DKbzMiN?iEnaqx%U=K9$2`^+;7R4ADZz$6+TZ1oi-XR+q^$AF%dLsgOcB@ zUwAvLciaoyJcWurajj?M-ct)!_1Z^uf!S{AhRtxZL-kXcgyAzv!bw*% zaOE_oAu&Hla`xyf{7gz%xc*?2isGqze!;A0q6n znE}U-+|pl#c6!J>z3`_@l(a9>HyUyycYJJ16PT;8BiUoGg26g!=T51kt&ZIyQ#<$& z%}e7q{Bk55pFE^X-DjfeRW-3v-h?usOXSU+WulDLHteVFz2`}BFY1dD zSO(WZ$h4Lk&L87{ag`5HftJtm%Y3cFol3P*iAfF*e|;(JwZ}%e$XFfz=zhUOg>RmZ zq`dlrlOVM1?DWSgI^N#iMIGw`&zcCc(m6x~j{F0ZH2{Xe;7AgBe3~8RkFYv~g~dIz z-!CWF#$eW)8VK0-vp%i;?;C?A=`QCL!XQmZjO<8?pUI;0CK|i2Cr0<#;pag#ra87zyLck8NuTvf?r#4g%;fF}esFbIy?NL&mXh}% zz4`1%_Qir&{lOBJ8q6Gb0I$T;5z-D#T)OQKOp|(V_BB1({$7Xs>DdqR8r7e5m?QJM zt6wzeu>Pyw9%AM5KN2ReG*jkSqh~51um)3pjvl+=seMzTed9OFMOKw7nB5ep?EHmh z$L01@K-?I-SeALRlGcP^`>TK<{?*D?tOeRL&3vKTZD3DK%=_{gzEWQv$adLKcNcZe zYam3XhKtY8fN<}g5&Wogc;{1RMcMQw(R|_iloR#kUD<}MA;HY1VrJMV1?J?Br$C*XrDeqIyXk^CIiJa~- zGB;Z01^ld~9S%)+2GvJ}Bl1Oft?>QnBopzJ&@lw!b(G-!gi~qVmWsmq+*Y&%C-^sI zI*#_RY6aF_!m~~8jm2zpolnPJYDrxxs6hAxKBo~s=Av#fMFV5%J`f(NayU!hs0+G9 zpWkh9go?W6Ftg|JQFWe;zf()!C{4kh64cYg+8t;$hFM=jE1)~0$fd(&}g7%E=bLf3)dr4&Di_s1js7{J>w!$rVY> zV=#i->FZ>d!f<4qEWh1K#k5#$PxU>;zd8Tsg7fFp)HySo?y@_Fvpr{S3o}6$N(z$j z!DF4e4vnAYE8mM!~)7Ivn!$Q=B z&ih7FD<5;KN2ig4rA+kfCYtU&Mj5O3c7IuAEr`eVPaK)jvoh%A*4h0{d#PHcE>fMn z-O2WP2VcQ&s<)+ARA0s?hkM(}-P;#6-Nq`|!o_0h`+lhcNXJwfiY7*Mpk+Q+mZoFv zztcFybO!J9S6QAJ==Rc2!;O&Lui6~0O=&TvdYepB-N&GFFVG)CZ4&PoJ!OYvEwFYC zW3)K?=}dR!EEjg+Z>@8lc;D?X*L_w+%k5q{Ut8e zsy}qSN6r?gEz+EpYCe_Gq(L}r1vj-)QQmm{oSRhqc$w(!SV)tWI%krs4NWtnUo#o9 z6>MlZ`%&2bH1E_QdRxH8-JoPWx<<7&!o}UtXU9ly_ygNTs8?ipq(~y^N72M!5qaR~ z?wbmd>f8hf3Y;LZT!r$UrRfR1$DczuIIckdb(ThV69Yx|T$ona$*YBpP9pO+Xec*juX!P4rwp zuwEI>NQVkC%Cl{nBMAegPXst|e;+`Ah+9gnzqa8hW^4%(iT5K9$*X*_`;#e!Y&HJde*#?dPW*v{hN9(F z^N-6$J5T)ZXNkq{mZov^c|Ygc=7ivu;r!T7nQ!F#DVh2=b`w!Xc>n5?UB7@BZbc3* zt5Mv3{%oH*FpF~pf&ISAZzz-9#(T``xMhNJkf*(t#QrG1uj0S&<+UCqCF^K?F=zRW zD*s_Tu803GKZ}{ErpZ75hezt;L=Ds^mpi4Y3i)Jaf#%K3;9{!~vm;C7D zx6ix;-DRDexYQafF7`*W#k;z@C0r(uk&(4(Ed^Z;}EJB?1Y;A2bWG<6xKy!64tGw{3om4JR0NoI~)4-OzZ&`8vG{nR@d#zB3Ke!&@0r@t) zfJppD|Nd)1-_e%4PnFKtZ>XrMhLH-gQL&F{n|Gs=V&mWhQ>Js>_Aj>w)L2Y$VZL#5 zi=`Ard^*W*anm?R(l^+@ny0iW%gP!!W?XGK(>Al6Z)Aae`BAt5>S}Df@oh94n#5~= zR>(;uOS+IHX76Q5MQcq3PUf`WGCZV!DEeyxD!!CPgcJWawF2mB9xSBiczDdZm4@&d z(j(-fyl~RZ&FUebIREC-)}`K7zP7K2fW!2G)yGXE9Jz%Y>CFCM$H$fJz*kpIQa)Y5$Ec_^){DymR11#o zrFCH4bxFXANxYT%)2z@j`Wzo0a{^H2x=l5W#l;{9moFmvhxhMM8a2Oe&X~xmSGgdw zmkM94u~#`P3NlcTu`GdK6t6dPqq#nPUZ+iwnah9)35iQ#d0rJOx}ioUhblnfSM??DCzHuOIJcir(z z5QrX1yE1FUq^o^ycRg&ua>{TS+4=C{JrVEm_^zNk9*cIP)n3D3GWW&76b4-lXdWza z!E3)^HCHp3cHd}qix_dfJJDWKf%@_gfE0B4Ioru1%7a+k1~7t^)?`NcTmlu$YPwPk zb>&B|_|Tf=D+UIJ$8zRjV6JF1P%?Y@{Qf(Cq+dfrdT;!{L&NLPt#YwdP>@>m@^m}j zVzpkl0ho;J>;*eJ+Yldo;B05AOuYg{Z2RlX*7VxfH8f&y*nqKA36oY0rlIV9MT-?y zm2!=>^M@B*&}%zd%~_$JGzr=rNxIa;CZer!=|?m(um-2SFAo!1d=WQN0AQ4Ii2i6+ zS2!`@K`l(%KmXTi`b+<^c)wqC=nqL6+XK<)-pvn)%1X;IFw}0mn$vQs!F>-aoWSDk zeVzR=l1z}V%34p=imAJ^D@(85wf?z!{?3xmV|J6lHXUtkZAD#GT}5pHi*rl#imI_b5XyTaW<*oasWEA>Qv+%b zKxZn;f64r6Blt1bWsB|Z#m}*RvogCXzz@l$p>_YwcmvYmgA@3fov%UeV8ILjd;v}l zbZZ$PfVzRDpVjLO?{3_}&*vcg&byWUhNSGl-3>s^hnivwTC-i}D`U5(GCD(Uvx^?! z7Bg~{nOe-+iBAC3rEKEhJKG=i;RLLW0Bk8L0Ha;5|1mHka5LN*_NgQdR_Y1QAEGf3 z22`+@NEO51NC=Qq0q2`d*QMmFA!wj-(CuQ|pGdFH6bpUN&kq5z@O++?6=)=MUi1u1 z-1}*&Q%nqa`^aiAsemcwY_r&j@j7mt07W^36aZ(9UNb8wa0*A^qyS9eV^i}Nf4-@j zMr7?O2&-M_>hz>DG`>8mTF<#7W!34tsCb=u{{lQDU;x0FFiKD6f_AXl1L@oZ)*;0_ zu88dnbZ1(<#qlNryvfqW=_v=0Qq4a!AJQWix5O%scX2FK+?d> zwGz!e6SIQ|LiUhTgY#1Q@_0vaap?_73^KMJYtU=q{)XB0FdW)2y?VQeR?$EKGHDDv zd@Usi4i3)F_VaBCHm!^Qag*zEWzwS)63Cx-zz@8))Z{h}gK>tBix}zYKcYLm2Tq#G zHJ-?SRQPBnWhUki4dCV~Vb?mCt#`lJ-_2mJO1&kiCNWNA9&-Yeis3tUBgN{(4ol;O z%O5%Y27>XTbCzl97$>zw7pMGuz@m*F#r!=_8q|U;_1Vvm8u0>Bg+|P!Xn@yjM~1Qr zH=4CKHqIS$If}_)tlTTMjZfwRwJ~ef#+L(mg*?g`Bw2KoL7ssSmkpc@R2CuBH zxLxeyN;TL)>QOQQ)e!h1+wJc{23Q_d1iO>t$ucdugI@aH$B54)LG#nDxdhJ7c8n9; zn)3BbJii_L+)ft4%*r$8G6Ggq!pn%vF|6)(0qEowCqrx9z- zHMCmEjicy#fl{5=weU%!KY}L&x|ZUNrKg1!?F8Q(%L~y;7T2(~z#Bn{)2>&pvX7Pa zVPJ`F^u1tQlO*nb(<{O%%ZX3JX@W(nrGVR&yty^@o#A312Ju=&yfy>cH-H($0l$FE zT+_%fjEpk|7fi2IZ_qvT1Qj3KaG^|3FJ)TUX?xymw5^jp*L$YGAn@Virybqo(Vb|I zLD7Jl8j%wBEAIH+Kadr9WZihhRl52b|NMH#I)IPQsLxP1T3cCLd7H^`7Kdbip3`XZ zF{(E902g2(VSRB$Q`cOOVuJ1mSYm>?`QeZRDk1Q zt_hm2!#W#^F`#y&+SADBZ*ae`0`y<%?b#GCdh5kfou!E2(K>*&D8!z zk6*N*5b#;adT|`Z%0DaDjQ9LCMnjZ8MDjJ@Ox%5G`*N*V?iXqT{23bhO$~Q;cIsMd ztagRB>6JwQabqHBNZ9rtH2&8!%^$HU)XG2plO=z}u0EK6Q4syC@P|PEOV-{2yJq}u z#^#iN>P(Y)F$Do1ax1aG z|F6*QzcH8}putHWg%$qOiG3ok<(ws&?Fb{pGNWp zm;lo2LcG8Gj{hRp)-RuA_yg1LeEjcw3It#RnEJ|0|3I$MUlNd(sQKR+{dFUP1WbUk zCI1f#@-I=z0`f4Vg6!45Uj4`Qe;4lWzSpmH#QeVt_je5oaOVG?Bu-$I8~I08apP-Y zYiloEvA1vST*X|Ca_065ZR+Qn)B7mU3X5Kql+2U*+KL$&`SGV)oT>SKT@OELJBtNpXiInT2s-j{_LPGMlZ{s|iDxdfT zs;v7*3yC-8*ydMRhk#BdM?48be<;KyxeQe{NV%zn?9lADZ$AiX>1ez5Lc%LJ?4D!K zk)eUmA;m`mQ{OQl;A~tV_8*xmC@_=i?Ueve90f>cw9URMxi@#4t|taZ;-m#EErC_g3S1Cp{>MZUm| z2;`#pOrpY)?&NTw;i;uXM2w}O;8Q32K~nNVP{Q2gRa!=+l(oFJcAG>@WPG<$`*0mt zF76L){(?>(=ic7d>~0cPq`i-w(C;f=Y7-Y*^z5nT9?TdC^zKXa(`Y?W5Tm`l{bA^2 z?$c_)A%v)zdCL55@!sBEso)>eUN;Y8Qoc>Uq@kHK@O1q zW;st_)&MngqjDDeP)t+Z6ttQo)9<89`IZ#R2sAKJdc7y0dtoFSlaQ=+aa-7JAo}?N zRhTPy6{m-YT#nfd)Qa5U`Y9G0hX;{4;|aH7$=}`*)WS-ESv??RLvhjK14|=NgE*O$ zXmY*atxL|gb>>}MALNkFYQpND5Uoa?z@_wt&uS>F(rV9R&ki-3QqE0WKOh`kJ1PPI z$Hsje|D+pM0b9SxyUV9Kmqn zysAD)`+8{@YYuMd^znO!?z*^$zLlleZYvA=-IoO;QL+TsF!|goTWlmCj8Z^9d%3|$ ze9;xI0YsueIBtKQmYlFDSlQ(|{*@QTP}az2alRW96Z4bZ_>jod{>!*c!3VjZ3cR<% zxoRD;2`e!%0Vg;9MH^j9sYZ%oe)vP(th8K{PY13I&3;cV19pr@2q8-@@_Dkf-G0dN z%5jKdI+^iN2?0Z7;-abLv;oRpcF*?XO{b-TT}+WQ#C+qjS}OALho|hr-}CbH?9V0;r1-;c`xw;9 zRs^?Zs~O%3x;vk*C&(4JZ7rKz>@8N0ud+@~OOB=TJ2Pume)nE%PUUm_LddDh63HLo z@~BO6W#y0%?j0oGw)HWq8Zm?f5RSA(6YzzqKUD|!JP+C9fzSzy5c1f?z}(#b0w7dbf?1_-yaIB2!MTkeY(HrED8C;9YYHd z8Glqzd5r0rW-xC%`PH)DNN4|r&^!nk`D>aZDE^qsXK{C2o)_-M2AgQav3MN~ihjBx z{zETxW6&D19*=*2@uR2=3gD~bU+gZVs^&%Vdye-g?QNvXr8d}%zHkcukjCZdW^S%2 zpBUci$KJ(l_G7K-Vi7(J9@g=ORU1y#@Y~`sChmpO^W=EngMiR)V3xyee9K_-3|42m zTF6;M*plJn3rt{}MCvj9>YYx-Cz{CDh!{jXpDqtIBT(XgC1E|`=Z;$=t#*1RtUbLm z%?1*~WRuA|wMY6n8Rf5;IIE@c8B!=&goPO_lyt4gjJ|q%d3l+eo2xBmX0>I7YiRKD z@_Gp(z}8t&ygZHrp9&Vf|GPivgZP%hJW)phNU}=>opr>i#$OpaJ<*8wh!u&R;n|Fu zudd^$;(z-Bk@BO(uI4G8trC?y6_;?sM@2;dd*5RdIxJLcvB^vYUS0VVOh~)M%{7^t zI5X=UE^*MUPVt<+@noML$m49miiUlBpMI$sVCm7T^%4w>vVk=?^1B@B`;B(KaYxk) zeq1A+Fr+O8q!HS*Ci@i@AGY=8G1*cB$?^ z<|zpY31jJW-UmH|m|kYQLCLkh*-YhgB66NJ+ch>Z+2pI7vCp?Z13F@&XjcbuD4o!Cenq_OdtoR;G> zcLS|k>t26$z)&eZo};_syEEr9XoQ-HSM{*aJtHgSQDISO*tz!0J=&jU2(NMMK8U!C zZ1AY*xg3eXNBr1_ctE=qA;feZx7QYB;Ngi86d)EO1|M!&?~i19epCQttOzg;?Ck6s zGJFH_iJpUBcZ+3`N2+FK++9{D%ksA|5+Rah1^$S^&Q3qFq?*N9DOs^hJ3>g>x$^%W6K^&wkBf-Y zuF5kXv_lcww3kiilv!RLh5TdS$#kQuwCW`7LIjZbj07^jVMlp^^)?-c=X-MiJk21f zBu-8B&Sdrk(9V(DZ7u&b+ATWPtjydKpob)o8WDBL)POVqdkGHx<0wOwBP5k1*}CY z{;Kt}`BhH~$xcOwA17WT=!SNX&A&a3o86TlXPE($WWQ?x-^6P0u!f0&A$n(B)qnV) zJIp}o4zJ1U{AwIXQq9}kI%cxPi@7jqXlTgxN09PkH_dm|^6to76(#D?bkM~F@Et}K zv~u%%w{m|UeUa24<>qF*GtlgL&1LQNZfJX02+qg?{XDbOOHcocyJx?~B_u~4eSVmC zx;+sJltHC@pF3!}5L&HYTM6CmyJoVn$b38V67!o(;p_O@_p-9HV3UJBm7*VGKY*k| zxB;Q{YdI05b{pLYLf*`~b^yhj!xVEYZxaAqw7d$bFc8Ne;|S{iPJ3Krz8D*@{{wQQV&OfC1y1xf*MU^FTJGrayS62`5O? zxVy`BWrYFjmCJ^99PZ?o88VAyiW|F^hC6N}o$<}Ii(LGH{)B-gp0&x;6HlJ_7ZijG zlHr||P>9x>i3%{{4P>1aI7;hM?KCbZ8e+4y0NM2pO0%=YrP{DCRWLN|_9m1?*LknH z+SXJUeshADRKKEkzpeI>&6uvE6P|V9J2q40dXjA27#(Y3w7kOfs}l_JK=Ym3P@J0X zXn}zQWU!FaLh_W;bfjfd&*kIrLX$e%XV?rxtxSjAcsw6G#MfU_{E|hl(m|>{dM1pW zj@x;nPz6Y~P!(x=Xp{8CGeI--fg~1yP#JZ16KWPFEXY)?2ld*Ut44igC1u@JbKl}q zGFL+t0KVAGG+B7}sAkUsL#gFk0W1YL-C8OO)`65DtO8vN(j9)%z#xvRn8WikTU zlw@y)@{lLOj|20-ao_>5iZ6WWq&IuoY6Q|I41YSd5yC!OMm0}AYLi7C%+eJTRuFeP zhC%X!-t`EXd8%tXttast8AxQ0o`;qrOOmVQ&L3VfaHx18sW@D?mbbhQ~{Bu3&k@Lsr>jXx>fqiSqZvsS7~}T z^K#&(+adnqHIFN!gy{F-!Gi!vZ!NdS6Tv3H{uo8L>xk00I}O`qvUT&-r&$MS1#)^- zshz>YL+a!=G0YzQlfV`PTIy>rj}iCaxdQ<6h2Lp6qulEjG1op_$V%G}zvm2GJP66DcILiDV`W^2F(h!a;;|M!plHcJm= zTsT^&9>k+q%w+j{DnI$t4vGPGFg!4kcY2MumhDTniH*3H*|*V2)*jw;y(H8Qdi-}F zpgr&=&}Pl3o<2Rt;$WePr-IiEv*aWM&L1dUK{nxOlOnsyfl zVswoFx8*1J9*3<@we7(AN(EGeg;K90)`8_nVS}ef3cso0HNp4}jgSsvctwe?6BWK> z_#!_x23upLA4%GyUZ7mP-p*0Mb`(gdYSvn(Pnf7CZBAt5c@0@5WlGzdtyDBVcM&_jo`(%m6a(j_sJ#L(T{-Q94H&%5rr@6Y@E z$zrWJbIyFvj!*2Z7<&~PyXFdvi&;_s=*YRdRw_-QKI0WlI)8+i65*&{X&h8U)sFDY zMNMq6D4F$LT%7Xhj$Yv&# z6YDO#jUwz{F~cSBkb6J%rp`|N5@)-psB6MoR8`eF3afVX*7`B;D02_uTAg#yD#SBm zsXnXN>^{FGO*z)q)gAlwnNH2rnL{9;hUUT!QjW+%5S$QV#1Ky`nJ3R$K&P#|cTAs@6AN z4$I{yZw9Bttuts$Xxa?0*b(mh=8%v@cc#o1I+c>boLDZSB)2t+R42kk-mXisw1qY# z8b!H;(rEn2X?xf_!oj11)-Dr!b8~ZjT))zB6X5VtE+T`skFdt+vk1pBCc zEzVtE0&~OI#YN4#QfHa}qN0Ef<^yZBiLp=~Z4W<`KZYMF-NfE^(v3om|UfwqKWUB0Xjm{h?iH8&qh#$Ri(4F)zN|#lu zpk4WaGVi54d5v0iXsf!R~H_&*SPa2`PE;VI5^t0zxwHbbU6yqQF2L7Od3syFe zdj&Jouh&Df+wG&aNr&Q6{pvjjz#@8H?vx1F5;W=E-s6?ZY8&iuwMjxD&-?qD3DQf> zG;9xZiPvx|_~x$O{fX+IT;=3Au{cp`EheibQ+cc{hA=GWky%f2R@{-D+NVo(cp*z( zcGEF5C@4gKY{3Vlyms8io%VE!11W-#@x;LbOv;#)6dXdz;Q*{{zr!IcGNF32L!cBo zUdqVpO1@N#Z0?dLsMb#N=Ko#!|2vgRz^gy_YF7ONB=38}IK!(k5HWuQW!hk>92s>X z0qW?l&&)LF40X2iu4fy)42Lv0H?f7}T0!sI5qg=_3(42APA%im4t1#B^#H~v>!bno z(gUzI{DX3Vd`S}T15OVmzlCt)h;0gR~@`u*>R@2d9 zocF|5_pIN$gSut+q=)&frUllYH&Sl6ZV3Br5z?ypAksegVSx!HMdjVVjN#vyA^aJQpS+#!KT&7OG zbieIH3ny`BYFKqA@Ed@o4N3=d>Yu_Dq_?AoYE_%Z?L-bsK0iI$tKhz}!-C60IA5++{aa%=llv#EJk0eUIA$;D{RC%PkdKM+BEIRDPf`^P z^75?1t|j!DEbCG>d}Z4xgApFGN=g(wR(NvdI(2p>@ZLWuNmK0dUDMR1giiXRJ`bC9 zg5WmN;p;NjKVVdbDw)Kv##RcNy0%<~zv=N>nKSS^P3KA@SKXc_eSHBeZj^xgZ9V?m zx~`1RDg`M$KKW*pJ}cUPVK{lQ>Fd{UzqzmQ%<}HJ!AS>;XB2{&d;aa) zD>V8{@88wFB8&w}E4SZal+_zuvuiE^m`rj(9Y8b9% zua|7s=u948rGuU4iGz;+I$uMC6NXW^&~II@9+M3?HjCUBvL8*YY}mlw7x0bNoR)Q|jQ_@xE;^-8`Yt#aQ!o;u1!SC6BBAatRD)VmjgXNn+7z7o2Q0coI@Uh z&*sfEc&Fttx<*^*@vxMn?}c;RzSbo_Rcb&aQdE^K%J9~7Xv_Uola_SnV1LG^itxb z1Cq;7NDQ~-&v5ZKF(pu-FX#T_r{pHd{CEB8PltR7csngvibJx*5T;@sAe=@?V$qut zsOBj%=}S_~3`aMUHJ6gC5h@4hMWM}jpHa+MYj!q9asc-+l-MFdz~DE>v|Xt1N7q+l zgNFA3P?hRzt~A7)Stw6TZ+50cv-0(F(Itfjn1xbthTl`Hz*a+Nav1!U`-cDr6&&#Z zO7i+b0fhZyJyrFgv&Dj^8e5uz&`Z??&+EgE@ZxISJ6Y*MJ58M6LDeIv?XK)NRLwf~(4$PDUXL>WkcZ+Fu0i)%(<6lQ%KOWG`INq0u9giz z)}xl{X$DZL)vZq?T_R=|g-;?T2ZOM@%j5ZLAdfL?lqxAH5p#KPb2S%Z?bZErl!b9m z1`8vt&=V5t8pb{!ImQWm*VwYE9yXq{Q@=UuU8H&Y>MYr-|HIyz6IU$XiA_xbl~&1; z`*wzTmiJY0dCT3y`7mR&-a_D|@q3*_PALu&tw@ZJLUU^ik~B2kI#*jCu_r&ZlF#|0 z{v|&L#k-5AN~rJZWIgTx&~H?mu9a7FDBWIaeoFfKb-7;MQAFL+T%{9~@_qUS!1GEX zu30TL+7|Qo#eNbhdw~i4*}s)wnm5R18gAgTnGpL?J_*SV*jajWvL2=4v4t)FvGr_^ zx#!Hs`~G%!tnGJqD-x>rWP*l5vVE|(6_RXcy_2b>9ffh}D6q&H+?ki8>o^)jIKyM~ zs)3(>AZm+Mf}hgT>~u4@GiQ)79g8kJ#RZ~n8#4cS`o>2`evtCiJtq+o5~6tQeF7(M znuE`%B!CZ+ECZSXex=Fh};Q8SDh#xh3?JQch_}ae$T43lY(r>AanJb%<4_|Po6tJ zP79*eu{k{fc<{57k#FSA;)_wl>p#skFY;$+2i#5Wq`%!0Dme<3o(GRLCDW_bbYWz&1?_E}Cw`5rGEgr1Ul!B3e7!a^mM z2{AZ6w(rcH{tZ5nIB>p3WWAOwe{_d*Z4%GU7;WWBG9x?~n2W=!6R*!CBQy}iR+|*6a&!n;o<|L81wKaT5Bh>G2X2RuvfG=uD4^T!plYM;85VsO zy1CZ^Me8L;i#MqiL>6kXEkxpD2?(`UpuIZNDq?O*Sxig^HVEOSWh~SwgQ2hK0LUPv zU)b|%8gbhR7nAHAHtD<{$(D%F?Zo&*w2L2aO#1m2gYtLH80)#3-7Rde$8wAJ099g) zL8HyBd6uu8?2bbL)d7DDKi)+GBujR&Gm%}hekUMGq-E#px#EbYipjs80WwN>)&7HI zO%3-HXhk*)h|d50sa##%*ruXFsEG#?8eKzdI!8q!GpQ|slu6q6PH9DMJ`WfH{>=qL zu8zvCvvKk@JtOa&AWXvG$ z0pN#o`MOA6mzxnIgW(K-G1%i%UhspPdNBYqo`x*=kdF4Sv@1+B62pLKGoW1Ci_;2q z-hFsH_Kt%1PwZIk?)uCA-dSz&JQn^jc)Ebp|1TC41*Ny`!`N5ZI|7#Ns&GsSvm;8 z0*Rn2dcp_&65WPAovl0tk?Mi)aQ$Y_7_?|TyA^z94bIAi8rp+gm;C`iu!}`0z-^)K zWU}Q&%QJU#x}Fj*<|i?p52x0R@ScDE7t4R85cVv8n;k_>J9kS38?TQFHa3!`4n@G0 zw0)hS;;~fAZ)#IxjV;I5h(4sHug!LPOlYbj#JBJ*`(7!?^Z^K+BVMnZ)2sTMPkn+M7a582wgOfV@1BrWTW z(pSxk?l5?vI6@VQZ4wMR>3X4qnuWv9AThMIKXqmpMa-2t zb5T;lA{2Oo1?T`3skx2&M_FY^YSgpIUb(vF3Zryy796?sSoTzn<`T0On0?}1c9ZB= zFRe%1mf^FaZYvVqFX2)q=Sa`BwA_s#c^Ok{JAcO>ba>FGg|xV-mftpV?5vaqhRn8G zEWY!f?tw=6Y!xW6Me~LZI&ZQ_kMUoZayju09_k&LgP^!9qZ?Otiv;fj!?(vh+LzE> z`sJJdL+QUK#{nSABzIX8bz;I}J3Q$TK58C1(9mI+lY4*Y!tXIU9jmeJ3A&jy9{<^P z-+pOy!+`1duMG^Y5v0+YrkqS^p{C=qj*cIrC>8+*`Rb_j%}V0S8qbRzu>}^>{H8Gk zZDwv_`JCJQK6Op3S4?4twRA4`@xOWY1Qu+9q_W=TznZH)WKgnQNY2Uz@f4$DHJN#X zqSdE#c3g8Qv}VG44>7)c!muY=m?;4p>|HjNUOc;adGfaHPe%VIt7orb12^K?oEIhw z$SS{1e(d6?%U_fmcqE3WV&&r!zH$MZ;JZ8x=eFLIvW->7iv3>pP(Qh=`v4_ z?e_?jPprE2*vAkrFY3(qUqDC7;#xpKeotXi++suC5QZW%PeC+2c_uvjEGN)qh8Mx{Gwi|5s{=Qe=zw<+tP4}a2Q3*Qp11iU#LOy@*8=k^IrD14%T&U`0H#L)DA%e5rHgS>zmJ(wnL;_U z+hmyKgK;E=g_*wRzeo&W@ z6j-9Nb4Z^FlI-$&k&6L=IOqQO@4NCI0 z&niRhb>9wB2)Y7$vH);E%8u(R%<~r1N;aJ<9Yu#j;$3C0n#A@Q%{!$!o8iPHZN#B~ z6N3JN2j*tqoDGnuRFw+zk+`dn>v#Y7Q7C+j@?oPb*DOai8>EQ|z zn3nsu4?^&1$7-^X;_mmPFw$Jr|4#)5hz}JIe}pQkIBMB( zDW^}S@yrra_5U(Z_bR7tr&$f7WhRQC6wQ2DqXl_2sYq7OrMuw#wP0?wq^wV+i}7To zauiiA&CPLP{eZ%KZ_lW{H2c(zc{ml24v@G^hSCt{*^nT?EonL3YhlSS^~rlV;9{6q zT#CM0vDeYTqWGm&Klz-@4gVi>l`rLQ^d23SvFwKn55J`4*kTsuNn9>DJK+XuAaN90 zsg$3umU&dyPIzAt7uh6rv@*_+n&=M_3}h~`hzd4qDV%>mL_-Hc;vQ z%s$_xFHyu{vT9o?1swpRJH=E^)$%$HGb4zN)3l1Hj7=4pvk;c>_g&rl`k1~qOAbuY z?Imxel+MpJ7ybWrYj5CrX#O&m+1h<`UB8<22}WR42bFY&-Ji63q4ExP8WHOi%8h0S zXp?<6tb_YFAQT(*J(0P_*&V03*y=%C+~J8M&holIJ%fdNoMubu|3ZxaBMGy5{}&i< z`~8un!NkiFW?ZbkS*trYRbnpX*IF;Im$vNV-edKyohEg~6?Q*hZ8+R>0MM-!6IVDG zUk`6|mrJOnzV7i61h#i-;0}Cp`G>Ci`zJOAAU*-X%}>hBcT~-)-~7(Y=P$^s9-WET zj1!=z@6HJJz*uvQG;`&-W8fC zYvup#CS-t{uzkz)-8`qL*%aS258vW*RZfCON=C*PGetrIf->EPDp`-XiwinNMn>4V zP3uP#4)432>GwL+9lN+GwgMk4b1O%e?yrxJCyL^V(C1=~vDv3+;9ln?#p5L=o~3o} zs!yGU4@`;a6#Z|eQfm6YKU0$S$J#MH-Ghkpx82>{9P)y6iCy2(6eisC?T+p)_v`Ey z8{Nkf=@e71_9mJ6`Dd-LS;hp<{O1xQNO*oQgVX|G`R4#vR*~r%7&cfby^YI8K`5Q- zT)z9~$lxDB<9|e-g&cpMthsn@Y`P$b?$2l9tR$TSRz^j|?{)cKpt`q!p4+|4!VnK! zV3z>^UG4F^K*e2=mYVu)oJi4{Y?OzzGG_k*e7Bn5<9fUV$QDd=1}JOIwR1-M`}*YM zo9WEcSm&bVK!7OOT8vAXg@5+HV!F0489(-IuUa;f7%DKa(GU7H+P%~d*>r#7m0Qd$ zOIK%Sj_UQ%Y)Wi;Vth1N|0^xiF0TQg38}MLTq;yOOEJ%!EwSXvSLR|cZbIFo6D5u% z6-&#^%mhaI#QnLO8wtRfPt14+OP05zK*cq@rwWEglJW%&|>n zAPR}M^t4la?^?=&bA0}jQ&*B-ub_e0xIsb+e3jqi>T}k{$ zViL4xVzI>CL+&FD*b+xx`FxkDhy5xsR(*gAeDt7Rs$D}d4@*oXi-@Xo^vI1Kou8eZ zjlX61m=Y7?zm!K|qMtDlo(?L{XDt_rp_FLn5&+JaSR+6$rok`Sn9uuhE@Ic)DN+<5 zXV!D5Gyx;#<=m0E3mt;ET_Z+|a{jNR)K(Yo*S&7Jaf(M%+q?wcrL~x$R?+zTG!utP zS(up^UAsEFIvbleZ)JNa2!`2MSgsQj2$DL_;5y0`&bWSbX5@aDIIBndywK$Cv^Uyl z0p2+M6M!r)uVp_!ryvZniN{&B(KPm>;|1m83T+(D)vhx@B_$;VAx8%b4P1&9IlY8A8|D%R{cl$><{Mm@9acuu}_Lm^yx2`=pgjh z{u>@OJ|$8J)UcPzYBv;DwRb${b>+RJP-cOnvDiLyJkAuJbvVrg=rLHQN{8!=ScKu0 zTDKIdHeOEuolc>hPSQsco)cT5Gz`z5P~~Qwkazi+a(yT+i2TN+!>(p#bd@{#PWv@a zq|(WBiq9ODmWm~{&8Xh=Q_WS8+e%!N^Uniw|MB+u#|6I^7Z);^*c=zJT(Z}*z=l`- zKG4(z&pcgMyXG83kGcEJ2^z1Fl=i~r0z8}9?D={PSG(5A@@=)Zl88;>SZO4Bfnnd) zBnaRxAH&O}0_kaKsWNBt8Y)-G@=?t!Y_b}l0LuNBvnZ&5zEZD1GTc4vOP-nG(K8&=Z~^7zNK@G>MYiXhZ7q4ege`;52E7WATGCe=Px!&;27s;WaJ-O zKW!+~nlB#cAekU02FmGBeVZAg7*@ZGmuhqQ$TQd}knUOXBmH8uPnW{)~G&xq+t zNpPF$z{_?&207l*^9*K`hgywC4R?Ms;Y}NtGW}2L#`d4XmQkp9&1H$}9~TGU`hrwc zI5?#1FjAYYKn?Xz9?hmQmU}7{$XHu%>1gY$mm_B&NJ;`s=|Gr*+kis_aj z4dFyHh#I3)$VmAcL$7gHCoyoAP<+nS^a_^$NeSJ4FLH`roeLr9PHxr(0GFKKmM>!{ ze?zZ@dO8glRo^}uw{tOD^2&lKNF|2sHO!=}CoXd&kllr?>QOk;7@XtcN?-#wMAgn9 zOxt*2V<_lbGt5Lq;=lI=m*y8sFw5|XZx&_Zy_rV6Nsll=Tyngh#JrC7(Pg8&Jj1)m z+0^32x2&xE{EW2xDTpiT=neSFc0ukT)Za1bLx^EULQ6SwbC(y&q8lJ-%e2Y%1BuBX zl_eW!%bZHPh z3jJtolAOHQuFc6z7tBAuV=h746u8BpL&WIwsYc4Ix{vVBUOHZu>w7SI+IJq&p{D~6 z^Sr))9%3!E{Y1r-_GKB2dc+U)L-XAyElDp2RU6A9Xi2*BdT&JR_?mH?o}KRO(ZfUY zOXne9G;u6~likoow)WBeIhAU(Dp@ z#w;(7@zg=KDB>fto`YRdw_GTaC~w#ZQ*4~t*m&BCY~-FqQ1k2$EBu?x)ov+0b5qmG z*P3EtaMiU4wx4MJ`@#QH<#YoFo>MT_l(3G}gMM;$y>y0|Kz}yJHMt3SI zsEqe{HgO!qrEh<#)ai=yvj*pXV&4BTTlkaUhR&raK5=D5ZiSm+?8%v#>QJqlnlk82 zRDl^1zFu zJ{=_`Of=K=7N8)`r|9>2yaU|PRZ48hnx_P;+JMoVaF@a;Bt}PSCTHM33G#o6KqaNW zzw=CT^4Xaq0@`xTX5Uqq)&%EeOW3UXko|Jg0nx?LnvXV+(^{C_pIH~Cx20mvSfToNlsu=of^0>a94-b0&LHaQA zyTGrA{|-_4KlX-|!oQc;AYx`@#GETnaj+$u*xlWwrKPnv01Q{Rx(ib!Hb225!4vDs zzc(Q&X+6yRINvhh-W8S=`*L%7U>b67r)1e+i4THje_uPp0bU#vUNH3lyD~&4noQeG30e(P{%c za~q-Iu&}9LdP5OmQ^)`eDz-8~`bXgeMBHjCU0Hr&S0^0w4koI3q{Ed&A+V}w%RTS#28I4hW)+Z@5Wc4`= z#Xk)8@}bgAPl*Ot{!r&2SmXyYCn`r%WcW}2U{ZfgRf8xKz`yfMgn_1`LRJ`*vm0AS&)eZ<_XdTbOuuFlSo7vgHH=D{IEr zTLRPJKd!NVy^5p5M)9CuM82GZjC}J``2Y$b94Nq!gq|s1IH)zD4tx+I%}K7{@!m|{ zJx$b8GnMW%Fs=g7fT4=U27M>c^V;2j`rMtLn8lDijwAT)PSkcQ`}!!qh2hNUdLLe9 zKrg+vM4ux@L|#`fG&QB!HQ27X69O7p&zKo$K@|zKja% zX|}$cr-t&5bI?qg>(K&g$UeA!*Ddm-v~IcKbW5i|ISc3F=k?>MGCJcgXnUPziLZGa zo$~H1ba_Cl`VheY7^XQLLLss@-|TwWsDkR@dbspB@98UQeKqZx<+^&wyCn1&UJWlw z^4ni;=C>_W4-|C#xFYR^eS>{FIX!tKnWRACc}J|329jJ_t-L3FeM|I(5uTpQzmV|4 zvArFiEGs%XElxuJ^x(keY429nw3Dl-rzeQuqP$@D+lXD_qPQh82$IP>$GJF`qg6Ct z&dNWW99636Aj&ca;8FEneH$7Eo{wEg`i)H6T2cX0@%DFopY3cX@=ttPK?)D89JD7rV1`a%&?{fk|4)n}(43=Bm z&T!sM>v<~vVjm4YFVs7ltCipI73z*8e(WL~f4V<#s#|b2d0XvvP#wthrm*Z`s1}gK zcdc92fY6APDFCP!=Prof*#0$&j<%&@i9A>U(NaTKB&eP%(r&Ki zHpTbZ{OqSZy>erx-k)%Q4Z{t%1DU{$?LdoZpjl3XB}Zb4i0;ZzT( zAPt~)i_4VWM08@%JF`FS%;hclP6d&}PunR|r8@VsO^;WC$|9HOS>?nAUPlmQkw@Tb z?)(}vEe*#t>j*YCr;$SU-M`d0JZ=UQhARPW79HFdf}P9r&mz}N26@f%Rg&Keo-XTW zH_;BOHkog#M+CUWK_~`=^Q}~?!+C(S99|6d!-X)Xg}hpCT_Bxe8YTs&^YT*jLo+k; z`B|->DDoDAuQw+b7tU%!Lqm?hs(~|l#m|IAY!fw;x~k{sSswqFQ2v)S!p}Qr8o{a# zuRu}sn6txkdPXg?h*w&zJiZU(Sx!!lfM{fDw;-zcJZ7azv&l^sfC%gwPoeqe07WZ$ zGabUP>~L>OE>Kf`&Na6B047-B)NV0;dEKjg^x)9i;vLzgrQ|1KeWH)pl5^R=n!MD^ z)58742MCTstVEo5Mu6D_gBiTf0azkJ&kyI~DP1?l_5-S8A3tnXqE6CZD)mm3XpLtI zd#n(paBqI|^u6CF1sC2$-|>K#nr8n}Oghhf*5%8t{ewQz2oOr2n^Ay!qpDac6SFk1 zAH^B#7y0svIgxGarz`C~9R;8L$kHWqIH}-ohjl4nUXAzpAtV@!d=E0Qbm?Y{(E4g# z`Vij0w!HC9TS)amw(0C!|0%gcl~#~Gh1r)NqBxjjc8O&rYEvF|840wgm4wAh1CKf{*Y=E;|_TqeqV z&o4EkBFHR{sXbdBtn!mo!niLrUD%BiosK7>se*x)O{q8 zPB5ZYLzPp367RBefB}|E3)*c#CMFw%MwF0JM>J*7v#)?%0c+?wwZNaBzhSxIPOb@0 zEbYW@O##z`VXn_eBBbehNXMu2>7gya;^2HpxZ8^#PDJc|)WczU$@!Z3?!smmI=tKE z9*^kr?BbAzS|-R=plac^;tjJk?ym$E(ZjjV!ZvHiy`<&MUY9)6t36}`tcS(jP^k9HC2 zS!f`!KAfNWo+``EgGy;`tw?H+0YCrt(7R`^8ryl89UzUtq{z6~85N$0dpSSGHgUL& z4b{O1>IJ~2S6ohaWqC8r#U5{iA5|PH+J~t5tR(etUD8r>#3X9 ziR=arQ~Xqy)r+i|AAJt=TH8}_hul^ho>Tikw%X--&F#Z&2TFX_)JId`EuV~3_1g45 zkJryBQ8Ng>EuuTq^*8l=P)f6frn9l{ol+tXJ0`7nm*88e`|nxL6C!&o3y$XzJqO!a zzNb@ZV1YeI3*cb#_%-~M&;96@a0FdOeVf+}dOlpBBuN!T=5BSY-+a*b^C!)MG$5UR zS`-!Z=()r4xiNu;w80ycY!CC3;gMLp$H2+tU2t}?vs7ajI`KHcdkQ0Ds%xvCk5 z-J!nllrb2trJm`|@@dptXCV?6GP|%aH)ZVy76HhPBMe<->p75qV5n~JyuaEFxDdzV z2U9?GGLui#VX)3Q9z1M*L=iq~hAggA8{O++;pa7JO5bq$I1<>&De`fxr3oYU`G^n) z6;1(dmi0sNL%+*Z3hskI(Y#*fuFy?eR>y^`z}MENL!3F8nhaN|pIFcV*TS{|8HN|K zYVgDE%Ea~Jz0UYUZ$T!V@z>ODirchm3F>szHvMYXL146nMyYNW7pIf+!_D~Pk=GjD z)?gYI+%~fP?AhiFFllIdmfjy7*pqR@Gp*n1yj#Vnp?e89a1celS&ja<)d4s4y?v9P zXn4MM{_G+$vdVQclk3|-9`T$m+67DrS-wyXMShv75sYOjews?mjQGTdtiFEs{CJir z&vr$4RS+q#=1xgTe0ME@^Az6w43@b$-6=##4@BIPGRq2Faqb;`y<$L@TM2dD<#a#G z1L*H9Bd3~-9(}~Uz!xITslqbtwO<`wBmKcP{sw2^a3KuYm9_yli2aqlNvcrTY=S|` zmgxPi9stj_+1~e<_!b;uwLUl7&PVYHD%KNFXyEWPy7j(Z5b?=)N~ZliL)F;B$D2)hpB5ZJ5QEj4Wx!Uo_UPctA1 z9?hc7_wO1k%s zlQ}H6RZqE;6pPCHHWZZL-UH6#RX0P;oN;@0h{Z7_cVH6-@w(Y?rbMx7u2NTlt%rpF zJ8?C$7TzF^TkH=j|pV9-+7D*kH&M><*oiE(X+@>&^zLa@8x_IoE8`eo|l`1 z_ZO5s7`I3BV5B*85&`(Zfo5{IoioOy3;|=lOSg$IfqcI#l5JK>ocJu*mpU!hD~E2b#a|R-!do*GC@e zLECUSpkzilI(21Yz0zY%)=^7dn))864K+0#)_pS=?iW{!X?8|3Si(1cg?6eci#%Ptx} zEYUkYVb;UF;*wbbqu;*5m)ysWSxe0g(eKP+D6PicF1F-h)d_Iwjh4(#1<0&$?LJm0 zx)g!4mXdV6VrBtTBh{qIC>ZFsJAg?RSk)@K$*(o5oQrOyZp!JO{#>t{c(A#!!LOnM zieH04v(+;_`?L5r2JKTNTKAg+DL(XF2GSUq0)ii>y{z9_jsR_cI*hTGvC~(;`rs^x zFn##COLXD6fH_}R>J_>uVTi5N>cV+(iy1%j?VWWV!y>)6ihTKPsabG;5R26N&EkFtUN76W<~G3w~-uW(MEav=1elTW@wf4>1OslPgm$y8KQhYm2;!-gom4Cu}IBoHC zSCI@39SB#?KWjW*vZxBxa&SpV0OI?xg13*p$T42n;Gv=C53}^Xh2&GhU0?QQ1^30f zOQEQD30r{p3LaZrZ;NVSZxOs(&3tPUW+3(n?U2q6mw7R~0rmw_BK^ZT0@mH+ zdfH~UmMrFX6;9IX>aefECPE_I`O({rK*ua;nav-Tc`3N}iF3K(>Mpyezt{9I z-f4&;-{ku)_`x8ccu-Fj23)5<#V@* zSb%>++q8ieVEh% zJ`!T4=Z7CK_qibK+;f@sLWU})p*@r+e&Vt|N%6>J(1R@UtkU>AdK7l(QJ7Fwf@~Hn z?zoRJtLw9#u3L|vJG{Mua|H;&9$rnCH`%K;X>~RYw~6yWJ2k9eX$LHPTBCUV9%#Sn zAX%tTKA?AKzFxe(mZs$BFr!0D!Ano_BNZxS$^@ApnIR5gCz#B$8yLNeIQLu9vZTyA zscU@-3Q68#__N_3m3Z^!Z;?>a3z^Je(|tL9pOL}WFC<GT(++Mqbfqb{{ZP$6 zpUU|Ko;k_`1%Wy?SwShXw`~g%p-iVP)0gf*lfp($?pum-r_17HoS=K)>hzx56UM1v z?O(vl2AGQjdW9d!3U|&Pmtl83lc~`B{k=E#3K}gj@&VWLL#Dym;rVftaO}s7{GGfc z1IgMY=XDI4VjiSr#ak;oAPsmqcs)kc`CO+xbD`EKkgpv zUA>hMMX3G`|HlOPLgiC}f7x;NAgc5BZos9>LjmL^4~m*>aD~CsGI+qb6L8e6EG<6< z(>v!J#2DR-ot8fxE#33c=syBV`u6#)a2NV^u8M}+k3*DsZG{u>*V|IH3pQ*WDEAbp-qzg9ishv;dqhpm_tJF zjoI*k)?L4LFjV{p;>ek8AC4Y2NG90DPiMSmXv%EK-}lDkdJ)2IEK9m;J(B&Wgbijv z2=>eJeIovjkowKl`3ZbZ{M+!7rzz;t{ltgXiH|lVAC#>}wO9D0sLocsegHv|Z_=*?JDAoMF+r z+-lvyZrQOkBUdsz(WjeptacVgv5*$)r0)oi1r@Yeo=-uV=BwpFx!gtT?(={rI0SZy zv;K$B^{73E)KfpimZ;zI9b*iKp2#PK633UX&-<8xbq9}!W3A7y2DD|Da7#fw`xajc z!Y~fbgYh~_|C|7W?DF0LW-p#|RPa>IERfi@S(L)Oo`MKZA*m^w{2u&wg)|wX`NbUA zD+{{^oFP^x--nSgspzN_GaS#t;2xl?#11A`dDAQ>W%y!xj%%m&`Gg%`ET(J` zY*fv>h*@NV##)C&Wf@5zOSbaDyXPJ(O`HcaNS{McNEkj^O_!1PM1Huiij+SWv}@%# zuhYIz`6Z%RNT>RWU|+3nLc*Y48I>Mpr8(<>|=BqEFNKPG}F!Gy57yz$B-tt+u(rGM2H@;an!sL~BmtMGiVKJv0~Ve|$G zd!}CF{?Zpu?IqiV$s^^TtH8ViTUK3&g6NRYdbmFCa(k13!YME*W2?W>CE{_fGp|-5 zHtL7*rqxj9r6ddfsS6S4i^^GR3q z{b60kMem3;WI$;;zH^{+)wV5(;nQc*-?bbfJvrqxfEGTdy$bjJ|xty^okZK2UA0eMfdb-K2E9? zMD1(x&@*Wc;UmloEdFlv$p^*p@$O3Ot<$LyLYDVY!%+q4qxODpfF9l4X_8V-gqU3? zJA*e)+8Db}IH@R{lM3mu0p_Y9lDQ;}bObQe(je;3^;lxC0WKo`Ck_xH;!S1KiOJ*r zs&rCIE;Gg?wkUe<5wPo&keI|`rox{!MHPMfI_OJihW(ot+kVM|@T_0N0#Ev9ZmiDY ze)ji(FLo-Al~Q-ur+EDA$c&px+oh;IPICuyr7^IW#qIOaZR>sT*DoHHydiyo4kkF? zbbApCQyXlL?5Kh>F+`hqtH~^O1_qk)ucu8r7%bU$oN*v{PQ8sAL|=pR87GpxuPpyK zOYhry&d8T*iZR1Tc40Zm8PDH&A9GZAzfdfMb0LqBf(15fPS>TnHEh}@?59dBxS~5U z$%FqIwb97L>o*BQzg&-YXH{TEl#n}Gz>@}C?ar6CUQm+rpYd!EpuBl&;QjgfDM~mp zz`^(H&MMf<+kN$R+u^H%X(wma>mNUt>n&-dB@%j7t2WlL9Z@>43%?M1yjSU!MrA`| z*3KEU8~Z7{@_GF=b{jK~FGBmU`?f3J!-)j5Iy&1^XWD9Tng@rR3_)NUFn{R6cf*KT zl?xh@^f5`EEzfBf(#dXiUo4Se3t3LT0Wllj>`SH%Qa$fS>J30{UAe8N;(OO6$_%6nrq zhT*}v(q!)FzV}z|Z_1fV?W?9v{(M$# zkTZSO%=}&l*RqKC!vLp6*W1x6s#4wcSYMDu@j-HSmXc5PT$(^=;FG<8P`m_tP%pXN z$W=KRBsszr9ACh6_K4Z5#wrIW?hR382H4;r?Hj$v#zkG6AeN)A9>}#PTnL$xdcFOG zkPIS&1}8(#FWYQMZ+J!z`JNw~Qt)NbQ*|cfF0wq9z4phIMUGx~6B)iuuw&Dsb?zY_ z;zuiHYMB~0A4uo6yw}AoljF=#c zZ}}vP@ZWUPv4rmz&KVjjo7S9F`g57OOYoAN=QP#LpB|R=$+$OmXrj;`$Djn9^KrxU z%cI0xtrx=@omOr6Ij3$f&eDDlCGQrYXjXUAW$Of!)4h#xVc(kwbNdnoI9SM162t4o zyY#H`q9vtMLVEE#aq(^KCimKAt6Mz*r_JsXRa-8L_sP?}&FT?*9kKvJ;=HMz`dpJ& z*IDH{-HO<^7Q-m(GVnZn`9x3m(#IY~eb^u>0v% z03p`%8}&bDKL`(x;98}p^yU6kyz-Gi-_IX)y4C!U*g4$4QJw7Hr@#i|@9vH*)$gO&=by zI9%PDUSZT|y@0jwoZw2~ikg<(v+SeO#@#iNf5xo^R`w77Yw!|Xb)g=ezn2b$?|p#s z`E0|{2a5XUKPO_M?A%XQ)vO>@xYiYsH^X%y1%r2$Fv#c=-WW-uD}2j?lLDh{_}=wT$(?!dj-w@Rw)CBZwm zkHj=hB?H~LimLT#Fg)fJD6`7Ta*u`S439oWjjQ_9oQQR0E76@Gf1-~sWAXRwW_Zr` zczV*JrO+zL+djShsCN5xT_!4*1+nMw;=&K^`RN|306aeYYzr3?c*`cu^anQH@rNv& zdF@f^|;DX9*FRm{IcNtWikLV>&cCh{AO4=!e9(qZpe)ka9o=|UTHO_=kT2C z{^TF+H#^@A5a8g}%ZrXKYB-%`pGTZ1obzCG51bAg(%w5-z*^`C)7pNMcipo2n=sRJ z3I=WMnTbawCJpe^r!#io*`46z@uNa*0W)h(_lgPOd;C2rIPC{`7LR_Z`)m-%w=-< zwdYNa9}#vcg)shpNib}iCf_(u&dBxwe#fR4oqOON*Y2kvy*UAo!|>!2w4X*UQ}5A- z#;9-Q&kH(xo@-+|1oga7394zN!X3>TpSWM5Ui6;F%TPe8# zH-hqvHdStaILZTm!~;&fpt|VEpIV1%7O68P*_{C$^WmqdNV9S*s7WAQqW*@ z(yKdCa7--ZWr5jc`mv%BN8?<=jGyiJ;X$IZSC$1A?@hqFpFa+g8r-k7SB zAsf$6f)^ccSHvq|`UfowZqOE9(=pQ|NVnW(iPMlNywC&9=lF`#aIYM;tuhq!vDIt; z~jv@@NBX^PSQ6fi!Ygb@&;*iUP73GekRJ~6xt*6~2+8919ZoAT&x& z0aP}@4l+&idOgw#km8}TFb($b(YUg(owS5o_D=BP!ahs}La0yzf&#PWayB;vgQ*<% zGoy=Es{bGM-hwNxWs4RL4#6$BySoJq?h=B#I|O$N!CiuDun^p(vEc6R?(WXFx#zz7 z?z!hDd~Xa!kM2SD-c_|%%_X(gT#RjT!Lyq8?{%D+UwFUtaA}iArg9&0GFP0?fu|)%{Jfi(q#4Ykx_lzUp!2|pCyfZLhqwW z$h?m`#3+~f4|`ar(`DE7(xhw8Wg2D@e5{f$#uS!Q0@S+H_dR%Jj;wX1A*f-XlV*rj z+MyO#waHqrX~en^+ga#`+r!6Uu4LZITBN&u0bcK!(%wP$7c6S zsmnW~XJDe$`WsOn!Ew@*;1YLh3I4nplk(WXLVa^fw6;n=g}#mHd>I%QYZ#-CH6)I3 zO&`nU?l#c`lgLej4>CoF{PPPm8ThGO5J<$bYhw%T!cI_qU#WbCh1NfU@~Do0a+XQ3 zd^fN6<;Y-%V9t|xmj0Fgk;)o3$Xa+bRSKp#Wa6_j?{_UNcsYUVi-C>&F3%xMJd3Mg z3hIdVES|Eq{g7%gCc&dE@D+f$Xq-*pacDAPV7@;ec6%Hhl)IF;N#!Ok1H( zIHg8Ck!{B_X(o(jzB$yv`C(ukf5G*eNd0~l22QkD;R6gaEl zytW`HDjF_rSDU>)nS_WN#VG%FZuT=T;`HVOt1?JgztB(F&vT#jOSV!60`DApc8Bye zYxWedQc_bVDhwcavv){EAVNy)0_r_=2|2rhl+c(1 z2PoPj`WnBv#&V)?uGmR;UJ`b1ljxxjtY_TZ@Q&lk;?`hPK5BQl3w-!mzp?}`xP>8b zcv!Ae-Im1`e0BoVQL(%T88nMLZPNi3B?`QM#=}OXv0~~^DnIz*G3nc-YL?hN_B(5J zB5c`4lAslvLlI4MSZnM$lBl0b2wf7Z-Q4Mn1Qs2P;@|MYm8cJ9ij)g6wTA>Q`pAUw z*sgPKCr%=umwrXFRo8?fTW`eI<-|Onc^VCS(N=Lt7S9aj;>w$!<0e`tsFdycR=q`khmxB`GX@Owy z>A#sp@%nGLS1G8zh*Q?CKO+@-_-vMAYxNNf2LI@~GSdv?zN!m6<2SkDyxPQW39~m6 zH`(E4`r7ZYG6#=$x5BmTw*4asB#HIwEUS^1Wo}qQ8P%1Y9RRA@6YzfKTUa_%He0a) zKZ5rkp+Qreqx9A7V@di7f2dw&^>$gZ`;)~=H8~)*7niwPMLGboC*UYe9rpYF$F4Xz zi?FzNsv9}e>+6%^wu5IL^48&w2*l&+E8e#)oIS6u4?`(O7vFSSy#n=y4;9dH>l{Zz z%*I2;aybd-FUr$tEDg}R2rZyyg&x`*ye!0vmJ3{uo#w5kOSU^W_1g@*iovs3q7wTx z{GnYz{`CGjtv2QYv0qp=YHhQQK4(e(?!%LH6`on*Dqzw1+S zaY$|ZT9&$Of=^CtT5n!iFPIO%=th6cGO?Mb&36*3JqLv{z30wGSZT9(Q`C18N8%IA z;h#&kQX_>9J;D`JH{n$g+T6J;@I+b;*L*rZD+9-2$ zj}=KqiYx`#CkwL{UWV8dvN#U$mh4HO8rfsPv%D|H)%1o9y*~UPe%X3zJyF!lJr?gU zI~!ki zCnKL%@7Ok}h_$nC+wwcP`_ZEuLqEJPq(&vXkgltkf4tH-&ZjK+B_FFI+XLIx>-{s_ zS+buPwhs6QQYlt|@wiB7>xOW-yygY!nWBN&0|~nI*f!X41Zgp=QbNS}9cN~^JaL=} zda&Eq3MBo0OmXJYQTQePh2|XJ%{wGG25lA~t&IgOCYgZj*M{r|%NMLV4!W0WPh-sD z3OMVn=KIT^S2Pef$HG{BF+QWZFYGgV)T?4kWIS9{FOX1hlcV~TIMQ=g<@}wA0hfzF zh0J)bX5)a2DkL6dYRLSrR-5Sf{yDFl(v=|hxRCkD0`DrFp^=oqg|g-GIu$xczCg4B zSG4>LfD#iK|9SQG=6%Vvq~ml)0kUY>0ura!I(ZO}VOrL|otN%0jkNyA>$DZ>cM^|(H`ujaB^ zm}>AKgym@AB8}e~qf-m{t4;0UAjcU`qZ8s^_S%~<3Z8pM* zrdr3QPlk|ve#vrM5CEg_X0#ydll`bSGItvIp>s57MCA|s!G2+;J}ys~Io@bfD0iO| z9IW~}B>TkaAA`2EWHPcVJ^YZze{&te9WPb*vX&$ygB zQLGl=MQa5sna&V(GcQ+_-%&Sl=0$%QMI>KM4PJ}Itsg4$m@)QDv?Z|!^@m-_#z&Pa zyzC8wZeL)2^5MEA!>478i%76qgOdVWM+2+Nc$^^#*>jtf*&`BoZWOF@UBf{PPI*V2 zx;{|lo_xvN(faqJKu+m%jEE*oo@#4H3A#Vq_{sX0u~=!OF2`f_I6qfnBU0yssmAQd z?knR8&gd&)eOs4o$olXTf}}^M=`zsGL1C7AVy2XUw#A%Mo@A{uR+&hahv_@A>$$3C z9(&U13}0PQ7T%~+6xY=EfJ?mfqdh9xUe}S<`zPwJt5xP>84;M^x?vo)-2;aCtoqMU z0XRDpWikrLpzQFBnou7~>+%J?F9ID-YwA|P$a8|P-?MNBxE2T2{hfbbD5*tgBxgp- za*&x_8|8U6!9N~@qL0DwUA1|qB4kZZmJh`}US~kqs=9T?&0pu=+1fodQL2@<2>CcF zd+wd$@8&b6z&}0Tx=?~R=7z<32rHH+eP7P`a)XxX9n&HpfrAUC%N5TP;lfA(L?Sy_ zAMA<8=nrbxu1-!BF<|LpEo~H+yRSW?L`Iz{DH{HgwjEd3nclg+WN0lESh&lQdrD;- zKf(7Qeq+|mya-!kFZQi>O0ZUbXcOpSR%=tM&h$5)lOQ(TY!y(jwl^ZAF7yMru6QHw zcK2bOzHh1k14B@WuEn_l^@Ztf7MZ16fHDo@=b>PQkqx5cec9OsP>eEI2|bTk{O{Ts zXJeDwf4tA@cgC9D_IW%G4!z!;H0vTY-PI(9qrPl3gTZ%Pf-Bh`)I^@K1`EJERXmVy zauqdcGvL`p<0b&L>O>w)lOh)WEVwD(Vt3nPe(JHW2I5#(5<u4FYgI`&;}x`7OJo@Bb>1^sUA zSpq9fWBB}Hk|>hkF=si)!j<!uC3+xh8H3fhekvv;uu24 z?}gQlkhLx&s0Sl0@$ncBh^27Bq5pwhlP7|STxLA}XuMZpRSq)fDrN%FMKLcu?ku`_ z>bdOayUYlg^Hg^6@t(O4bvG8B`NSES#<6<$9K|c}d*9J@e&xWGfn!8u4a?D)MA@$GX`=h3FGRLgo*!?j(QsWj8}@??|J9(jubihlVq+0wZ6YmuYInx`X(Skhb2|?EOsSlzcKo47F%TxEQt&E~ zJ{T{R|AVrY=EcaCtGgAHYSViLo6E#uQPp3H0#}NehVnMP4pGVc83qk}CJ}MieUfAd zTzuzSld3~2RnBz#A~5{+-MtN;^L{3;wdVl2h+PY_29pVNYIVMC!OJ-eY4zDshp%7t zUYh!-{Q+6cm6TxotqhXiyL)rcP*N3o;~Kntq?Ieh^rS&T$MPInn~RbIkG@Xs+3(x9T9r3i5PwU^-bq zoP;(dA|8PL9d4hLRw0NqmgN(~^$xy!u?VJ9&-=bWw*}QuLGUtt7Y0eFo508dA^Jj^ z>fCu2IB!m98`@|E(B8dew@A;}#&J(htmwAMstiYPJu=B*sVJx^Dz$(v-fvVBeyBpZtJ{%xI)V{eqA_o#hEr3DnR9SUIOD6LDMPzliJPsPVyJ)EY}plpj{h-Pz@Ow z`iRX2Llu9yfNUQDyY4EV(dlRpcCO60^!F5k!8jfa_etiqJ}a1 zS;mJ&-FFbO6K3s0`;NBH-_Gjfj-3csUNY}IZQ8sKra_BSPr~gKS5J_$a^}lrv23=&5DpdBgYT}O<^QsZgJ%aQ z*;Jz3vLE=|+QR7v+M#x{;Iq^%jiL6b4R8K%cMREo6H}V;4fbrgJZ@Nju!84yB#F!I z^*a`!rxM0xq%*7*JU?xFJz1?apx;tzsxz;=6=1kQ;&6n`gFyl(FWf&t$xPs)iZEJ1 z>`|0#W8!NnY;$hy=0rrcKr;bOBs};bQy{TF5v1X~p~8NP5`kUHimP@@Y3LSPODs zR?81-2h+dr=}3ouQFve^oVig%BneaWxJqVIywwPW1Pa;TI2l=FO?1h>t6%gw8qd2v zn)V#}h3c=sN~d0>NE`6SNEZ)P)f17` zuzKZ?m~K9FYyQw0-MXRXx9FiqX|osjZi;rulobB1Wz_S;+pj(54-=$z_V}#{MTOr8 zqOY*5DmlNNp)XHmFe>w%{N~~l5W!7-y3s0IRel>Z4s-yKDV121S}eBPg|9#9Y%Qy9cY^@%uE>I_eH}bn|0IBa4V76Kl2* zDH}7Lc+fbY%Fh~&%TH#I!cSO~sTQ!rrtcPb}xJIhg%h%j!V_aG4; z)^&I0##Kwy^?WRyJx4trFg`oEi1tJPFj~{ zUhA4@N$*^Vx!%dO?Dya~Fnr~|H2M8yB#ZhR((5CSW6FI;3}O&fgc(a9HoZJzApc1J zvBK?Ake;ht8AE7-pV-9`$%$o0&ccyZ*}e~@-bK)1s?1%a1eS`q}l zG3ZpS0pjDjOrEz*S4)DotDg0Xk!Wkv%lkhW_o&X*{c&I8%9hVe#%iRLpI}7?0&^YM z{qbve(P#jU@QQ23&|mt?jbs5o=(ISq&GV^yC_)h=gT~>RHgfyo>w4TTcP^*S-d#*x zrWoavl<6?GKF?^qpUZ5IONXM5#H2Q&Sq~coHByx17MeYc%R{W|ULV4(F&jLoFTpS? ztlyz4>>HPeKfQ@su?xe@2SnrZQ=p0{>>MI-c#(YB9Cu%Yjzh$MEo0kJwpS^*G=?`Prk`Hj7^6z=eX2r= z$)ak~%j2jKFRAKDW?z-@Wf(-;7xSmV1{vXZ|9x@k?B?UUm#cP&FFoeuQsQ&uV*xhX=Ajl19M z|MoNDJbZGL4PZ(}>_#E15X_QfG%|Q%q4l}R# z%d*t4qz5C+Pk2E}o~-5dB~&trd7VeDQfpibluR9Rd9LJvLDs&Z4_a}nb+Xy^UB^VV{g(15jgC%5ig*q!+h?3*X6rVup^Ux2b)zg`l;P9)uh0a z(fSkh48=%xAk2BTm{+XMH2*I?x)_4n%ogsvU^5g3o?mk%vFO^5e+ zthksTx4Ja#eJ0^fq}V53j$%8OWNt)6M!~>-7$Y=%6=ZH)t5zt0GPYKOEv_9eT8rAS zN+WPT;kT14n?mGT>B|4}3VU*^4Tk_0;dPBk?!E%yrOj>PO8vS0iNEDT^62@xhyS{+N&q$*g7gNq$CI zYt};?~1w|4#JWeRbtT2a(+ZLgvahfT4i)jfNqGu z7@@h4ep124x4Q$Ya*5}WXfW`e3shn2s+Z>n=n=;9eTeD#EnOl~%%U!^jJsP3_~a$@s4>~Y%}AcB)EN6xTv!*`&h!0l zRye?g(C`&iQv%eyimt$aJkYfe$U_Npv^vrAl>mm1HwKJD9PXIjklv7cs_qz-F&wc% zwne8%043{?u?{(}NF!G~FF~TtW-!fcAmP?6UNogEO2JK9NDTiscJvnqVxRMkwk91P zD0$Mxhw?~#+e5=JjwWu|Vs%p6HNV2n12y+e=cY3+X`^PQskWwKsN+>haT0eQW8e$VHhFd4SbtrIQGcIUp7U;Va|Sre>|7>S!?xF zCq`^b^PbY({f)}s+) zYJ-pq=fn_VFy?jj3)QESRCkt45AS);D4I#H^;@{-gGJ%Rd*Nx{gMBj=vBQ~_7GX2K zMoJcex%~}B7e(ZNRAmLhc%?R7uIs${2t|;w0mPS@MceCpVX=)N^ZioSrG6CT(x&Yl z-JG56%#R*V>Ohh-9)A!BgX<+{@&@{l$L<#=|mho$U9DqA!%pxkI5i}B)gHxPyLD_?@=~xj?o|rFaM6um;$IA%v^D zxS*eztLP9;L63~m;(G*~#wc}!)N}g}Mx%Ci%;a0(GvR`G9}S!i1@G2Gc*ipWWpREQ zPOw_q_&lCeBlD%WhN%v=$V(-{SxrcSkMd1^Qb3(_VQ2R-RV9)$>>7m2%4ar~- zyhau@xEJ+7Pk7HtN#W~hx0G$0RoPEl;wGW=&`x7#_|qqDvYKB%92X2WMQ{qqv}UoH zEj0kCS@#9gp4BsleuY`WGd~AIEH;!C_}L7ntoX>D+|)f*r`T$uB_qc~2w^_fU znENemqiIF9gnugh4#pOMCD{f6!-pO&a5KH$*>8)euFbD&=LX1lggI_ zMy%@F#z=d{?2nVK5H=e6Y_$$cYZJ63^6f1XH}(dzdZ-1*SS-pqLq z#I+(Cy;kk|L68wS=2y{Orm$HW(EVfU;~>e9WbrYlzAyndhIbMbDf_3rfQTf;IG!xn zD{Ab6ZJ$lm_07Ev9Mnw)R^vSxYCEYm-@#|Xlf~d7m|wY#GqPEAhUCAY=<^i8VF+Dt z9j|L=NsKOE{?x(hus9si6lO++gK?qL*3`aWgP02idxG36C$To5Brp*O5#1g_B{l6^ z^G+2~yf)=p8reoa7LuI~S(Tmqu@Y3Iv=jcaA<8;prSSSADJT;lrMD^rt z?#gyMo@~%8Pd}29#lO2c$ws>Qr@OmIbVP(eg)uY({ub%+n~g~lQ{$3hCYj5i3;Fv? z8Akcf_v%PDY5>^)L;PpxV=MK02BPiDvcj||oekUOm&57sK?(jF(=(OMcbSa1E19vf zW6j-}T;rc7HiNechF1{!sXtQqR-@8>U{nv$u9Vp1-w^nN36=?h>hN(Ur?yhmk5LAD4RPVrmFQyLbWvC`%WKZL1T2X>&iTokDopC-xAjq1fQQKN88TcE#$(M4aw&n+IcUI zrHJ=n10^F?i!pv-$+aWd(7F0P7v>Vt+!xqouwn32A%@ps9!nqaHudrv#Nc;gv5yTG za~H?`2?br)gWx!MSq0Jics@BP^G&_5?!Rns!S6?X7wgG_?9ZK+$`##bHkSh+DUtmwSQd@DjJ&AJWLA+kjl7V7y(xa`T7>zv8= z_f!V6h{7s?B;uE*a`&_N!)nz9>S_|cbl|&3NW0?*^oDMMtSBO{$x`EG6xagUeZteH zdIZbh1~DCtK@R(slD*+1xoROq@rAOVBD%g@AC|YCwUH_o5V-c^mHXjB%BLfmSYYv&>!&IWuu`?C@B>4IqxcDW)6n_$i06S~jI z{R)KhD!*%fUf$Uff#VTeQ4!5jKEUsOIE7sB{XJXq?1t03&_THf#6Fcxv@7!*dJiHc0J-;gSW>2$e?YwNjMs9js>bKjj z*;Tj6<$MI3?C)my>3_Ns5{^4jB!kdb+ydz7tu0h)W%)tRBcPNEPJ<)t;?$SpdMNq~ ze%mKEUin@KH<{D4CZO8$wck*EeY}^*tfVgrHU_%$;{>-^qHO!gZC~yZ$;c@*@;Jcl z0>-5qN==AuM~amjZ1VXtb;=(C&XuhazN{Z9DX}SVDw(Ru>UrPYajM)1HC^NEXYC{1 zB*z(o^S7e6T1^BJ2&}s~D9idv19?`zfleEvwNks5rUBI!G1#4O`c}!CG@Vz!nm0T& zlfq>uphsfrz(dDoi)ZavLZY4&&bz5Ip;?dF!`sC{zv}N?Im|iWdOtu79x5fYaMabz zXm5_mWM0ROu|@aogu6vbPc#<#9*uMfhLR7<0)9gc#|Tn&FRVqfH9HU{3kgQ+D6-$` zVUL0dsO^Ewxlq5-zUP*9jVYs*o?5hRlLt%5a48ap!xlBNb-1T?pR?IjFz%c~Dd&+y$Y(k& z-&5cvPMVH#Sk5S&yi(1-kp0J2U5FT(7bneaix`#i2w zG^6~XC&zl3(|9EaNNe^L23OtF-u!j?y~c@IFMxr6?2;KP_77!SvfOMEQoc-9n@~37 z5(ViJtL-r8C!$?|NQtO-Qw zV$IUqv_Q8)SlKdx*XF3gEFW42Q*#Dx+EXBP?6VfNu-(b@Ad^u%lvN-On<@0gPfH}x zg=rie)*$&Oxb)g^85B;xuNOCY{mi1N$FudwyLhP)T=xODtG%`DtB*h~W=F@x3>(fc zQq9ti$=-VzbTuT+PvoSOo*h!Yi zrVXp&Du)euU3=%IJP0f%E;B(xf)=Sx$MiA=2zVO-b>I9Rx54hTJsKSL0#zHOn2 zzGn`F_(T6SL8(nhHcw}vU6$Il=DDA0k+~R}m9`g@ki}~Wf#A@1OEnvQ4Xf+slg;*8 zz#>_lXY4QZ-DThtGg5+|GlGYO?q-SW-N4!U+qrF3(=bV}It$)?ybk#m7PP>jEn0y! zzKeMp7(~{tyuKuwBTlqvR%XaN2&>lfx``!=+n8%&dbrZzHgU% zSvV2ZhBvFeOrD#ip*84w5zWXt9^iMJM*Yw|q-MhpsmNgE@IxQ(guVth7+>|OS3?-R zUs+l8y0l4orNqDhWMAd?8wpk>tYlgSm3AYQJid*~iH*v8R7nKzJ3%8!LKq)|UCW;O zNNP)Y{#x(36)$tKJ_PI=fbHqM%6eVt(n^B5T-~w@nb9R=adX10{3|KTe6jIOOq#; zo%}A7^h0}2qoc2z&5-(%>f|f}e%L8vL4|g1n(YCOw+c99KwBdHe6u^e&Z4PY8l)`3 z#x(ht-nkXFx^HaF;PQ%QQ4r8jnK`F3rL|Vm0I{vg9-KpD$wWEvu|%1p2&caTq34rS zklk4OqCX~d_1K*O5vt^ertph+rA+N^%n?-o^drfg!gPnv>NKgjvSZ1Qoyd3a2-Kai zGFe^+I8$l-O?vLP8TG-OWUDLy2h2+wB!5toyh!AIOK^;WO&(GV0(Y>klLK z5O?fQI4s@4@o;V}N@U0U*%{8VL+7#{iwT^+WdCwtxjye}bERHCm_1=pn7Ki;>=YWT(>G+UZh8sATW_y;Nh!>lDHtX}_%@di0ar!dD=6SJEE?>UJ>i+D11iMww}cPa|M@>Of4{CH(T4Yy0slq93+&Xl%}PT;4AVxj zCOo2TseAuN_HmM4+laMFS|}jAB$TG#wA`{lhs?3xXQyI0tVB}<$Q%9_ujPMUQQ^#& zk3!5ZT!~K(O>f;+o9}d97OJea4}7xS*SmBM6P)Y*^Ig)IHOLxUmv4H+9OW^vedf(E z?LCEa@x4+#Q9sB7P}e3X|M%+MGJrFDei5z8>v44J6P+m33l7;1#cuO|FZtJK6eECz z!6JJyS79U4s@oWUC&mrUKK8$D*HQd8NQqfM4SlqBqrTBlW(TkHNh2BG@S;=h^j-zNa-N(VHn%n$5zDwo26!#`SX5(0;c6u>+yRH5~ zye`cSNF~L?g^iupJ;vo)>`u=NG{aS4_%PRN^89PE-RrrFYq4?a%$e~H8D46q3!9Es zDr5YRU9lt2A>-qTkVDmrLA(nF;nH+n^!1u=((rRLX#%6^^0D@C(hniSYlk zn*Ux_p$#DSE2CkSvL}(F++byYEwlt$LmI8Y(7w4)o zheVrct45tN>#KYthU3bL?)Pak5qZN3|I>Ba4>o}k+`(V9s+=;aD=1^5 ze{R#4gF)~8z}$Ovb+m)jK%GTfi1 z339yuE5gL!J(6iURj1#Iky(Se&W<{nl9M0vtSC(c*(WcfT(-e>?$L)d?7j=$%G_LT zPz_yv876wQh+6K<9?QITP3}^|*JqqtdBU`%AQnl}yQ26!a`~?XIB(32nj_!D% zo7up7jeNOrTcF`Q8b3cf$oFbyJ?py{T3*O?KGdgV4^!uXIUMTgVSk5x`|@%mHG);c z%;jTTXX4KCQYyu9x>sH-oAzMpAfa40bQ3_+U-0?2Yo85!5YeInolZJWT`b9VvYty< zMFW=Du->s8C6Qy0l%a$BNKc7_&u%?)a5S@3{gEVqHUHUg|K3ZufK&qg9xui+wO&TQ z$g_=lTeUtYOh+))Adg&9I{}R&0(b9B_Y+9v>gGZ%A4ebJ;~O1SB+qAhCiu`c?E|={@X6r<1jjB(Ca?*I z&VildRoOPC7M%^p4X}6KlPH?4Uu149PEzu2>=D2m>%ZUpDDTl%GK2Ebj zn0jiuf}X1;E;oXPc@EBtk*?&2>llP>#s0C??9pQ2Yc}%qVww(BulTY|%udx^Q#Hoi zU?oz#PP8&5YT9OZhe`-->b_IQl=`0bs03V-xt;1QhSz-9ykU0Pw5E<9w~$yUdm*Ma zl90xcc?z=G=_&g29ir{p@a$VuQ8VY?K@|*DQXK#+^qYyTiHZlz7Ra`84%mDb-n`6P zLALzolYvA#_RU=zg|!#0#(rhkO-=fW`R%F{++k7MdV|vzpJFMw8&mV(3_ipJX3TUZjcV@X>`4d1lmJGwdT;nuP@q9AN4y&t{AIiC85f`gM0 za{TvfhIwSPc=VR?bbqjMG=0`&HVT~5A0kv~PR?@u&<21wv#1%UB;R7O9ll}s0ihR> z+sZunhriB110?(PM@DRwkiQRJs1i^=I`ng!ibdC4LFjh%8iO`Z!BBOo&Jd^t&fG2a z&OYLwcia}c%L3-V#?+NJK2MIBcmK~u0X|v-WkR65mG|MZDG~Gmy118i#V^k%dUn!m z-?#={Th5kmE)C_F4r9`Y(nWi%R$A4EF=>0RP*o zHrephodwmM$orKr?OsmSLM|4WiD8}K6mgXy{w%yMhx+xO_*5%*41$}^mugMnE2wvl z8TTdeRGsx!#sx2xWCA@XRW1Jzt2s>AzKkz$tpk0d*2|hF+<{c4DI|`v^Q^jCW6H9p zoSBkC54xixoUl#kqb#f1h9kD70y@?YBTKR2F}2vQN9AX%oNy=$u{Ao3;nEsQ~l*`ZmuqC{eeb$-73+G$Y(&?r^$-WPV*{wH7PqvrX?s zs?3V#0pykPMbOUNIB#k4b(`f*2!58COXv}S$-OXr1;@wU{yYrcckhU*q(nb`fw<=x zmi?8)q1U1R^$#vnfd=Aab?vU9oKHu9Uk%gWEf~e7H#76ktfN)Ir(g1{rc)LLx>508 zJz0Ncq@+b^+);%O*U>ZCItJmq7Vm$Ye{5lQrNT+e#o8^I5|f?~oi9PrWtmQ&WS9QE zmh)%TF53MYufjQiL@5f-lcv1(&?K;^}3TEYDj1)WU|~QdYBpj&3Sp zqYW_%rPABd_C+K`z9roW3M|Mq*RoX_BA#>jY}RGFxC~Cksxu|?Xt+8~EGBWX!xx!Z zbqqXoK3JCB^Ys{(=d{}YWuFsMf*(%I_9n=Oie@{Z0yf<4p~jVA9lt-sVe%&`cch;A z52YNJYMvuQs&<^1pXHX{uS}VLKl2Xmxi?0y;|`sN^R$>^{y(_ouM-B?csd6ThsFe8 z413#(2}kdW9SJ^mIIZ+P>3LTxFgOYkI0|nPm|YD@+i5WU!?q;`50nFz&j6jV>EfJP z;7Q`tjElbJP>sE~K3OGgs378}Rgfjxf0XiHZ~S#qfV)DrJkWcYcn58Ryzkh;PbTPr zQWH1vQk=v!EXm=&X>2ESqgw;p=jsPC}GYW~M$4-tAx_t%Ly zb1e55Xq>RvmG3VQibiDo$66{jL&nXN$uO;aNT^yU2IBO$Y^jY?%@+YFH-#Dv1=+=3 z-7PlVTEtea>uSJ88|qCgbvxIEp9Y+{|D%v|AZPN+kt4rEz$SPA%dzPd3NJDg<%q75 z{+iV@mGc^BeT>t)I%-1&;@&BK<^G}Fdyy~*PzxYv%R&8MUcj(1n@vpM55Yx{6 zjqWc>47l{9+EBFsrTSll`u};&PCx%aPC!v_b---PPCnp!SW7%r$r%-`bTvT1fZwaLmtZoPPw-t+Mq-v-p-Q z7Bye4um(pmPbM8FV&{2b+Cy~Z?@lW9x6?v<+@vKBBE5AzfEAp{B3MIpImEV zq&eLLv@2WPz25%JX4a^2I+#jv#V>StERjh6_V72amRv{W;9Qk-9iRPz<&F}m!zn6@l=-hX}{sag7L@wG@o7S59m zma>fr|H5vx$o7iHoe>52sb5pZ)wQm7Xgj5>LMQ0+e^hcJYK5aVsP%XW8&lRgPilgGS1s+Ne*p!)5NI<#9@@)2CW~&4glggY6@( z_^RsP$Bm~Ct7iEsb}@7#LXzNif& ze6;Y4con3pL4F-y;#%f&sA=4OeS*P!YXjqtCcYN)P@rNQ>68$UbET6Iu(PsH$+nnB zo>r^Xob{LW?B4~r2E6Cxv6|H2ys&vHrS(tYP(_%(zx>i@b69>j^v%$;uWwQFxjlLC zeJxQhRO(K>o@L6&N{kO1fr&U#yNvX! znhdc;gfpTudbtyROgX)#J$<|j-s)cu{j>Pm5arHD=Y^xZ$gb!R$B7!-j#<2FkC$`h zd7BQI>Da%GAjmg@Ixxm>sc-dwlG3zlp3$kLqdkgClNPg9+V1r|X|wb+YAq+JtE~$1 z@-%w6y7!uh^#$dOdM!6W-K&KvNg}zA&q5VI^ z?=&&#{$)`p>Vwnhp)PdwdbuV#jh;(7yK_Tr13wFhX-1p$1)Z|zXkHlEo-Lc;-&ny;3Y7G zfidMT^oTWY%qZgF?`COBE?(ub!Ao7HgQ+&x`0m0Ndg(^MG-N9NL7Y-Bz=Sb`n*?632)Px2NXYNh~TJtv1`-)iTDUi>5@ zl-5ZWqqFdEqw1((xyKe4d;=G*$vXR{8Rx3|vnPU$+bE3pZ#r10h}dtjuT&{Xqa@vQ zpn;_?M%l;c#RVsATxzAI#D1=#YTrj+vMDAcOD$DNFtCeO_+PWjHh<%S(p>p12f6Wy zn5I!Sr3&+qaNOd!dB1qaSJ!*=dE)m>$#~6ls-TZ%+Y$22?Lw2SiuAqoet2u~#L*cx zL5`T^Yz2?$iGwoBw03iKgq%nEY86L0D&^sn;1HP}E~Rzb*NvOpz0OzZ+w`zadHmoe zqGtnWU%N6sVp(0We~q1n`0F*y&JXKP#;w(#pd zb=7yS%GN}>F>GjTrD+>9Ah$pqzYAKqD&095ZCOfV8yb*RdIJ}oVwegX8yYCb@TWk-Ss+87R3}56W)YOEj&`qye4RP(bc@5?5+AiqpNFZuYdSzN#^`F`gqP mCp24mDwTf*(Y3iRAG z@hDi*&21V9yB})ps8UMvYq)a&jZ(y?~Tq= z?O#NFzyIrr08v08z#d=`Qu{#~gACp`w-4X8P_^}V;K|MupW0)q+EZ7;KwYdHuRKUe zQAkcfMP-t9lxLhCsrGBqTrCi_v>Y+L+3&%)AJgS zaP{JxUd!ukQKR?l>ng?L{cZEtSEgaM)nr|pp~%vDBGS#%Wx44mx`hChzu-ff3yePC zYkcgXsyshP8;8dK%}l`%0BebW&#JUU@&ASn7#d3rE|+mUDtMeZ6_Ip_*6J^6Jv(xg zbaXr%m|13+mK?IujAn81W9C$a#!2P6Of(=G|?4?@PVy#*vBX@Q2GbOVj9Im;Ptj1#*8O6!sfJiQoO! zgfyh6uz3#KDj7DJIIvc4b=yo;agIJo{G5~OOcGV0bD7OH^UO_A`y>6~bl#;cz^V3xf;=et1~ z^XOXol1<_BsPVeoiJg zDAX@ni1VeJt4!lc*;LhGIhRqcNPU^+7hK-7d2*wTmP?Onyw0EMtsC|QDJhyFlg|UT zx-V4K4e#7RMEH73_EsWCX8@C`|++T^>OM1tfCe5|kEc0VIH^ln{{@1(Zmr zQW6m9NPq+gRjME@1dt9P35rr9U_>br;BLTYnfn*KH!riZGs*mRHox;b`#azBIlKF- z*fZdAfFiz!7flT%F|s4OhXm}m367>Ngo}XI{j-tHecNNjx|c^JZE0Y z3~5*9rg_dRMkk0rjoi@bkhi>azWlEF3!s1vf$0wc74@?WH+G1!Y%QvKAys75hGEsP z>zKNx8=LL~+}U)_iyo6uwyST5wG-aj<%Bfdm*lQ=tGDCn2*;9MP^4ZRidP$%zbgD9 z)>v_+moAU+43opfaA;YYW6592%GzEGInRjInjN3vsbh%r@sGV;A@HrLTzui>1_?N! zFR?nho0q1YW~xFgIOS~ z?Tl#0;sQHJ1uK}=oUzEXGP(7DnTS6!GBS%&EW#Nx1}s|u+rq8do{)o9{hmzcB_=(X zCV&ZkwJ`7M;-2-L5{Pu!+B-!k-&E%~X!!~{%LjGkbTV`G~1Tm zEyk*2EQF%$Rvs;ClX8Fy#BCJfIrv=k%@XoVSKGl-NaHg zpGKNs&X{amt|eF^pp`x+jPPg!-mw-gsm|&!rCMBp8q9N_p)}k*+XjnJ!y(?W1ThS} zSgKEq*&#v%E>)4aEKMLr3-$myNNsmQ}kb97>Qv3=1!r9dY2 zeh6zpv^<$_ZP`eCG-SIM;o|IEWW5mAw~l0%lk6J;@^o(n+N~)NX04r&VF$^puN6?0 zcd@4&D5Tx>%f$BW#%)u-(=x)l?xrrYi|n#|0x2}wTJwtH%ax#}ETrgM_U3F*cje7% zCQUW|P#%sE62U2SCJapA-TtL;<(|9kY8S)nIli)f_xejKMyf6t{Kn6$Hrj~v&20*K zk_I_xUdaDG6i||exChXc2}-;Qc`f@c?yK~eOvjb{$;%V5 z%dSWS%rC;_p6GBa8kpSyS%H;iv5NJHe9<@O@I`>8{o2oI(y$uj>*(ZOpayF?R}iooEaQg?=D+ols54uM*R6fQQ)Gl?bIHpqUYqIvh_beZ9Z zY3+>(N)QB4_K%MTnydsJj_a#ekLY_wFZiw#$ZIOKd5l?h5e#+v^DLrE1B}Mwi|bYt z$=Tjooo!7Xv6q=x*3MyX*@OT$R87w}1}h}V$eJ z!WkJ^cJduWo5@@X<(#6XLt9h+;chTkDfg^;6(ZLR-{mf{NQLLSSOA4ofu^!QZp>=P zT|R^R&DB=Bjqx=U^+9&7IpbyNo;}#v&NU_NvFBt1$l_jYEiR!?VP#;!r-A-3eNz9$ zg6G89eb2g|>D%#ocu9)ya!|!|3b*)qW28cbW%Y;FJ`B#nrBaI)imMh?4YN=xZ(W$v zpI@6BXO2|YRvE35dw|4zJVfElM@Zo}3HIm=CZmMi{myDs-qtdfN)Re}Ji@2v^>va2 zR>^~|ud++#5gt~xO0wGyvp)c0f!enU??XJacs?Lh?W+Sq3cJ`;b$r&MQv^n`$D!bD z4auz6>dDkh-^7_6f*n&!$~m(+X7&tL!d!)F+2N-xF^iwZ(ZjP2VUkjKeh|MLyaJm* zS9Sx9mdNr2>uh;^(RZ$b40+T&lkGo^gqQW#LLqC7^#*f@M2Fld~&lZLH>ac}E+PZj;x>g0_e;_qx0y4kNJ z5zWg-T4+>iOJs()GZ9GeH$x_GpW-Mu7#F3}T<%zME&m|Kk5>mf6Rk-ds&Zn7iwFN` z2(-OEAW@)aGio!J#tst)&b(KT!Ka2EtU?(vux2`&9r(64N#lPl8n;e4;N93e_zf(S zmgf(bx^5wxv=B{x^kzTi)k%nILdQ+}vOfXBSuY8=PQlVA|0rl>!5gCW&kci4Kz1Z} z+&r&hj5~lylZZ6EV?N`rtQgj;wB4yKD>LiSJjr+2yXnUtDUcPcn-D!vifr`FbR*ry zU4o3lFP!yKuX~K>$!fQXi80$>()Ppv3WWlTa~QSCT=>Z_5D+#V$ZS=ZHbO>uOv&2O zM)c{w(C2xPO(_0BJajxR{}UD_lxP0%C!=o+fROCg_V&$K@r(I**5=h2ZC;SFJM@1! q)y7Et2r>UZ46qf?T>t$hSqjt(z2c5CRxa8Ce1Nr}FObe(zyCLTjyRS8 diff --git a/archive/2.0.0a16/guide/images/ding/webhook.png b/archive/2.0.0a16/guide/images/ding/webhook.png deleted file mode 100644 index c957e72f925e1490afdfabf2af7b0aecfaeb3252..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102603 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%0DQ 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 diff --git a/archive/2.0.0a16/guide/installation.md b/archive/2.0.0a16/guide/installation.md deleted file mode 100644 index 48dd9615..00000000 --- a/archive/2.0.0a16/guide/installation.md +++ /dev/null @@ -1,115 +0,0 @@ -# 安装 - -## 安装 NoneBot - -:::warning 注意 -请确保你的 Python 版本 >= 3.7。 -::: - -:::warning 注意 -请在安装 NoneBot v2 之前卸载 NoneBot v1 - -```bash -pip uninstall nonebot -``` - -::: - -### (推荐安装方式)通过脚手架安装 - -1. (推荐)使用你喜欢的 Python 环境管理工具(如 `poetry`)创建新的虚拟环境 -2. 使用 `pip` 或 其他包管理工具 安装 `nb-cli`，`nonebot2` 会作为其依赖被一起安装 - - ```bash - pip install nb-cli - ``` - -3. 点个 star 吧 - - nonebot2: [![nonebot2](https://img.shields.io/github/stars/nonebot/nonebot2?style=social)](https://github.com/nonebot/nonebot2) - - nb-cli: [![nb-cli](https://img.shields.io/github/stars/nonebot/nb-cli?style=social)](https://github.com/nonebot/nb-cli) - -4. 如果有疑问，可以加群交流(点击链接直达) - - [![QQ Chat](https://img.shields.io/badge/QQ%E7%BE%A4-768887710-orange?style=social)](https://jq.qq.com/?_wv=1027&k=5OFifDh) - - [![Telegram Chat](https://img.shields.io/badge/telegram-cqhttp-blue?style=social)](https://t.me/cqhttp) - -### (纯净安装)不使用脚手架 - -```bash -pip install nonebot2 -# 也可以通过 poetry 安装 -poetry add nonebot2 -``` - -如果你需要使用最新的（可能**尚未发布**的）特性，可以直接从 GitHub 仓库安装： - -:::warning 注意 -直接从 Github 仓库中安装意味着你将使用最新提交的代码，它们并没有进行充分的稳定性测试 -在任何情况下请不要将其应用于生产环境! -::: - -```bash -# master分支 -poetry add git+https://github.com/nonebot/nonebot2.git#master -# dev分支 -poetry add git+https://github.com/nonebot/nonebot2.git#dev -``` - -或者在克隆 Git 仓库后手动安装： - -```bash -git clone https://github.com/nonebot/nonebot2.git -cd nonebot2 -poetry install --no-dev # 推荐 -pip install . # 不推荐 -``` - -## 安装适配器 - -适配器可以通过 `nb-cli` 在创建项目时根据你的选择自动安装，也可以自行使用 `pip` 安装 - -```bash -pip install -``` - -```bash -# 列出所有的适配器 -nb adapter list -``` - -## 安装插件 - -插件可以通过 `nb-cli` 进行安装，也可以自行安装并加载插件。 - -```bash -# 列出所有的插件 -nb plugin list -# 搜索插件 -nb plugin search -# 安装插件 -nb plugin install -``` - -如果急于上线 Bot 或想要使用现成的插件，以下插件可作为参考： - -### 官方插件 - -- [NoneBot-Plugin-Docs](https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-plugin-docs) 离线文档插件 -- [NoneBot-Plugin-Test](https://github.com/nonebot/plugin-test) 本地机器人测试前端插件 -- [NoneBot-Plugin-APScheduler](https://github.com/nonebot/plugin-apscheduler) 定时任务插件 -- [NoneBot-Plugin-LocalStore](https://github.com/nonebot/plugin-localstore) 本地数据文件存储插件 -- [NoneBot-Plugin-Sentry](https://github.com/cscs181/QQ-GitHub-Bot/tree/master/src/plugins/nonebot_plugin_sentry) Sentry 在线日志分析插件 -- [NoneBot-Plugin-Status](https://github.com/cscs181/QQ-GitHub-Bot/tree/master/src/plugins/nonebot_plugin_status) 服务器状态查看插件 - -### 其他插件 - -还有更多的插件在 [这里](/store.html) 等着你发现～ - -## 安装开发环境(可选) - -NoneBot v2 全程使用 `VSCode` 搭配 `Pylance` 的开发环境进行开发，在严格的类型检查下，NoneBot v2 具有完善的类型设计与声明。 - -在围绕 NoneBot v2 进行开发时，使用 `VSCode` 搭配 `Pylance` 进行类型检查是非常推荐的。这有利于统一代码风格及避免低级错误的发生。 diff --git a/archive/2.0.0a16/guide/loading-a-plugin.md b/archive/2.0.0a16/guide/loading-a-plugin.md deleted file mode 100644 index 5f445a14..00000000 --- a/archive/2.0.0a16/guide/loading-a-plugin.md +++ /dev/null @@ -1,184 +0,0 @@ -# 加载插件 - -在 [创建一个完整的项目](creating-a-project) 一章节中，我们已经创建了插件目录 `awesome_bot/plugins`，现在我们在机器人入口文件中加载它。当然，你也可以单独加载一个插件。 - -## 加载内置插件 - -在 `bot.py` 文件中添加以下行： - -```python{8} -import nonebot -from nonebot.adapters.cqhttp import Bot - -nonebot.init() - -driver = nonebot.get_driver() -driver.register_adapter("cqhttp", Bot) # 注册 CQHTTP 的 Adapter -nonebot.load_builtin_plugins() # 加载 nonebot 内置插件 - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -::: warning -目前, 内建插件仅支持 CQHTTP 的 Adapter - -如果您使用的是其他 Adapter, 请移步该 Adapter 相应的文档 -::: - -这将会加载 nonebot 内置的插件，它包含： - -- 命令 `say`：可由**superuser**使用，可以将消息内容由特殊纯文本转为富文本 -- 命令 `echo`：可由任何人使用，将消息原样返回 - -以上命令均需要指定机器人，即私聊、群聊内@机器人、群聊内称呼机器人昵称。参考 [Rule: to_me](../api/rule.md#to-me) - -## 加载插件目录 - -在 `bot.py` 文件中添加以下行： - -```python{6} -import nonebot - -nonebot.init() - -# 加载插件目录，该目录下为各插件，以下划线开头的插件将不会被加载 -nonebot.load_plugins("awesome_bot/plugins") - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -:::tip 提示 -加载插件目录时，目录下以 `_` 下划线开头的插件将不会被加载！ -::: - -:::warning 提示 -**不能存在相同名称的插件！** -::: - -:::danger 警告 -插件间不应该存在过多的耦合，如果确实需要导入某个插件内的数据，可以参考 [进阶-跨插件访问](../advanced/export-and-require.md) -::: - -## 加载单个插件 - -在 `bot.py` 文件中添加以下行： - -```python{6,8} -import nonebot - -nonebot.init() - -# 加载一个 pip 安装的插件 -nonebot.load_plugin("nonebot_plugin_status") -# 加载本地的单独插件 -nonebot.load_plugin("awesome_bot.plugins.xxx") - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -## 从 json 文件中加载插件 - -在 `bot.py` 文件中添加以下行： - -```python{6} -import nonebot - -nonebot.init() - -# 从 plugin.json 加载插件 -nonebot.load_from_json("plugin.json") - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -**json 文件示例** - -```json -{ - "plugins": ["nonebot_plugin_status", "awesome_bot.plugins.xxx"], - "plugin_dirs": ["awesome_bot/plugins"] -} -``` - -## 从 toml 文件中加载插件 - -在 `bot.py` 文件中添加以下行： - -```python{6} -import nonebot - -nonebot.init() - -# 从 pyproject.toml 加载插件 -nonebot.load_from_toml("pyproject.toml") - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -**toml 文件示例：** - -```toml -[nonebot.plugins] -plugins = ["nonebot_plugin_status", "awesome_bot.plugins.xxx"] -plugin_dirs = ["awesome_bot/plugins"] -``` - -::: tip -nb-cli 默认使用 `pyproject.toml` 加载插件。 -::: - -## 子插件(嵌套插件) - -在插件中同样可以加载子插件，例如如下插件目录结构： - - -:::vue -foo_plugin -├── `plugins` -│ ├── `sub_plugin1` -│ │ └── \_\_init\_\_.py -│ └── `sub_plugin2.py` -├── `__init__.py` -└── config.py -::: - - -在插件目录下的 `__init__.py` 中添加如下代码： - -```python -from pathlib import Path - -import nonebot - -# store all subplugins -_sub_plugins = set() -# load sub plugins -_sub_plugins |= nonebot.load_plugins( - str((Path(__file__).parent / "plugins").resolve())) -``` - -插件将会被加载并存储于 `_sub_plugins` 中。 - -## 运行结果 - -尝试运行 `nb run` 或者 `python bot.py`，可以看到日志输出了类似如下内容： - -```plain -09-19 21:51:59 [INFO] nonebot | Succeeded to import "nonebot.plugins.base" -09-19 21:51:59 [INFO] nonebot | Succeeded to import "plugin_in_folder" -``` diff --git a/archive/2.0.0a16/guide/mirai-guide.md b/archive/2.0.0a16/guide/mirai-guide.md deleted file mode 100644 index aa598dfa..00000000 --- a/archive/2.0.0a16/guide/mirai-guide.md +++ /dev/null @@ -1,253 +0,0 @@ -# Mirai-API-HTTP 协议使用指南 - -::: warning - -Mirai-API-HTTP 的适配现在仍然处于早期阶段, 可能没有进行过充分的测试 - -在生产环境中请谨慎使用 - -::: - -::: tip - -为了你的使用之旅更加顺畅, 我们建议您在配置之前具有以下的前置知识 - -- 对服务端/客户端(C/S)模型的基本了解 -- 对 Web 服务配置基础的认知 -- 对`YAML`语法的一点点了解 - -::: - -::: danger - -Mirai-API-HTTP 的适配器以 [AGPLv3 许可](https://opensource.org/licenses/AGPL-3.0) 单独开源 - -这意味着在使用该适配器时需要 **以该许可开源您的完整程序代码** - -::: - -**为了便捷起见, 以下内容均以缩写 `MAH` 代替 `mirai-api-http`** - -## 安装 NoneBot Mirai 适配器 - -```bash -pip install nonebot-adapter-mirai -``` - -## 配置 MAH 客户端 - -正如你可能刚刚在[CQHTTP 协议使用指南](./cqhttp-guide.md)中所读到的: - -> 单纯运行 NoneBot 实例并不会产生任何效果，因为此刻 QQ 这边还不知道 NoneBot 的存在，也就无法把消息发送给它，因此现在需要使用一个无头 QQ 来把消息等事件上报给 NoneBot。 - -这次, 我们将采用在实现上有别于 OneBot（CQHTTP）协议的另外一种无头 QQ API 协议, 即 MAH - -为了配置 MAH 端, 我们现在需要移步到[MAH 的项目地址](https://github.com/project-mirai/mirai-api-http), 来看看它是如何配置的 - -根据[项目提供的 README](https://github.com/project-mirai/mirai-api-http/blob/056beedba31d6ad06426997a1d3fde861a7f8ba3/README.md),配置 MAH 大概需要以下几步 - -1. 下载并安装 Java 运行环境, 你可以有以下几种选择: - - - [由 Oracle 提供的 Java 运行环境](https://java.com/zh-CN/download/manual.jsp) **在没有特殊需求的情况下推荐** - - [由 Zulu 编译的 OpenJRE 环境](https://www.azul.com/downloads/zulu-community/?version=java-8-lts&architecture=x86-64-bit&package=jre) - -2. 下载[Mirai Console Loader](https://github.com/iTXTech/mirai-console-loader) - - - 请按照文档 README 中的步骤下载并安装 - -3. 安装 MAH: - - - 在 Mirai Console Loader 目录下执行该指令 - - - ```shell - ./mcl --update-package net.mamoe:mirai-api-http --channel stable --type plugin - ``` - - 注意: 该指令的前缀`./mcl`可能根据操作系统以及使用 java 环境的不同而变化 - -4. 修改配置文件 - - ::: tip - - 在此之前, 你可能需要了解我们为 MAH 设计的两种通信方式 - - - 正向 Websocket - - NoneBot 作为纯粹的客户端,通过 websocket 监听事件下发 - - 优势 - 1. 网络配置简单, 特别是在使用 Docker 等网络隔离的容器时 - 2. 在初步测试中连接性较好 - - 劣势 - 1. 与 NoneBot 本身的架构不同, 可能稳定性较差 - 2. 需要在注册 adapter 时显式指定 qq, 对于需要开源的程序来讲不利 - - POST 消息上报 - - NoneBot 在接受消息上报时作为服务端, 发送消息时作为客户端 - - 优势 - 1. 与 NoneBot 本身架构相符, 性能和稳定性较强 - 2. 无需在任何地方指定 QQ, 即插即用 - - 劣势 - 1. 由于同时作为客户端和服务端, 配置较为复杂 - 2. 在测试中网络连接性较差 (未确认原因) - - ::: - - - 这是当使用正向 Websocket 时的配置举例 - - 正向连接可以选择支持客户端连接方式的 `Driver` 来进行连接，请根据需求进行选择： - - - `nonebot.drivers.fastapi`: 同时支持正向和反向 - - `nonebot.drivers.aiohttp`: 仅支持正向 - - ::: warning - - 在默认情况下, NoneBot 和 MAH 会同时监听 8080 端口, 这会导致端口冲突的错误 - 请确保二者配置不在同一端口下 - - ::: - - - MAH 的`setting.yml`文件 - - - ```yaml - # 省略了部分无需修改的部分 - - host: "0.0.0.0" # 监听地址 - port: 8080 # 监听端口 - authKey: 1234567890 # 访问密钥, 最少八位 - enableWebsocket: true # 必须为true - ``` - - - `.env`文件 - - - ```shell - PORT=2333 - - MIRAI_AUTH_KEY=1234567890 - MIRAI_HOST=127.0.0.1 # 当MAH运行在本机时 - MIRAI_PORT=8080 # MAH的监听端口 - PORT=2333 # 防止与MAH接口冲突 - ``` - - - `bot.py`文件 - - - ```python - import nonebot - from nonebot.adapters.mirai import Bot - - nonebot.init() - nonebot.get_driver().register_adapter('mirai', - Bot, - qq=12345678) - # qq参数需要填在mah中登录的qq, 如果需要多个帐号, 可以填写类似于 [123456,789100] 的数组形式 - - nonebot.load_builtin_plugins() # 加载 nonebot 内置插件 - nonebot.run() - ``` - - - 这是当使用 POST 消息上报时的配置文件 - - - MAH 的`setting.yml`文件 - - - ```yaml - # 省略了部分无需修改的部分 - - host: '0.0.0.0' # 监听地址 - port: 8080 # 监听端口 - authKey: 1234567890 # 访问密钥, 最少八位 - - ## 消息上报 - report: - enable: true # 必须为true - groupMessage: - report: true # 群消息上报 - friendMessage: - report: true # 好友消息上报 - tempMessage: - report: true # 临时会话上报 - eventMessage: - report: true # 事件上报 - destinations: - - 'http://127.0.0.1:2333/mirai/http' #上报地址, 请按照实际情况修改 - # 上报时的额外Header - extraHeaders: {} - ``` - - - `.env`文件 - - - ```shell - HOST=127.0.0.1 # 当MAH运行在本机时 - PORT=2333 # 防止与MAH接口冲突 - - MIRAI_AUTH_KEY=1234567890 - MIRAI_HOST=127.0.0.1 # 当MAH运行在本机时 - MIRAI_PORT=8080 # MAH的监听端口 - ``` - - - `bot.py`文件 - - - ```python - import nonebot - from nonebot.adapters.mirai import Bot - - nonebot.init() - nonebot.get_driver().register_adapter('mirai', Bot) - nonebot.load_builtin_plugins() # 加载 nonebot 内置插件 - nonebot.run() - ``` - -## 历史性的第一次对话 - -现在, 先启动 NoneBot, 再启动 MAH - -如果你的配置文件一切正常, 你将在控制台看到类似于下列的日志 - -```log -02-01 18:25:12 [INFO] nonebot | NoneBot is initializing... -02-01 18:25:12 [INFO] nonebot | Current Env: prod -02-01 18:25:12 [DEBUG] nonebot | Loaded Config: {'driver': 'nonebot.drivers.fastapi', 'host': IPv4Address('127.0.0.1'), 'port': 8080, 'debug': True, 'api_root': {}, 'api_timeout': 30.0, 'access_token': None, 'secret': None, 'superusers': set(), 'nickname': set(), 'command_start': {'/'}, 'command_sep': {'.'}, 'session_expire_timeout': datetime.timedelta(seconds=120), 'mirai_port': 8080, 'environment': 'prod', 'mirai_auth_key': 12345678, 'mirai_host': '127.0.0.1'} -02-01 18:25:12 [DEBUG] nonebot | Succeeded to load adapter "mirai" -02-01 18:25:12 [INFO] nonebot | Succeeded to import "nonebot.plugins.echo" -02-01 18:25:12 [INFO] nonebot | Running NoneBot... -02-01 18:25:12 [DEBUG] nonebot | Loaded adapters: mirai -02-01 18:25:12 [INFO] uvicorn | Started server process [183155] -02-01 18:25:12 [INFO] uvicorn | Waiting for application startup. -02-01 18:25:12 [INFO] uvicorn | Application startup complete. -02-01 18:25:12 [INFO] uvicorn | Uvicorn running on http://127.0.0.1:2333 (Press CTRL+C to quit) -02-01 18:25:14 [INFO] uvicorn | 127.0.0.1:37794 - "POST /mirai/http HTTP/1.1" 204 -02-01 18:25:14 [DEBUG] nonebot | MIRAI | received message {'type': 'BotOnlineEvent', 'qq': 1234567} -02-01 18:25:14 [INFO] nonebot | MIRAI 1234567 | [BotOnlineEvent]: {'self_id': 1234567, 'type': 'BotOnlineEvent', 'qq': 1234567} -02-01 18:25:14 [DEBUG] nonebot | Checking for matchers in priority 1... -``` - -恭喜你, 你的配置已经成功! - -现在, 我们可以写一个简单的插件来测试一下 - -```python -from nonebot.plugin import on_keyword, on_command -from nonebot.rule import to_me -from nonebot.adapters.mirai import Bot, MessageEvent - -message_test = on_keyword({'reply'}, rule=to_me()) - - -@message_test.handle() -async def _message(bot: Bot, event: MessageEvent): - text = event.get_plaintext() - await bot.send(event, text, at_sender=True) - - -command_test = on_command('miecho') - - -@command_test.handle() -async def _echo(bot: Bot, event: MessageEvent): - text = event.get_plaintext() - await bot.send(event, text, at_sender=True) -``` - -它具有两种行为 - -- 在指定机器人，即私聊、群聊内@机器人、群聊内称呼机器人昵称的情况下 (即 [Rule: to_me](../api/rule.md#to-me)), 如果消息内包含 `reply` 字段, 则该消息会被机器人重复一次 - -- 在执行指令`miecho xxx`时, 机器人会发送回参数`xxx` - -至此, 你已经初步掌握了如何使用 Mirai Adapter diff --git a/archive/2.0.0a16/sidebar.config.json b/archive/2.0.0a16/sidebar.config.json deleted file mode 100644 index 5fb75fef..00000000 --- a/archive/2.0.0a16/sidebar.config.json +++ /dev/null @@ -1,193 +0,0 @@ -{ - "sidebar": {}, - "locales": { - "/": { - "label": "简体中文", - "selectText": "Languages", - "editLinkText": "在 GitHub 上编辑此页", - "lastUpdated": "上次更新", - "nav": [ - { - "text": "主页", - "link": "/" - }, - { - "text": "指南", - "link": "/guide/" - }, - { - "text": "进阶", - "link": "/advanced/" - }, - { - "text": "API", - "link": "/api/" - }, - { - "text": "商店", - "link": "/store" - }, - { - "text": "更新日志", - "link": "/changelog" - } - ], - "sidebarDepth": 2, - "sidebar": { - "/guide/": [ - { - "title": "开始", - "collapsable": false, - "sidebar": "auto", - "children": [ - "", - "installation", - "getting-started", - "creating-a-project", - "basic-configuration" - ] - }, - { - "title": "编写插件", - "collapsable": false, - "sidebar": "auto", - "children": [ - "loading-a-plugin", - "creating-a-plugin", - "creating-a-matcher", - "creating-a-handler", - "end-or-start" - ] - }, - { - "title": "协议适配", - "collapsable": false, - "sidebar": "auto", - "children": [ - "cqhttp-guide", - "ding-guide", - "mirai-guide", - "feishu-guide" - ] - } - ], - "/advanced/": [ - { - "title": "进阶", - "collapsable": false, - "sidebar": "auto", - "children": [ - "", - "scheduler", - "permission", - "runtime-hook", - "export-and-require", - "overloaded-handlers" - ] - }, - { - "title": "发布", - "collapsable": false, - "sidebar": "auto", - "children": [ - "publish-plugin" - ] - } - ], - "/api/": [ - { - "title": "NoneBot Api Reference", - "path": "", - "collapsable": false, - "children": [ - { - "title": "nonebot 模块", - "path": "nonebot" - }, - { - "title": "nonebot.config 模块", - "path": "config" - }, - { - "title": "nonebot.plugin 模块", - "path": "plugin" - }, - { - "title": "nonebot.message 模块", - "path": "message" - }, - { - "title": "nonebot.matcher 模块", - "path": "matcher" - }, - { - "title": "nonebot.handler 模块", - "path": "handler" - }, - { - "title": "nonebot.rule 模块", - "path": "rule" - }, - { - "title": "nonebot.permission 模块", - "path": "permission" - }, - { - "title": "nonebot.log 模块", - "path": "log" - }, - { - "title": "nonebot.utils 模块", - "path": "utils" - }, - { - "title": "nonebot.typing 模块", - "path": "typing" - }, - { - "title": "nonebot.exception 模块", - "path": "exception" - }, - { - "title": "nonebot.drivers 模块", - "path": "drivers/" - }, - { - "title": "nonebot.drivers.fastapi 模块", - "path": "drivers/fastapi" - }, - { - "title": "nonebot.drivers.quart 模块", - "path": "drivers/quart" - }, - { - "title": "nonebot.drivers.aiohttp 模块", - "path": "drivers/aiohttp" - }, - { - "title": "nonebot.adapters 模块", - "path": "adapters/" - }, - { - "title": "nonebot.adapters.cqhttp 模块", - "path": "adapters/cqhttp" - }, - { - "title": "nonebot.adapters.ding 模块", - "path": "adapters/ding" - }, - { - "title": "nonebot.adapters.mirai 模块", - "path": "adapters/mirai" - }, - { - "title": "nonebot.adapters.feishu 模块", - "path": "adapters/feishu" - } - ] - } - ] - } - } - } -} \ No newline at end of file diff --git a/website/docs/guide/cqhttp-guide.md b/website/docs/guide/cqhttp-guide.md deleted file mode 100644 index 1d6ee314..00000000 --- a/website/docs/guide/cqhttp-guide.md +++ /dev/null @@ -1,117 +0,0 @@ -# CQHTTP 协议使用指南 - -## 安装 NoneBot CQHTTP 适配器 - -```bash -pip install nonebot-adapter-cqhttp -``` - -## 配置 CQHTTP 协议端（以 QQ 为例） - -单纯运行 NoneBot 实例并不会产生任何效果，因为此刻 QQ 这边还不知道 NoneBot 的存在，也就无法把消息发送给它，因此现在需要使用一个无头 QQ 来把消息等事件上报给 NoneBot。 - -QQ 协议端举例: - -- [go-cqhttp](https://github.com/Mrs4s/go-cqhttp) (基于 [MiraiGo](https://github.com/Mrs4s/MiraiGo)) -- [onebot-kotlin](https://github.com/yyuueexxiinngg/onebot-kotlin) -- [Mirai](https://github.com/mamoe/mirai) + [onebot-mirai](https://github.com/yyuueexxiinngg/onebot-kotlin) -- [Mirai](https://github.com/mamoe/mirai) + [Mirai Native](https://github.com/iTXTech/mirai-native) + [CQHTTP](https://github.com/richardchien/coolq-http-api) -- [node-onebot](https://github.com/takayama-lily/node-onebot) (基于 [abot](https://github.com/takayama-lily/abot), [OICQ](https://github.com/takayama-lily/oicq)) - -这里以 [go-cqhttp](https://github.com/Mrs4s/go-cqhttp) 为例 - -1. 下载 go-cqhttp 对应平台的 release 文件，[点此前往](https://github.com/Mrs4s/go-cqhttp/releases) -2. 运行 exe 文件或者使用 `./go-cqhttp` 启动 -3. 生成默认配置文件并修改默认配置 - -### 选项 1 反向 WebSocket 连接 - -```yml{2,3,6,10} -account: - uin: 机器人QQ号 - password: "机器人密码" - -message: - post-format: array - -servers: - - ws-reverse: - universal: ws://127.0.0.1:8080/cqhttp/ws -``` - -其中 `ws://127.0.0.1:8080/cqhttp/ws` 中的 `127.0.0.1` 和 `8080` 应分别对应 nonebot 配置的 HOST 和 PORT。 - -`cqhttp` 是前述 `register_adapter` 时传入的第一个参数，代表设置的 `CQHTTPBot` 适配器的路径，你可以对不同的适配器设置不同路径以作区别。 - -### 选项 2 HTTP POST 上报 - -```yml{2,3,6,11} -account: - uin: 机器人QQ号 - password: "机器人密码" - -message: - post-format: array - -servers: - - http: - post: - - url: "http://127.0.0.1:8080/cqhttp/http" - secret: "" -``` - -其中 `ws://127.0.0.1:8080/cqhttp/http` 中的 `127.0.0.1` 和 `8080` 应分别对应 nonebot 配置的 HOST 和 PORT。 - -`cqhttp` 是前述 `register_adapter` 时传入的第一个参数，代表设置的 `CQHTTPBot` 适配器的路径，你可以对不同的适配器设置不同路径以作区别。 - -### 选项 3 正向 WebSocket 连接 - -```yml{2,3,6,10,11} -account: - uin: 机器人QQ号 - password: "机器人密码" - -message: - post-format: array - -servers: - - ws: - host: 127.0.0.1 - port: 6700 -``` - -NoneBot 配置 - -```dotenv -CQHTTP_WS_URLS={"机器人QQ号": "ws://127.0.0.1:6700/"} -``` - -其中 `ws://127.0.0.1:6700/` 中的 `127.0.0.1` 和 `6700` 应分别对应 go-cqhttp 配置的 HOST 和 PORT。 - -正向连接可以选择支持客户端连接方式的 `Driver` 来进行连接，请根据需求进行选择： - -- `nonebot.drivers.fastapi`: 同时支持正向和反向 -- `nonebot.drivers.aiohttp`: 仅支持正向 - -## 历史性的第一次对话 - -一旦新的配置文件正确生效之后，NoneBot 所在的控制台（如果正在运行的话）应该会输出类似下面的内容（两条访问日志）： - -```default -09-14 21:31:16 [INFO] uvicorn | ('127.0.0.1', 12345) - "WebSocket /cqhttp/ws" [accepted] -09-14 21:31:16 [INFO] nonebot | WebSocket Connection from CQHTTP Bot 你的QQ号 Accepted! -``` - -这表示 CQHTTP 协议端已经成功地使用 CQHTTP 协议连接上了 NoneBot。 - -现在，尝试向你的机器人账号发送如下内容： - -```default -/echo 你好，世界 -``` - -到这里如果一切 OK，你应该会收到机器人给你回复了 `你好，世界`。这一历史性的对话标志着你已经成功地运行了一个 NoneBot 的最小实例，开始了编写更强大的 QQ 机器人的创意之旅！ - - diff --git a/website/docs/guide/creating-a-handler.md b/website/docs/guide/creating-a-handler.md deleted file mode 100644 index 3e0d49a4..00000000 --- a/website/docs/guide/creating-a-handler.md +++ /dev/null @@ -1,206 +0,0 @@ ---- -sidebar_position: 9 - -options: - menu: - weight: 90 - category: guide ---- - -# 事件处理 - -在上一章中，我们已经注册了事件响应器，现在我们可以正式编写事件处理逻辑了！ - -## [事件处理函数](../api/typing.md#handler) - -```python{1,2,8,9} -@weather.handle() -async def handle_first_receive(bot: Bot, event: Event, state: T_State): - args = str(event.get_message()).strip() # 首次发送命令时跟随的参数，例：/天气 上海，则args为上海 - if args: - state["city"] = args # 如果用户发送了参数则直接赋值 - - -@weather.got("city", prompt="你想查询哪个城市的天气呢？") -async def handle_city(bot: Bot, event: Event, state: T_State): - city = state["city"] - if city not in ["上海", "北京"]: - await weather.reject("你想查询的城市暂不支持，请重新输入！") - city_weather = await get_weather(city) - await weather.finish(city_weather) -``` - -在之前的样例中，我们定义了两个函数 `handle_first_receive`, `handle_city`，他们被事件响应器的装饰器装饰从而成为事件响应器的事件处理函数。 - -:::tip 提示 -在事件响应器中，事件处理函数是**顺序**执行的！ -::: - -### 添加一个事件处理函数 - -事件响应器提供了三种装饰事件处理函数的装饰器，分别是： - -1. [handle()](../api/matcher.md#classmethod-handle) -2. [receive()](../api/matcher.md#classmethod-receive) -3. [got(key, prompt, args_parser)](../api/matcher.md#classmethod-got-key-prompt-none-args-parser-none) - -#### handle() - -简单的为事件响应器添加一个事件处理函数，这个函数将会在上一个处理函数正常返回执行完毕后立即执行。 - -#### receive() - -指示 NoneBot 接收一条新的用户消息后继续执行该处理函数。此时函数将会接收到新的消息而非前一条消息，之前相关信息可以存储在 state 中。 - -特别地，当装饰的函数前没有其他事件处理函数，那么 `receive()` 不会接收一条新的消息而是直接使用第一条接收到的消息。 - -#### got(key, prompt, args_parser) - -指示 NoneBot 当 `state` 中不存在 `key` 时向用户发送 `prompt` 等待用户回复并赋值给 `state[key]`。 - -`prompt` 可以为 `str`, `Message`, `MessageSegment`，若为空则不会向用户发送，若不为空则会在 format 之后发送，即 `prompt.format(**state)`，注意对 `{}` 进行转义。示例： - -```python -@matcher.receive() -async def handle(bot: Bot, event: Event, state: T_State): - state["key"] = "hello" - - -@matcher.got("key2", prompt="{key}!") -async def handle2(bot: Bot, event: Event, state: T_State): - pass -``` - -`args_parser` 为参数处理函数，在这里传入一个新的函数以覆盖默认的参数处理。详情参照 [args_parser](#参数处理函数-args-parser) - -特别的，这些装饰器都可以套娃使用： - -```python -@matcher.got("key1") -@matcher.got("key2") -async def handle(bot: Bot, event: Event, state: T_State): - pass -``` - -### 事件处理函数参数 - -事件处理函数类型为： - -- `Callable[[Bot, Event, T_State, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, Event, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, T_State, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, Event], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot, Matcher], Union[Awaitable[None], Awaitable[NoReturn]]]` -- `Callable[[Bot], Union[Awaitable[None], Awaitable[NoReturn]]]` - -简单说就是：除了 `bot` 参数，其他都是可选的。 - -以下函数都是合法的事件处理函数（仅列举常用的）： - -```python -async def handle(bot: Bot, event: Event, state: T_State): - pass - -async def handle(bot: Bot, event: Event, state: T_State, matcher: Matcher): - pass - -async def handle(bot: Bot, event: Event): - pass - -async def handle(bot: Bot, state: T_State): - pass - -async def handle(bot: Bot): - pass -``` - -:::danger 警告 -函数的参数名固定不能修改！ -::: - -参数分别为： - -1. [nonebot.adapters.Bot](../api/adapters/README.md#class-bot): 即事件上报连接对应的 Bot 对象，为 BaseBot 的子类。特别注意，此处的类型注释可以替换为指定的 Bot 类型，例如：`nonebot.adapters.cqhttp.Bot`，只有在上报事件的 Bot 类型与类型注释相符时才会执行该处理函数！可用于多平台进行不同的处理。 -2. [nonebot.adapters.Event](../api/adapters/README.md#class-event): 即上报事件对象，可以获取到上报的所有信息。 -3. [state](../api/typing.md#t-state): 状态字典，可以存储任意的信息，其中还包含一些特殊的值以获取 NoneBot 内部处理时的一些信息，如： - -- `state["_current_key"]`: 存储当前 `got` 获取的参数名 -- `state["_prefix"]`, `state["_suffix"]`: 存储当前 TRIE 匹配的前缀/后缀，可以通过该值获取用户命令的原始命令 - -:::tip 提示 -NoneBot 会对不同类型的参数进行不同的操作，详情查看 [事件处理函数重载](../advanced/handler/overload.md) -::: - -### 参数处理函数 args_parser - -在使用 `got` 获取用户输入参数时，需要对用户的消息进行处理以转换为我们所需要的信息。在默认情况下，NoneBot 会把用户的消息字符串原封不动的赋值给 `state[key]` 。可以通过以下两种方式修改默认处理逻辑： - -- `@matcher.args_parser` 装饰器：直接装饰一个函数作为参数处理器 -- `got(key, prompt, args_parser)`：直接把函数作为参数传入 - -参数处理函数类型为：`Callable[[Bot, Event, T_State], Union[Awaitable[None], Awaitable[NoReturn]]]`，即： - -```python -async def parser(bot: Bot, event: Event, state: T_State): - state[state["_current_key"]] = str(event.get_message()) -``` - -特别的，`state["_current_key"]` 中存储了当前获取的参数名 - -### 逻辑控制 - -NoneBot 也为事件处理函数提供了一些便捷的逻辑控制函数： - -#### `matcher.send` - -这个函数用于发送一条消息给当前交互的用户。~~其实这并不是一个逻辑控制函数，只是不知道放在哪里……~~ - -#### `matcher.pause` - -这个函数用于结束当前事件处理函数，强制接收一条新的消息再运行**下一个消息处理函数**。 - -#### `matcher.reject` - -这个函数用于结束当前事件处理函数，强制接收一条新的消息再**再次运行当前消息处理函数**。常用于用户输入信息不符合预期。 - -#### `matcher.finish` - -这个函数用于直接结束当前事件处理。 - -以上三个函数都拥有一个参数 `message` / `prompt`，用于向用户发送一条消息。以及 `**kwargs` 直接传递给 `bot.send` 的额外参数。 - -## 常用事件处理结构 - -```python -matcher = on_command("test") - -# 修改默认参数处理 -@matcher.args_parser -async def parse(bot: Bot, event: Event, state: T_State): - print(state["_current_key"], ":", str(event.get_message())) - state[state["_current_key"]] = str(event.get_message()) - -@matcher.handle() -async def first_receive(bot: Bot, event: Event, state: T_State): - # 获取用户原始命令，如：/test - print(state["_prefix"]["raw_command"]) - # 处理用户输入参数，如：/test arg1 arg2 - raw_args = str(event.get_message()).strip() - if raw_args: - arg_list = raw_args.split() - # 将参数存入state以阻止后续再向用户询问参数 - state["arg1"] = arg_list[0] - - -@matcher.got("arg1", prompt="参数？") -async def arg_handle(bot: Bot, event: Event, state: T_State): - # 在这里对参数进行验证 - if state["arg1"] not in ["allow", "list"]: - await matcher.reject("参数不正确！请重新输入") - # 发送一些信息 - await bot.send(event, "message") - await matcher.send("message") - await matcher.finish("message") -``` diff --git a/website/docs/guide/creating-a-matcher.md b/website/docs/guide/creating-a-matcher.md deleted file mode 100644 index e028d718..00000000 --- a/website/docs/guide/creating-a-matcher.md +++ /dev/null @@ -1,157 +0,0 @@ ---- -sidebar_position: 8 - -options: - menu: - weight: 80 - category: guide ---- - -# 注册事件响应器 - -好了，现在插件已经创建完毕，我们可以开始编写实际代码了，下面将以一个简易单文件天气查询插件为例。 - -在插件目录下 `weather.py` 中添加如下代码： - -```python -from nonebot import on_command -from nonebot.rule import to_me -from nonebot.typing import T_State -from nonebot.adapters import Bot, Event - -weather = on_command("天气", rule=to_me(), priority=5) - - -@weather.handle() -async def handle_first_receive(bot: Bot, event: Event, state: T_State): - args = str(event.get_message()).strip() # 首次发送命令时跟随的参数，例：/天气 上海，则args为上海 - if args: - state["city"] = args # 如果用户发送了参数则直接赋值 - - -@weather.got("city", prompt="你想查询哪个城市的天气呢？") -async def handle_city(bot: Bot, event: Event, state: T_State): - city = state["city"] - if city not in ["上海", "北京"]: - await weather.reject("你想查询的城市暂不支持，请重新输入！") - city_weather = await get_weather(city) - await weather.finish(city_weather) - - -async def get_weather(city: str): - return f"{city}的天气是..." -``` - -为了简单起见，我们在这里的例子中没有接入真实的天气数据，但要接入也非常简单，你可以使用中国天气网、和风天气等网站提供的 API。 - -接下来我们来说明这段代码是如何工作的。 - -:::tip 提示 -从这里开始，你需要对 Python 的 asyncio 编程有所了解，因为 NoneBot 是完全基于 asyncio 的，具体可以参考 [廖雪峰的 Python 教程](https://www.liaoxuefeng.com/wiki/1016959663602400/1017959540289152) -::: - -## [事件响应器](../api/matcher.md) - -```python{5} -from nonebot import on_command -from nonebot.rule import to_me -from nonebot.permission import Permission - -weather = on_command("天气", rule=to_me(), permission=Permission(), priority=5) -``` - -在上方代码中，我们注册了一个事件响应器 `Matcher`，它由几个部分组成： - -1. `on_command` 注册一个消息类型的命令处理器 -2. `"天气"` 指定 command 参数 - 命令名 -3. `rule` 补充事件响应器的匹配规则 -4. `priority` 事件响应器优先级 -5. `block` 是否阻止事件传递 - -其他详细配置可以参考 API 文档，下面我们详细说明各个部分： - -### 事件响应器类型 type - -事件响应器类型其实就是对应事件的类型 `Event.get_type()` ，NoneBot 提供了一个基础类型事件响应器 `on()` 以及一些其他内置的事件响应器。 - -以下所有类型的事件响应器都是由 `on(type, rule)` 的形式进行了简化封装。 - -- `on("事件类型")`: 基础事件响应器，第一个参数为事件类型，空字符串表示不限 -- `on_metaevent()` ~ `on("meta_event")`: 元事件响应器 -- `on_message()` ~ `on("message")`: 消息事件响应器 -- `on_request()` ~ `on("request")`: 请求事件响应器 -- `on_notice()` ~ `on("notice")`: 通知事件响应器 -- `on_startswith(str)` ~ `on("message", startswith(str))`: 消息开头匹配响应器，参考 [startswith](../api/rule.md#startswith-msg) -- `on_endswith(str)` ~ `on("message", endswith(str))`: 消息结尾匹配响应器，参考 [endswith](../api/rule.md#endswith-msg) -- `on_keyword(set)` ~ `on("message", keyword(str))`: 消息关键词匹配响应器，参考 [keyword](../api/rule.md#keyword-keywords) -- `on_command(str|tuple)` ~ `on("message", command(str|tuple))`: 命令响应器，参考 [command](../api/rule.md#command-cmds) -- `on_regex(pattern_str)` ~ `on("message", regex(pattern_str))`: 正则匹配处理器，参考 [regex](../api/rule.md#regex-regex-flags-0) - -### 匹配规则 rule - -事件响应器的匹配规则即 `Rule`，详细内容在下方介绍。[直达](#自定义-rule) - -### 优先级 priority - -事件响应器的优先级代表事件响应器的执行顺序，同一优先级的事件响应器会 **同时执行！**，优先级数字**越小**越先响应！优先级请从 `1` 开始排序！ - -:::tip 提示 -使用 `nonebot-plugin-test` 可以在网页端查看当前所有事件响应器的执行流程，有助理解事件响应流程！ - -```bash -nb plugin install nonebot_plugin_test -``` - -::: - -### 阻断 block - -当有任意事件响应器发出了阻止事件传递信号时，该事件将不再会传递给下一优先级，直接结束处理。 - -NoneBot 内置的事件响应器中，所有 `message` 类的事件响应器默认会阻断事件传递，其他则不会。 - -在部分情况中，可以使用 `matcher.stop_propagation()` 方法动态阻止事件传播，该方法需要 `handler` 在参数中获取 `matcher` 实例后调用方法。 - -## 自定义 rule - -rule 的出现使得 nonebot 对事件的响应可以非常自由，nonebot 内置了一些规则： - -- [startswith(msg)](../api/rule.md#startswith-msg) -- [endswith(msg)](../api/rule.md#endswith-msg) -- [keyword(\*keywords)](../api/rule.md#keyword-keywords) -- [command(\*cmds)](../api/rule.md#command-cmds) -- [regex(regex, flag)](../api/rule.md#regex-regex-flags-0) - -以上规则都是返回类型为 `Rule` 的函数，`Rule` 由非负个 `RuleChecker` 组成，当所有 `RuleChecker` 返回 `True` 时匹配成功。这些 `Rule`, `RuleChecker` 的形式如下： - -```python -from nonebot.rule import Rule -from nonebot.typing import T_State - -async def async_checker(bot: Bot, event: Event, state: T_State) -> bool: - return True - -def sync_checker(bot: Bot, event: Event, state: T_State) -> bool: - return True - -def check(arg1, arg2): - - async def _checker(bot: Bot, event: Event, state: T_State) -> bool: - return bool(arg1 + arg2) - - return Rule(_checker) -``` - -`Rule` 和 `RuleChecker` 之间可以使用 `与 &` 互相组合： - -```python -from nonebot.rule import Rule - -Rule(async_checker1) & sync_checker & async_checker2 -``` - -**_请勿将事件处理的逻辑写入 `rule` 中，这会使得事件处理返回奇怪的响应。_** - -:::danger 警告 -`Rule(*checkers)` 只接受 async function，或使用 `nonebot.utils.run_sync` 自行包裹 sync function。在使用 `与 &` 时，NoneBot 会自动包裹 sync function -::: diff --git a/website/docs/guide/creating-a-plugin.md b/website/docs/guide/creating-a-plugin.md deleted file mode 100644 index 3ab21e35..00000000 --- a/website/docs/guide/creating-a-plugin.md +++ /dev/null @@ -1,128 +0,0 @@ ---- -sidebar_position: 7 - -options: - menu: - weight: 70 - category: guide ---- - -# 创建插件 - -如果之前使用 `nb-cli` 生成了项目结构，那我们已经有了一个空的插件目录 `Awesome-Bot/awesome_bot/plugins`，并且它已在 `bot.py` 中被加载，我们现在可以开始创建插件了！ - -使用 `nb-cli` 创建包形式插件，或自行创建文件(夹) - -```bash -nb plugin new -``` - -下面分别对两种通常的插件形式做具体介绍 - -## 单文件形式 - -在插件目录下创建名为 `foo.py` 的 Python 文件，暂时留空，此时目录结构如下： - - -:::vue -AweSome-Bot -├── awesome_bot -│ └── plugins -│ └── `foo.py` -├── .env -├── .env.dev -├── .env.prod -├── .gitignore -├── bot.py -├── docker-compose.yml -├── Dockerfile -├── pyproject.toml -└── README.md -::: - - -这个时候它已经可以被称为一个插件了，尽管它还什么都没做。 - -## 包形式(推荐) - -在插件目录下创建文件夹 `foo`，并在该文件夹下创建文件 `__init__.py`，此时目录结构如下： - - -:::vue -AweSome-Bot -├── awesome_bot -│ └── plugins -│ └── `foo` -│ └── `__init__.py` -├── .env -├── .env.dev -├── .env.prod -├── .gitignore -├── bot.py -├── docker-compose.yml -├── Dockerfile -├── pyproject.toml -└── README.md -::: - - -这个时候 `foo` 就是一个合法的 Python 包了，同时也是合法的 NoneBot 插件，插件内容可以在 `__init__.py` 中编写。 - -### 推荐结构(仅供参考) - - -:::vue -foo -├── `__init__.py` -├── `config.py` -├── `data_source.py` -└── `model.py` -::: - - -#### \_\_init\_\_.py - -在该文件中编写各类事件响应及处理逻辑。 - -#### config.py - -在该文件中使用 `pydantic` 定义插件所需要的配置项以及类型。 - -示例： - -```python -from pydantic import BaseSettings - - -class Config(BaseSettings): - - # plugin custom config - plugin_setting: str = "default" - - class Config: - extra = "ignore" -``` - -并在 `__init__.py` 文件中添加以下行 - -```python -import nonebot -from .config import Config - -global_config = nonebot.get_driver().config -plugin_config = Config(**global_config.dict()) -``` - -此时就可以通过 `plugin_config.plugin_setting` 获取到插件所需要的配置项了。 - -#### data_source.py - -在该文件中编写数据获取函数。 - -:::warning 警告 -数据获取应尽量使用**异步**处理！例如使用 [httpx](https://www.python-httpx.org/) 而非 [requests](https://requests.readthedocs.io/en/master/) -::: - -#### model.py - -在该文件中编写数据库模型。 diff --git a/website/docs/guide/ding-guide.md b/website/docs/guide/ding-guide.md deleted file mode 100644 index 46295ee8..00000000 --- a/website/docs/guide/ding-guide.md +++ /dev/null @@ -1,181 +0,0 @@ -# 钉钉机器人使用指南 - -基于企业机器人的 outgoing（回调）机制，用户@机器人之后，钉钉会将消息内容 POST 到开发者的消息接收地址。开发者解析出消息内容、发送者身份，根据企业的业务逻辑，组装响应的消息内容返回，钉钉会将响应内容发送到群里。 - -::: warning 只有企业内部机器人支持接收消息 -普通的机器人尚不支持应答机制，该机制指的是群里成员在聊天@机器人的时候，钉钉回调指定的服务地址，即 Outgoing 机器人。 -::: - -首先你需要有钉钉机器人的相关概念，请参阅相关文档： - -- [群机器人概述](https://developers.dingtalk.com/document/app/overview-of-group-robots) -- [开发企业内部机器人](https://developers.dingtalk.com/document/app/develop-enterprise-internal-robots) - -钉钉官方机器人教程（Java）： - -- [开发一个钉钉机器人](https://developers.dingtalk.com/document/tutorial/create-a-robot) - -## 安装 NoneBot 钉钉 适配器 - -```bash -pip install nonebot-adapter-ding -``` - -## 关于 DingAdapter 的说明 - -你需要显式的注册 ding 这个适配器： - -```python{2,6} -import nonebot -from nonebot.adapters.ding import Bot as DingBot - -nonebot.init() -driver = nonebot.get_driver() -driver.register_adapter("ding", DingBot) -nonebot.load_builtin_plugins() - -if __name__ == "__main__": - nonebot.run() -``` - -注册适配器的目的是将 `/ding` 这个路径挂载到程序上，并且和 DingBot 适配器关联起来。之后钉钉把收到的消息回调到 `http://xx.xxx.xxx.xxx:{port}/ding` 时，Nonebot 才知道要用什么适配器去处理该消息。 - -## 第一个命令 - -因为 Nonebot 可以根据你的命令处理函数的类型注解来选择使用什么 Adapter 进行处理，所以你如果需要使用钉钉相关的功能，你的 handler 中 `bot` 类型的注解需要是 DingBot 及其父类。 - -对于 Event 来说也是如此，Event 也可以根据标注来判断，比如一个 handler 的 event 标注位 `PrivateMessageEvent`，那这个 handler 只会处理私聊消息。 - -举个栗子： - -```python -test = on_command("test", to_me()) - - -@test.handle() -async def test_handler1(bot: DingBot, event: PrivateMessageEvent): - await test.finish("PrivateMessageEvent") - - -@test.handle() -async def test_handler2(bot: DingBot, event: GroupMessageEvent): - await test.finish("GroupMessageEvent") -``` - -这样 Nonebot 就会根据不同的类型注解使用不同的 handler 来处理消息。 - -可以查看 Nonebot 官方的这个例子：，更详细的了解一个 Bot 的结构。 - -## 多种消息格式 - -发送 markdown 消息： - -```python -@markdown.handle() -async def markdown_handler(bot: DingBot): - message = MessageSegment.markdown( - "Hello, This is NoneBot", - "#### NoneBot \n> Nonebot 是一款高性能的 Python 机器人框架\n> ![screenshot](https://v2.nonebot.dev/logo.png)\n> [GitHub 仓库地址](https://github.com/nonebot/nonebot2) \n" - ) - await markdown.finish(message) -``` - -可以按自己的需要发送原生的格式消息（需要使用 `MessageSegment` 包裹，可以很方便的实现 @ 等操作）： - -```python -@raw.handle() -async def raw_handler(bot: DingBot, event: MessageEvent): - message = MessageSegment.raw({ - "msgtype": "text", - "text": { - "content": f"@{event.senderId}，你好" - }, - }) - message += MessageSegment.atDingtalkIds(event.senderId) - await raw.send(message) -``` - -其他消息格式请查看 [钉钉适配器的 MessageSegment](https://github.com/nonebot/nonebot2/blob/dev/nonebot/adapters/ding/message.py#L8)，里面封装了很多有关消息的方法，比如 `code`、`image`、`feedCard` 等。 - -## 发送到特定群聊 - -钉钉也支持通过 Webhook 的方式直接将消息推送到某个群聊([参考链接](https://developers.dingtalk.com/document/app/custom-robot-access/title-zob-eyu-qse))，你可以在机器人的设置中看到当前群的 Webhook 地址。 - -![机器人所在群的 Webhook 地址](./images/ding/webhook.png) - -获取到 Webhook 地址后，用户可以向这个地址发起 HTTP POST 请求，即可实现给该钉钉群发送消息。 - -对于这种通过 Webhook 推送的消息，钉钉需要开发者进行安全方面的设置（目前有 3 种安全设置方式，请根据需要选择一种），如下： - -1. **自定义关键词：** 最多可以设置 10 个关键词，消息中至少包含其中 1 个关键词才可以发送成功。 - 例如添加了一个自定义关键词：监控报警，则这个机器人所发送的消息，必须包含监控报警这个词，才能发送成功。 -2. **加签：** 发送请求时带上验签的值，可以在机器人设置里看到密钥。 - ![加签密钥](./images/ding/jiaqian.png) -3. **IP 地址（段）：** 设定后，只有来自 IP 地址范围内的请求才会被正常处理。支持两种设置方式：IP 地址和 IP 地址段，暂不支持 IPv6 地址白名单。 - -如果你选择 1/3 两种安全设置，你需要自己确认当前网络和发送的消息能被钉钉接受，然后使用 `bot.send` 的时候将 webhook 地址传入 webhook 参数即可。 - -如我设置了 `打卡` 为关键词： - -```python -message = MessageSegment.text("打卡成功：XXXXXX") -await hello.send( - message, - webhook= - "https://oapi.dingtalk.com/robot/send?access_token=XXXXXXXXXXXXXX", -) -``` - -对于第二种加签方式，你可以在 `bot.send` 的时候把 `secret` 参数传进去，Nonebot 内部会自动帮你计算发送该消息的签名并发送，如： - -这里的 `secret` 参数就是加签选项给出的那个密钥。 - -```python -message = MessageSegment.raw({ - "msgtype": "text", - "text": { - "content": 'hello from webhook,一定要注意安全方式的鉴权哦，否则可能发送失败的' - }, -}) -message += MessageSegment.atDingtalkIds(event.senderId) -await hello.send( - message, - webhook="https://oapi.dingtalk.com/robot/send?access_token=XXXXXXXXXXXXXX", - secret="SECXXXXXXXXXXXXXXXXXXXXXXXXX", -) -``` - -然后就可以发送成功了。 - -![测试 Webhook 发送](images/ding/test_webhook.png) - -## 创建机器人并连接 - -在钉钉官方文档 [「开发企业内部机器人 -> 步骤一：创建机器人应用」](https://developers.dingtalk.com/document/app/develop-enterprise-internal-robots/title-ufs-4gh-poh) 中有详细介绍，这里就省去创建的步骤，介绍一下如何连接上程序。 - -### 本地开发机器人 - -在本地开发机器人的时候可能没有公网 IP，钉钉官方给我们提供一个 [内网穿透工具](https://developers.dingtalk.com/document/resourcedownload/http-intranet-penetration?pnamespace=app)，方便开发测试。 - -::: tip -究其根源这是一个魔改版的 ngrok，钉钉提供了一个服务器。 - -本工具不保证稳定性，仅适用于开发测试阶段，禁止当作公网域名使用。如线上应用使用本工具造成稳定性问题，后果由自己承担。如使用本工具传播违法不良信息，钉钉将追究法律责任。 -::: - -官方文档里已经讲了如何使用。我们再以 Windows（终端使用 Powershell） 为例，来演示一下。 - -1. 将仓库 clone 到本地，打开 `windows_64` 文件夹。 -2. 执行 `.\ding.exe -config="./ding.cfg" -subdomain=rcnb 8080` 就可以将 8080 端口暴露到公网中。 - 你访问 都会映射到 。 - -假设我们的机器人监听的端口是 `2333`，并且已经注册了钉钉适配器。那我们就执行 `.\ding.exe -config="./ding.cfg" -subdomain=rcnb 2333`，然后在机器人的后台设置 POST 的地址：`http://rcnb.vaiwan.com/ding`。 -这样钉钉接收到消息之后就会 POST 消息到 `http://rcnb.vaiwan.com/ding` 上，然后这个服务会把消息再转发到我们本地的开发服务器上。 - -### 生产模式 - -生产模式你的机器需要有一个公网 IP，然后到机器人的后台设置 POST 的地址就好了。 - -## 示例 - -关于钉钉机器人能做啥，你可以查看 `https://github.com/nonebot/nonebot2/blob/dev/tests/test_plugins/test_ding.py`，里面有一些例子。 diff --git a/website/docs/guide/end-or-start.md b/website/docs/guide/end-or-start.md deleted file mode 100644 index 4d8a3e42..00000000 --- a/website/docs/guide/end-or-start.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -sidebar_position: 5 ---- - -# 结语 - -至此，相信你已经能够写出一个基础的插件了。这里给出几个小提示： - -- 请千万注意事件处理器的优先级设定 -- 在匹配规则中请勿使用耗时极长的函数 - -如果「指南」还不能满足你，前往 [进阶](../advanced/README.md) 查看更多的功能信息。 diff --git a/website/docs/guide/feishu-guide.md b/website/docs/guide/feishu-guide.md deleted file mode 100644 index 83c7fb24..00000000 --- a/website/docs/guide/feishu-guide.md +++ /dev/null @@ -1,101 +0,0 @@ -# 飞书机器人使用指南 - -基于飞书开放平台事件回调与 API 进行机器人适配，目前仅适配企业自建应用。 - -## 安装 NoneBot 飞书 适配器 - -```bash -pip install nonebot-adapter-feishu -``` - -## 创建应用与启用应用“机器人”能力 - -::: tip -此部分可参考[飞书开放平台-快速开发机器人-创建应用](https://open.feishu.cn/document/home/develop-a-bot-in-5-minutes/create-an-app)部分的文档。 - -::: - -## 开启应用权限 - -应用拥有所需权限后，才能调用飞书接口获取相关信息。如果需要用到所有飞书平台的 API，请开启所有应用权限。 - -在仅群聊功能的情况下，需要为应用开启用户、消息、通讯录和群聊权限组所有权限。 - -## 配置飞书事件订阅 - -::: tip - -在添加事件订阅时请注意，带有**（历史版本）**字样的事件的格式为**不受支持的旧版事件格式**，请使用对应的**新版事件（不带历史版本字样）作为替代**。 - -::: - -目前，飞书适配器支持以下事件： -| 事件名称 | 事件描述| -| ---- | ---- | -|接收消息|机器人接收到用户发送的消息。| -|消息已读|用户阅读机器人发送的单聊消息。| -|群解散|群组被解散。| -|群配置更改|群组配置被修改后触发此事件，包含：群主转移、群基本信息修改、群权限修改。| -|机器人进群|机器人被添加至群聊。| -|机器人被移出群|机器人被移出群聊。| -|用户进群|新用户进群。| -|撤销拉用户进群|撤销拉用户进群。| -|用户被移出群|用户主动退群或被移出群聊。| - -## 在 NoneBot 配置中添加相应配置 - -在 `.env` 文件中添加以下配置 - -``` -APP_ID= -APP_SECRET= -VERIFICATION_TOKEN= -``` - -复制所创建应用**“凭证和基础信息”**中的 **App ID** 、 **App Secret** 和 **“事件订阅”** 中的 **Verification Token** ，替换上面相应的配置的值。 - -此外，对于飞书平台的事件订阅加密机制，飞书适配器也提供 `ENCRYPT_KEY` 配置项。 - -``` -ENCRYPT_KEY= -``` - -当此项不为空时，飞书适配器会认为用户启用了加密机制，并对事件上报中的密文进行解密。 - -对于[Lark(飞书平台海外版)](https://www.larksuite.com) 的用户，飞书适配器也提供**实验性**支持，仅需要在配置文件中添加 `IS_LARK=true` 即可。 - -``` -IS_LARK=true -``` - -## 注册飞书适配器 - -在 `bot.py` 中添加： - -```python -from nonebot.adapters.feishu import Bot as FeishuBot - -driver.register_adapter("feishu", FeishuBot) -``` - -## 编写一个适用于飞书适配器的插件并加载 - -插件代码范例： - -```python -from nonebot.plugin import on_command -from nonebot.typing import T_State -from nonebot.adapters.feishu import Bot as FeishuBot, MessageEvent - -helper = on_command("say") - - -@helper.handle() -async def feishu_helper(bot: FeishuBot, event: MessageEvent, state: T_State): - message = event.get_message() - await helper.finish(message, at_sender=True) -``` - -以上代码注册了一个对飞书平台适用的`say`指令，并会提取`/say`之后的内容发送到事件所对应的群或私聊。 - -大功告成！现在可以试试向机器人发送类似`/say Hello, Feishu!`的消息进行测试了。 diff --git a/website/docs/guide/getting-started.md b/website/docs/guide/getting-started.md deleted file mode 100644 index fc19eb8d..00000000 --- a/website/docs/guide/getting-started.md +++ /dev/null @@ -1,96 +0,0 @@ ---- -sidebar_position: 3 - -options: - menu: - weight: 30 - category: guide ---- - -# 开始使用 - -一切都安装成功后，你就已经做好了进行简单配置以运行一个最小的 NoneBot 实例的准备工作。 - -## 最小实例 - -如果你已经按照推荐方式安装了 `nb-cli`，使用它创建一个空项目： - -```bash -nb create -``` - -根据引导进行项目配置，完成后会在当前目录下创建一个项目目录，项目目录内包含 `bot.py`。 - -如果未安装 `nb-cli`，使用你最熟悉的编辑器或 IDE，创建一个名为 `bot.py` 的文件，内容如下（这里以 CQHTTP 适配器为例）： - -```python{4,6,7,10} -import nonebot -from nonebot.adapters.cqhttp import Bot as CQHTTPBot - -nonebot.init() -driver = nonebot.get_driver() -driver.register_adapter("cqhttp", CQHTTPBot) -nonebot.load_builtin_plugins() - -if __name__ == "__main__": - nonebot.run() -``` - -## 解读 - -在上方 `bot.py` 中，这几行高亮代码将依次： - -1. 使用默认配置初始化 NoneBot -2. 加载 NoneBot 内置的 CQHTTP 协议适配组件 - `register_adapter` 的第一个参数我们传入了一个字符串，该字符串将会在后文 [配置 CQHTTP 协议端](#配置-cqhttp-协议端-以-qq-为例) 时使用。 -3. 加载 NoneBot 内置的插件 -4. 在地址 `127.0.0.1:8080` 运行 NoneBot - -在命令行使用如下命令即可运行这个 NoneBot 实例： - -```bash -# nb-cli -nb run -# 其他 -python bot.py -``` - -运行后会产生如下日志： - -```plain -09-14 21:02:00 [INFO] nonebot | Succeeded to import "nonebot.plugins.base" -09-14 21:02:00 [INFO] nonebot | Running NoneBot... -09-14 21:02:00 [INFO] uvicorn | Started server process [1234] -09-14 21:02:00 [INFO] uvicorn | Waiting for application startup. -09-14 21:02:00 [INFO] uvicorn | Application startup complete. -09-14 21:02:00 [INFO] uvicorn | Uvicorn running on http://127.0.0.1:8080 (Press CTRL+C to quit) -``` - -## 配置协议端上报 - -在 `bot.py` 文件中使用 `register_adapter` 注册协议适配之后即可配置协议端来完成与 NoneBot 的通信，详细配置方法参考： - -- [配置 CQHTTP](./cqhttp-guide.md) -- [配置钉钉](./ding-guide.md) -- [配置 mirai-api-http](./mirai-guide.md) - -NoneBot 接受的上报地址与 `Driver` 有关，默认使用的 `FastAPI Driver` 所接受的上报地址有： - -- `/{adapter name}/`: HTTP POST 上报 -- `/{adapter name}/http/`: HTTP POST 上报 -- `/{adapter name}/ws`: WebSocket 上报 -- `/{adapter name}/ws/`: WebSocket 上报 - -:::warning 注意 -如果到这一步你没有在 NoneBot 看到连接成功日志，比较常见的出错点包括： - -- NoneBot 监听 `0.0.0.0`，然后在协议端上报配置中填了 `ws://0.0.0.0:8080/***/ws` -- 在 Docker 容器内运行协议端，并通过 `127.0.0.1` 访问宿主机上的 NoneBot -- 想从公网访问，但没有修改云服务商的安全组策略或系统防火墙 -- NoneBot 所监听的端口存在冲突，已被其它程序占用 -- 弄混了 NoneBot 的 `host`、`port` 参数与协议端上报配置中的 `host`、`port` 参数 -- `ws://` 错填为 `http://` -- 协议端或 NoneBot 启动时遭到外星武器干扰 - -请尝试重启协议端 NoneBot、更换端口、修改防火墙、重启系统、仔细阅读前面的文档及提示、更新协议端 和 NoneBot 到最新版本等方式来解决。 -::: diff --git a/website/docs/guide/images/Handle-Event.png b/website/docs/guide/images/Handle-Event.png deleted file mode 100644 index 6546632c62c9dfee7d4f8e0ad5d2a7a082929542..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126466 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 z zHuSyaZaZg}!X+LOdpdDN1$Z}?6&M}49`qn#(3rlv@b%lwihqvI-~aemLjCpZ&D+2ZIHJa223EOs;i^^ZDOwjQv#&s+;z1{>NxD6k zelzS3FqMxVGt6j1>>e&U8=;_{^1EZg6rgRJP2*|WT=oG!i0)lX<1aFNy$4p}L0btE zE!Z)A;D;QIOBlfOVkt&%XrZy+D>xqs0n=s(# zGuY~rH$UX$C})DEv~SZte!O+)___Dbn-9};0tf(r$bp9Mp(^fW)ry(+j~8}e^xl(`K$8C~ z8$5d%Xj0gZdL|aY5nTJg5fTODf%T9qX!XY?X8pi_&sELeQwal8VK-o>bwU`8*i*H< zIZ?0wYru!{faU$Hjea%Sq;2~LT9bL&zZ_^Qp`*S2-|P=4p6wq$@%*n`fPc{$|1Apt zEeiiba{uKN{p*ka<0Lq5e;{7ORG8MO7Y{mSBYJfW3$9hu`VOzm=fPVmX3_*wWjsme z{EI!DzKk7W6SaJc2Y)Q=4_Im8bs?1Xx6&Gzf%@a^?Bm^d_!=|9|h|KRKp@Y zFakvPnUqX#&-kQxjR)Vg;FHKJEZGJ&P0`?wRa%$z1unAUi;CU+5_B{O06ZcMSTK5n z$y^F=ll`r?I`Vg4 z9;CnXdK*;6f6BT84tl3Je73eJbiJ3>8sM~w{kym|FXb;LuFDOq@V&EdFNOayU;9vdIb&$v(!(*047j$2w(?gRCQt!}mI= z*L!?!zuWhByM6!t{DtG3^L&i!aXqf^348D3Ba{fDVi?D(zo ze$s&fC=Sa0dGJFWTu^U)&2l}XGhw}-LDln$GJbt)^%=9@Km;K(*>CXlV?bqE+>5^| z&g0iRs^mux?+Djyh73bx{e`b1JEgUW42q|y1@Yk{k6ejX9*YND2E*?X_sg+Jkwmv+ zZL6wXVuqi8Z2ySy!!NvbTiV^8mhL~9*f%{d_n33K%YCtI8j7JVpmM?f+}(DkJ}`wz zqGqVGz(^H2`k(An_}nHGuKc)8w>jo%g9M9R#X{-9)S89Tp$X`!UGN0+4QpE##)mYi^enXd_#;qv zq(+ZIBP$+}U%m@?g!1kVfhvb+`+eT+JDzfPWr^|9U;FtC@n)d-z5Tt7)v8c00OJ@v zHKS!mrGeUy#+L?dcc#iwt?w{{-IwaB+)r`BXrcm&9~g}g3;eTtjCY}^%7em8fXUM6 zAT9>=&RN22;p)lj>G;k{!y8}&86i{-ZmD_49-Iw;Mpc3WJ_fIL;-s$3Y?fmkBlXYTVXzEG1f)4pP>6tif87>@CHT= zr+EvgihK}Udvou7J`RiNWRR%M*j!I;X{8TGj=lD?+dj%4=TOQ6RoiEc`ad=tg}0*dX)1Ry}9%ADqe-%jf%keUFh{%0c%_ z3;Qf4gu2i6z41QT)&Go~a5{f6W&DKaw4P_lH>;oDKiPiUV8ah@|2}qMr0|&INSVVl zjUxN;8e&T|yMD64>#Q;!{apw1y+v9~f;&T@o3kH&2vhEtRhlTk#I|ZU?MOcmPwkjh zVCxm;C31=S;?`4Ryxfbd5ov6}mz+?i*$!6*=BmE=l;8{F!XjUYdmnZi9`qS>8YgTY&iym!GDK5lm% z|Gg|X!T!t-X4LyP173z@8BX`t%;)?5&C+DK0hnWrfP?XWSZiOwOr=deM*Gh8b*k+-6fa#4ozI}!<4^Q_umA*gmjI&a%!e8H{md|lthU+tJ9v% zD031kL~-%0KEe+=9d)JguQRxv$U1>!E^Vku#keQEkMH4 znfrHbWc*+hn@vJ&Pi3ayw>UM<1H>b}FW?~zd;fuVqA*D@*b *}eYX-4FxSv>JU5 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

*N@WS@+EN$Q;{@LQ)Z!7WSW2|_;9z|pPtZ1U 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 VK6&fZIU5*&z|+;wWt~$(698!sxRL+> diff --git a/website/docs/guide/images/ding/jiaqian.png b/website/docs/guide/images/ding/jiaqian.png deleted file mode 100644 index 8895d6c6d866cd6049642da40dccebdfb94429bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102378 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 mCp24mDwTf*(Y3iRAG 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 diff --git a/website/docs/guide/images/ding/webhook.png b/website/docs/guide/images/ding/webhook.png deleted file mode 100644 index c957e72f925e1490afdfabf2af7b0aecfaeb3252..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102603 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%0DQ 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 diff --git a/website/docs/guide/loading-a-plugin.md b/website/docs/guide/loading-a-plugin.md deleted file mode 100644 index 1913008f..00000000 --- a/website/docs/guide/loading-a-plugin.md +++ /dev/null @@ -1,193 +0,0 @@ ---- -sidebar_position: 6 - -options: - menu: - weight: 60 - category: guide ---- - -# 加载插件 - -在 [创建一个完整的项目](creating-a-project) 一章节中，我们已经创建了插件目录 `awesome_bot/plugins`，现在我们在机器人入口文件中加载它。当然，你也可以单独加载一个插件。 - -## 加载内置插件 - -在 `bot.py` 文件中添加以下行： - -```python{8} -import nonebot -from nonebot.adapters.cqhttp import Bot - -nonebot.init() - -driver = nonebot.get_driver() -driver.register_adapter("cqhttp", Bot) # 注册 CQHTTP 的 Adapter -nonebot.load_builtin_plugins() # 加载 nonebot 内置插件 - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -::: warning -目前, 内建插件仅支持 CQHTTP 的 Adapter - -如果您使用的是其他 Adapter, 请移步该 Adapter 相应的文档 -::: - -这将会加载 nonebot 内置的插件，它包含： - -- 命令 `say`：可由**superuser**使用，可以将消息内容由特殊纯文本转为富文本 -- 命令 `echo`：可由任何人使用，将消息原样返回 - -以上命令均需要指定机器人，即私聊、群聊内@机器人、群聊内称呼机器人昵称。参考 [Rule: to_me](../api/rule.md#to-me) - -## 加载插件目录 - -在 `bot.py` 文件中添加以下行： - -```python{6} -import nonebot - -nonebot.init() - -# 加载插件目录，该目录下为各插件，以下划线开头的插件将不会被加载 -nonebot.load_plugins("awesome_bot/plugins") - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -:::tip 提示 -加载插件目录时，目录下以 `_` 下划线开头的插件将不会被加载！ -::: - -:::warning 提示 -**不能存在相同名称的插件！** -::: - -:::danger 警告 -插件间不应该存在过多的耦合，如果确实需要导入某个插件内的数据，可以参考 [进阶-跨插件访问](../advanced/export-and-require.md) -::: - -## 加载单个插件 - -在 `bot.py` 文件中添加以下行： - -```python{6,8} -import nonebot - -nonebot.init() - -# 加载一个 pip 安装的插件 -nonebot.load_plugin("nonebot_plugin_status") -# 加载本地的单独插件 -nonebot.load_plugin("awesome_bot.plugins.xxx") - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -## 从 json 文件中加载插件 - -在 `bot.py` 文件中添加以下行： - -```python{6} -import nonebot - -nonebot.init() - -# 从 plugin.json 加载插件 -nonebot.load_from_json("plugin.json") - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -**json 文件示例** - -```json -{ - "plugins": ["nonebot_plugin_status", "awesome_bot.plugins.xxx"], - "plugin_dirs": ["awesome_bot/plugins"] -} -``` - -## 从 toml 文件中加载插件 - -在 `bot.py` 文件中添加以下行： - -```python{6} -import nonebot - -nonebot.init() - -# 从 pyproject.toml 加载插件 -nonebot.load_from_toml("pyproject.toml") - -app = nonebot.get_asgi() - -if __name__ == "__main__": - nonebot.run() -``` - -**toml 文件示例：** - -```toml -[nonebot.plugins] -plugins = ["nonebot_plugin_status", "awesome_bot.plugins.xxx"] -plugin_dirs = ["awesome_bot/plugins"] -``` - -::: tip -nb-cli 默认使用 `pyproject.toml` 加载插件。 -::: - -## 子插件(嵌套插件) - -在插件中同样可以加载子插件，例如如下插件目录结构： - - -:::vue -foo_plugin -├── `plugins` -│ ├── `sub_plugin1` -│ │ └── \_\_init\_\_.py -│ └── `sub_plugin2.py` -├── `__init__.py` -└── config.py -::: - - -在插件目录下的 `__init__.py` 中添加如下代码： - -```python -from pathlib import Path - -import nonebot - -# store all subplugins -_sub_plugins = set() -# load sub plugins -_sub_plugins |= nonebot.load_plugins( - str((Path(__file__).parent / "plugins").resolve())) -``` - -插件将会被加载并存储于 `_sub_plugins` 中。 - -## 运行结果 - -尝试运行 `nb run` 或者 `python bot.py`，可以看到日志输出了类似如下内容： - -```plain -09-19 21:51:59 [INFO] nonebot | Succeeded to import "nonebot.plugins.base" -09-19 21:51:59 [INFO] nonebot | Succeeded to import "plugin_in_folder" -``` diff --git a/website/docs/guide/mirai-guide.md b/website/docs/guide/mirai-guide.md deleted file mode 100644 index b4e050f7..00000000 --- a/website/docs/guide/mirai-guide.md +++ /dev/null @@ -1,253 +0,0 @@ -# Mirai-API-HTTP 协议使用指南 - -:::warning - -Mirai-API-HTTP 的适配现在仍然处于早期阶段, 可能没有进行过充分的测试 - -在生产环境中请谨慎使用 - -::: - -:::tip - -为了你的使用之旅更加顺畅, 我们建议您在配置之前具有以下的前置知识 - -- 对服务端/客户端(C/S)模型的基本了解 -- 对 Web 服务配置基础的认知 -- 对`YAML`语法的一点点了解 - -::: - -:::danger - -Mirai-API-HTTP 的适配器以 [AGPLv3 许可](https://opensource.org/licenses/AGPL-3.0) 单独开源 - -这意味着在使用该适配器时需要 **以该许可开源您的完整程序代码** - -::: - -**为了便捷起见, 以下内容均以缩写 `MAH` 代替 `mirai-api-http`** - -## 安装 NoneBot Mirai 适配器 - -```bash -pip install nonebot-adapter-mirai -``` - -## 配置 MAH 客户端 - -正如你可能刚刚在[CQHTTP 协议使用指南](./cqhttp-guide.md)中所读到的: - -> 单纯运行 NoneBot 实例并不会产生任何效果，因为此刻 QQ 这边还不知道 NoneBot 的存在，也就无法把消息发送给它，因此现在需要使用一个无头 QQ 来把消息等事件上报给 NoneBot。 - -这次, 我们将采用在实现上有别于 OneBot（CQHTTP）协议的另外一种无头 QQ API 协议, 即 MAH - -为了配置 MAH 端, 我们现在需要移步到[MAH 的项目地址](https://github.com/project-mirai/mirai-api-http), 来看看它是如何配置的 - -根据[项目提供的 README](https://github.com/project-mirai/mirai-api-http/blob/056beedba31d6ad06426997a1d3fde861a7f8ba3/README.md),配置 MAH 大概需要以下几步 - -1. 下载并安装 Java 运行环境, 你可以有以下几种选择: - - - [由 Oracle 提供的 Java 运行环境](https://java.com/zh-CN/download/manual.jsp) **在没有特殊需求的情况下推荐** - - [由 Zulu 编译的 OpenJRE 环境](https://www.azul.com/downloads/zulu-community/?version=java-8-lts&architecture=x86-64-bit&package=jre) - -2. 下载[Mirai Console Loader](https://github.com/iTXTech/mirai-console-loader) - - - 请按照文档 README 中的步骤下载并安装 - -3. 安装 MAH: - - - 在 Mirai Console Loader 目录下执行该指令 - - ```bash - ./mcl --update-package net.mamoe:mirai-api-http --channel stable --type plugin - ``` - - 注意: 该指令的前缀`./mcl`可能根据操作系统以及使用 java 环境的不同而变化 - -4. 修改配置文件 - - :::tip - - 在此之前, 你可能需要了解我们为 MAH 设计的两种通信方式 - - - 正向 Websocket - - NoneBot 作为纯粹的客户端,通过 websocket 监听事件下发 - - 优势 - 1. 网络配置简单, 特别是在使用 Docker 等网络隔离的容器时 - 2. 在初步测试中连接性较好 - - 劣势 - 1. 与 NoneBot 本身的架构不同, 可能稳定性较差 - 2. 需要在注册 adapter 时显式指定 qq, 对于需要开源的程序来讲不利 - - POST 消息上报 - - NoneBot 在接受消息上报时作为服务端, 发送消息时作为客户端 - - 优势 - 1. 与 NoneBot 本身架构相符, 性能和稳定性较强 - 2. 无需在任何地方指定 QQ, 即插即用 - - 劣势 - 1. 由于同时作为客户端和服务端, 配置较为复杂 - 2. 在测试中网络连接性较差 (未确认原因) - - ::: - - - 这是当使用正向 Websocket 时的配置举例 - - 正向连接可以选择支持客户端连接方式的 `Driver` 来进行连接，请根据需求进行选择： - - - `nonebot.drivers.fastapi`: 同时支持正向和反向 - - `nonebot.drivers.aiohttp`: 仅支持正向 - - :::warning - - 在默认情况下, NoneBot 和 MAH 会同时监听 8080 端口, 这会导致端口冲突的错误 - 请确保二者配置不在同一端口下 - - ::: - - - MAH 的`setting.yml`文件 - - - ```yaml - # 省略了部分无需修改的部分 - - host: "0.0.0.0" # 监听地址 - port: 8080 # 监听端口 - authKey: 1234567890 # 访问密钥, 最少八位 - enableWebsocket: true # 必须为true - ``` - - - `.env`文件 - - - ```shell - PORT=2333 - - MIRAI_AUTH_KEY=1234567890 - MIRAI_HOST=127.0.0.1 # 当MAH运行在本机时 - MIRAI_PORT=8080 # MAH的监听端口 - PORT=2333 # 防止与MAH接口冲突 - ``` - - - `bot.py`文件 - - - ```python - import nonebot - from nonebot.adapters.mirai import Bot - - nonebot.init() - nonebot.get_driver().register_adapter('mirai', - Bot, - qq=12345678) - # qq参数需要填在mah中登录的qq, 如果需要多个帐号, 可以填写类似于 [123456,789100] 的数组形式 - - nonebot.load_builtin_plugins() # 加载 nonebot 内置插件 - nonebot.run() - ``` - - - 这是当使用 POST 消息上报时的配置文件 - - - MAH 的`setting.yml`文件 - - - ```yaml - # 省略了部分无需修改的部分 - - host: "0.0.0.0" # 监听地址 - port: 8080 # 监听端口 - authKey: 1234567890 # 访问密钥, 最少八位 - - ## 消息上报 - report: - enable: true # 必须为true - groupMessage: - report: true # 群消息上报 - friendMessage: - report: true # 好友消息上报 - tempMessage: - report: true # 临时会话上报 - eventMessage: - report: true # 事件上报 - destinations: - - "http://127.0.0.1:2333/mirai/http" #上报地址, 请按照实际情况修改 - # 上报时的额外Header - extraHeaders: {} - ``` - - - `.env`文件 - - - ```shell - HOST=127.0.0.1 # 当MAH运行在本机时 - PORT=2333 # 防止与MAH接口冲突 - - MIRAI_AUTH_KEY=1234567890 - MIRAI_HOST=127.0.0.1 # 当MAH运行在本机时 - MIRAI_PORT=8080 # MAH的监听端口 - ``` - - - `bot.py`文件 - - - ```python - import nonebot - from nonebot.adapters.mirai import Bot - - nonebot.init() - nonebot.get_driver().register_adapter('mirai', Bot) - nonebot.load_builtin_plugins() # 加载 nonebot 内置插件 - nonebot.run() - ``` - -## 历史性的第一次对话 - -现在, 先启动 NoneBot, 再启动 MAH - -如果你的配置文件一切正常, 你将在控制台看到类似于下列的日志 - -```log -02-01 18:25:12 [INFO] nonebot | NoneBot is initializing... -02-01 18:25:12 [INFO] nonebot | Current Env: prod -02-01 18:25:12 [DEBUG] nonebot | Loaded Config: {'driver': 'nonebot.drivers.fastapi', 'host': IPv4Address('127.0.0.1'), 'port': 8080, 'debug': True, 'api_root': {}, 'api_timeout': 30.0, 'access_token': None, 'secret': None, 'superusers': set(), 'nickname': set(), 'command_start': {'/'}, 'command_sep': {'.'}, 'session_expire_timeout': datetime.timedelta(seconds=120), 'mirai_port': 8080, 'environment': 'prod', 'mirai_auth_key': 12345678, 'mirai_host': '127.0.0.1'} -02-01 18:25:12 [DEBUG] nonebot | Succeeded to load adapter "mirai" -02-01 18:25:12 [INFO] nonebot | Succeeded to import "nonebot.plugins.echo" -02-01 18:25:12 [INFO] nonebot | Running NoneBot... -02-01 18:25:12 [DEBUG] nonebot | Loaded adapters: mirai -02-01 18:25:12 [INFO] uvicorn | Started server process [183155] -02-01 18:25:12 [INFO] uvicorn | Waiting for application startup. -02-01 18:25:12 [INFO] uvicorn | Application startup complete. -02-01 18:25:12 [INFO] uvicorn | Uvicorn running on http://127.0.0.1:2333 (Press CTRL+C to quit) -02-01 18:25:14 [INFO] uvicorn | 127.0.0.1:37794 - "POST /mirai/http HTTP/1.1" 204 -02-01 18:25:14 [DEBUG] nonebot | MIRAI | received message {'type': 'BotOnlineEvent', 'qq': 1234567} -02-01 18:25:14 [INFO] nonebot | MIRAI 1234567 | [BotOnlineEvent]: {'self_id': 1234567, 'type': 'BotOnlineEvent', 'qq': 1234567} -02-01 18:25:14 [DEBUG] nonebot | Checking for matchers in priority 1... -``` - -恭喜你, 你的配置已经成功! - -现在, 我们可以写一个简单的插件来测试一下 - -```python -from nonebot.plugin import on_keyword, on_command -from nonebot.rule import to_me -from nonebot.adapters.mirai import Bot, MessageEvent - -message_test = on_keyword({'reply'}, rule=to_me()) - - -@message_test.handle() -async def _message(bot: Bot, event: MessageEvent): - text = event.get_plaintext() - await bot.send(event, text, at_sender=True) - - -command_test = on_command('miecho') - - -@command_test.handle() -async def _echo(bot: Bot, event: MessageEvent): - text = event.get_plaintext() - await bot.send(event, text, at_sender=True) -``` - -它具有两种行为 - -- 在指定机器人，即私聊、群聊内@机器人、群聊内称呼机器人昵称的情况下 (即 [Rule: to_me](../api/rule.md#to_me)), 如果消息内包含 `reply` 字段, 则该消息会被机器人重复一次 - -- 在执行指令`miecho xxx`时, 机器人会发送回参数`xxx` - -至此, 你已经初步掌握了如何使用 Mirai Adapter From 717fbd1b9556981d0dae24c1ee089833374b652a Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 27 Dec 2021 13:22:58 +0800 Subject: [PATCH 131/174] :memo: update readme --- README.md | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..b9561e93 --- /dev/null +++ b/README.md @@ -0,0 +1,158 @@ + +

+ nonebot +

+ +
+ +# NoneBot + + + +_✨ 跨平台 Python 异步机器人框架 ✨_ + + +
+ +

+ + license + + + pypi + + python
+ + cqhttp + + + + + + ding + + + + + + feishu + + + QQ频道 + +
+ + QQ Chat + + + Telegram Channel + + + Discord Server + +

+ +

+ 文档 + · + 安装 + · + 开始使用 + · + 文档打不开？ +

+ + + +## 简介 + +NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人收到的事件进行解析和处理，并以插件化的形式，按优先级分发给事件所对应的事件响应器，来完成具体的功能。 + +除了起到解析事件的作用，NoneBot 还为插件提供了大量实用的预设操作和权限控制机制。对于命令处理，它更是提供了完善且易用的会话机制和内部调用机制，以分别适应命令的连续交互和插件内部功能复用等需求。 + +得益于 Python 的 [asyncio](https://docs.python.org/3/library/asyncio.html) 机制，NoneBot 处理事件的吞吐量有了很大的保障，再配合 WebSocket 通信方式（也是最建议的通信方式），NoneBot 的性能可以达到 HTTP 通信方式的两倍以上，相较于传统同步 I/O 的 HTTP 通信，更是有质的飞跃。 + +## 特色 + +NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义**，并且可以作为插件进行**替换/添加**！ + +目前 NoneBot2 内置的驱动框架： + +- [FastAPI](https://fastapi.tiangolo.com/) +- [Quart](https://pgjones.gitlab.io/quart/) (异步 Flask) +- [aiohttp](https://docs.aiohttp.org/en/stable/) +- [httpx](https://www.python-httpx.org/) +- [websockets](https://websockets.readthedocs.io/en/stable/) + +目前 NoneBot2 官方维护的协议适配： + +- [OneBot 协议](https://onebot.dev/) (QQ 等) +- [Mirai-API-HTTP 协议](https://github.com/project-mirai/mirai-api-http) +- [钉钉](https://ding-doc.dingtalk.com/document#/org-dev-guide/elzz1p) +- [Telegram](https://core.telegram.org/bots/api) +- [飞书](https://open.feishu.cn/document/home/index) +- [QQ 频道](https://bot.q.qq.com/wiki/) + +更多：[商店](https://v2.nonebot.dev/store.html) + +## 即刻开始 + +~~完整~~文档可以在 [这里](https://v2.nonebot.dev/) 查看。 + +懒得看文档？下面是快速安装指南： + +1. (可选)使用你喜欢的 Python 环境管理工具创建新的虚拟环境。 +2. 使用 `pip` (或其他) 安装 NoneBot 脚手架。 + + ```bash + pip install nb-cli + ``` + +3. 使用脚手架创建项目 + + ```bash + nb create + ``` + +## 社区资源 + +### 常见问题 + +- [常见问题解答(FAQ)](https://faq.nonebot.dev/) + +### 教程/实际项目/经验分享 + +- [awesome-nonebot](https://github.com/nonebot/awesome-nonebot) + +### 插件 + +此外，NoneBot2 还有丰富的官方以及第三方现成的插件供大家使用： + +- [NoneBot-Plugin-Docs](https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-plugin-docs)：离线文档至本地使用(别再说文档打不开了！) + + ```bash + nb plugin install nonebot_plugin_docs + ``` + + 或者尝试以下镜像： + + - [文档镜像(中国境内)](https://nb2.baka.icu) + - [文档镜像(Vercel)](https://nonebot2-vercel-mirror.vercel.app) + +- 其他插件请查看 [商店](https://v2.nonebot.dev/store.html) + +## 许可证 + +`NoneBot` 采用 `MIT` 协议开源，协议文件参考 [LICENSE](./LICENSE)。 + +## 贡献 + +如果你在使用过程中发现任何问题，可以 [提交 Issue](https://github.com/nonebot/nonebot2/issues/new) 或自行 Fork 修改后提交 Pull Request。 + +如果你要提交 Pull Request，请确保你的代码风格和项目已有的代码保持一致，遵循 [PEP 8](https://www.python.org/dev/peps/pep-0008/) 与 [PEP 484](https://www.python.org/dev/peps/pep-0484/)，变量命名清晰，有适当的注释，**并且请以 `dev` 分支作为 Pull Request 目标分支**。 + +感谢以下开发者对 NoneBot2 的贡献： + + + + From 91262d68bc26ffa9bb5a4d29426be5acfa472aa0 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 27 Dec 2021 13:26:34 +0800 Subject: [PATCH 132/174] :memo: add codecov badge --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b9561e93..3b2da142 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,11 @@ _✨ 跨平台 Python 异步机器人框架 ✨_ pypi - python
+ python + + + +
cqhttp From c815ac7ca37797a1da8c78594b2d5797387ff6d8 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 27 Dec 2021 13:37:08 +0800 Subject: [PATCH 133/174] :fire: temp remove link in advanced --- website/docs/advanced/README.md | 9 +++++---- website/docs/advanced/publish-plugin.md | 2 +- website/docs/guide/README.md | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/website/docs/advanced/README.md b/website/docs/advanced/README.md index 2d6fd630..ed1065f1 100644 --- a/website/docs/advanced/README.md +++ b/website/docs/advanced/README.md @@ -36,7 +36,7 @@ options: 2. **调用 `API`**, 在**事件处理**的过程中，`nonebot` 可以通过 `bot` 调用协议端指定的 `API` 来获取更多数据，或者反馈响应给协议端; `nonebot` 也可以通过调用 `API` 向协议端主动请求数据或者主动推送数据。 -在**指南**模块， 我们已经叙述了[如何配置 nonebot](../guide/basic-configuration.md), [如何注册协议适配器](../guide/getting-started.md)，[如何加载插件](../guide/loading-a-plugin.md), 在这里便不再赘述。 + 下面，我们将对**事件处理**， **调用 API**进行说明。 @@ -44,7 +44,7 @@ options: 我们可以先看事件处理的流程图： -![handle-event](../guide/images/Handle-Event.png) + 在流程图里，我们可以看到，`nonebot` 会有三个阶段来处理事件： @@ -94,14 +94,15 @@ options: 关于`hook`的更多信息，可以查阅[这里](./runtime-hook.md) ::: -2. **Matcher**与**matcher**，在**指南**中，我们讲述了[如何注册事件响应器](../guide/creating-a-matcher.md)，这里的事件响应器或者说 `Matcher` 并不是一个具体的实例 `instance`，而是一个具有特定属性的类 `class`。只有当 `Matcher` **响应事件**时，才会实例化为具体的 `instance`，也就是 `matcher`。`matcher` 可以认为是 `nonebot` 处理 `Event` 的基本单位，运行 `matcher` 是`nonebot`工作的主要内容。 + 3. **handler**，或者说**事件处理函数**, 它们可以认为是 `nonebot` 处理 `Event` 的最小单位。在不考虑 `hook` 的情况下，**运行 matcher 就是顺序运行 matcher.handlers**，这句话换种表达方式就是，`handler` 只有添加到 `matcher.handlers` 时，才可以参与到 `nonebot` 的工作中来。 ::: tip 如何让 `handler` 添加到 `matcher.handlers`？ - 一方面，我们可以参照[这里](../guide/creating-a-handler.md)利用装饰器来添加；另一方面，我们在用 `on()` 或者 `on_*()` 注册事件响应器时，可以添加 `handlers=[handler1, handler2, ...]` 这样的关键词参数来添加。 + + ::: #### 处理 Event diff --git a/website/docs/advanced/publish-plugin.md b/website/docs/advanced/publish-plugin.md index 2de8293a..16c51324 100644 --- a/website/docs/advanced/publish-plugin.md +++ b/website/docs/advanced/publish-plugin.md @@ -9,7 +9,7 @@ options: ## 前注 -本章节仅包含插件发布流程指导，插件开发请查阅 **[创建插件](../guide/creating-a-plugin.md)** 章节与 **[Plugin API 文档](../api/plugin.md)** 。 + ## 插件发布流程 diff --git a/website/docs/guide/README.md b/website/docs/guide/README.md index 49306739..66312529 100644 --- a/website/docs/guide/README.md +++ b/website/docs/guide/README.md @@ -7,7 +7,7 @@ slug: /guide # 概览 :::tip 提示 -初次使用时可能会觉得这里的概览过于枯燥，可以先简单略读之后直接前往 [安装](./installation.md) 查看安装方法，并进行后续的基础使用教程。 +初次使用时可能会觉得这里的概览过于枯燥，可以先简单略读之后直接前往 [安装](./start/installation.md) 查看安装方法，并进行后续的基础使用教程。 ::: NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人收到的事件进行解析和处理，并以插件化的形式，按优先级分发给事件所对应的事件响应器，来完成具体的功能。 From 7e9dabfd5f6b45bb09932a12353dfaa8c7644b45 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 27 Dec 2021 13:51:38 +0800 Subject: [PATCH 134/174] :memo: annotate links --- website/docs/advanced/handler/overload.md | 2 +- website/docs/advanced/permission.md | 2 +- website/docusaurus.config.js | 2 +- yarn.lock | 28 +++++++++++------------ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/website/docs/advanced/handler/overload.md b/website/docs/advanced/handler/overload.md index f232c074..444e72cd 100644 --- a/website/docs/advanced/handler/overload.md +++ b/website/docs/advanced/handler/overload.md @@ -13,7 +13,7 @@ options: 针对这个问题， `nonebot2` 提供一个便捷而高效的解决方案：事件处理函数重载机制。简单地说，`handler` (事件处理函数) 会根据其参数的 `type hints` ([PEP484 类型标注](https://www.python.org/dev/peps/pep-0484/)) 来对相对应的 `adapter` 和 `Event` 进行响应，并且会忽略不符合其参数类型标注的情况。 -必须要注意的是，该机制利用了 `inspect` 标准库获取到了事件处理函数的 `singnature` (签名) ，进一步获取到参数名称和类型标注。故而，我们在编写 `handler` 时，参数的名称和类型标注必须要符合 `T_Handler` 规定，详情可以参看 **指南** 中的[事件处理](../../guide/creating-a-handler)。 + :::tip 提示 diff --git a/website/docs/advanced/permission.md b/website/docs/advanced/permission.md index c72b4bf2..870f909e 100644 --- a/website/docs/advanced/permission.md +++ b/website/docs/advanced/permission.md @@ -11,7 +11,7 @@ options: ## 应用 -如同 `Rule` 一样, `Permission` 可以在[注册事件响应器](../guide/creating-a-matcher)时添加 `permission` 参数来加以应用，这样 `Nonebot` 会在事件响应时检测事件主体的权限。下面我们以 `SUPERUSER` 为例，对该机制的应用做一下介绍。 + ```python from nonebot.permission import SUPERUSER diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index 21b26d84..28bf30f2 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -105,7 +105,7 @@ const config = { icon: ["fas", "book"], items: [ { label: "Introduction", to: "/docs/guide" }, - { label: "Installation", to: "/docs/guide/installation" }, + { label: "Installation", to: "/docs/guide/start/installation" }, ], }, { diff --git a/yarn.lock b/yarn.lock index 301a2b5e..1c1a251e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1849,9 +1849,9 @@ integrity sha1-k+Jb+e51/g/YC1lLxP6w6GIRG1o= "@types/node@*": - version "17.0.4" - resolved "https://registry.npmmirror.com/@types/node/download/@types/node-17.0.4.tgz#fec0ce0526abb6062fd206d72a642811b887a111" - integrity sha512-6xwbrW4JJiJLgF+zNypN5wr2ykM9/jHcL7rQ8fZe2vuftggjzZeRSM4OwRc6Xk8qWjwJ99qVHo/JgOGmomWRog== + version "17.0.5" + resolved "https://registry.npmmirror.com/@types/node/download/@types/node-17.0.5.tgz#57ca67ec4e57ad9e4ef5a6bab48a15387a1c83e0" + integrity sha512-w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw== "@types/parse-json@^4.0.0": version "4.0.0" @@ -3031,9 +3031,9 @@ css-select@^2.0.0: nth-check "^1.0.2" css-select@^4.1.3: - version "4.2.0" - resolved "https://registry.npmmirror.com/css-select/download/css-select-4.2.0.tgz#ab28276d3afb00cc05e818bd33eb030f14f57895" - integrity sha512-6YVG6hsH9yIb/si3Th/is8Pex7qnVHO6t7q7U6TIUnkQASGbS8tnUDBftnPynLNnuUl/r2+PTd0ekiiq7R0zJw== + version "4.2.1" + resolved "https://registry.npmmirror.com/css-select/download/css-select-4.2.1.tgz#9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd" + integrity sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ== dependencies: boolbase "^1.0.0" css-what "^5.1.0" @@ -3338,19 +3338,19 @@ dns-txt@^2.0.2: buffer-indexof "^1.0.0" docusaurus-preset-nonepress@canary: - version "0.0.0-122" - resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-122.tgz#7daaef39d45984852b30d30ac69751c0f4eba586" - integrity sha512-EOFVl1xV/vbTTOdMLyXnXEAKg4jEmm9CR8HbUQlEX2/+y5mLpGMAafGEXEyxzZT1KlfQcpGKhCMkMDhcWY8gRg== + version "0.0.0-123" + resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-123.tgz#2cafef58c6264ac6da0e6ed9c70720084df39024" + integrity sha512-PuSOUwWYI2aDyFQfLKhyn0w94a22leL8cB6LfivDvn9qlDmglxa6Le3VNsmgxiGieeoEQ3IA5907RoZQwzuQjg== dependencies: "@docusaurus/core" "2.0.0-beta.9" "@docusaurus/plugin-content-docs" "2.0.0-beta.9" "@docusaurus/plugin-content-pages" "2.0.0-beta.9" - docusaurus-theme-nonepress "0.0.0-122" + docusaurus-theme-nonepress "0.0.0-123" -docusaurus-theme-nonepress@0.0.0-122: - version "0.0.0-122" - resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-122.tgz#0ca3649b3f7c56ca421eab05ab41e889d8c5bc5a" - integrity sha512-fk+miOhRYYpM4hzPTFsYYXnDq0nV66uhASVbV2L1RxxrJOebcdvHJxuFPelh42NsQNQBDq/ypOS2mjO9yfTcoQ== +docusaurus-theme-nonepress@0.0.0-123: + version "0.0.0-123" + resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-123.tgz#0bbba71820930bcbfec5b1ea7191dbbb698dc0bc" + integrity sha512-eOh+sM0pp0tjB5g4lTwUkWERwmWjv9M//bhoNZ5NwJ9sAVLB7AI+YiQP2BthAk8HlVqvQyR5EJz0hFCr6THZ1Q== dependencies: "@docsearch/react" "^3.0.0-alpha.39" "@docusaurus/core" "2.0.0-beta.9" From 3b1dd6d5db1d2563ce6704f429c744f7178f733a Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 27 Dec 2021 15:29:34 +0800 Subject: [PATCH 135/174] :memo: update choose driver doc --- docs_build/drivers/httpx.rst | 9 ++ docs_build/drivers/websockets.rst | 9 ++ website/docs/guide/tutorial/choose-driver.md | 130 ++++++++++++++++++ website/docs/guide/tutorial/configuration.md | 10 +- .../docs/guide/tutorial/creating-a-project.md | 18 +-- website/docs/guide/tutorial/custom-logger.md | 6 + 6 files changed, 169 insertions(+), 13 deletions(-) create mode 100644 docs_build/drivers/httpx.rst create mode 100644 docs_build/drivers/websockets.rst diff --git a/docs_build/drivers/httpx.rst b/docs_build/drivers/httpx.rst new file mode 100644 index 00000000..357588e7 --- /dev/null +++ b/docs_build/drivers/httpx.rst @@ -0,0 +1,9 @@ + + +NoneBot.drivers.httpx 模块 +============================= + +.. automodule:: nonebot.drivers.httpx + :members: + :private-members: + :show-inheritance: diff --git a/docs_build/drivers/websockets.rst b/docs_build/drivers/websockets.rst new file mode 100644 index 00000000..0193de7b --- /dev/null +++ b/docs_build/drivers/websockets.rst @@ -0,0 +1,9 @@ + + +NoneBot.drivers.websockets 模块 +============================= + +.. automodule:: nonebot.drivers.websockets + :members: + :private-members: + :show-inheritance: diff --git a/website/docs/guide/tutorial/choose-driver.md b/website/docs/guide/tutorial/choose-driver.md index 1e518223..4363751b 100644 --- a/website/docs/guide/tutorial/choose-driver.md +++ b/website/docs/guide/tutorial/choose-driver.md @@ -9,3 +9,133 @@ options: --- # 选择驱动器 + +:::warning 注意 +驱动器的选择通常与你所使用的协议适配器相关，如果你不知道该选择哪个驱动器，可以先阅读你想要使用的协议适配器文档说明。 +::: + +:::tip 提示 +如何**安装**驱动器请参考 [安装驱动器](../start/install-driver.md) + +如何**使用**驱动器请参考 [配置](./configuration.md#driver) +::: + +## 驱动器的类型 + +驱动器的类型有两种： + +- `ForwardDriver`: 即客户端类型驱动器，多用于使用 HTTP 轮询，WebSocket 连接服务器的情形。 +- `ReverseDriver`: 即服务端类型驱动器，多用于使用 WebHook 情形。 + +其中 `ReverseDriver` 可以配合 `ForwardDriver` 一起使用，即可以同时使用客户端功能和服务端功能。 + +## 驱动器的功能 + +在 NoneBot 中，驱动器主要负责数据的收发，不对数据进行处理。通常，驱动器会实现以下功能： + +### ForwardDriver + +1. 异步发送 HTTP 请求，自定义 `HTTP Method`, `URL`, `Header`, `Body`, `Cookie`, `Proxy`, `Timeout` 等。 +2. 异步建立 WebSocket 连接上下文，自定义 `WebSocket URL`, `Header`, `Cookie`, `Proxy`, `Timeout` 等。 + +### ReverseDriver + +1. 协议适配器自定义 HTTP 上报地址以及对上报数据处理的回调函数。 +2. 协议适配器自定义 WebSocket 连接请求地址以及对 WebSocket 请求处理的回调函数。 +3. 用户可以将 Driver 作为服务端使用，自行添加任何服务端相关功能。 + +## 内置驱动器 + +### FastAPI （默认） + +类型: `ReverseDriver` + +> FastAPI is a modern, fast (high-performance), web framework for building APIs with Python 3.6+ based on standard Python type hints. + +FastAPI 是一个易上手、高性能的异步 Web 框架，具有极佳的编写体验，可以挂载其他 ASGI, WSGI 应用。 + +FastAPI: [文档](https://fastapi.tiangolo.com/), [仓库](https://github.com/tiangolo/fastapi) + +驱动器: [API](../../api/drivers/fastapi.md), [源码](https://github.com/nonebot/nonebot2/blob/master/nonebot/drivers/fastapi.py) + +```env +DRIVER=~fastapi +``` + +### Quart + +类型: `ReverseDriver` + +> Quart is an asyncio reimplementation of the popular Flask microframework API. + +Quart 是一个类 Flask 的异步版本，拥有与 Flask 非常相似的接口和使用方法。 + +Quart: [文档](https://pgjones.gitlab.io/quart/), [仓库](https://gitlab.com/pgjones/quart) + +驱动器: [API](../../api/drivers/quart.md), [源码](https://github.com/nonebot/nonebot2/blob/master/nonebot/drivers/quart.py) + +```env +DRIVER=~quart +``` + +### HTTPX + +类型: `ForwardDriver` + +:::warning 注意 +本驱动器仅支持 HTTP 请求，不支持 WebSocket 请求。 +::: + +> HTTPX is a fully featured HTTP client for Python 3, which provides sync and async APIs, and support for both HTTP/1.1 and HTTP/2. + +HTTPX: [文档](https://www.python-httpx.org/), [仓库](https://github.com/encode/httpx/) + +驱动器: [API](../../api/drivers/httpx.md), [源码](https://github.com/nonebot/nonebot2/blob/master/nonebot/drivers/httpx.py) + +```env +DRIVER=~httpx +``` + +:::important 注意 +本驱动器支持 `Mixin` +::: + +### websockets + +类型: `ForwardDriver` + +:::warning 注意 +本驱动器仅支持 WebSocket 请求，不支持 HTTP 请求。 +::: + +> websockets is a library for building WebSocket servers and clients in Python with a focus on correctness, simplicity, robustness, and performance. + +websockets: [文档](https://websockets.readthedocs.io/en/stable/), [仓库](https://github.com/aaugustin/websockets) + +驱动器: [API](../../api/drivers/websockets.md), [源码](https://github.com/nonebot/nonebot2/blob/master/nonebot/drivers/websockets.py) + +```env +DRIVER=~websockets +``` + +:::important 注意 +本驱动器支持 `Mixin` +::: + +### AIOHTTP + +类型: `ForwardDriver` + +> Asynchronous HTTP Client/Server for asyncio and Python. + +AIOHTTP: [文档](https://docs.aiohttp.org/en/stable/), [仓库](https://github.com/aio-libs/aiohttp) + +驱动器: [API](../../api/drivers/aiohttp.md), [源码](https://github.com/nonebot/nonebot2/blob/master/nonebot/drivers/aiohttp.py) + +```env +DRIVER=~httpx +``` + +:::important 注意 +本驱动器支持 `Mixin` +::: diff --git a/website/docs/guide/tutorial/configuration.md b/website/docs/guide/tutorial/configuration.md index 653a3af7..0a68666d 100644 --- a/website/docs/guide/tutorial/configuration.md +++ b/website/docs/guide/tutorial/configuration.md @@ -134,10 +134,12 @@ NoneBot 运行所使用的驱动器。主要分为 `ForwardDriver`, `ReverseDriv NoneBot 内置了几个常用驱动器，包括了各类常用功能，常见驱动器配置如下： -- `~fastapi` -- `~httpx+~websockets` -- `~fastapi+~httpx+~websockets` -- `~fastapi+~aiohttp` +```env +DRIVER=~fastapi +DRIVER=~httpx+~websockets +DRIVER=~fastapi+~httpx+~websockets +DRIVER=~fastapi+~aiohttp +``` 各驱动器的功能与区别请参考 [选择驱动器](./choose-driver.md) 。 diff --git a/website/docs/guide/tutorial/creating-a-project.md b/website/docs/guide/tutorial/creating-a-project.md index abab2b61..659bdd54 100644 --- a/website/docs/guide/tutorial/creating-a-project.md +++ b/website/docs/guide/tutorial/creating-a-project.md @@ -19,20 +19,20 @@ nb create ## 目录结构 -:::vue +```bash AweSome-Bot -├── `awesome_bot` _(**或是 src**)_ -│ └── `plugins` -├── `.env` _(**可选的**)_ -├── `.env.dev` _(**可选的**)_ -├── `.env.prod` _(**可选的**)_ +├── "awesome_bot" # 或是 src +│ └── "plugins" +├── ".env" # 可选的 +├── ".env.dev" # 可选的 +├── ".env.prod" # 可选的 ├── .gitignore -├── `bot.py` +├── "bot.py" ├── docker-compose.yml ├── Dockerfile -├── `pyproject.toml` +├── "pyproject.toml" └── README.md -::: +``` - `awesome_bot/plugins` 或 `src/plugins`: 用于存放编写的 bot 插件 diff --git a/website/docs/guide/tutorial/custom-logger.md b/website/docs/guide/tutorial/custom-logger.md index e69de29b..649e42a0 100644 --- a/website/docs/guide/tutorial/custom-logger.md +++ b/website/docs/guide/tutorial/custom-logger.md @@ -0,0 +1,6 @@ +--- +sidebar_position: 100 +description: 修改日志级别与输出 +--- + +# 自定义日志 From 7690f0e640e04ffa3678cb550b980252f485977d Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 27 Dec 2021 16:06:47 +0800 Subject: [PATCH 136/174] :memo: add register adapter doc --- .../docs/guide/tutorial/register-adapter.md | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 website/docs/guide/tutorial/register-adapter.md diff --git a/website/docs/guide/tutorial/register-adapter.md b/website/docs/guide/tutorial/register-adapter.md new file mode 100644 index 00000000..c7f72958 --- /dev/null +++ b/website/docs/guide/tutorial/register-adapter.md @@ -0,0 +1,93 @@ +--- +sidebar_position: 6 +description: 协议适配器的功能与使用 + +options: + menu: + weight: 26 + category: guide +--- + +# 使用适配器 + +:::tip 提示 +如何**安装**协议适配器请参考 [安装协议适配器](../start/install-adapter.md) +::: + +## 协议适配器的功能 + +由于 NoneBot 的跨平台特性，需要支持不同的协议，因此需要对特定的平台协议编写一个转换器。 + +协议适配器即是充当中间人的转换器，它将驱动器所收到的数据转换为可以被 NoneBot 处理的事件 Event，并将事件传递给 NoneBot。 + +同时，协议适配器还会处理 API 调用，转换为可以被驱动器处理的数据发送出去。 + +## 注册协议适配器 + +NoneBot 在默认情况下并不会加载任何协议适配器，需要自己手动注册。下方是个加载协议适配器的例子： + +```python title=bot.py +import nonebot +from your_adapter_package import Adapter + +nonebot.init() +driver = nonebot.get_driver() +driver.register_adapter(Adapter) + +nonebot.run() +``` + +加载步骤如下： + +### 导入协议适配器 + +首先从你需要的协议适配器的包中导入适配器类，通常为 `Adapter` + +```python title=bot.py {2} +import nonebot +from your_adapter_package import Adapter + +nonebot.init() +driver = nonebot.get_driver() +driver.register_adapter(Adapter) + +nonebot.run() +``` + +### 获得驱动器实例 + +加载协议适配器需要通过驱动器来进行，因此，你需要先初始化 NoneBot，并获得驱动器实例。 + +```python title=bot.py {4,5} +import nonebot +from your_adapter_package import Adapter + +nonebot.init() +driver = nonebot.get_driver() +driver.register_adapter(Adapter) + +nonebot.run() +``` + +### 注册 + +获得驱动器实例后，你需要调用 `register_adapter` 方法来注册协议适配器。NoneBot 会通过协议适配器的 `get_name` 方法来获得协议适配器的名字。 + +:::warning 注意 +你可以多次调用来注册多个协议适配器，但不能注册多次相同的协议适配器，发生这种情况时 NoneBot 会给出一个警告并忽略这次注册。 +::: + +```python title=bot.py {6} +import nonebot +from your_adapter_package import Adapter + +nonebot.init() +driver = nonebot.get_driver() +driver.register_adapter(Adapter) + +nonebot.run() +``` + +:::danger 警告 +协议适配器需要在 NoneBot 启动前进行注册，即 `nonebot.run()` 之前，否则会出现未知的错误。 +::: From 0f5a4473abf62bf6fee5c499af9bf681a9fc9723 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 27 Dec 2021 22:08:59 +0800 Subject: [PATCH 137/174] :memo: add plugin docs --- website/docs/{guide => }/README.md | 2 +- website/docs/README.mdx | 7 - website/docs/advanced/di/_category_.json | 3 + .../{handler => di}/dependency-injection.md | 0 .../docs/advanced/{handler => di}/overload.md | 0 .../advanced/{handler => di}/sync-support.md | 0 website/docs/guide/start/_category_.json | 4 - website/docs/guide/start/installation.md | 122 ------------------ website/docs/guide/tutorial/_category_.json | 4 - .../docs/{guide => }/start/editor-support.md | 0 .../docs/{guide => }/start/install-adapter.md | 0 .../docs/{guide => }/start/install-driver.md | 0 .../docs/{guide => }/start/install-plugin.md | 0 website/docs/start/installation.md | 75 +++++++++++ website/docs/{guide => }/start/nb-cli.md | 0 website/docs/{guide => }/start/question.md | 2 +- .../{guide => }/tutorial/choose-driver.md | 12 +- .../{guide => }/tutorial/configuration.md | 2 +- .../tutorial/creating-a-project.md | 4 +- .../{guide => }/tutorial/custom-logger.md | 0 website/docs/tutorial/plugin/_category_.json | 5 + website/docs/tutorial/plugin/config-plugin.md | 6 + .../docs/tutorial/plugin/create-matcher.md | 11 ++ website/docs/tutorial/plugin/introduction.md | 67 ++++++++++ website/docs/tutorial/plugin/load-plugin.md | 11 ++ .../{guide => }/tutorial/register-adapter.md | 2 +- website/sidebars.js | 101 +++++---------- 27 files changed, 218 insertions(+), 222 deletions(-) rename website/docs/{guide => }/README.md (99%) delete mode 100644 website/docs/README.mdx create mode 100644 website/docs/advanced/di/_category_.json rename website/docs/advanced/{handler => di}/dependency-injection.md (100%) rename website/docs/advanced/{handler => di}/overload.md (100%) rename website/docs/advanced/{handler => di}/sync-support.md (100%) delete mode 100644 website/docs/guide/start/_category_.json delete mode 100644 website/docs/guide/start/installation.md delete mode 100644 website/docs/guide/tutorial/_category_.json rename website/docs/{guide => }/start/editor-support.md (100%) rename website/docs/{guide => }/start/install-adapter.md (100%) rename website/docs/{guide => }/start/install-driver.md (100%) rename website/docs/{guide => }/start/install-plugin.md (100%) create mode 100644 website/docs/start/installation.md rename website/docs/{guide => }/start/nb-cli.md (100%) rename website/docs/{guide => }/start/question.md (87%) rename website/docs/{guide => }/tutorial/choose-driver.md (84%) rename website/docs/{guide => }/tutorial/configuration.md (97%) rename website/docs/{guide => }/tutorial/creating-a-project.md (95%) rename website/docs/{guide => }/tutorial/custom-logger.md (100%) create mode 100644 website/docs/tutorial/plugin/_category_.json create mode 100644 website/docs/tutorial/plugin/config-plugin.md create mode 100644 website/docs/tutorial/plugin/create-matcher.md create mode 100644 website/docs/tutorial/plugin/introduction.md create mode 100644 website/docs/tutorial/plugin/load-plugin.md rename website/docs/{guide => }/tutorial/register-adapter.md (99%) diff --git a/website/docs/guide/README.md b/website/docs/README.md similarity index 99% rename from website/docs/guide/README.md rename to website/docs/README.md index 66312529..57fbb399 100644 --- a/website/docs/guide/README.md +++ b/website/docs/README.md @@ -1,7 +1,7 @@ --- sidebar_position: 0 id: index -slug: /guide +slug: / --- # 概览 diff --git a/website/docs/README.mdx b/website/docs/README.mdx deleted file mode 100644 index 8e3c943b..00000000 --- a/website/docs/README.mdx +++ /dev/null @@ -1,7 +0,0 @@ ---- -slug: / ---- - -import { Redirect } from "@docusaurus/router"; - -; diff --git a/website/docs/advanced/di/_category_.json b/website/docs/advanced/di/_category_.json new file mode 100644 index 00000000..af708df3 --- /dev/null +++ b/website/docs/advanced/di/_category_.json @@ -0,0 +1,3 @@ +{ + "label": "依赖注入" +} diff --git a/website/docs/advanced/handler/dependency-injection.md b/website/docs/advanced/di/dependency-injection.md similarity index 100% rename from website/docs/advanced/handler/dependency-injection.md rename to website/docs/advanced/di/dependency-injection.md diff --git a/website/docs/advanced/handler/overload.md b/website/docs/advanced/di/overload.md similarity index 100% rename from website/docs/advanced/handler/overload.md rename to website/docs/advanced/di/overload.md diff --git a/website/docs/advanced/handler/sync-support.md b/website/docs/advanced/di/sync-support.md similarity index 100% rename from website/docs/advanced/handler/sync-support.md rename to website/docs/advanced/di/sync-support.md diff --git a/website/docs/guide/start/_category_.json b/website/docs/guide/start/_category_.json deleted file mode 100644 index 8f729133..00000000 --- a/website/docs/guide/start/_category_.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "position": 1, - "label": "开始" -} diff --git a/website/docs/guide/start/installation.md b/website/docs/guide/start/installation.md deleted file mode 100644 index 4f430cce..00000000 --- a/website/docs/guide/start/installation.md +++ /dev/null @@ -1,122 +0,0 @@ ---- -sidebar_position: 0 -description: 通过脚手架, PyPI, GitHub 安装 NoneBot - -options: - menu: - weight: 10 - category: guide ---- - -# 安装 NoneBot - -:::warning 注意 -请确保你的 Python 版本 >= 3.7.3。 -::: - -:::warning 注意 -请在安装 NoneBot v2 之前卸载 NoneBot v1 - -```bash -pip uninstall nonebot -``` - -::: - -## 通过脚手架安装 (推荐) - -1. (可选) 使用你喜欢的 Python 环境管理工具 (如 `poetry`, `venv`, `conda` 等) 创建新的虚拟环境 -2. 使用 `pip` 或 其他包管理工具 安装 `nb-cli`，`nonebot2` 会作为其依赖被一起安装 - - ```bash - pip install nb-cli - ``` - - - -:::important 提示 -`nb-cli` 的使用方法详见 [使用脚手架](./nb-cli.md) -::: - -## 不使用脚手架 (纯净安装) - -如果你不想使用脚手架，可以直接安装 `nonebot2`，并自行完成开发配置。 - -```bash -pip install nonebot2 -# 也可以通过 poetry 安装 -poetry add nonebot2 -``` - -## 从 GitHub 安装 - -如果你需要使用最新的（可能**尚未发布**的）特性，可以直接从 GitHub 仓库安装： - -:::warning 注意 -直接从 Github 仓库中安装意味着你将使用最新提交的代码，它们并没有进行充分的稳定性测试 - -在任何情况下请不要将其应用于生产环境! -::: - -```bash title="Install From Github" -# master分支 -poetry add git+https://github.com/nonebot/nonebot2.git#master -# dev分支 -poetry add git+https://github.com/nonebot/nonebot2.git#dev -``` - -或者在克隆 Git 仓库后手动安装： - -```bash -git clone https://github.com/nonebot/nonebot2.git -cd nonebot2 -poetry install --no-dev # 推荐 -pip install . # 不推荐 -``` - - diff --git a/website/docs/guide/tutorial/_category_.json b/website/docs/guide/tutorial/_category_.json deleted file mode 100644 index df4a90ff..00000000 --- a/website/docs/guide/tutorial/_category_.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "position": 2, - "label": "教程" -} diff --git a/website/docs/guide/start/editor-support.md b/website/docs/start/editor-support.md similarity index 100% rename from website/docs/guide/start/editor-support.md rename to website/docs/start/editor-support.md diff --git a/website/docs/guide/start/install-adapter.md b/website/docs/start/install-adapter.md similarity index 100% rename from website/docs/guide/start/install-adapter.md rename to website/docs/start/install-adapter.md diff --git a/website/docs/guide/start/install-driver.md b/website/docs/start/install-driver.md similarity index 100% rename from website/docs/guide/start/install-driver.md rename to website/docs/start/install-driver.md diff --git a/website/docs/guide/start/install-plugin.md b/website/docs/start/install-plugin.md similarity index 100% rename from website/docs/guide/start/install-plugin.md rename to website/docs/start/install-plugin.md diff --git a/website/docs/start/installation.md b/website/docs/start/installation.md new file mode 100644 index 00000000..dfa8d798 --- /dev/null +++ b/website/docs/start/installation.md @@ -0,0 +1,75 @@ +--- +sidebar_position: 0 +description: 通过脚手架, PyPI, GitHub 安装 NoneBot + +options: + menu: + weight: 10 + category: guide +--- + +# 安装 NoneBot + +:::warning 注意 +请确保你的 Python 版本 >= 3.7.3。 +::: + +:::warning 注意 +请在安装 NoneBot v2 之前卸载 NoneBot v1 + +```bash +pip uninstall nonebot +``` + +::: + +## 通过脚手架安装 (推荐) + +1. (可选) 使用你喜欢的 Python 环境管理工具 (如 `poetry`, `venv`, `conda` 等) 创建新的虚拟环境 +2. 使用 `pip` 或 其他包管理工具 安装 `nb-cli`，`nonebot2` 会作为其依赖被一起安装 + + ```bash + pip install nb-cli + ``` + + + +:::important 提示 +`nb-cli` 的使用方法详见 [使用脚手架](./nb-cli.md) +::: + +## 不使用脚手架 (纯净安装) + +如果你不想使用脚手架，可以直接安装 `nonebot2`，并自行完成开发配置。 + +```bash +pip install nonebot2 +# 也可以通过 poetry 安装 +poetry add nonebot2 +``` + +## 从 GitHub 安装 + +如果你需要使用最新的（可能**尚未发布**的）特性，可以直接从 GitHub 仓库安装： + +:::warning 注意 +直接从 Github 仓库中安装意味着你将使用最新提交的代码，它们并没有进行充分的稳定性测试 + +在任何情况下请不要将其应用于生产环境! +::: + +```bash title="Install From Github" +# master分支 +poetry add git+https://github.com/nonebot/nonebot2.git#master +# dev分支 +poetry add git+https://github.com/nonebot/nonebot2.git#dev +``` + +或者在克隆 Git 仓库后手动安装： + +```bash +git clone https://github.com/nonebot/nonebot2.git +cd nonebot2 +poetry install --no-dev # 推荐 +pip install . # 不推荐 +``` diff --git a/website/docs/guide/start/nb-cli.md b/website/docs/start/nb-cli.md similarity index 100% rename from website/docs/guide/start/nb-cli.md rename to website/docs/start/nb-cli.md diff --git a/website/docs/guide/start/question.md b/website/docs/start/question.md similarity index 87% rename from website/docs/guide/start/question.md rename to website/docs/start/question.md index e7f0fcf1..41e30d5c 100644 --- a/website/docs/guide/start/question.md +++ b/website/docs/start/question.md @@ -9,7 +9,7 @@ description: 如何获取帮助 1. 点击下方链接前往 GitHub ~~点击 star~~ ，前往 Issues 页面，在 `New Issue` Template 中选择 `Question` - [![nonebot2](https://img.shields.io/github/stars/nonebot/nonebot2?style=social)](https://github.com/nonebot/nonebot2) + NoneBot2: [![nonebot2](https://img.shields.io/github/stars/nonebot/nonebot2?style=social)](https://github.com/nonebot/nonebot2) 2. 通过 QQ 群 (点击下方链接直达) diff --git a/website/docs/guide/tutorial/choose-driver.md b/website/docs/tutorial/choose-driver.md similarity index 84% rename from website/docs/guide/tutorial/choose-driver.md rename to website/docs/tutorial/choose-driver.md index 4363751b..898d9f24 100644 --- a/website/docs/guide/tutorial/choose-driver.md +++ b/website/docs/tutorial/choose-driver.md @@ -4,7 +4,7 @@ description: 各驱动器的功能与区别 options: menu: - weight: 25 + weight: 22 category: guide --- @@ -56,7 +56,7 @@ FastAPI 是一个易上手、高性能的异步 Web 框架，具有极佳的编 FastAPI: [文档](https://fastapi.tiangolo.com/), [仓库](https://github.com/tiangolo/fastapi) -驱动器: [API](../../api/drivers/fastapi.md), [源码](https://github.com/nonebot/nonebot2/blob/master/nonebot/drivers/fastapi.py) +驱动器: [API](../api/drivers/fastapi.md), [源码](https://github.com/nonebot/nonebot2/blob/master/nonebot/drivers/fastapi.py) ```env DRIVER=~fastapi @@ -72,7 +72,7 @@ Quart 是一个类 Flask 的异步版本，拥有与 Flask 非常相似的接口 Quart: [文档](https://pgjones.gitlab.io/quart/), [仓库](https://gitlab.com/pgjones/quart) -驱动器: [API](../../api/drivers/quart.md), [源码](https://github.com/nonebot/nonebot2/blob/master/nonebot/drivers/quart.py) +驱动器: [API](../api/drivers/quart.md), [源码](https://github.com/nonebot/nonebot2/blob/master/nonebot/drivers/quart.py) ```env DRIVER=~quart @@ -90,7 +90,7 @@ DRIVER=~quart HTTPX: [文档](https://www.python-httpx.org/), [仓库](https://github.com/encode/httpx/) -驱动器: [API](../../api/drivers/httpx.md), [源码](https://github.com/nonebot/nonebot2/blob/master/nonebot/drivers/httpx.py) +驱动器: [API](../api/drivers/httpx.md), [源码](https://github.com/nonebot/nonebot2/blob/master/nonebot/drivers/httpx.py) ```env DRIVER=~httpx @@ -112,7 +112,7 @@ DRIVER=~httpx websockets: [文档](https://websockets.readthedocs.io/en/stable/), [仓库](https://github.com/aaugustin/websockets) -驱动器: [API](../../api/drivers/websockets.md), [源码](https://github.com/nonebot/nonebot2/blob/master/nonebot/drivers/websockets.py) +驱动器: [API](../api/drivers/websockets.md), [源码](https://github.com/nonebot/nonebot2/blob/master/nonebot/drivers/websockets.py) ```env DRIVER=~websockets @@ -130,7 +130,7 @@ DRIVER=~websockets AIOHTTP: [文档](https://docs.aiohttp.org/en/stable/), [仓库](https://github.com/aio-libs/aiohttp) -驱动器: [API](../../api/drivers/aiohttp.md), [源码](https://github.com/nonebot/nonebot2/blob/master/nonebot/drivers/aiohttp.py) +驱动器: [API](../api/drivers/aiohttp.md), [源码](https://github.com/nonebot/nonebot2/blob/master/nonebot/drivers/aiohttp.py) ```env DRIVER=~httpx diff --git a/website/docs/guide/tutorial/configuration.md b/website/docs/tutorial/configuration.md similarity index 97% rename from website/docs/guide/tutorial/configuration.md rename to website/docs/tutorial/configuration.md index 0a68666d..94ee90cd 100644 --- a/website/docs/guide/tutorial/configuration.md +++ b/website/docs/tutorial/configuration.md @@ -119,7 +119,7 @@ nonebot.get_driver()._adapters["adapter_name"].config.custom_config ## 详细配置项 -配置项的 API 文档可以前往 [Class Config](../../api/config.md#class-config) 查看。 +配置项的 API 文档可以前往 [Class Config](../api/config.md#class-config) 查看。 ### Driver diff --git a/website/docs/guide/tutorial/creating-a-project.md b/website/docs/tutorial/creating-a-project.md similarity index 95% rename from website/docs/guide/tutorial/creating-a-project.md rename to website/docs/tutorial/creating-a-project.md index 659bdd54..194b651e 100644 --- a/website/docs/guide/tutorial/creating-a-project.md +++ b/website/docs/tutorial/creating-a-project.md @@ -18,8 +18,7 @@ nb create ## 目录结构 - -```bash +```bash title=Project AweSome-Bot ├── "awesome_bot" # 或是 src │ └── "plugins" @@ -33,7 +32,6 @@ AweSome-Bot ├── "pyproject.toml" └── README.md ``` - - `awesome_bot/plugins` 或 `src/plugins`: 用于存放编写的 bot 插件 - `.env`, `.env.dev`, `.env.prod`: 各环境配置文件 diff --git a/website/docs/guide/tutorial/custom-logger.md b/website/docs/tutorial/custom-logger.md similarity index 100% rename from website/docs/guide/tutorial/custom-logger.md rename to website/docs/tutorial/custom-logger.md diff --git a/website/docs/tutorial/plugin/_category_.json b/website/docs/tutorial/plugin/_category_.json new file mode 100644 index 00000000..4ad35288 --- /dev/null +++ b/website/docs/tutorial/plugin/_category_.json @@ -0,0 +1,5 @@ +{ + "position": 7, + "label": "插件", + "collapsible": false +} diff --git a/website/docs/tutorial/plugin/config-plugin.md b/website/docs/tutorial/plugin/config-plugin.md new file mode 100644 index 00000000..e397da91 --- /dev/null +++ b/website/docs/tutorial/plugin/config-plugin.md @@ -0,0 +1,6 @@ +--- +sidebar_position: 2 +description: 规范定义插件配置项 +--- + +# 定义插件配置 diff --git a/website/docs/tutorial/plugin/create-matcher.md b/website/docs/tutorial/plugin/create-matcher.md new file mode 100644 index 00000000..bba6a230 --- /dev/null +++ b/website/docs/tutorial/plugin/create-matcher.md @@ -0,0 +1,11 @@ +--- +sidebar_position: 3 +description: 定义事件响应器，对特定的事件进行处理 + +options: + menu: + weight: 26 + category: guide +--- + +# 定义事件响应器 diff --git a/website/docs/tutorial/plugin/introduction.md b/website/docs/tutorial/plugin/introduction.md new file mode 100644 index 00000000..d85c46b7 --- /dev/null +++ b/website/docs/tutorial/plugin/introduction.md @@ -0,0 +1,67 @@ +--- +sidebar_position: 0 +description: 插件入门 +--- + +# 插件入门 + +## 插件结构 + +在编写插件之前，首先我们需要了解一下插件的概念。 + +在 NoneBot 中，插件可以是 Python 的一个模块 `module` ，也可以是一个包 `package` 。NoneBot 会在导入时对这些模块或包做一些特殊的处理使得他们成为一个插件。 + +下面详细介绍两种插件的结构： + +### 模块插件（单文件形式） + +在合适的路径创建一个 `.py` 文件即可。例如在 [创建项目](../creating-a-project.md) 中创建的项目中，我们可以在 `awesome_bot/plugins/` 目录中创建一个文件 `foo.py`。 + +```bash title=Project {4} +AweSome-Bot +├── awesome_bot +│ └── plugins +| └── foo.py +├── .env +├── .env.dev +├── .env.prod +├── .gitignore +├── bot.py +├── docker-compose.yml +├── Dockerfile +├── pyproject.toml +└── README.md +``` + +这个时候它已经可以被称为一个插件了，尽管它还什么都没做。 + +### 包插件（文件夹形式） + +在合适的路径创建一个文件夹，并在文件夹内创建文件 `__init__.py` 即可。例如在 [创建项目](../creating-a-project.md) 中创建的项目中，我们可以在 `awesome_bot/plugins/` 目录中创建一个文件夹 `foo`，并在这个文件夹内创建一个文件 `__init__.py`。 + +```bash title=Project {4,5} +AweSome-Bot +├── awesome_bot +│ └── plugins +| └── foo.py +| └── __init__.py +├── .env +├── .env.dev +├── .env.prod +├── .gitignore +├── bot.py +├── docker-compose.yml +├── Dockerfile +├── pyproject.toml +└── README.md +``` + +这个时候 `foo` 就是一个合法的 Python 包了，同时也是合法的 NoneBot 插件，插件内容可以在 `__init__.py` 中编写。 + +## 创建插件 + +除了通过手动创建的方式以外，还可以通过 `nb-cli` 来创建插件，`nb-cli` 会为你在合适的位置创建一个模板包插件。 + +```bash +nb plugin create +``` diff --git a/website/docs/tutorial/plugin/load-plugin.md b/website/docs/tutorial/plugin/load-plugin.md new file mode 100644 index 00000000..19071da6 --- /dev/null +++ b/website/docs/tutorial/plugin/load-plugin.md @@ -0,0 +1,11 @@ +--- +sidebar_position: 1 +description: 通过不同方式加载插件 + +options: + menu: + weight: 25 + category: guide +--- + +# 加载插件 diff --git a/website/docs/guide/tutorial/register-adapter.md b/website/docs/tutorial/register-adapter.md similarity index 99% rename from website/docs/guide/tutorial/register-adapter.md rename to website/docs/tutorial/register-adapter.md index c7f72958..98638c1f 100644 --- a/website/docs/guide/tutorial/register-adapter.md +++ b/website/docs/tutorial/register-adapter.md @@ -4,7 +4,7 @@ description: 协议适配器的功能与使用 options: menu: - weight: 26 + weight: 23 category: guide --- diff --git a/website/sidebars.js b/website/sidebars.js index 8786cf3f..b91cd3b6 100644 --- a/website/sidebars.js +++ b/website/sidebars.js @@ -15,80 +15,37 @@ const sidebars = { // By default, Docusaurus generates a sidebar from the docs folder structure tutorial: [ + "index", { - type: "autogenerated", - dirName: "guide", + type: "category", + label: "开始", + items: [ + { + type: "autogenerated", + dirName: "start", + }, + ], + }, + { + type: "category", + label: "教程", + items: [ + { + type: "autogenerated", + dirName: "tutorial", + }, + ], + }, + { + type: "category", + label: "进阶", + items: [ + { + type: "autogenerated", + dirName: "advanced", + }, + ], }, - // { - // type: "category", - // label: "指南", - // items: [ - // { - // type: "category", - // label: "开始", - // collapsible: false, - // items: [ - // "guide/index", - // "guide/installation", - // "guide/getting-started", - // "guide/creating-a-project", - // "guide/basic-configuration", - // ], - // }, - // { - // type: "category", - // label: "编写插件", - // collapsible: false, - // items: [ - // "guide/loading-a-plugin", - // "guide/creating-a-plugin", - // "guide/creating-a-matcher", - // "guide/creating-a-handler", - // "guide/end-or-start", - // ], - // }, - // { - // type: "category", - // label: "协议适配", - // collapsible: false, - // items: [ - // "guide/cqhttp-guide", - // "guide/ding-guide", - // "guide/mirai-guide", - // "guide/feishu-guide", - // ], - // }, - // ], - // }, - // { - // type: "category", - // label: "进阶", - // items: [ - // { - // type: "category", - // label: "进阶", - // collapsible: false, - // items: [ - // "advanced/index", - // "advanced/scheduler", - // "advanced/permission", - // "advanced/runtime-hook", - // "advanced/export-and-require", - // { - // type: "category", - // label: "高级事件处理", - // items: [{ type: "autogenerated", dirName: "advanced/handler" }], - // }, - // ], - // }, - // { - // type: "category", - // label: "发布", - // collapsible: false, - // items: ["advanced/publish-plugin"], - // }, - // ], - // }, ], api: [{ type: "autogenerated", dirName: "api" }], From db826caff4a839ef13815526f6cd954f298d5fdb Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 28 Dec 2021 01:02:04 +0800 Subject: [PATCH 138/174] :memo: add load plugin and config doc --- nonebot/plugin/load.py | 4 +- website/docs/advanced/README.md | 2 +- ...reating-a-project.md => create-project.md} | 0 website/docs/tutorial/plugin/config-plugin.md | 31 +++++++ website/docs/tutorial/plugin/introduction.md | 8 +- website/docs/tutorial/plugin/load-plugin.md | 91 +++++++++++++++++++ website/docusaurus.config.js | 4 +- website/src/components/Hero.tsx | 2 +- website/src/pages/index.tsx | 1 - 9 files changed, 134 insertions(+), 9 deletions(-) rename website/docs/tutorial/{creating-a-project.md => create-project.md} (100%) diff --git a/nonebot/plugin/load.py b/nonebot/plugin/load.py index bfd08918..26d2d7e3 100644 --- a/nonebot/plugin/load.py +++ b/nonebot/plugin/load.py @@ -131,11 +131,11 @@ def load_from_toml(file_path: str, encoding: str = "utf-8") -> Set[Plugin]: return load_all_plugins(plugins, plugin_dirs) -def load_builtin_plugins(name: str = "echo") -> Optional[Plugin]: +def load_builtin_plugins(name: str) -> Optional[Plugin]: """ :说明: - 导入 NoneBot 内置插件, 默认导入 ``echo`` 插件 + 导入 NoneBot 内置插件 :返回: diff --git a/website/docs/advanced/README.md b/website/docs/advanced/README.md index ed1065f1..ea64f8ec 100644 --- a/website/docs/advanced/README.md +++ b/website/docs/advanced/README.md @@ -12,7 +12,7 @@ options: ## 它如何工作？ -如同[概览](../guide/README.md)所言: +如同[概览](../README.md)所言: > NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人收到的事件进行解析和处理，并以插件化的形式，按优先级分发给事件所对应的事件响应器，来完成具体的功能。 diff --git a/website/docs/tutorial/creating-a-project.md b/website/docs/tutorial/create-project.md similarity index 100% rename from website/docs/tutorial/creating-a-project.md rename to website/docs/tutorial/create-project.md diff --git a/website/docs/tutorial/plugin/config-plugin.md b/website/docs/tutorial/plugin/config-plugin.md index e397da91..28a40a07 100644 --- a/website/docs/tutorial/plugin/config-plugin.md +++ b/website/docs/tutorial/plugin/config-plugin.md @@ -4,3 +4,34 @@ description: 规范定义插件配置项 --- # 定义插件配置 + +通常，插件可以从配置文件中读取自己的配置项，但是由于额外的全局配置项没有预先定义的问题，导致开发时编辑器无法提示字段与类型，以及运行时没有对配置项直接进行检查。那么就需要一种方式来规范定义插件配置项。 + +## 定义配置模型 + +在 NoneBot 中，我们使用强大高效的 [Pydantic](https://pydantic-docs.helpmanual.io/) 来定义配置模型，这个模型可以被用于配置的读取和类型检查等。例如，我们可以定义一个配置模型包含一个 string 类型的配置项： + +```python title=config.py {3,4} +from pydantic import BaseModel, Extra + +class Config(BaseModel, extra=Extra.ignore): + token: str +``` + +:::important 参考 +更多丰富的模型定义方法（默认值，自定义 validator 等），请参考 [Pydantic](https://pydantic-docs.helpmanual.io/) 文档。 +::: + +## 读取配置 + +定义完成配置模型后，我们可以在插件加载时获取全局配置，导入插件自身的配置模型： + +```python title=__init__.py {5} +from nonebot import get_driver + +from .config import Config + +plugin_config = Config.parse_obj(get_driver().config) +``` + +至此，插件已经成功读取了自身所需的配置项，并且具有字段和类型提示，也可以对配置进行运行时修改。 diff --git a/website/docs/tutorial/plugin/introduction.md b/website/docs/tutorial/plugin/introduction.md index d85c46b7..fcc50161 100644 --- a/website/docs/tutorial/plugin/introduction.md +++ b/website/docs/tutorial/plugin/introduction.md @@ -15,7 +15,7 @@ description: 插件入门 ### 模块插件（单文件形式） -在合适的路径创建一个 `.py` 文件即可。例如在 [创建项目](../creating-a-project.md) 中创建的项目中，我们可以在 `awesome_bot/plugins/` 目录中创建一个文件 `foo.py`。 +在合适的路径创建一个 `.py` 文件即可。例如在 [创建项目](../create-project.md) 中创建的项目中，我们可以在 `awesome_bot/plugins/` 目录中创建一个文件 `foo.py`。 ```bash title=Project {4} AweSome-Bot @@ -37,7 +37,7 @@ AweSome-Bot ### 包插件（文件夹形式） -在合适的路径创建一个文件夹，并在文件夹内创建文件 `__init__.py` 即可。例如在 [创建项目](../creating-a-project.md) 中创建的项目中，我们可以在 `awesome_bot/plugins/` 目录中创建一个文件夹 `foo`，并在这个文件夹内创建一个文件 `__init__.py`。 +在合适的路径创建一个文件夹，并在文件夹内创建文件 `__init__.py` 即可。例如在 [创建项目](../create-project.md) 中创建的项目中，我们可以在 `awesome_bot/plugins/` 目录中创建一个文件夹 `foo`，并在这个文件夹内创建一个文件 `__init__.py`。 ```bash title=Project {4,5} AweSome-Bot @@ -60,6 +60,10 @@ AweSome-Bot ## 创建插件 +:::danger 警告 +请注意，插件名称不能存在重复，即所有模块插件的文件名和所有包插件的文件夹名不能存在相同。 +::: + 除了通过手动创建的方式以外，还可以通过 `nb-cli` 来创建插件，`nb-cli` 会为你在合适的位置创建一个模板包插件。 ```bash diff --git a/website/docs/tutorial/plugin/load-plugin.md b/website/docs/tutorial/plugin/load-plugin.md index 19071da6..3b92dc6e 100644 --- a/website/docs/tutorial/plugin/load-plugin.md +++ b/website/docs/tutorial/plugin/load-plugin.md @@ -9,3 +9,94 @@ options: --- # 加载插件 + +:::danger 警告 +请勿在插件被加载前 `import` 插件模块，这会导致 NoneBot 无法将其转换为插件而损失部分功能。 +::: + +加载插件通常在机器人的入口文件进行，例如在 [创建项目](../create-project.md) 中创建的项目中的 `bot.py` 文件。在 NoneBot 初始化完成后即可加载插件。 + +```python title=bot.py {5} +import nonebot + +nonebot.init() + +# load your plugin here + +nonebot.run() +``` + +加载插件的方式有多种，但在底层的加载逻辑是一致的。以下是为加载插件提供的几种方式： + +## `load_plugin` + +通过点分割模块名称来加载插件，通常用于加载单个插件或者是第三方插件。例如： + +```python +nonebot.load_plugin("path.to.your.plugin") +``` + +## `load_plugins` + +加载传入插件目录中的所有插件，通常用于加载一系列本地编写的插件。例如： + +```python +nonebot.load_plugins("src/plugins", "path/to/your/plugins") +``` + +:::warning 警告 +请注意，插件所在目录应该为相对机器人入口文件可导入的，例如与入口文件在同一目录下。 +::: + +## `load_all_plugins` + +这种加载方式是以上两种方式的融合，加载所有传入的插件模块名称，以及所有给定目录下的插件。例如： + +```python +nonebot.load_all_plugins(["path.to.your.plugin"], ["path/to/your/plugins"]) +``` + +## `load_from_json` + +通过 JSON 文件加载插件，是 [`load_all_plugins`](#load_all_plugins) 的 JSON 变种。通过读取 JSON 文件中的 `plugins` 字段和 `plugin_dirs` 字段进行加载。例如： + +```json title=plugin_config.json +{ + "plugins": ["path.to.your.plugin"], + "plugin_dirs": ["path/to/your/plugins"] +} +``` + +```python +nonebot.load_from_json("plugin_config.json", encoding="utf-8") +``` + +:::tip 提示 +如果 JSON 配置文件中的字段无法满足你的需求，可以使用 [`load_all_plugins`](#load_all_plugins) 方法自行读取配置来加载插件。 +::: + +## `load_from_toml` + +通过 TOML 文件加载插件，是 [`load_all_plugins`](#load_all_plugins) 的 TOML 变种。通过读取 TOML 文件中的 `[tool.nonebot]` Table 中的 `plugins` 和 `plugin_dirs` Array 进行加载。例如： + +```toml title=plugin_config.toml +[tool.nonebot] +plugins = ["path.to.your.plugin"] +plugin_dirs = ["path/to/your/plugins"] +``` + +```python +nonebot.load_from_toml("plugin_config.toml", encoding="utf-8") +``` + +:::tip 提示 +如果 TOML 配置文件中的字段无法满足你的需求，可以使用 [`load_all_plugins`](#load_all_plugins) 方法自行读取配置来加载插件。 +::: + +## `load_builtin_plugin` + +加载一个内置插件，是 [`load_plugin`](#load_plugin) 的封装。例如： + +```python +nonebot.load_builtin_plugin("echo") +``` diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index 28bf30f2..bc8dce24 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -104,8 +104,8 @@ const config = { title: "Learn", icon: ["fas", "book"], items: [ - { label: "Introduction", to: "/docs/guide" }, - { label: "Installation", to: "/docs/guide/start/installation" }, + { label: "Introduction", to: "/docs/" }, + { label: "Installation", to: "/docs/start/installation" }, ], }, { diff --git a/website/src/components/Hero.tsx b/website/src/components/Hero.tsx index 37eace6a..7d6c6112 100644 --- a/website/src/components/Hero.tsx +++ b/website/src/components/Hero.tsx @@ -21,7 +21,7 @@ export function Hero(): JSX.Element {

开始使用 diff --git a/website/src/pages/index.tsx b/website/src/pages/index.tsx index fb8a6cfa..71ef0276 100644 --- a/website/src/pages/index.tsx +++ b/website/src/pages/index.tsx @@ -2,7 +2,6 @@ import clsx from "clsx"; import React from "react"; import CodeBlock from "@theme/CodeBlock"; -import { HeroFeatureDouble, HeroFeatureSingle } from "@theme/Hero"; import Layout from "@theme/Layout"; import { Hero, HeroFeature } from "../components/Hero"; From 9379182f0464bd220e795fe030c7bc683f049ecc Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 28 Dec 2021 10:00:47 +0800 Subject: [PATCH 139/174] :arrow_up: upgrade dependencies --- yarn.lock | 47 +++++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 26 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1c1a251e..79d63b7f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2144,18 +2144,18 @@ acorn-walk@^8.0.0: acorn@^6.1.1: version "6.4.2" - resolved "https://registry.npmmirror.com/acorn/download/acorn-6.4.2.tgz?cache=0&sync_timestamp=1637225522161&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Facorn%2Fdownload%2Facorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" + resolved "https://registry.npmmirror.com/acorn/download/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha1-NYZv1xBSjpLeEM8GAWSY5H454eY= acorn@^7.0.0: version "7.4.1" - resolved "https://registry.npmmirror.com/acorn/download/acorn-7.4.1.tgz?cache=0&sync_timestamp=1637225522161&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Facorn%2Fdownload%2Facorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + resolved "https://registry.npmmirror.com/acorn/download/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo= acorn@^8.0.4, acorn@^8.4.1: - version "8.6.0" - resolved "https://registry.npmmirror.com/acorn/download/acorn-8.6.0.tgz?cache=0&sync_timestamp=1637225522161&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Facorn%2Fdownload%2Facorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895" - integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw== + version "8.7.0" + resolved "https://registry.npmmirror.com/acorn/download/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" + integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== address@^1.0.1, address@^1.1.2: version "1.1.2" @@ -2593,7 +2593,7 @@ camelcase@^6.2.0: caniuse-api@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/caniuse-api/download/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" + resolved "https://registry.npmmirror.com/caniuse-api/download/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" integrity sha1-Xk2Q4idJYdRikZl99Znj7QCO5MA= dependencies: browserslist "^4.0.0" @@ -2982,7 +2982,7 @@ crypto-random-string@^2.0.0: css-declaration-sorter@^6.0.3: version "6.1.3" - resolved "https://registry.nlark.com/css-declaration-sorter/download/css-declaration-sorter-6.1.3.tgz?cache=0&sync_timestamp=1630965563343&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcss-declaration-sorter%2Fdownload%2Fcss-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2" + resolved "https://registry.npmmirror.com/css-declaration-sorter/download/css-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2" integrity sha1-6YUuTPlAunn1CdlCWxN9H5RDjcI= dependencies: timsort "^0.3.0" @@ -3338,19 +3338,19 @@ dns-txt@^2.0.2: buffer-indexof "^1.0.0" docusaurus-preset-nonepress@canary: - version "0.0.0-123" - resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-123.tgz#2cafef58c6264ac6da0e6ed9c70720084df39024" - integrity sha512-PuSOUwWYI2aDyFQfLKhyn0w94a22leL8cB6LfivDvn9qlDmglxa6Le3VNsmgxiGieeoEQ3IA5907RoZQwzuQjg== + version "0.0.0-124" + resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-124.tgz#f53645c2f79ad07b6cc575fc0e36101306c8ad2b" + integrity sha512-DvNe8aUh/8biSkn2qyCoz5DCTHsqZVRqUkpWdV+kBOGEH4UvtHCEzAgy8g/MZDHaFh6BlSjUX5TqtK4vZ3+0jg== dependencies: "@docusaurus/core" "2.0.0-beta.9" "@docusaurus/plugin-content-docs" "2.0.0-beta.9" "@docusaurus/plugin-content-pages" "2.0.0-beta.9" - docusaurus-theme-nonepress "0.0.0-123" + docusaurus-theme-nonepress "0.0.0-124" -docusaurus-theme-nonepress@0.0.0-123: - version "0.0.0-123" - resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-123.tgz#0bbba71820930bcbfec5b1ea7191dbbb698dc0bc" - integrity sha512-eOh+sM0pp0tjB5g4lTwUkWERwmWjv9M//bhoNZ5NwJ9sAVLB7AI+YiQP2BthAk8HlVqvQyR5EJz0hFCr6THZ1Q== +docusaurus-theme-nonepress@0.0.0-124: + version "0.0.0-124" + resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-124.tgz#460d6ac2b9f962b975bcd321b330b02a3c7f0704" + integrity sha512-m2jNAKKXdL+ENroKf4kk0xmxz2R7CUwOIWHnR2oOomQtpl/UR0mIOcpqfY3TSMW6UYnQkaOQoLgIWzC3SwT6sA== dependencies: "@docsearch/react" "^3.0.0-alpha.39" "@docusaurus/core" "2.0.0-beta.9" @@ -6655,11 +6655,11 @@ run-parallel@^1.1.9: queue-microtask "^1.2.2" rxjs@^7.1.0: - version "7.4.0" - resolved "https://registry.npmmirror.com/rxjs/download/rxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68" - integrity sha1-oSpE1+6/AW9f8kQbh/KMmlHOvGg= + version "7.5.1" + resolved "https://registry.npmmirror.com/rxjs/download/rxjs-7.5.1.tgz#af73df343cbcab37628197f43ea0c8256f54b157" + integrity sha512-KExVEeZWxMZnZhUZtsJcFwz8IvPvgu4G2Z2QyqjZQzUGr32KDYuSxrEYO4w3tFFNbfLozcrKUTvTPi+E9ywJkQ== dependencies: - tslib "~2.1.0" + tslib "^2.1.0" safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" @@ -7307,16 +7307,11 @@ trough@^1.0.0: resolved "https://registry.nlark.com/trough/download/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" integrity sha1-uLY5zvrX0LsqvTfUM/+Ck++l9AY= -tslib@^2.0.3, tslib@^2.3.1: +tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1: version "2.3.1" resolved "https://registry.nlark.com/tslib/download/tslib-2.3.1.tgz?cache=0&sync_timestamp=1628722556410&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftslib%2Fdownload%2Ftslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha1-6KM1rdXOrlGqJh0ypJAVjvBC7wE= -tslib@~2.1.0: - version "2.1.0" - resolved "https://registry.nlark.com/tslib/download/tslib-2.1.0.tgz?cache=0&sync_timestamp=1628722556410&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftslib%2Fdownload%2Ftslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha1-2mCGDxwuyqVwOrfTm8Bba/mIuXo= - type-fest@^0.20.2: version "0.20.2" resolved "https://registry.npmmirror.com/type-fest/download/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" @@ -7596,7 +7591,7 @@ vfile-location@^3.0.0, vfile-location@^3.2.0: vfile-message@^2.0.0: version "2.0.4" - resolved "https://registry.nlark.com/vfile-message/download/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" + resolved "https://registry.npmmirror.com/vfile-message/download/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" integrity sha1-W0O4gXHUCerlhHfRPyPdQdUsNxo= dependencies: "@types/unist" "^2.0.0" From 86c859fec268d66bcca8dae6050c6e630bafa756 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 28 Dec 2021 11:51:14 +0800 Subject: [PATCH 140/174] :memo: add create matcher doc --- nonebot/matcher.py | 3 +- .../docs/tutorial/plugin/create-matcher.md | 93 ++ yarn.lock | 852 +++++++++--------- 3 files changed, 521 insertions(+), 427 deletions(-) diff --git a/nonebot/matcher.py b/nonebot/matcher.py index fa50f4c3..b55287f7 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -694,7 +694,8 @@ class Matcher(metaclass=MatcherMeta): async def resolve_reject(self): handler = current_handler.get() self.handlers.insert(0, handler) - self.state[REJECT_TARGET] = self.state[REJECT_CACHE_TARGET] + if REJECT_CACHE_TARGET in self.state: + self.state[REJECT_TARGET] = self.state[REJECT_CACHE_TARGET] async def simple_run( self, diff --git a/website/docs/tutorial/plugin/create-matcher.md b/website/docs/tutorial/plugin/create-matcher.md index bba6a230..59489073 100644 --- a/website/docs/tutorial/plugin/create-matcher.md +++ b/website/docs/tutorial/plugin/create-matcher.md @@ -9,3 +9,96 @@ options: --- # 定义事件响应器 + +事件响应器 (`Matcher`) 是对接收到的事件进行响应的基本单元，所有的事件响应器都继承自 `Matcher` 基类。为方便编写插件，NoneBot 在 `nonebot.plugin` 模块中为插件开发定义了一些辅助函数，以便插件开发者可以简化插件开发。首先，让我们来了解一下 `Matcher` 由哪些部分组成。 + +## 事件响应器的基本组成 + +### 事件响应器类型 `type` + +事件响应器的类型即是该响应器所要响应的事件类型，只有在接收到的事件类型与该响应器的类型相同时，才会触发该响应器。如果类型留空，则该响应器将会响应所有类型的事件。 + +NoneBot 内置了四种主要类型：`meta_event`, `message`, `notice`, `request`。通常情况下，协议适配器会将事件合理的分类至这四种类型中。如果有其他类型的事件需要响应，可以自行定义新的类型。 + +:::warning 注意 +当会话状态更新时，会执行 `type_updater` 以更新 `type` 属性，以便会话收到新事件时能够正确匹配。 + +`type_updater` 默认将 `type` 修改为 `message`，你也可以自行定义 `type_updater` 来控制 `type` 属性更新。`type_updater` 是一个返回 `str` 的函数，可选依赖注入参数参考类型 `T_TypeUpdater`。 + +```python {3-5} +matcher = on_request() + +@matcher.type_updater +async def update_type(): + return "message" +``` + +::: + +### 事件匹配规则 `rule` + +事件响应器的匹配规则是一个 `Rule` 对象，它是一系列 `checker` 的集合，当所有的 `checker` 都返回 `True` 时，才会触发该响应器。 + +规则编写方法参考 [自定义规则](#自定义规则)。 + +:::warning 注意 +当会话状态更新时，`rule` 会被清空，以便会话收到新事件时能够正确匹配。 +::: + +### 事件触发权限 `permission` + +事件响应器的触发权限是一个 `Permission` 对象，它也是一系列 `checker` 的集合，当其中一个 `checker` 返回 `True` 时，就会触发该响应器。 + +权限编写方法参考 [自定义权限](#自定义权限)。 + +:::warning 注意 +与 `rule` 不同的是，`permission` 不会在会话状态更新时丢失，因此 `permission` 通常用于会话的响应控制。 + +并且, 当会话状态更新时，会执行 `permission_updater` 以更新 `permission`。默认情况下，`permission_updater` 会在原有的 `permission` 基础上添加一个 `USER` 条件，以检查事件的 `session_id` 是否与当前会话一致。 + +你可以自行定义 `permission_updater` 来控制会话的响应权限更新。`permission_updater` 是一个返回 `Permission` 的函数，可选依赖注入参数参考类型 `T_PermissionUpdater`。 + +```python {3-5} +matcher = on_message() + +@matcher.permission_updater +async def update_type(matcher: Matcher): + return matcher.permission # return same without session_id check +``` + +::: + +### 优先级 `priority` + +事件响应器的优先级代表事件响应器的执行顺序 + +:::warning 警告 +同一优先级的事件响应器会 **同时执行**，优先级数字 **越小** 越先响应！优先级请从 `1` 开始排序！ +::: + +### 阻断 `block` + +当有任意事件响应器发出了阻止事件传递信号时，该事件将不再会传递给下一优先级，直接结束处理。 + +NoneBot 内置的事件响应器中，所有非 `command` 规则的 `message` 类型的事件响应器都会阻断事件传递，其他则不会。 + +在部分情况中，可以使用 `matcher.stop_propagation()` 方法动态阻止事件传播，该方法需要 `handler` 在参数中获取 `matcher` 实例后调用方法。 + +```python {5} +foo = on_request() + +@foo.handle() +async def handle(matcher: Matcher): + matcher.stop_propagation() +``` + +### 有效期 `temp` / `expire_time` + +事件响应器可以设置有效期，当事件响应器超过有效期时，将会被移除。 + +- `temp` 属性：配置事件响应器在下一次响应之后移除。 +- `expire_time` 属性：配置事件响应器在指定时间之后移除。 + +## 自定义规则 + +## 自定义权限 diff --git a/yarn.lock b/yarn.lock index 79d63b7f..33e2758b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -132,14 +132,14 @@ "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.8.3": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/code-frame/download/@babel/code-frame-7.16.0.tgz?cache=0&sync_timestamp=1635560663383&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcode-frame%2Fdownload%2F%40babel%2Fcode-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" + resolved "https://registry.npmmirror.com/@babel/code-frame/download/@babel/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" integrity sha1-DfyAMJvuyEEeZecGRhxAiwu5tDE= dependencies: "@babel/highlight" "^7.16.0" "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.0", "@babel/compat-data@^7.16.4": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/compat-data/download/@babel/compat-data-7.16.4.tgz?cache=0&sync_timestamp=1637102917946&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcompat-data%2Fdownload%2F%40babel%2Fcompat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" + resolved "https://registry.npmmirror.com/@babel/compat-data/download/@babel/compat-data-7.16.4.tgz?cache=0&sync_timestamp=1637102913685&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcompat-data%2Fdownload%2F%40babel%2Fcompat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q== "@babel/core@7.12.9": @@ -196,7 +196,7 @@ "@babel/helper-annotate-as-pure@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.16.0.tgz?cache=0&sync_timestamp=1635560944976&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-annotate-as-pure%2Fdownload%2F%40babel%2Fhelper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" + resolved "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" integrity sha1-mh8OvNpT2aLQAQjEzqzmpdXx8I0= dependencies: "@babel/types" "^7.16.0" @@ -211,7 +211,7 @@ "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.3": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/download/@babel/helper-compilation-targets-7.16.3.tgz?cache=0&sync_timestamp=1636494857717&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-compilation-targets%2Fdownload%2F%40babel%2Fhelper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" + resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/download/@babel/helper-compilation-targets-7.16.3.tgz?cache=0&sync_timestamp=1636495224047&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-compilation-targets%2Fdownload%2F%40babel%2Fhelper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA== dependencies: "@babel/compat-data" "^7.16.0" @@ -234,7 +234,7 @@ "@babel/helper-create-regexp-features-plugin@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/download/@babel/helper-create-regexp-features-plugin-7.16.0.tgz?cache=0&sync_timestamp=1635566958507&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-create-regexp-features-plugin%2Fdownload%2F%40babel%2Fhelper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" + resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/download/@babel/helper-create-regexp-features-plugin-7.16.0.tgz?cache=0&sync_timestamp=1635567064344&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-create-regexp-features-plugin%2Fdownload%2F%40babel%2Fhelper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" integrity sha1-BrI0jON/zMT14Y3NjXUFPyp8RP8= dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -242,7 +242,7 @@ "@babel/helper-define-polyfill-provider@^0.3.0": version "0.3.0" - resolved "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/download/@babel/helper-define-polyfill-provider-0.3.0.tgz?cache=0&sync_timestamp=1636799963185&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-define-polyfill-provider%2Fdownload%2F%40babel%2Fhelper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971" + resolved "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/download/@babel/helper-define-polyfill-provider-0.3.0.tgz?cache=0&sync_timestamp=1636799929688&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-define-polyfill-provider%2Fdownload%2F%40babel%2Fhelper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971" integrity sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg== dependencies: "@babel/helper-compilation-targets" "^7.13.0" @@ -286,7 +286,7 @@ "@babel/helper-hoist-variables@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-hoist-variables/download/@babel/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" + resolved "https://registry.npmmirror.com/@babel/helper-hoist-variables/download/@babel/helper-hoist-variables-7.16.0.tgz?cache=0&sync_timestamp=1635560943828&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-hoist-variables%2Fdownload%2F%40babel%2Fhelper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" integrity sha1-TJAjwvHe9+KP9G/B2802o5vqqBo= dependencies: "@babel/types" "^7.16.0" @@ -300,7 +300,7 @@ "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-module-imports/download/@babel/helper-module-imports-7.16.0.tgz?cache=0&sync_timestamp=1635560941965&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-module-imports%2Fdownload%2F%40babel%2Fhelper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" + resolved "https://registry.npmmirror.com/@babel/helper-module-imports/download/@babel/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" integrity sha1-kFOOYLZy7PG0SPX09UM9N+eaPsM= dependencies: "@babel/types" "^7.16.0" @@ -358,21 +358,21 @@ "@babel/helper-simple-access@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-simple-access/download/@babel/helper-simple-access-7.16.0.tgz?cache=0&sync_timestamp=1635560942808&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-simple-access%2Fdownload%2F%40babel%2Fhelper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" + resolved "https://registry.npmmirror.com/@babel/helper-simple-access/download/@babel/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" integrity sha1-IdaidiDjg+N1NM9sELugGab5BRc= dependencies: "@babel/types" "^7.16.0" "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/download/@babel/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" + resolved "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/download/@babel/helper-skip-transparent-expression-wrappers-7.16.0.tgz?cache=0&sync_timestamp=1635567064131&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-skip-transparent-expression-wrappers%2Fdownload%2F%40babel%2Fhelper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" integrity sha1-DuM4gHAUfDrgUeSH7KPrsOLouwk= dependencies: "@babel/types" "^7.16.0" "@babel/helper-split-export-declaration@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-split-export-declaration/download/@babel/helper-split-export-declaration-7.16.0.tgz?cache=0&sync_timestamp=1635560943488&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-split-export-declaration%2Fdownload%2F%40babel%2Fhelper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" + resolved "https://registry.npmmirror.com/@babel/helper-split-export-declaration/download/@babel/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" integrity sha1-KWcvQ2Y+k23zcKrrIr7ds7rsdDg= dependencies: "@babel/types" "^7.16.0" @@ -384,7 +384,7 @@ "@babel/helper-validator-option@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/helper-validator-option/download/@babel/helper-validator-option-7.14.5.tgz?cache=0&sync_timestamp=1623281108450&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-validator-option%2Fdownload%2F%40babel%2Fhelper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" + resolved "https://registry.nlark.com/@babel/helper-validator-option/download/@babel/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" integrity sha1-bnKh//GNXfy4eOHmLxoCHEty1aM= "@babel/helper-wrap-function@^7.16.5": @@ -408,7 +408,7 @@ "@babel/highlight@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/highlight/download/@babel/highlight-7.16.0.tgz?cache=0&sync_timestamp=1635560940881&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhighlight%2Fdownload%2F%40babel%2Fhighlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" + resolved "https://registry.npmmirror.com/@babel/highlight/download/@babel/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" integrity sha1-bOsysspLj182H7f9gh4/3fShclo= dependencies: "@babel/helper-validator-identifier" "^7.15.7" @@ -429,7 +429,7 @@ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/download/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz#358972eaab006f5eb0826183b0c93cbcaf13e1e2" + resolved "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/download/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz?cache=0&sync_timestamp=1635566443788&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-bugfix-v8-spread-parameters-in-optional-chaining%2Fdownload%2F%40babel%2Fplugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz#358972eaab006f5eb0826183b0c93cbcaf13e1e2" integrity sha1-NYly6qsAb16wgmGDsMk8vK8T4eI= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -575,7 +575,7 @@ "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" - resolved "https://registry.nlark.com/@babel/plugin-syntax-async-generators/download/@babel/plugin-syntax-async-generators-7.8.4.tgz?cache=0&sync_timestamp=1618847046078&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-async-generators%2Fdownload%2F%40babel%2Fplugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + resolved "https://registry.nlark.com/@babel/plugin-syntax-async-generators/download/@babel/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" integrity sha1-qYP7Gusuw/btBCohD2QOkOeG/g0= dependencies: "@babel/helper-plugin-utils" "^7.8.0" @@ -589,28 +589,28 @@ "@babel/plugin-syntax-class-static-block@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-class-static-block/download/@babel/plugin-syntax-class-static-block-7.14.5.tgz?cache=0&sync_timestamp=1623281106862&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-class-static-block%2Fdownload%2F%40babel%2Fplugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" + resolved "https://registry.nlark.com/@babel/plugin-syntax-class-static-block/download/@babel/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" integrity sha1-GV34mxRrS3izv4l/16JXyEZZ1AY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-dynamic-import@^7.8.3": version "7.8.3" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-dynamic-import/download/@babel/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" + resolved "https://registry.nlark.com/@babel/plugin-syntax-dynamic-import/download/@babel/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" integrity sha1-Yr+Ysto80h1iYVT8lu5bPLaOrLM= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-export-namespace-from@^7.8.3": version "7.8.3" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-export-namespace-from/download/@babel/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" + resolved "https://registry.nlark.com/@babel/plugin-syntax-export-namespace-from/download/@babel/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" integrity sha1-AolkqbqA28CUyRXEh618TnpmRlo= dependencies: "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-json-strings@^7.8.3": version "7.8.3" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-json-strings/download/@babel/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" + resolved "https://registry.nlark.com/@babel/plugin-syntax-json-strings/download/@babel/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" integrity sha1-AcohtmjNghjJ5kDLbdiMVBKyyWo= dependencies: "@babel/helper-plugin-utils" "^7.8.0" @@ -638,7 +638,7 @@ "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": version "7.8.3" - resolved "https://registry.nlark.com/@babel/plugin-syntax-nullish-coalescing-operator/download/@babel/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-nullish-coalescing-operator/download/@babel/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" integrity sha1-Fn7XA2iIYIH3S1w2xlqIwDtm0ak= dependencies: "@babel/helper-plugin-utils" "^7.8.0" @@ -659,7 +659,7 @@ "@babel/plugin-syntax-optional-catch-binding@^7.8.3": version "7.8.3" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-optional-catch-binding/download/@babel/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + resolved "https://registry.nlark.com/@babel/plugin-syntax-optional-catch-binding/download/@babel/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" integrity sha1-YRGiZbz7Ag6579D9/X0mQCue1sE= dependencies: "@babel/helper-plugin-utils" "^7.8.0" @@ -673,14 +673,14 @@ "@babel/plugin-syntax-private-property-in-object@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-private-property-in-object/download/@babel/plugin-syntax-private-property-in-object-7.14.5.tgz?cache=0&sync_timestamp=1623280462994&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-private-property-in-object%2Fdownload%2F%40babel%2Fplugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" + resolved "https://registry.nlark.com/@babel/plugin-syntax-private-property-in-object/download/@babel/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" integrity sha1-DcZnHsDqIrbpShEU+FeXDNOd4a0= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-top-level-await@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-top-level-await/download/@babel/plugin-syntax-top-level-await-7.14.5.tgz?cache=0&sync_timestamp=1623280464882&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-top-level-await%2Fdownload%2F%40babel%2Fplugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" + resolved "https://registry.nlark.com/@babel/plugin-syntax-top-level-await/download/@babel/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" integrity sha1-wc/a3DWmRiQAAfBhOCR7dBw02Uw= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -1084,7 +1084,7 @@ "@babel/preset-modules@^0.1.5": version "0.1.5" - resolved "https://registry.npmmirror.com/@babel/preset-modules/download/@babel/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" + resolved "https://registry.npmmirror.com/@babel/preset-modules/download/@babel/preset-modules-0.1.5.tgz?cache=0&sync_timestamp=1635094707880&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-modules%2Fdownload%2F%40babel%2Fpreset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" integrity sha1-75Odbn8miCfhhBY43G/5VRXhFdk= dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -1131,7 +1131,7 @@ "@babel/template@^7.12.7", "@babel/template@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/template/download/@babel/template-7.16.0.tgz?cache=0&sync_timestamp=1635560664232&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Ftemplate%2Fdownload%2F%40babel%2Ftemplate-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" + resolved "https://registry.npmmirror.com/@babel/template/download/@babel/template-7.16.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Ftemplate%2Fdownload%2F%40babel%2Ftemplate-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" integrity sha1-0Wo16/TNdOICCDNW+rId2JNj3dY= dependencies: "@babel/code-frame" "^7.16.0" @@ -1484,7 +1484,7 @@ "@hapi/hoek@^9.0.0": version "9.2.1" - resolved "https://registry.npmmirror.com/@hapi/hoek/download/@hapi/hoek-9.2.1.tgz?cache=0&sync_timestamp=1632777883600&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40hapi%2Fhoek%2Fdownload%2F%40hapi%2Fhoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" + resolved "https://registry.npmmirror.com/@hapi/hoek/download/@hapi/hoek-9.2.1.tgz?cache=0&sync_timestamp=1632776440309&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40hapi%2Fhoek%2Fdownload%2F%40hapi%2Fhoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" integrity sha1-lVEUKhmAUDdSU2tQUP2Z9KfxOxc= "@hapi/topo@^5.0.0": @@ -1521,7 +1521,7 @@ "@mdx-js/react@1.6.22", "@mdx-js/react@^1.6.21": version "1.6.22" - resolved "https://registry.npmmirror.com/@mdx-js/react/download/@mdx-js/react-1.6.22.tgz?cache=0&sync_timestamp=1637010066448&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40mdx-js%2Freact%2Fdownload%2F%40mdx-js%2Freact-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573" + resolved "https://registry.npmmirror.com/@mdx-js/react/download/@mdx-js/react-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573" integrity sha1-rgm0dE/dx0cU7p+dbxembnfENXM= "@mdx-js/runtime@^1.6.22": @@ -1535,7 +1535,7 @@ "@mdx-js/util@1.6.22": version "1.6.22" - resolved "https://registry.npm.taobao.org/@mdx-js/util/download/@mdx-js/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" + resolved "https://registry.nlark.com/@mdx-js/util/download/@mdx-js/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" integrity sha1-IZ39ia5bl6iAHwFTI/+kti9FcYs= "@nodelib/fs.scandir@2.1.5": @@ -1548,12 +1548,12 @@ "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" - resolved "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&sync_timestamp=1622792655362&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + resolved "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha1-W9Jir5Tp0lvR5xsF3u1Eh2oiLos= "@nodelib/fs.walk@^1.2.3": version "1.2.8" - resolved "https://registry.nlark.com/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.8.tgz?cache=0&sync_timestamp=1625769815389&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.walk%2Fdownload%2F%40nodelib%2Ffs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + resolved "https://registry.nlark.com/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" integrity sha1-6Vc36LtnRt3t9pxVaVNJTxlv5po= dependencies: "@nodelib/fs.scandir" "2.1.5" @@ -1561,7 +1561,7 @@ "@polka/url@^1.0.0-next.20": version "1.0.0-next.21" - resolved "https://registry.npmmirror.com/@polka/url/download/@polka/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" + resolved "https://registry.npmmirror.com/@polka/url/download/@polka/url-1.0.0-next.21.tgz?cache=0&sync_timestamp=1633093128630&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40polka%2Furl%2Fdownload%2F%40polka%2Furl-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha1-XeWiOFo1MJQn9gEZkrVEUU1VmqE= "@seznam/compose-react-refs@^1.0.6": @@ -1588,7 +1588,7 @@ "@sindresorhus/is@^0.14.0": version "0.14.0" - resolved "https://registry.nlark.com/@sindresorhus/is/download/@sindresorhus/is-0.14.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40sindresorhus%2Fis%2Fdownload%2F%40sindresorhus%2Fis-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" + resolved "https://registry.nlark.com/@sindresorhus/is/download/@sindresorhus/is-0.14.0.tgz?cache=0&sync_timestamp=1631543441871&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40sindresorhus%2Fis%2Fdownload%2F%40sindresorhus%2Fis-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" integrity sha1-n7OjzzEyMoFR81PeRjLgHlIQK+o= "@slorber/static-site-generator-webpack-plugin@^4.0.0": @@ -1707,7 +1707,7 @@ "@szmarczak/http-timer@^1.1.2": version "1.1.2" - resolved "https://registry.nlark.com/@szmarczak/http-timer/download/@szmarczak/http-timer-1.1.2.tgz?cache=0&sync_timestamp=1629502165113&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40szmarczak%2Fhttp-timer%2Fdownload%2F%40szmarczak%2Fhttp-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" + resolved "https://registry.nlark.com/@szmarczak/http-timer/download/@szmarczak/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" integrity sha1-sWZeLEYaLNkvTBu/UNVFTeDUtCE= dependencies: defer-to-connect "^1.0.1" @@ -1729,12 +1729,12 @@ "@tsconfig/docusaurus@^1.0.4": version "1.0.4" - resolved "https://registry.nlark.com/@tsconfig/docusaurus/download/@tsconfig/docusaurus-1.0.4.tgz#fc40f87a672568678d83533dd4031a09d75877ca" + resolved "https://registry.npmmirror.com/@tsconfig/docusaurus/download/@tsconfig/docusaurus-1.0.4.tgz#fc40f87a672568678d83533dd4031a09d75877ca" integrity sha1-/ED4emclaGeNg1M91AMaCddYd8o= "@types/body-parser@*": version "1.19.2" - resolved "https://registry.npmmirror.com/@types/body-parser/download/@types/body-parser-1.19.2.tgz?cache=0&sync_timestamp=1637264988188&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fbody-parser%2Fdownload%2F%40types%2Fbody-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" + resolved "https://registry.npmmirror.com/@types/body-parser/download/@types/body-parser-1.19.2.tgz?cache=0&sync_timestamp=1637265217498&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fbody-parser%2Fdownload%2F%40types%2Fbody-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== dependencies: "@types/connect" "*" @@ -1780,7 +1780,7 @@ "@types/estree@*", "@types/estree@^0.0.50": version "0.0.50" - resolved "https://registry.npmmirror.com/@types/estree/download/@types/estree-0.0.50.tgz?cache=0&sync_timestamp=1637264753186&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Festree%2Fdownload%2F%40types%2Festree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" + resolved "https://registry.npmmirror.com/@types/estree/download/@types/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" integrity sha1-Hgyqk2TT/M0pMcPtlv2+ql1MyoM= "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": @@ -1794,7 +1794,7 @@ "@types/express@*": version "4.17.13" - resolved "https://registry.npmmirror.com/@types/express/download/@types/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + resolved "https://registry.npmmirror.com/@types/express/download/@types/express-4.17.13.tgz?cache=0&sync_timestamp=1637265368217&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fexpress%2Fdownload%2F%40types%2Fexpress-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" integrity sha1-p24plXKJmbq1GjP6vOHXBaNwkDQ= dependencies: "@types/body-parser" "*" @@ -1833,19 +1833,19 @@ "@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.9" - resolved "https://registry.npmmirror.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + resolved "https://registry.npmmirror.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz?cache=0&sync_timestamp=1637266234284&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fjson-schema%2Fdownload%2F%40types%2Fjson-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha1-l+3JA36gw4WFMgsolk3eOznkZg0= "@types/mdast@^3.0.0": version "3.0.10" - resolved "https://registry.npmmirror.com/@types/mdast/download/@types/mdast-3.0.10.tgz?cache=0&sync_timestamp=1637267171178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fmdast%2Fdownload%2F%40types%2Fmdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af" + resolved "https://registry.npmmirror.com/@types/mdast/download/@types/mdast-3.0.10.tgz?cache=0&sync_timestamp=1637267193135&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fmdast%2Fdownload%2F%40types%2Fmdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af" integrity sha1-RyQkSoKkWYiEy76bz9c9/5J+6K8= dependencies: "@types/unist" "*" "@types/mime@^1": version "1.3.2" - resolved "https://registry.npmmirror.com/@types/mime/download/@types/mime-1.3.2.tgz?cache=0&sync_timestamp=1637267348464&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fmime%2Fdownload%2F%40types%2Fmime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" + resolved "https://registry.npmmirror.com/@types/mime/download/@types/mime-1.3.2.tgz?cache=0&sync_timestamp=1637267530748&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fmime%2Fdownload%2F%40types%2Fmime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" integrity sha1-k+Jb+e51/g/YC1lLxP6w6GIRG1o= "@types/node@*": @@ -1865,12 +1865,12 @@ "@types/prop-types@*": version "15.7.4" - resolved "https://registry.npmmirror.com/@types/prop-types/download/@types/prop-types-15.7.4.tgz?cache=0&sync_timestamp=1637270164807&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fprop-types%2Fdownload%2F%40types%2Fprop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + resolved "https://registry.npmmirror.com/@types/prop-types/download/@types/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" integrity sha1-/PcgXCXf95Xuea8eMNosl5CAjxE= "@types/q@^1.5.1": version "1.5.5" - resolved "https://registry.npmmirror.com/@types/q/download/@types/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" + resolved "https://registry.npmmirror.com/@types/q/download/@types/q-1.5.5.tgz?cache=0&sync_timestamp=1637269985043&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fq%2Fdownload%2F%40types%2Fq-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" integrity sha1-daKo59irSyMEFFBdkjNdHctTpt8= "@types/qs@*": @@ -1901,7 +1901,7 @@ "@types/react-router-dom@*": version "5.3.2" - resolved "https://registry.npmmirror.com/@types/react-router-dom/download/@types/react-router-dom-5.3.2.tgz?cache=0&sync_timestamp=1637450082491&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Freact-router-dom%2Fdownload%2F%40types%2Freact-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee" + resolved "https://registry.npmmirror.com/@types/react-router-dom/download/@types/react-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee" integrity sha1-69jhRc8FbbXGbrHaxjxy9S6FQu4= dependencies: "@types/history" "*" @@ -1927,24 +1927,24 @@ "@types/retry@^0.12.0": version "0.12.1" - resolved "https://registry.npmmirror.com/@types/retry/download/@types/retry-0.12.1.tgz?cache=0&sync_timestamp=1637270319130&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fretry%2Fdownload%2F%40types%2Fretry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" + resolved "https://registry.npmmirror.com/@types/retry/download/@types/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" integrity sha1-2PHA0Nwjr61twWqemToIZXdLQGU= "@types/scheduler@*": version "0.16.2" - resolved "https://registry.npmmirror.com/@types/scheduler/download/@types/scheduler-0.16.2.tgz?cache=0&sync_timestamp=1637270322974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fscheduler%2Fdownload%2F%40types%2Fscheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + resolved "https://registry.npmmirror.com/@types/scheduler/download/@types/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" integrity sha1-GmL4lSVyPd4kuhsBsJK/XfitTTk= "@types/serve-index@^1.9.1": version "1.9.1" - resolved "https://registry.npmmirror.com/@types/serve-index/download/@types/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" + resolved "https://registry.npmmirror.com/@types/serve-index/download/@types/serve-index-1.9.1.tgz?cache=0&sync_timestamp=1637273328244&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fserve-index%2Fdownload%2F%40types%2Fserve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" integrity sha1-G16FNwoZLAHsbOxHNc8pFzN6Yng= dependencies: "@types/express" "*" "@types/serve-static@*": version "1.13.10" - resolved "https://registry.npmmirror.com/@types/serve-static/download/@types/serve-static-1.13.10.tgz?cache=0&sync_timestamp=1637270658875&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fserve-static%2Fdownload%2F%40types%2Fserve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" + resolved "https://registry.npmmirror.com/@types/serve-static/download/@types/serve-static-1.13.10.tgz?cache=0&sync_timestamp=1637270717450&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fserve-static%2Fdownload%2F%40types%2Fserve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" integrity sha1-9eDOh5fS18xevtpIpSyWxPpHqNk= dependencies: "@types/mime" "^1" @@ -1959,7 +1959,7 @@ "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3": version "2.0.6" - resolved "https://registry.npmmirror.com/@types/unist/download/@types/unist-2.0.6.tgz?cache=0&sync_timestamp=1637272115806&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Funist%2Fdownload%2F%40types%2Funist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" + resolved "https://registry.npmmirror.com/@types/unist/download/@types/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" integrity sha1-JQp7FsO5H2cqJFUuxkZ47rHToI0= "@types/ws@^8.2.2": @@ -1971,7 +1971,7 @@ "@webassemblyjs/ast@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.1.tgz?cache=0&sync_timestamp=1625473466238&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fast%2Fdownload%2F%40webassemblyjs%2Fast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" + resolved "https://registry.nlark.com/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.1.tgz?cache=0&sync_timestamp=1625473368618&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fast%2Fdownload%2F%40webassemblyjs%2Fast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" integrity sha1-K/12fq4aaZb0Mv9+jX/HVnnAtqc= dependencies: "@webassemblyjs/helper-numbers" "1.11.1" @@ -1979,22 +1979,22 @@ "@webassemblyjs/floating-point-hex-parser@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.11.1.tgz?cache=0&sync_timestamp=1625473463638&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Ffloating-point-hex-parser%2Fdownload%2F%40webassemblyjs%2Ffloating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" + resolved "https://registry.nlark.com/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" integrity sha1-9sYacF8P16auyqToGY8j2dwXnk8= "@webassemblyjs/helper-api-error@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" + resolved "https://registry.nlark.com/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.11.1.tgz?cache=0&sync_timestamp=1625473460936&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-api-error%2Fdownload%2F%40webassemblyjs%2Fhelper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" integrity sha1-GmMZLYeI5cASgAump6RscFKI/RY= "@webassemblyjs/helper-buffer@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" + resolved "https://registry.nlark.com/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.11.1.tgz?cache=0&sync_timestamp=1625473462686&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-buffer%2Fdownload%2F%40webassemblyjs%2Fhelper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" integrity sha1-gyqQDrREiEzemnytRn+BUA9eWrU= "@webassemblyjs/helper-numbers@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-numbers/download/@webassemblyjs/helper-numbers-1.11.1.tgz?cache=0&sync_timestamp=1625473464260&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-numbers%2Fdownload%2F%40webassemblyjs%2Fhelper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" + resolved "https://registry.nlark.com/@webassemblyjs/helper-numbers/download/@webassemblyjs/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" integrity sha1-ZNgdohn7u6HjvRv8dPboxOEKYq4= dependencies: "@webassemblyjs/floating-point-hex-parser" "1.11.1" @@ -2003,7 +2003,7 @@ "@webassemblyjs/helper-wasm-bytecode@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.11.1.tgz?cache=0&sync_timestamp=1625473463016&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-wasm-bytecode%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" + resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" integrity sha1-8ygkHkHnsZnQsgwY6IQpxEMyleE= "@webassemblyjs/helper-wasm-section@1.11.1": @@ -2018,26 +2018,26 @@ "@webassemblyjs/ieee754@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/ieee754/download/@webassemblyjs/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" + resolved "https://registry.nlark.com/@webassemblyjs/ieee754/download/@webassemblyjs/ieee754-1.11.1.tgz?cache=0&sync_timestamp=1625473454591&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fieee754%2Fdownload%2F%40webassemblyjs%2Fieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" integrity sha1-ljkp6bvQVwnn4SJDoJkYCBKZJhQ= dependencies: "@xtuc/ieee754" "^1.2.0" "@webassemblyjs/leb128@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/leb128/download/@webassemblyjs/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" + resolved "https://registry.nlark.com/@webassemblyjs/leb128/download/@webassemblyjs/leb128-1.11.1.tgz?cache=0&sync_timestamp=1625473456730&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fleb128%2Fdownload%2F%40webassemblyjs%2Fleb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" integrity sha1-zoFLRVdOk9drrh+yZEq5zdlSeqU= dependencies: "@xtuc/long" "4.2.2" "@webassemblyjs/utf8@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" + resolved "https://registry.nlark.com/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.11.1.tgz?cache=0&sync_timestamp=1625474622442&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Futf8%2Fdownload%2F%40webassemblyjs%2Futf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" integrity sha1-0fi3ZDaefG5rrjUOhU3smlnwo/8= "@webassemblyjs/wasm-edit@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.11.1.tgz?cache=0&sync_timestamp=1625473468202&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-edit%2Fdownload%2F%40webassemblyjs%2Fwasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" integrity sha1-rSBuv0v5WgWM6YgKjAksXeyBk9Y= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2051,7 +2051,7 @@ "@webassemblyjs/wasm-gen@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.11.1.tgz?cache=0&sync_timestamp=1625473361759&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-gen%2Fdownload%2F%40webassemblyjs%2Fwasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" integrity sha1-hsXqMEhJdZt9iMR6MvTwOa48j3Y= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2072,7 +2072,7 @@ "@webassemblyjs/wasm-parser@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-parser/download/@webassemblyjs/wasm-parser-1.11.1.tgz?cache=0&sync_timestamp=1625473464593&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-parser%2Fdownload%2F%40webassemblyjs%2Fwasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-parser/download/@webassemblyjs/wasm-parser-1.11.1.tgz?cache=0&sync_timestamp=1625473358573&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-parser%2Fdownload%2F%40webassemblyjs%2Fwasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" integrity sha1-hspzRTT0F+m9PGfHocddi+QfsZk= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2102,7 +2102,7 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: version "1.3.7" - resolved "https://registry.npm.taobao.org/accepts/download/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + resolved "https://registry.npmmirror.com/accepts/download/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" integrity sha1-UxvHJlF6OytB+FACHGzBXqq1B80= dependencies: mime-types "~2.1.24" @@ -2110,22 +2110,22 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: acorn-dynamic-import@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/acorn-dynamic-import/download/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" + resolved "https://registry.nlark.com/acorn-dynamic-import/download/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" integrity sha1-SCIQFAWCo2uDw+NC4c/ryqkkCUg= acorn-import-assertions@^1.7.6: version "1.8.0" - resolved "https://registry.npmmirror.com/acorn-import-assertions/download/acorn-import-assertions-1.8.0.tgz?cache=0&sync_timestamp=1633349167595&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Facorn-import-assertions%2Fdownload%2Facorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" + resolved "https://registry.npmmirror.com/acorn-import-assertions/download/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" integrity sha1-uitZOc5iwjjbbZPYHJsRGym4Vek= acorn-jsx@^5.0.1: version "5.3.2" - resolved "https://registry.nlark.com/acorn-jsx/download/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + resolved "https://registry.nlark.com/acorn-jsx/download/acorn-jsx-5.3.2.tgz?cache=0&sync_timestamp=1625793240297&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-jsx%2Fdownload%2Facorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha1-ftW7VZCLOy8bxVxq8WU7rafweTc= acorn-node@^1.6.1: version "1.8.2" - resolved "https://registry.npm.taobao.org/acorn-node/download/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" + resolved "https://registry.nlark.com/acorn-node/download/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" integrity sha1-EUyV1kU55T3t4j3oudlt98euKvg= dependencies: acorn "^7.0.0" @@ -2134,12 +2134,12 @@ acorn-node@^1.6.1: acorn-walk@^7.0.0: version "7.2.0" - resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-7.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-7.2.0.tgz?cache=0&sync_timestamp=1630916608758&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha1-DeiJpgEgOQmw++B7iTjcIdLpZ7w= acorn-walk@^8.0.0: version "8.2.0" - resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-8.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-8.2.0.tgz?cache=0&sync_timestamp=1630916608758&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha1-dBIQ8uJCZFRQiFOi9E0KuDt/acE= acorn@^6.1.1: @@ -2172,19 +2172,19 @@ aggregate-error@^3.0.0: ajv-formats@^2.1.1: version "2.1.1" - resolved "https://registry.npmmirror.com/ajv-formats/download/ajv-formats-2.1.1.tgz?cache=0&sync_timestamp=1636312243183&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-formats%2Fdownload%2Fajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + resolved "https://registry.npmmirror.com/ajv-formats/download/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" integrity sha1-bmaUAGWet0lzu/LjMycYCgmWtSA= dependencies: ajv "^8.0.0" ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: version "3.5.2" - resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1637523772179&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1637524478967&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha1-MfKdpatuANHC0yms97WSlhTVAU0= ajv-keywords@^5.0.0: version "5.1.0" - resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-5.1.0.tgz?cache=0&sync_timestamp=1637523772179&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-5.1.0.tgz?cache=0&sync_timestamp=1637524478967&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== dependencies: fast-deep-equal "^3.1.3" @@ -2218,7 +2218,7 @@ algoliasearch-helper@^3.5.5: algoliasearch@^4.0.0, algoliasearch@^4.11.0: version "4.11.0" - resolved "https://registry.npmmirror.com/algoliasearch/download/algoliasearch-4.11.0.tgz?cache=0&sync_timestamp=1634738174058&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Falgoliasearch%2Fdownload%2Falgoliasearch-4.11.0.tgz#234befb3ac355c094077f0edf3777240b1ee013c" + resolved "https://registry.npmmirror.com/algoliasearch/download/algoliasearch-4.11.0.tgz#234befb3ac355c094077f0edf3777240b1ee013c" integrity sha1-I0vvs6w1XAlAd/Dt83dyQLHuATw= dependencies: "@algolia/cache-browser-local-storage" "4.11.0" @@ -2243,7 +2243,7 @@ alphanum-sort@^1.0.2: ansi-align@^3.0.0: version "3.0.1" - resolved "https://registry.npmmirror.com/ansi-align/download/ansi-align-3.0.1.tgz?cache=0&sync_timestamp=1632743673432&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fansi-align%2Fdownload%2Fansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" + resolved "https://registry.npmmirror.com/ansi-align/download/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" integrity sha1-DN8S4RGs53OobpofrRIlxDyxmlk= dependencies: string-width "^4.1.0" @@ -2304,17 +2304,17 @@ argparse@^2.0.1: array-flatten@1.1.1: version "1.1.1" - resolved "https://registry.npm.taobao.org/array-flatten/download/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + resolved "https://registry.nlark.com/array-flatten/download/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= array-flatten@^2.1.0: version "2.1.2" - resolved "https://registry.npm.taobao.org/array-flatten/download/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" + resolved "https://registry.nlark.com/array-flatten/download/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha1-JO+AoowaiTYX4hSbDG0NeIKTsJk= array-union@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/array-union/download/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + resolved "https://registry.nlark.com/array-union/download/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha1-t5hCCtvrHego2ErNii4j0+/oXo0= async@^2.6.2: @@ -2326,7 +2326,7 @@ async@^2.6.2: at-least-node@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/at-least-node/download/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + resolved "https://registry.nlark.com/at-least-node/download/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha1-YCzUtG6EStTv/JKoARo8RuAjjcI= autoprefixer@^10.3.1, autoprefixer@^10.3.5, autoprefixer@^10.3.7: @@ -2350,7 +2350,7 @@ axios@^0.21.1: babel-loader@^8.2.2: version "8.2.3" - resolved "https://registry.npmmirror.com/babel-loader/download/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" + resolved "https://registry.npmmirror.com/babel-loader/download/babel-loader-8.2.3.tgz?cache=0&sync_timestamp=1634769717079&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-loader%2Fdownload%2Fbabel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" integrity sha1-iYa0Dxpkys/LS4QpMgCF72ixNC0= dependencies: find-cache-dir "^3.3.1" @@ -2360,7 +2360,7 @@ babel-loader@^8.2.2: babel-plugin-apply-mdx-type-prop@1.6.22: version "1.6.22" - resolved "https://registry.npm.taobao.org/babel-plugin-apply-mdx-type-prop/download/babel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b" + resolved "https://registry.nlark.com/babel-plugin-apply-mdx-type-prop/download/babel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b" integrity sha1-0hbo/Q3pHePxR47zIx4FRGvIcFs= dependencies: "@babel/helper-plugin-utils" "7.10.4" @@ -2368,14 +2368,14 @@ babel-plugin-apply-mdx-type-prop@1.6.22: babel-plugin-dynamic-import-node@2.3.0: version "2.3.0" - resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.0.tgz?cache=0&sync_timestamp=1618846790496&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" + resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" integrity sha1-8A9Qe9qjw+P/bn5emNkKesq5b38= dependencies: object.assign "^4.1.0" babel-plugin-dynamic-import-node@^2.3.3: version "2.3.3" - resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.3.tgz?cache=0&sync_timestamp=1618846790496&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" + resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" integrity sha1-hP2hnJduxcbe/vV/lCez3vZuF6M= dependencies: object.assign "^4.1.0" @@ -2389,7 +2389,7 @@ babel-plugin-extract-import-names@1.6.22: babel-plugin-polyfill-corejs2@^0.3.0: version "0.3.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/download/babel-plugin-polyfill-corejs2-0.3.0.tgz?cache=0&sync_timestamp=1636799826882&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs2%2Fdownload%2Fbabel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/download/babel-plugin-polyfill-corejs2-0.3.0.tgz?cache=0&sync_timestamp=1636799927981&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs2%2Fdownload%2Fbabel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd" integrity sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA== dependencies: "@babel/compat-data" "^7.13.11" @@ -2398,7 +2398,7 @@ babel-plugin-polyfill-corejs2@^0.3.0: babel-plugin-polyfill-corejs3@^0.4.0: version "0.4.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/download/babel-plugin-polyfill-corejs3-0.4.0.tgz?cache=0&sync_timestamp=1636799935761&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs3%2Fdownload%2Fbabel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/download/babel-plugin-polyfill-corejs3-0.4.0.tgz?cache=0&sync_timestamp=1636799928071&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs3%2Fdownload%2Fbabel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087" integrity sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.0" @@ -2406,19 +2406,19 @@ babel-plugin-polyfill-corejs3@^0.4.0: babel-plugin-polyfill-regenerator@^0.3.0: version "0.3.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/download/babel-plugin-polyfill-regenerator-0.3.0.tgz?cache=0&sync_timestamp=1636799716073&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-regenerator%2Fdownload%2Fbabel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/download/babel-plugin-polyfill-regenerator-0.3.0.tgz?cache=0&sync_timestamp=1636799927789&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-regenerator%2Fdownload%2Fbabel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be" integrity sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.0" bail@^1.0.0: version "1.0.5" - resolved "https://registry.npmmirror.com/bail/download/bail-1.0.5.tgz?cache=0&sync_timestamp=1636274421830&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbail%2Fdownload%2Fbail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" + resolved "https://registry.npmmirror.com/bail/download/bail-1.0.5.tgz?cache=0&sync_timestamp=1636274637966&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbail%2Fdownload%2Fbail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" integrity sha1-tvoTNASjksvB+MS/Y/WVM1Hnp3Y= balanced-match@^1.0.0: version "1.0.2" - resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + resolved "https://registry.nlark.com/balanced-match/download/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4= batch@0.6.1: @@ -2438,7 +2438,7 @@ binary-extensions@^2.0.0: bluebird@^3.7.1: version "3.7.2" - resolved "https://registry.nlark.com/bluebird/download/bluebird-3.7.2.tgz?cache=0&sync_timestamp=1622605302685&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbluebird%2Fdownload%2Fbluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + resolved "https://registry.nlark.com/bluebird/download/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha1-nyKcFb4nJFT/qXOs4NvueaGww28= body-parser@1.19.1: @@ -2476,7 +2476,7 @@ boolbase@^1.0.0, boolbase@~1.0.0: boxen@^5.0.0, boxen@^5.0.1: version "5.1.2" - resolved "https://registry.npmmirror.com/boxen/download/boxen-5.1.2.tgz?cache=0&sync_timestamp=1634028659618&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fboxen%2Fdownload%2Fboxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" + resolved "https://registry.npmmirror.com/boxen/download/boxen-5.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fboxen%2Fdownload%2Fboxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" integrity sha1-eIy2hvyDwfSG36ikDGj8K4MdK1A= dependencies: ansi-align "^3.0.0" @@ -2490,7 +2490,7 @@ boxen@^5.0.0, boxen@^5.0.1: brace-expansion@^1.1.7: version "1.1.11" - resolved "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + resolved "https://registry.nlark.com/brace-expansion/download/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" integrity sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0= dependencies: balanced-match "^1.0.0" @@ -2539,17 +2539,17 @@ buffer-indexof@^1.0.0: bytes@3.0.0: version "3.0.0" - resolved "https://registry.npmmirror.com/bytes/download/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + resolved "https://registry.npmmirror.com/bytes/download/bytes-3.0.0.tgz?cache=0&sync_timestamp=1637015110760&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbytes%2Fdownload%2Fbytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= bytes@3.1.1: version "3.1.1" - resolved "https://registry.npmmirror.com/bytes/download/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a" + resolved "https://registry.npmmirror.com/bytes/download/bytes-3.1.1.tgz?cache=0&sync_timestamp=1637015110760&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbytes%2Fdownload%2Fbytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a" integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg== cacheable-request@^6.0.0: version "6.1.0" - resolved "https://registry.nlark.com/cacheable-request/download/cacheable-request-6.1.0.tgz?cache=0&sync_timestamp=1623237504263&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcacheable-request%2Fdownload%2Fcacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" + resolved "https://registry.nlark.com/cacheable-request/download/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" integrity sha1-IP+4vRYrpL4R6VZ9gj22UQUsqRI= dependencies: clone-response "^1.0.2" @@ -2570,7 +2570,7 @@ call-bind@^1.0.0, call-bind@^1.0.2: callsites@^3.0.0: version "3.1.0" - resolved "https://registry.nlark.com/callsites/download/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + resolved "https://registry.npmmirror.com/callsites/download/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha1-s2MKvYlDQy9Us/BRkjjjPNffL3M= camel-case@^4.1.2: @@ -2583,12 +2583,12 @@ camel-case@^4.1.2: camelcase-css@2.0.1, camelcase-css@^2.0.1: version "2.0.1" - resolved "https://registry.npm.taobao.org/camelcase-css/download/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" + resolved "https://registry.nlark.com/camelcase-css/download/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" integrity sha1-7pePaUeRTMMMa0R0G27R338EP9U= camelcase@^6.2.0: version "6.2.1" - resolved "https://registry.npmmirror.com/camelcase/download/camelcase-6.2.1.tgz?cache=0&sync_timestamp=1636945151239&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" + resolved "https://registry.npmmirror.com/camelcase/download/camelcase-6.2.1.tgz?cache=0&sync_timestamp=1636945205805&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== caniuse-api@^3.0.0: @@ -2630,22 +2630,22 @@ chalk@^4.1.0, chalk@^4.1.2: character-entities-legacy@^1.0.0: version "1.1.4" - resolved "https://registry.npmmirror.com/character-entities-legacy/download/character-entities-legacy-1.1.4.tgz?cache=0&sync_timestamp=1635911795757&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities-legacy%2Fdownload%2Fcharacter-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" + resolved "https://registry.npmmirror.com/character-entities-legacy/download/character-entities-legacy-1.1.4.tgz?cache=0&sync_timestamp=1635911762988&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities-legacy%2Fdownload%2Fcharacter-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" integrity sha1-lLwYRdznClu50uzHSHJWYSk9j8E= character-entities@^1.0.0: version "1.2.4" - resolved "https://registry.npmmirror.com/character-entities/download/character-entities-1.2.4.tgz?cache=0&sync_timestamp=1635869130345&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities%2Fdownload%2Fcharacter-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" + resolved "https://registry.npmmirror.com/character-entities/download/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" integrity sha1-4Sw5Obfq9OWxXnrUxeKOHUjFsWs= character-reference-invalid@^1.0.0: version "1.1.4" - resolved "https://registry.npmmirror.com/character-reference-invalid/download/character-reference-invalid-1.1.4.tgz?cache=0&sync_timestamp=1636446288388&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-reference-invalid%2Fdownload%2Fcharacter-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" + resolved "https://registry.npmmirror.com/character-reference-invalid/download/character-reference-invalid-1.1.4.tgz?cache=0&sync_timestamp=1636446344223&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-reference-invalid%2Fdownload%2Fcharacter-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" integrity sha1-CDMpzaDq4nKrPbvzfpo4LBOvFWA= cheerio@^0.22.0: version "0.22.0" - resolved "https://registry.nlark.com/cheerio/download/cheerio-0.22.0.tgz?cache=0&sync_timestamp=1623167701954&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcheerio%2Fdownload%2Fcheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" + resolved "https://registry.nlark.com/cheerio/download/cheerio-0.22.0.tgz?cache=0&sync_timestamp=1623167586610&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcheerio%2Fdownload%2Fcheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4= dependencies: css-select "~1.2.0" @@ -2704,7 +2704,7 @@ clean-css@^5.1.5, clean-css@^5.2.2: clean-stack@^2.0.0: version "2.2.0" - resolved "https://registry.nlark.com/clean-stack/download/clean-stack-2.2.0.tgz?cache=0&sync_timestamp=1621915044030&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fclean-stack%2Fdownload%2Fclean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + resolved "https://registry.nlark.com/clean-stack/download/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha1-7oRy27Ep5yezHooQpCfe6d/kAIs= cli-boxes@^2.2.1: @@ -2735,7 +2735,7 @@ clsx@^1.1.1: coa@^2.0.2: version "2.0.2" - resolved "https://registry.npmmirror.com/coa/download/coa-2.0.2.tgz?cache=0&sync_timestamp=1636035838814&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcoa%2Fdownload%2Fcoa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" + resolved "https://registry.npmmirror.com/coa/download/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" integrity sha1-Q/bCEVG07yv1cYfbDXPeIp4+fsM= dependencies: "@types/q" "^1.5.1" @@ -2778,7 +2778,7 @@ colord@^2.9.1: colorette@^2.0.10: version "2.0.16" - resolved "https://registry.npmmirror.com/colorette/download/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" + resolved "https://registry.npmmirror.com/colorette/download/colorette-2.0.16.tgz?cache=0&sync_timestamp=1633673060735&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcolorette%2Fdownload%2Fcolorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" integrity sha1-cTua+E/bAAE58EVGvUqT9ipQhdo= combine-promises@^1.1.0: @@ -2788,7 +2788,7 @@ combine-promises@^1.1.0: comma-separated-tokens@^1.0.0: version "1.0.8" - resolved "https://registry.npmmirror.com/comma-separated-tokens/download/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" + resolved "https://registry.nlark.com/comma-separated-tokens/download/comma-separated-tokens-1.0.8.tgz?cache=0&sync_timestamp=1619456046501&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcomma-separated-tokens%2Fdownload%2Fcomma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" integrity sha1-YyuAthF4Z6FY8QgK1Jiy++fj9eo= commander@^2.20.0: @@ -2813,7 +2813,7 @@ commander@^8.3.0: commondir@^1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/commondir/download/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + resolved "https://registry.nlark.com/commondir/download/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= compressible@~2.0.16: @@ -2825,7 +2825,7 @@ compressible@~2.0.16: compression@^1.7.4: version "1.7.4" - resolved "https://registry.npm.taobao.org/compression/download/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" + resolved "https://registry.nlark.com/compression/download/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" integrity sha1-lVI+/xcMpXwpoMpB5v4TH0Hlu48= dependencies: accepts "~1.3.5" @@ -2843,7 +2843,7 @@ concat-map@0.0.1: configstore@^5.0.1: version "5.0.1" - resolved "https://registry.npm.taobao.org/configstore/download/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" + resolved "https://registry.nlark.com/configstore/download/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" integrity sha1-02UCG130uYzdGH1qOw4/anzF7ZY= dependencies: dot-prop "^5.2.0" @@ -2855,7 +2855,7 @@ configstore@^5.0.1: connect-history-api-fallback@^1.6.0: version "1.6.0" - resolved "https://registry.nlark.com/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz?cache=0&sync_timestamp=1618847040596&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fconnect-history-api-fallback%2Fdownload%2Fconnect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" + resolved "https://registry.nlark.com/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha1-izIIk1kwjRERFdgcrT/Oq4iPl7w= consola@^2.15.3: @@ -2882,24 +2882,24 @@ content-type@~1.0.4: convert-source-map@^1.7.0: version "1.8.0" - resolved "https://registry.nlark.com/convert-source-map/download/convert-source-map-1.8.0.tgz?cache=0&sync_timestamp=1624045420970&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fconvert-source-map%2Fdownload%2Fconvert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + resolved "https://registry.nlark.com/convert-source-map/download/convert-source-map-1.8.0.tgz?cache=0&sync_timestamp=1624045508580&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fconvert-source-map%2Fdownload%2Fconvert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" integrity sha1-8zc8MtIbTXgN2ABFFGhPt5HKQ2k= dependencies: safe-buffer "~5.1.1" cookie-signature@1.0.6: version "1.0.6" - resolved "https://registry.npm.taobao.org/cookie-signature/download/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + resolved "https://registry.nlark.com/cookie-signature/download/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= cookie@0.4.1: version "0.4.1" - resolved "https://registry.npm.taobao.org/cookie/download/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" + resolved "https://registry.nlark.com/cookie/download/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha1-r9cT/ibr0hupXOth+agRblClN9E= copy-text-to-clipboard@^3.0.1: version "3.0.1" - resolved "https://registry.npm.taobao.org/copy-text-to-clipboard/download/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c" + resolved "https://registry.nlark.com/copy-text-to-clipboard/download/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c" integrity sha1-jL+PkOCkfxLkokdDc2Jl0Ve85pw= copy-webpack-plugin@^9.0.1: @@ -2934,12 +2934,12 @@ core-js@^3.18.0: core-util-is@~1.0.0: version "1.0.3" - resolved "https://registry.nlark.com/core-util-is/download/core-util-is-1.0.3.tgz?cache=0&sync_timestamp=1630420570787&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-util-is%2Fdownload%2Fcore-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + resolved "https://registry.nlark.com/core-util-is/download/core-util-is-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-util-is%2Fdownload%2Fcore-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha1-pgQtNjTCsn6TKPg3uWX6yDgI24U= cosmiconfig@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-6.0.0.tgz?cache=0&sync_timestamp=1629585969900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" + resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" integrity sha1-2k/uhTxS9rHmk19BwaL8UL1KmYI= dependencies: "@types/parse-json" "^4.0.0" @@ -2950,7 +2950,7 @@ cosmiconfig@^6.0.0: cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: version "7.0.1" - resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz?cache=0&sync_timestamp=1629585969900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" integrity sha1-cU11ZSLKzoZ4Z8y0R0xdAbuuXW0= dependencies: "@types/parse-json" "^4.0.0" @@ -3017,7 +3017,7 @@ css-minimizer-webpack-plugin@^3.0.2: css-select-base-adapter@^0.1.1: version "0.1.1" - resolved "https://registry.npm.taobao.org/css-select-base-adapter/download/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" + resolved "https://registry.nlark.com/css-select-base-adapter/download/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" integrity sha1-Oy/0lyzDYquIVhUHqVQIoUMhNdc= css-select@^2.0.0: @@ -3084,7 +3084,7 @@ css-what@^5.1.0: cssesc@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/cssesc/download/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + resolved "https://registry.nlark.com/cssesc/download/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4= cssnano-preset-advanced@^5.1.4: @@ -3157,7 +3157,7 @@ csso@^4.0.2, csso@^4.2.0: csstype@^3.0.2: version "3.0.10" - resolved "https://registry.npmmirror.com/csstype/download/csstype-3.0.10.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcsstype%2Fdownload%2Fcsstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" + resolved "https://registry.npmmirror.com/csstype/download/csstype-3.0.10.tgz?cache=0&sync_timestamp=1637224507298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcsstype%2Fdownload%2Fcsstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA== debug@2.6.9, debug@^2.6.0: @@ -3202,12 +3202,12 @@ deep-equal@^1.0.1: deep-extend@^0.6.0: version "0.6.0" - resolved "https://registry.npm.taobao.org/deep-extend/download/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + resolved "https://registry.nlark.com/deep-extend/download/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha1-xPp8lUBKF6nD6Mp+FTcxK3NjMKw= deepmerge@^4.2.2: version "4.2.2" - resolved "https://registry.npm.taobao.org/deepmerge/download/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + resolved "https://registry.nlark.com/deepmerge/download/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha1-RNLqNnm49NT/ujPwPYZfwee/SVU= default-gateway@^6.0.3: @@ -3224,24 +3224,24 @@ defer-to-connect@^1.0.1: define-lazy-prop@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/define-lazy-prop/download/define-lazy-prop-2.0.0.tgz?cache=0&sync_timestamp=1618387627365&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdefine-lazy-prop%2Fdownload%2Fdefine-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + resolved "https://registry.nlark.com/define-lazy-prop/download/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha1-P3rkIRKbyqrJvHSQXJigAJ7J7n8= define-properties@^1.1.3: version "1.1.3" - resolved "https://registry.nlark.com/define-properties/download/define-properties-1.1.3.tgz?cache=0&sync_timestamp=1618847174317&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdefine-properties%2Fdownload%2Fdefine-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + resolved "https://registry.nlark.com/define-properties/download/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" integrity sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE= dependencies: object-keys "^1.0.12" defined@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/defined/download/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" + resolved "https://registry.nlark.com/defined/download/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= del@^6.0.0: version "6.0.0" - resolved "https://registry.npm.taobao.org/del/download/del-6.0.0.tgz?cache=0&sync_timestamp=1615984345486&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdel%2Fdownload%2Fdel-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" + resolved "https://registry.nlark.com/del/download/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" integrity sha1-C0DQMyzqdD8WFPgYvk/rcXcUyVI= dependencies: globby "^11.0.1" @@ -3265,19 +3265,19 @@ destroy@~1.0.4: detab@2.0.4: version "2.0.4" - resolved "https://registry.nlark.com/detab/download/detab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43" + resolved "https://registry.nlark.com/detab/download/detab-2.0.4.tgz?cache=0&sync_timestamp=1629724198325&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdetab%2Fdownload%2Fdetab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43" integrity sha1-uSeJIGmv9AX7uaGG/pekSpKpS0M= dependencies: repeat-string "^1.5.4" detect-node@^2.0.4: version "2.1.0" - resolved "https://registry.nlark.com/detect-node/download/detect-node-2.1.0.tgz?cache=0&sync_timestamp=1621146902208&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdetect-node%2Fdownload%2Fdetect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + resolved "https://registry.nlark.com/detect-node/download/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha1-yccHdaScPQO8LAbZpzvlUPl4+LE= detect-port-alt@^1.1.6: version "1.1.6" - resolved "https://registry.npm.taobao.org/detect-port-alt/download/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275" + resolved "https://registry.nlark.com/detect-port-alt/download/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275" integrity sha1-JHB96r6TLUo89iEwICfCsmZWgnU= dependencies: address "^1.0.1" @@ -3293,7 +3293,7 @@ detect-port@^1.3.0: detective@^5.2.0: version "5.2.0" - resolved "https://registry.npm.taobao.org/detective/download/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b" + resolved "https://registry.nlark.com/detective/download/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b" integrity sha1-/rKnfoW5BOzepFmtiXzJCpm9Kns= dependencies: acorn-node "^1.6.1" @@ -3314,7 +3314,7 @@ dir-glob@^3.0.1: dlv@^1.1.3: version "1.1.3" - resolved "https://registry.npm.taobao.org/dlv/download/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" + resolved "https://registry.nlark.com/dlv/download/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" integrity sha1-XBmKihFFNZbnUUlNSYdLx3MvLnk= dns-equal@^1.0.0: @@ -3389,14 +3389,14 @@ docusaurus-theme-nonepress@0.0.0-124: dom-converter@^0.2.0: version "0.2.0" - resolved "https://registry.npm.taobao.org/dom-converter/download/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" + resolved "https://registry.nlark.com/dom-converter/download/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" integrity sha1-ZyGp2u4uKTaClVtq/kFncWJ7t2g= dependencies: utila "~0.4" dom-serializer@0: version "0.2.2" - resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.2.2.tgz?cache=0&sync_timestamp=1621256830355&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" + resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" integrity sha1-GvuB9TNxcXXUeGVd68XjMtn5u1E= dependencies: domelementtype "^2.0.1" @@ -3404,7 +3404,7 @@ dom-serializer@0: dom-serializer@^1.0.1: version "1.3.2" - resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-1.3.2.tgz?cache=0&sync_timestamp=1621256830355&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" + resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" integrity sha1-YgZDfTLO767HFhgDIwx6ILwbTZE= dependencies: domelementtype "^2.0.1" @@ -3413,7 +3413,7 @@ dom-serializer@^1.0.1: dom-serializer@~0.1.0: version "0.1.1" - resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.1.1.tgz?cache=0&sync_timestamp=1621256830355&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" + resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" integrity sha1-HsQFnihLq+027sKUHUqXChic58A= dependencies: domelementtype "^1.3.0" @@ -3421,12 +3421,12 @@ dom-serializer@~0.1.0: domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: version "1.3.1" - resolved "https://registry.npm.taobao.org/domelementtype/download/domelementtype-1.3.1.tgz?cache=0&sync_timestamp=1617298545989&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomelementtype%2Fdownload%2Fdomelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" + resolved "https://registry.nlark.com/domelementtype/download/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha1-0EjESzew0Qp/Kj1f7j9DM9eQSB8= domelementtype@^2.0.1, domelementtype@^2.2.0: version "2.2.0" - resolved "https://registry.npm.taobao.org/domelementtype/download/domelementtype-2.2.0.tgz?cache=0&sync_timestamp=1617298545989&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomelementtype%2Fdownload%2Fdomelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + resolved "https://registry.nlark.com/domelementtype/download/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" integrity sha1-mgtsJ4LtahxzI9QiZxg9+b2LHVc= domhandler@^2.3.0: @@ -3495,7 +3495,7 @@ duplexer@^0.1.1, duplexer@^0.1.2: ee-first@1.1.1: version "1.1.1" - resolved "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + resolved "https://registry.nlark.com/ee-first/download/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.4.17: @@ -3505,7 +3505,7 @@ electron-to-chromium@^1.4.17: emoji-regex@^8.0.0: version "8.0.0" - resolved "https://registry.npmmirror.com/emoji-regex/download/emoji-regex-8.0.0.tgz?cache=0&sync_timestamp=1632811716250&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Femoji-regex%2Fdownload%2Femoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + resolved "https://registry.npmmirror.com/emoji-regex/download/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha1-6Bj9ac5cz8tARZT4QpY79TFkzDc= emojis-list@^3.0.0: @@ -3532,7 +3532,7 @@ end-of-stream@^1.1.0: enhanced-resolve@^5.8.3: version "5.8.3" - resolved "https://registry.nlark.com/enhanced-resolve/download/enhanced-resolve-5.8.3.tgz?cache=0&sync_timestamp=1632130808043&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" + resolved "https://registry.nlark.com/enhanced-resolve/download/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" integrity sha1-bVUtRlzOBCP1s9cYUR6lOCansvA= dependencies: graceful-fs "^4.2.4" @@ -3557,7 +3557,7 @@ error-ex@^1.3.1: es-abstract@^1.17.2, es-abstract@^1.19.1: version "1.19.1" - resolved "https://registry.npmmirror.com/es-abstract/download/es-abstract-1.19.1.tgz?cache=0&sync_timestamp=1633234258828&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-abstract%2Fdownload%2Fes-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" + resolved "https://registry.npmmirror.com/es-abstract/download/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" integrity sha1-1IhXlodpFpWd547aoN9FZicRXsM= dependencies: call-bind "^1.0.2" @@ -3583,12 +3583,12 @@ es-abstract@^1.17.2, es-abstract@^1.19.1: es-module-lexer@^0.9.0: version "0.9.3" - resolved "https://registry.npmmirror.com/es-module-lexer/download/es-module-lexer-0.9.3.tgz?cache=0&sync_timestamp=1633649003753&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-module-lexer%2Fdownload%2Fes-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" + resolved "https://registry.npmmirror.com/es-module-lexer/download/es-module-lexer-0.9.3.tgz?cache=0&sync_timestamp=1633645560577&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-module-lexer%2Fdownload%2Fes-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" integrity sha1-bxPbAMw4QXE32vdDZvU1yOtDjxk= es-to-primitive@^1.2.1: version "1.2.1" - resolved "https://registry.npm.taobao.org/es-to-primitive/download/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + resolved "https://registry.npmmirror.com/es-to-primitive/download/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" integrity sha1-5VzUyc3BiLzvsDs2bHNjI/xciYo= dependencies: is-callable "^1.1.4" @@ -3597,12 +3597,12 @@ es-to-primitive@^1.2.1: escalade@^3.1.1: version "3.1.1" - resolved "https://registry.nlark.com/escalade/download/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + resolved "https://registry.npmmirror.com/escalade/download/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha1-2M/ccACWXFoBdLSoLqpcBVJ0LkA= escape-goat@^2.0.0: version "2.1.1" - resolved "https://registry.npm.taobao.org/escape-goat/download/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" + resolved "https://registry.nlark.com/escape-goat/download/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" integrity sha1-Gy3HcANnbEV+x2Cy3GjttkgYhnU= escape-html@^1.0.3, escape-html@~1.0.3: @@ -3627,7 +3627,7 @@ escape-string-regexp@^4.0.0: eslint-scope@5.1.1: version "5.1.1" - resolved "https://registry.npmmirror.com/eslint-scope/download/eslint-scope-5.1.1.tgz?cache=0&sync_timestamp=1637466831846&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Feslint-scope%2Fdownload%2Feslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + resolved "https://registry.npmmirror.com/eslint-scope/download/eslint-scope-5.1.1.tgz?cache=0&sync_timestamp=1637466929956&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Feslint-scope%2Fdownload%2Feslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha1-54blmmbLkrP2wfsNUIqrF0hI9Iw= dependencies: esrecurse "^4.3.0" @@ -3635,7 +3635,7 @@ eslint-scope@5.1.1: esprima@^4.0.0: version "4.0.1" - resolved "https://registry.npm.taobao.org/esprima/download/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + resolved "https://registry.nlark.com/esprima/download/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha1-E7BM2z5sXRnfkatph6hpVhmwqnE= esrecurse@^4.3.0: @@ -3647,17 +3647,17 @@ esrecurse@^4.3.0: estraverse@^4.1.1: version "4.3.0" - resolved "https://registry.npmmirror.com/estraverse/download/estraverse-4.3.0.tgz?cache=0&sync_timestamp=1635237706876&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + resolved "https://registry.npmmirror.com/estraverse/download/estraverse-4.3.0.tgz?cache=0&sync_timestamp=1635237716974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha1-OYrT88WiSUi+dyXoPRGn3ijNvR0= estraverse@^5.2.0: version "5.3.0" - resolved "https://registry.npmmirror.com/estraverse/download/estraverse-5.3.0.tgz?cache=0&sync_timestamp=1635237706876&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + resolved "https://registry.npmmirror.com/estraverse/download/estraverse-5.3.0.tgz?cache=0&sync_timestamp=1635237716974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" integrity sha1-LupSkHAvJquP5TcDcP+GyWXSESM= esutils@^2.0.2: version "2.0.3" - resolved "https://registry.npm.taobao.org/esutils/download/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + resolved "https://registry.nlark.com/esutils/download/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q= eta@^1.12.3: @@ -3667,19 +3667,19 @@ eta@^1.12.3: etag@~1.8.1: version "1.8.1" - resolved "https://registry.npm.taobao.org/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + resolved "https://registry.nlark.com/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= eval@^0.1.4: version "0.1.6" - resolved "https://registry.npm.taobao.org/eval/download/eval-0.1.6.tgz#9620d7d8c85515e97e6b47c5814f46ae381cb3cc" + resolved "https://registry.nlark.com/eval/download/eval-0.1.6.tgz#9620d7d8c85515e97e6b47c5814f46ae381cb3cc" integrity sha1-liDX2MhVFel+a0fFgU9Grjgcs8w= dependencies: require-like ">= 0.1.1" eventemitter3@^4.0.0: version "4.0.7" - resolved "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + resolved "https://registry.nlark.com/eventemitter3/download/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha1-Lem2j2Uo1WRO9cWVJqG0oHMGFp8= events@^3.2.0: @@ -3689,7 +3689,7 @@ events@^3.2.0: execa@^5.0.0: version "5.1.1" - resolved "https://registry.npmmirror.com/execa/download/execa-5.1.1.tgz?cache=0&sync_timestamp=1637147207309&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fexeca%2Fdownload%2Fexeca-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + resolved "https://registry.npmmirror.com/execa/download/execa-5.1.1.tgz?cache=0&sync_timestamp=1637147245057&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fexeca%2Fdownload%2Fexeca-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" integrity sha1-+ArZy/Qpj3vR1MlVXCHpN0HEEd0= dependencies: cross-spawn "^7.0.3" @@ -3757,7 +3757,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: fast-glob@^3.1.1, fast-glob@^3.2.7: version "3.2.7" - resolved "https://registry.nlark.com/fast-glob/download/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + resolved "https://registry.nlark.com/fast-glob/download/fast-glob-3.2.7.tgz?cache=0&sync_timestamp=1625773305786&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffast-glob%2Fdownload%2Ffast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" integrity sha1-/Wy3otfpqnp4RhEehaGW1rL3ZqE= dependencies: "@nodelib/fs.stat" "^2.0.2" @@ -3768,12 +3768,12 @@ fast-glob@^3.1.1, fast-glob@^3.2.7: fast-json-stable-stringify@^2.0.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + resolved "https://registry.nlark.com/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha1-h0v2nG9ATCtdmcSBNBOZ/VWJJjM= fast-url-parser@1.1.3: version "1.1.3" - resolved "https://registry.nlark.com/fast-url-parser/download/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" + resolved "https://registry.npm.taobao.org/fast-url-parser/download/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" integrity sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0= dependencies: punycode "^1.3.2" @@ -3801,7 +3801,7 @@ feed@^4.2.2: file-loader@^6.2.0: version "6.2.0" - resolved "https://registry.npm.taobao.org/file-loader/download/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" + resolved "https://registry.nlark.com/file-loader/download/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" integrity sha1-uu98+OGEDfMl5DkLRISHlIDuvk0= dependencies: loader-utils "^2.0.0" @@ -3821,7 +3821,7 @@ fill-range@^7.0.1: finalhandler@~1.1.2: version "1.1.2" - resolved "https://registry.npm.taobao.org/finalhandler/download/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + resolved "https://registry.nlark.com/finalhandler/download/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" integrity sha1-t+fQAP/RGTjQ/bBTUG9uur6fWH0= dependencies: debug "2.6.9" @@ -3834,7 +3834,7 @@ finalhandler@~1.1.2: find-cache-dir@^3.3.1: version "3.3.2" - resolved "https://registry.nlark.com/find-cache-dir/download/find-cache-dir-3.3.2.tgz?cache=0&sync_timestamp=1630260035189&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffind-cache-dir%2Fdownload%2Ffind-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + resolved "https://registry.nlark.com/find-cache-dir/download/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" integrity sha1-swxbbv8HMHMa6pu9nb7L2AJW1ks= dependencies: commondir "^1.0.1" @@ -3892,7 +3892,7 @@ fraction.js@^4.1.1: fresh@0.5.2: version "0.5.2" - resolved "https://registry.npm.taobao.org/fresh/download/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + resolved "https://registry.nlark.com/fresh/download/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= fs-extra@^10.0.0: @@ -3916,7 +3916,7 @@ fs-extra@^9.0.0: fs-monkey@1.0.3: version "1.0.3" - resolved "https://registry.npm.taobao.org/fs-monkey/download/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" + resolved "https://registry.nlark.com/fs-monkey/download/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" integrity sha1-rjrJLVO7Mo7+DpodlUH2rY1I4tM= fs.realpath@^1.0.0: @@ -3941,7 +3941,7 @@ gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2: get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: version "1.1.1" - resolved "https://registry.nlark.com/get-intrinsic/download/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + resolved "https://registry.npmmirror.com/get-intrinsic/download/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" integrity sha1-FfWfN2+FXERpY5SPDSTNNje0q8Y= dependencies: function-bind "^1.1.1" @@ -3982,19 +3982,19 @@ get-symbol-description@^1.0.0: github-slugger@^1.4.0: version "1.4.0" - resolved "https://registry.nlark.com/github-slugger/download/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" + resolved "https://registry.nlark.com/github-slugger/download/github-slugger-1.4.0.tgz?cache=0&sync_timestamp=1629817305312&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fgithub-slugger%2Fdownload%2Fgithub-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" integrity sha1-IG65bNsi7lb9xToo1aMCM4RjRE4= glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" - resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-5.1.2.tgz?cache=0&sync_timestamp=1632954501757&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-5.1.2.tgz?cache=0&sync_timestamp=1632953810778&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha1-hpgyxYA0/mikCTwX3BXoNA2EAcQ= dependencies: is-glob "^4.0.1" glob-parent@^6.0.1, glob-parent@^6.0.2: version "6.0.2" - resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-6.0.2.tgz?cache=0&sync_timestamp=1632954501757&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-6.0.2.tgz?cache=0&sync_timestamp=1632953810778&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" integrity sha1-bSN9mQg5UMeSkPJMdkKj3poo+eM= dependencies: is-glob "^4.0.3" @@ -4018,7 +4018,7 @@ glob@^7.0.0, glob@^7.1.3, glob@^7.1.6: global-dirs@^3.0.0: version "3.0.0" - resolved "https://registry.npmmirror.com/global-dirs/download/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" + resolved "https://registry.nlark.com/global-dirs/download/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" integrity sha1-cKdv6E6jFas3sfVXbL3n1I73JoY= dependencies: ini "2.0.0" @@ -4032,7 +4032,7 @@ global-modules@^2.0.0: global-prefix@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/global-prefix/download/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" + resolved "https://registry.nlark.com/global-prefix/download/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" integrity sha1-/IX3MGTfafUEIfR/iD/luRO6m5c= dependencies: ini "^1.3.5" @@ -4046,7 +4046,7 @@ globals@^11.1.0: globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.0.4: version "11.0.4" - resolved "https://registry.nlark.com/globby/download/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" + resolved "https://registry.nlark.com/globby/download/globby-11.0.4.tgz?cache=0&sync_timestamp=1629801109090&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglobby%2Fdownload%2Fglobby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" integrity sha1-LLr/d8Lypi5x6bKBOme5ejowAaU= dependencies: array-union "^2.1.0" @@ -4105,7 +4105,7 @@ gzip-size@^6.0.0: handle-thing@^2.0.0: version "2.0.1" - resolved "https://registry.npm.taobao.org/handle-thing/download/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" + resolved "https://registry.nlark.com/handle-thing/download/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" integrity sha1-hX95zjWVgMNA1DCBzGSJcNC7I04= has-bigints@^1.0.1: @@ -4115,12 +4115,12 @@ has-bigints@^1.0.1: has-flag@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/has-flag/download/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + resolved "https://registry.nlark.com/has-flag/download/has-flag-3.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= has-flag@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + resolved "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s= has-symbols@^1.0.1, has-symbols@^1.0.2: @@ -4130,26 +4130,26 @@ has-symbols@^1.0.1, has-symbols@^1.0.2: has-tostringtag@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/has-tostringtag/download/has-tostringtag-1.0.0.tgz?cache=0&sync_timestamp=1628198671004&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-tostringtag%2Fdownload%2Fhas-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + resolved "https://registry.nlark.com/has-tostringtag/download/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" integrity sha1-fhM4GKfTlHNPlB5zw9P5KR5liyU= dependencies: has-symbols "^1.0.2" has-yarn@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/has-yarn/download/has-yarn-2.1.0.tgz?cache=0&sync_timestamp=1631298711761&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-yarn%2Fdownload%2Fhas-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" + resolved "https://registry.nlark.com/has-yarn/download/has-yarn-2.1.0.tgz?cache=0&sync_timestamp=1631298792738&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-yarn%2Fdownload%2Fhas-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" integrity sha1-E34RNUp7W/EapctknPDG8/8rLnc= has@^1.0.3: version "1.0.3" - resolved "https://registry.nlark.com/has/download/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + resolved "https://registry.nlark.com/has/download/has-1.0.3.tgz?cache=0&sync_timestamp=1618847173393&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas%2Fdownload%2Fhas-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" integrity sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y= dependencies: function-bind "^1.1.1" hast-to-hyperscript@^9.0.0: version "9.0.1" - resolved "https://registry.nlark.com/hast-to-hyperscript/download/hast-to-hyperscript-9.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-to-hyperscript%2Fdownload%2Fhast-to-hyperscript-9.0.1.tgz#9b67fd188e4c81e8ad66f803855334173920218d" + resolved "https://registry.nlark.com/hast-to-hyperscript/download/hast-to-hyperscript-9.0.1.tgz?cache=0&sync_timestamp=1627031086157&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-to-hyperscript%2Fdownload%2Fhast-to-hyperscript-9.0.1.tgz#9b67fd188e4c81e8ad66f803855334173920218d" integrity sha1-m2f9GI5MgeitZvgDhVM0FzkgIY0= dependencies: "@types/unist" "^2.0.3" @@ -4162,7 +4162,7 @@ hast-to-hyperscript@^9.0.0: hast-util-from-parse5@^5.0.0: version "5.0.3" - resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-5.0.3.tgz?cache=0&sync_timestamp=1627032098094&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-util-from-parse5%2Fdownload%2Fhast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" + resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-5.0.3.tgz?cache=0&sync_timestamp=1627032254562&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-util-from-parse5%2Fdownload%2Fhast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" integrity sha1-MIncDuLM9uyLxBaRm1GlSlieCXw= dependencies: ccount "^1.0.3" @@ -4173,7 +4173,7 @@ hast-util-from-parse5@^5.0.0: hast-util-from-parse5@^6.0.0: version "6.0.1" - resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-6.0.1.tgz?cache=0&sync_timestamp=1627032098094&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-util-from-parse5%2Fdownload%2Fhast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" + resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-6.0.1.tgz?cache=0&sync_timestamp=1627032254562&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-util-from-parse5%2Fdownload%2Fhast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" integrity sha1-VU40q97qJax29b2VCh8BgOCzvCo= dependencies: "@types/parse5" "^5.0.0" @@ -4190,7 +4190,7 @@ hast-util-parse-selector@^2.0.0: hast-util-raw@6.0.1: version "6.0.1" - resolved "https://registry.npmmirror.com/hast-util-raw/download/hast-util-raw-6.0.1.tgz?cache=0&sync_timestamp=1636449577205&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhast-util-raw%2Fdownload%2Fhast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977" + resolved "https://registry.npmmirror.com/hast-util-raw/download/hast-util-raw-6.0.1.tgz?cache=0&sync_timestamp=1636449731286&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhast-util-raw%2Fdownload%2Fhast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977" integrity sha1-lzsVkwt1Kae2aYTJgUi0ZSaIWXc= dependencies: "@types/hast" "^2.0.0" @@ -4217,7 +4217,7 @@ hast-util-to-parse5@^6.0.0: hastscript@^5.0.0: version "5.1.2" - resolved "https://registry.nlark.com/hastscript/download/hastscript-5.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhastscript%2Fdownload%2Fhastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a" + resolved "https://registry.nlark.com/hastscript/download/hastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a" integrity sha1-veLC5W0Exi3SToxd8ojQUKNV+4o= dependencies: comma-separated-tokens "^1.0.0" @@ -4227,7 +4227,7 @@ hastscript@^5.0.0: hastscript@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/hastscript/download/hastscript-6.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhastscript%2Fdownload%2Fhastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" + resolved "https://registry.nlark.com/hastscript/download/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" integrity sha1-6HaNfqxWw/3qyKkoMNWOgR5b9kA= dependencies: "@types/hast" "^2.0.0" @@ -4238,7 +4238,7 @@ hastscript@^6.0.0: he@^1.2.0: version "1.2.0" - resolved "https://registry.npm.taobao.org/he/download/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" + resolved "https://registry.nlark.com/he/download/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha1-hK5l+n6vsWX922FWauFLrwVmTw8= history@^4.9.0: @@ -4262,7 +4262,7 @@ hoist-non-react-statics@^3.1.0: hpack.js@^2.1.6: version "2.1.6" - resolved "https://registry.npm.taobao.org/hpack.js/download/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" + resolved "https://registry.nlark.com/hpack.js/download/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI= dependencies: inherits "^2.0.1" @@ -4290,7 +4290,7 @@ html-minifier-terser@^6.0.2: html-tags@^3.1.0: version "3.1.0" - resolved "https://registry.npm.taobao.org/html-tags/download/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" + resolved "https://registry.nlark.com/html-tags/download/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" integrity sha1-e15vfmZen7QfMAB+2eDUHpf7IUA= html-void-elements@^1.0.0: @@ -4311,7 +4311,7 @@ html-webpack-plugin@^5.4.0: htmlparser2@^3.9.1: version "3.10.1" - resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-3.10.1.tgz?cache=0&sync_timestamp=1636641539121&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" + resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-3.10.1.tgz?cache=0&sync_timestamp=1636640853072&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" integrity sha1-vWedw/WYl7ajS7EHSchVu1OpOS8= dependencies: domelementtype "^1.3.1" @@ -4323,7 +4323,7 @@ htmlparser2@^3.9.1: htmlparser2@^6.1.0: version "6.1.0" - resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-6.1.0.tgz?cache=0&sync_timestamp=1636641539121&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" + resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-6.1.0.tgz?cache=0&sync_timestamp=1636640853072&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" integrity sha1-xNditsM3GgXb5l6UrkOp+EX7j7c= dependencies: domelementtype "^2.0.1" @@ -4380,7 +4380,7 @@ http-proxy-middleware@^2.0.0: http-proxy@^1.18.1: version "1.18.1" - resolved "https://registry.nlark.com/http-proxy/download/http-proxy-1.18.1.tgz?cache=0&sync_timestamp=1618847045732&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhttp-proxy%2Fdownload%2Fhttp-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + resolved "https://registry.nlark.com/http-proxy/download/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" integrity sha1-QBVB8FNIhLv5UmAzTnL4juOXZUk= dependencies: eventemitter3 "^4.0.0" @@ -4389,19 +4389,19 @@ http-proxy@^1.18.1: human-signals@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/human-signals/download/human-signals-2.1.0.tgz?cache=0&sync_timestamp=1624364695595&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhuman-signals%2Fdownload%2Fhuman-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + resolved "https://registry.nlark.com/human-signals/download/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha1-3JH8ukLk0G5Kuu0zs+ejwC9RTqA= iconv-lite@0.4.24: version "0.4.24" - resolved "https://registry.nlark.com/iconv-lite/download/iconv-lite-0.4.24.tgz?cache=0&sync_timestamp=1621826342262&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ficonv-lite%2Fdownload%2Ficonv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + resolved "https://registry.nlark.com/iconv-lite/download/iconv-lite-0.4.24.tgz?cache=0&sync_timestamp=1622686400731&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ficonv-lite%2Fdownload%2Ficonv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha1-ICK0sl+93CHS9SSXSkdKr+czkIs= dependencies: safer-buffer ">= 2.1.2 < 3" icss-utils@^5.0.0, icss-utils@^5.1.0: version "5.1.0" - resolved "https://registry.npm.taobao.org/icss-utils/download/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + resolved "https://registry.nlark.com/icss-utils/download/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" integrity sha1-xr5oWKvQE9do6YNmrkfiXViHsa4= ignore@^5.1.4: @@ -4423,7 +4423,7 @@ import-cwd@^3.0.0: import-fresh@^3.1.0, import-fresh@^3.2.1, import-fresh@^3.2.2, import-fresh@^3.3.0: version "3.3.0" - resolved "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + resolved "https://registry.nlark.com/import-fresh/download/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha1-NxYsJfy566oublPVtNiM4X2eDCs= dependencies: parent-module "^1.0.0" @@ -4438,7 +4438,7 @@ import-from@^3.0.0: import-lazy@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/import-lazy/download/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + resolved "https://registry.npm.taobao.org/import-lazy/download/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= imurmurhash@^0.1.4: @@ -4448,12 +4448,12 @@ imurmurhash@^0.1.4: indent-string@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/indent-string/download/indent-string-4.0.0.tgz?cache=0&sync_timestamp=1618679561483&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Findent-string%2Fdownload%2Findent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + resolved "https://registry.nlark.com/indent-string/download/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha1-Yk+PRJfWGbLZdoUx1Y9BIoVNclE= inflight@^1.0.4: version "1.0.6" - resolved "https://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + resolved "https://registry.nlark.com/inflight/download/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= dependencies: once "^1.3.0" @@ -4461,12 +4461,12 @@ inflight@^1.0.4: inherits@2, inherits@2.0.4, inherits@^2.0.0, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: version "2.0.4" - resolved "https://registry.nlark.com/inherits/download/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + resolved "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w= inherits@2.0.3: version "2.0.3" - resolved "https://registry.nlark.com/inherits/download/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" + resolved "https://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= ini@2.0.0: @@ -4495,7 +4495,7 @@ internal-slot@^1.0.3: interpret@^1.0.0: version "1.4.0" - resolved "https://registry.npmmirror.com/interpret/download/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + resolved "https://registry.nlark.com/interpret/download/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha1-Zlq4vE2iendKQFhOgS4+D6RbGh4= ip@^1.1.0: @@ -4520,7 +4520,7 @@ is-alphabetical@1.0.4, is-alphabetical@^1.0.0: is-alphanumerical@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-alphanumerical/download/is-alphanumerical-1.0.4.tgz?cache=0&sync_timestamp=1636009316820&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-alphanumerical%2Fdownload%2Fis-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf" + resolved "https://registry.npmmirror.com/is-alphanumerical/download/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf" integrity sha1-frmiQx+FX2se8aeOMm31FWlsTb8= dependencies: is-alphabetical "^1.0.0" @@ -4528,7 +4528,7 @@ is-alphanumerical@^1.0.0: is-arguments@^1.0.4: version "1.1.1" - resolved "https://registry.nlark.com/is-arguments/download/is-arguments-1.1.1.tgz?cache=0&sync_timestamp=1628201919104&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-arguments%2Fdownload%2Fis-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + resolved "https://registry.nlark.com/is-arguments/download/is-arguments-1.1.1.tgz?cache=0&sync_timestamp=1628202102318&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-arguments%2Fdownload%2Fis-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" integrity sha1-FbP4j9oB8ql/7ITKdhpWDxI++ps= dependencies: call-bind "^1.0.2" @@ -4536,7 +4536,7 @@ is-arguments@^1.0.4: is-arrayish@^0.2.1: version "0.2.1" - resolved "https://registry.npm.taobao.org/is-arrayish/download/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + resolved "https://registry.nlark.com/is-arrayish/download/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= is-bigint@^1.0.1: @@ -4555,7 +4555,7 @@ is-binary-path@~2.1.0: is-boolean-object@^1.1.0: version "1.1.2" - resolved "https://registry.nlark.com/is-boolean-object/download/is-boolean-object-1.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-boolean-object%2Fdownload%2Fis-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + resolved "https://registry.nlark.com/is-boolean-object/download/is-boolean-object-1.1.2.tgz?cache=0&sync_timestamp=1628207133571&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-boolean-object%2Fdownload%2Fis-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" integrity sha1-XG3CACRt2TIa5LiFoRS7H3X2Nxk= dependencies: call-bind "^1.0.2" @@ -4563,38 +4563,38 @@ is-boolean-object@^1.1.0: is-buffer@^2.0.0: version "2.0.5" - resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.5.tgz?cache=0&sync_timestamp=1604432327227&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-buffer%2Fdownload%2Fis-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" + resolved "https://registry.nlark.com/is-buffer/download/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha1-68JS5ADSL/jXf6CYiIIaJKZYwZE= is-callable@^1.1.4, is-callable@^1.2.4: version "1.2.4" - resolved "https://registry.nlark.com/is-callable/download/is-callable-1.2.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-callable%2Fdownload%2Fis-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + resolved "https://registry.nlark.com/is-callable/download/is-callable-1.2.4.tgz?cache=0&sync_timestamp=1628260416925&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-callable%2Fdownload%2Fis-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha1-RzAdWN0CWUB4ZVR4U99tYf5HGUU= is-ci@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/is-ci/download/is-ci-2.0.0.tgz?cache=0&sync_timestamp=1635261061017&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-ci%2Fdownload%2Fis-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + resolved "https://registry.npmmirror.com/is-ci/download/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" integrity sha1-a8YzQYGBDgS1wis9WJ/cpVAmQEw= dependencies: ci-info "^2.0.0" is-core-module@^2.2.0: version "2.8.0" - resolved "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz?cache=0&sync_timestamp=1634236731601&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-core-module%2Fdownload%2Fis-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" + resolved "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz?cache=0&sync_timestamp=1634236539354&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-core-module%2Fdownload%2Fis-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" integrity sha1-AyEzbD0JJeSX/Zf12VyxFKXM1Ug= dependencies: has "^1.0.3" is-date-object@^1.0.1: version "1.0.5" - resolved "https://registry.nlark.com/is-date-object/download/is-date-object-1.0.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-date-object%2Fdownload%2Fis-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + resolved "https://registry.nlark.com/is-date-object/download/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" integrity sha1-CEHVU25yTCVZe/bqYuG9OCmN8x8= dependencies: has-tostringtag "^1.0.0" is-decimal@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-decimal/download/is-decimal-1.0.4.tgz?cache=0&sync_timestamp=1636008960795&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-decimal%2Fdownload%2Fis-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" + resolved "https://registry.npmmirror.com/is-decimal/download/is-decimal-1.0.4.tgz?cache=0&sync_timestamp=1636008973005&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-decimal%2Fdownload%2Fis-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" integrity sha1-ZaOllYocW2OnBuGzM9fNn2MNP6U= is-docker@^2.0.0, is-docker@^2.1.1: @@ -4619,19 +4619,19 @@ is-fullwidth-code-point@^3.0.0: is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" - resolved "https://registry.npmmirror.com/is-glob/download/is-glob-4.0.3.tgz?cache=0&sync_timestamp=1632934586547&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-glob%2Fdownload%2Fis-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + resolved "https://registry.npmmirror.com/is-glob/download/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha1-ZPYeQsu7LuwgcanawLKLoeZdUIQ= dependencies: is-extglob "^2.1.1" is-hexadecimal@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-hexadecimal/download/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" + resolved "https://registry.npmmirror.com/is-hexadecimal/download/is-hexadecimal-1.0.4.tgz?cache=0&sync_timestamp=1636011609614&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-hexadecimal%2Fdownload%2Fis-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" integrity sha1-zDXJdYjaS9Saju3WvECC1E3LI6c= is-installed-globally@^0.4.0: version "0.4.0" - resolved "https://registry.npm.taobao.org/is-installed-globally/download/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" + resolved "https://registry.nlark.com/is-installed-globally/download/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" integrity sha1-mg/UB5ScMPhutpWe8beZTtC3tSA= dependencies: global-dirs "^3.0.0" @@ -4644,7 +4644,7 @@ is-negative-zero@^2.0.1: is-npm@^5.0.0: version "5.0.0" - resolved "https://registry.nlark.com/is-npm/download/is-npm-5.0.0.tgz?cache=0&sync_timestamp=1631992770984&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-npm%2Fdownload%2Fis-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" + resolved "https://registry.nlark.com/is-npm/download/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" integrity sha1-Q+jWXMVuG2f41HJiz2ZwmRk/Rag= is-number-object@^1.0.4: @@ -4661,12 +4661,12 @@ is-number@^7.0.0: is-obj@^1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/is-obj/download/is-obj-1.0.1.tgz?cache=0&sync_timestamp=1618600919478&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-obj%2Fdownload%2Fis-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + resolved "https://registry.nlark.com/is-obj/download/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= is-obj@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/is-obj/download/is-obj-2.0.0.tgz?cache=0&sync_timestamp=1618600919478&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-obj%2Fdownload%2Fis-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + resolved "https://registry.nlark.com/is-obj/download/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha1-Rz+wXZc3BeP9liBUUBjKjiLvSYI= is-path-cwd@^2.2.0: @@ -4681,17 +4681,17 @@ is-path-inside@^3.0.2: is-plain-obj@^2.0.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" + resolved "https://registry.nlark.com/is-plain-obj/download/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" integrity sha1-ReQuN/zPH0Dajl927iFRWEDAkoc= is-plain-obj@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" + resolved "https://registry.nlark.com/is-plain-obj/download/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" integrity sha1-r28uoUrFpkYYOlu9tbqrvBVq2dc= is-plain-object@^2.0.4: version "2.0.4" - resolved "https://registry.npm.taobao.org/is-plain-object/download/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + resolved "https://registry.nlark.com/is-plain-object/download/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" integrity sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc= dependencies: isobject "^3.0.1" @@ -4711,7 +4711,7 @@ is-regexp@^1.0.0: is-root@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/is-root/download/is-root-2.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-root%2Fdownload%2Fis-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" + resolved "https://registry.nlark.com/is-root/download/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" integrity sha1-gJ4YEpzxEpZEMCpPhUQDXVGYSpw= is-shared-array-buffer@^1.0.1: @@ -4733,14 +4733,14 @@ is-string@^1.0.5, is-string@^1.0.7: is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" - resolved "https://registry.nlark.com/is-symbol/download/is-symbol-1.0.4.tgz?cache=0&sync_timestamp=1620501174327&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-symbol%2Fdownload%2Fis-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + resolved "https://registry.nlark.com/is-symbol/download/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" integrity sha1-ptrJO2NbBjymhyI23oiRClevE5w= dependencies: has-symbols "^1.0.2" is-typedarray@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/is-typedarray/download/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + resolved "https://registry.nlark.com/is-typedarray/download/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= is-weakref@^1.0.1: @@ -4757,7 +4757,7 @@ is-whitespace-character@^1.0.0: is-word-character@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-word-character/download/is-word-character-1.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-word-character%2Fdownload%2Fis-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230" + resolved "https://registry.npmmirror.com/is-word-character/download/is-word-character-1.0.4.tgz#ce0e73216f98599060592f62ff31354ddbeb0230" integrity sha1-zg5zIW+YWZBgWS9i/zE1TdvrAjA= is-wsl@^2.1.1, is-wsl@^2.2.0: @@ -4769,17 +4769,17 @@ is-wsl@^2.1.1, is-wsl@^2.2.0: is-yarn-global@^0.3.0: version "0.3.0" - resolved "https://registry.nlark.com/is-yarn-global/download/is-yarn-global-0.3.0.tgz?cache=0&sync_timestamp=1619356554445&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-yarn-global%2Fdownload%2Fis-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" + resolved "https://registry.nlark.com/is-yarn-global/download/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" integrity sha1-1QLTOCWQ6jAEiTdGdUyJE5lz4jI= isarray@0.0.1: version "0.0.1" - resolved "https://registry.npm.taobao.org/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + resolved "https://registry.nlark.com/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= isarray@~1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + resolved "https://registry.nlark.com/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= isexe@^2.0.0: @@ -4789,7 +4789,7 @@ isexe@^2.0.0: isobject@^3.0.1: version "3.0.1" - resolved "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + resolved "https://registry.nlark.com/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= jest-worker@^27.0.2, jest-worker@^27.4.1: @@ -4814,12 +4814,12 @@ joi@^17.4.0, joi@^17.4.2: "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/js-tokens/download/js-tokens-4.0.0.tgz?cache=0&sync_timestamp=1619345098261&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fjs-tokens%2Fdownload%2Fjs-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + resolved "https://registry.nlark.com/js-tokens/download/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha1-GSA/tZmR35jjoocFDUZHzerzJJk= js-yaml@^3.13.1: version "3.14.1" - resolved "https://registry.npm.taobao.org/js-yaml/download/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + resolved "https://registry.nlark.com/js-yaml/download/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha1-2ugS/bOCX6MGYJqHFzg8UMNqBTc= dependencies: argparse "^1.0.7" @@ -4827,7 +4827,7 @@ js-yaml@^3.13.1: js-yaml@^4.0.0: version "4.1.0" - resolved "https://registry.npm.taobao.org/js-yaml/download/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + resolved "https://registry.nlark.com/js-yaml/download/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" integrity sha1-wftl+PUBeQHN0slRhkuhhFihBgI= dependencies: argparse "^2.0.1" @@ -4844,7 +4844,7 @@ jsesc@~0.5.0: json-buffer@3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/json-buffer/download/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" + resolved "https://registry.npmmirror.com/json-buffer/download/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= json-parse-better-errors@^1.0.2: @@ -4869,14 +4869,14 @@ json-schema-traverse@^1.0.0: json5@^1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/json5/download/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" + resolved "https://registry.nlark.com/json5/download/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" integrity sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4= dependencies: minimist "^1.2.0" json5@^2.1.2: version "2.2.0" - resolved "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + resolved "https://registry.nlark.com/json5/download/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" integrity sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM= dependencies: minimist "^1.2.5" @@ -4892,14 +4892,14 @@ jsonfile@^6.0.1: keyv@^3.0.0: version "3.1.0" - resolved "https://registry.npmmirror.com/keyv/download/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" + resolved "https://registry.npmmirror.com/keyv/download/keyv-3.1.0.tgz?cache=0&sync_timestamp=1635869184957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fkeyv%2Fdownload%2Fkeyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" integrity sha1-7MIoSG9pmR5J6UdkhaW+Ho/FxNk= dependencies: json-buffer "3.0.0" kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.3" - resolved "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + resolved "https://registry.nlark.com/kind-of/download/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha1-B8BQNKbDSfoG4k+jWqdttFgM5N0= kleur@^3.0.3: @@ -4909,7 +4909,7 @@ kleur@^3.0.3: klona@^2.0.5: version "2.0.5" - resolved "https://registry.npmmirror.com/klona/download/klona-2.0.5.tgz?cache=0&sync_timestamp=1635385383825&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fklona%2Fdownload%2Fklona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" + resolved "https://registry.npmmirror.com/klona/download/klona-2.0.5.tgz?cache=0&sync_timestamp=1635385749251&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fklona%2Fdownload%2Fklona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" integrity sha1-0WZXTZAHY5XZljqnqSj6u412r7w= latest-version@^5.1.0: @@ -4926,7 +4926,7 @@ leven@^3.1.0: lilconfig@^2.0.3: version "2.0.4" - resolved "https://registry.npmmirror.com/lilconfig/download/lilconfig-2.0.4.tgz?cache=0&sync_timestamp=1636150747257&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flilconfig%2Fdownload%2Flilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" + resolved "https://registry.npmmirror.com/lilconfig/download/lilconfig-2.0.4.tgz?cache=0&sync_timestamp=1636150567131&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flilconfig%2Fdownload%2Flilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" integrity sha1-9FB9BD1wWLOAtqj1y3vNSzTO4II= lines-and-columns@^1.1.6: @@ -4936,7 +4936,7 @@ lines-and-columns@^1.1.6: loader-runner@^4.2.0: version "4.2.0" - resolved "https://registry.npm.taobao.org/loader-runner/download/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" + resolved "https://registry.nlark.com/loader-runner/download/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" integrity sha1-1wIjgNZtFMX7HUlriYZOvP1Hg4Q= loader-utils@^1.4.0: @@ -4959,7 +4959,7 @@ loader-utils@^2.0.0: locate-path@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/locate-path/download/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + resolved "https://registry.nlark.com/locate-path/download/locate-path-3.0.0.tgz?cache=0&sync_timestamp=1629895618224&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flocate-path%2Fdownload%2Flocate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" integrity sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4= dependencies: p-locate "^3.0.0" @@ -4967,49 +4967,49 @@ locate-path@^3.0.0: locate-path@^5.0.0: version "5.0.0" - resolved "https://registry.nlark.com/locate-path/download/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + resolved "https://registry.nlark.com/locate-path/download/locate-path-5.0.0.tgz?cache=0&sync_timestamp=1629895618224&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flocate-path%2Fdownload%2Flocate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" integrity sha1-Gvujlq/WdqbUJQTQpno6frn2KqA= dependencies: p-locate "^4.1.0" lodash.assignin@^4.0.9: version "4.2.0" - resolved "https://registry.npm.taobao.org/lodash.assignin/download/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" + resolved "https://registry.nlark.com/lodash.assignin/download/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI= lodash.bind@^4.1.4: version "4.2.1" - resolved "https://registry.npm.taobao.org/lodash.bind/download/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35" + resolved "https://registry.nlark.com/lodash.bind/download/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35" integrity sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU= lodash.castarray@^4.4.0: version "4.4.0" - resolved "https://registry.npm.taobao.org/lodash.castarray/download/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" + resolved "https://registry.nlark.com/lodash.castarray/download/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU= lodash.debounce@^4.0.8: version "4.0.8" - resolved "https://registry.nlark.com/lodash.debounce/download/lodash.debounce-4.0.8.tgz?cache=0&sync_timestamp=1618847031591&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flodash.debounce%2Fdownload%2Flodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + resolved "https://registry.nlark.com/lodash.debounce/download/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= lodash.defaults@^4.0.1: version "4.2.0" - resolved "https://registry.nlark.com/lodash.defaults/download/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" + resolved "https://registry.npm.taobao.org/lodash.defaults/download/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= lodash.filter@^4.4.0: version "4.6.0" - resolved "https://registry.npm.taobao.org/lodash.filter/download/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" + resolved "https://registry.nlark.com/lodash.filter/download/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4= lodash.flatten@^4.2.0: version "4.4.0" - resolved "https://registry.nlark.com/lodash.flatten/download/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" + resolved "https://registry.npm.taobao.org/lodash.flatten/download/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= lodash.foreach@^4.3.0: version "4.5.0" - resolved "https://registry.npm.taobao.org/lodash.foreach/download/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" + resolved "https://registry.nlark.com/lodash.foreach/download/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM= lodash.isplainobject@^4.0.6: @@ -5024,7 +5024,7 @@ lodash.map@^4.4.0: lodash.memoize@^4.1.2: version "4.1.2" - resolved "https://registry.npm.taobao.org/lodash.memoize/download/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + resolved "https://registry.nlark.com/lodash.memoize/download/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= lodash.merge@^4.4.0, lodash.merge@^4.6.2: @@ -5044,7 +5044,7 @@ lodash.reduce@^4.4.0: lodash.reject@^4.4.0: version "4.6.0" - resolved "https://registry.npm.taobao.org/lodash.reject/download/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415" + resolved "https://registry.nlark.com/lodash.reject/download/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415" integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU= lodash.some@^4.4.0: @@ -5078,12 +5078,12 @@ lower-case@^2.0.2: lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-1.0.1.tgz?cache=0&sync_timestamp=1634551715073&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flowercase-keys%2Fdownload%2Flowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-1.0.1.tgz?cache=0&sync_timestamp=1634551769618&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flowercase-keys%2Fdownload%2Flowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" integrity sha1-b54wtHCE2XGnyCD/FabFFnt0wm8= lowercase-keys@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-2.0.0.tgz?cache=0&sync_timestamp=1634551715073&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flowercase-keys%2Fdownload%2Flowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-2.0.0.tgz?cache=0&sync_timestamp=1634551769618&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flowercase-keys%2Fdownload%2Flowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha1-JgPni3tLAAbLyi+8yKMgJVislHk= lru-cache@^6.0.0: @@ -5095,33 +5095,33 @@ lru-cache@^6.0.0: magic-string@^0.25.3: version "0.25.7" - resolved "https://registry.nlark.com/magic-string/download/magic-string-0.25.7.tgz?cache=0&sync_timestamp=1618847046304&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmagic-string%2Fdownload%2Fmagic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" + resolved "https://registry.nlark.com/magic-string/download/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" integrity sha1-P0l9b9NMZpxnmNy4IfLvMfVEUFE= dependencies: sourcemap-codec "^1.4.4" make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" - resolved "https://registry.npm.taobao.org/make-dir/download/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + resolved "https://registry.nlark.com/make-dir/download/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha1-QV6WcEazp/HRhSd9hKpYIDcmoT8= dependencies: semver "^6.0.0" markdown-escapes@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/markdown-escapes/download/markdown-escapes-1.0.4.tgz?cache=0&sync_timestamp=1635887464232&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmarkdown-escapes%2Fdownload%2Fmarkdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" + resolved "https://registry.npmmirror.com/markdown-escapes/download/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" integrity sha1-yVQV70UUmddgK5EJXzyOiXX3hTU= mdast-squeeze-paragraphs@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/mdast-squeeze-paragraphs/download/mdast-squeeze-paragraphs-4.0.0.tgz?cache=0&sync_timestamp=1627994916092&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-squeeze-paragraphs%2Fdownload%2Fmdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97" + resolved "https://registry.nlark.com/mdast-squeeze-paragraphs/download/mdast-squeeze-paragraphs-4.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-squeeze-paragraphs%2Fdownload%2Fmdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97" integrity sha1-fEwRRnnDvuJ+8QtY4uAVvnnx75c= dependencies: unist-util-remove "^2.0.0" mdast-util-definitions@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/mdast-util-definitions/download/mdast-util-definitions-4.0.0.tgz?cache=0&sync_timestamp=1627293635701&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-util-definitions%2Fdownload%2Fmdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2" + resolved "https://registry.nlark.com/mdast-util-definitions/download/mdast-util-definitions-4.0.0.tgz?cache=0&sync_timestamp=1627293815940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-util-definitions%2Fdownload%2Fmdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2" integrity sha1-xcGoTbeZFztNz3ZDzamZ5EDCTbI= dependencies: unist-util-visit "^2.0.0" @@ -5157,7 +5157,7 @@ mdn-data@2.0.4: mdurl@^1.0.0: version "1.0.1" - resolved "https://registry.npm.taobao.org/mdurl/download/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" + resolved "https://registry.nlark.com/mdurl/download/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= media-typer@0.3.0: @@ -5179,12 +5179,12 @@ merge-descriptors@1.0.1: merge-stream@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/merge-stream/download/merge-stream-2.0.0.tgz?cache=0&sync_timestamp=1622025345923&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmerge-stream%2Fdownload%2Fmerge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + resolved "https://registry.nlark.com/merge-stream/download/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha1-UoI2KaFN0AyXcPtq1H3GMQ8sH2A= merge2@^1.3.0: version "1.4.1" - resolved "https://registry.npm.taobao.org/merge2/download/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + resolved "https://registry.nlark.com/merge2/download/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha1-Q2iJL4hekHRVpv19xVwMnUBJkK4= methods@~1.1.2: @@ -5202,24 +5202,24 @@ micromatch@^4.0.2, micromatch@^4.0.4: mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": version "1.51.0" - resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.51.0.tgz?cache=0&sync_timestamp=1636425951030&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.51.0.tgz?cache=0&sync_timestamp=1636425960296&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== mime-db@~1.33.0: version "1.33.0" - resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.33.0.tgz?cache=0&sync_timestamp=1636425951030&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" + resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.33.0.tgz?cache=0&sync_timestamp=1636425960296&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" integrity sha1-o0kgUKXLm2NFBUHjnZeI0icng9s= mime-types@2.1.18: version "2.1.18" - resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.18.tgz?cache=0&sync_timestamp=1636432244120&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" + resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.18.tgz?cache=0&sync_timestamp=1636432302620&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" integrity sha1-bzI/YKg9ERRvgx/xH9ZuL+VQO7g= dependencies: mime-db "~1.33.0" mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24: version "2.1.34" - resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.34.tgz?cache=0&sync_timestamp=1636432244120&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" + resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.34.tgz?cache=0&sync_timestamp=1636432302620&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== dependencies: mime-db "1.51.0" @@ -5231,17 +5231,17 @@ mime@1.6.0: mimic-fn@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + resolved "https://registry.nlark.com/mimic-fn/download/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs= mimic-response@^1.0.0, mimic-response@^1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/mimic-response/download/mimic-response-1.0.1.tgz?cache=0&sync_timestamp=1628692524926&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmimic-response%2Fdownload%2Fmimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + resolved "https://registry.nlark.com/mimic-response/download/mimic-response-1.0.1.tgz?cache=0&sync_timestamp=1628692424254&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmimic-response%2Fdownload%2Fmimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha1-SSNTiHju9CBjy4o+OweYeBSHqxs= mini-create-react-context@^0.4.0: version "0.4.1" - resolved "https://registry.npm.taobao.org/mini-create-react-context/download/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" + resolved "https://registry.nlark.com/mini-create-react-context/download/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" integrity sha1-ByFxVhv9ySLaCKYMIZekl8wtHV4= dependencies: "@babel/runtime" "^7.12.1" @@ -5249,7 +5249,7 @@ mini-create-react-context@^0.4.0: mini-css-extract-plugin@^1.6.0: version "1.6.2" - resolved "https://registry.npmmirror.com/mini-css-extract-plugin/download/mini-css-extract-plugin-1.6.2.tgz?cache=0&sync_timestamp=1637170563108&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" + resolved "https://registry.npmmirror.com/mini-css-extract-plugin/download/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" integrity sha1-gxcrT9gS+PxKCdb20W+ST1OZDKg= dependencies: loader-utils "^2.0.0" @@ -5263,14 +5263,14 @@ minimalistic-assert@^1.0.0: minimatch@3.0.4, minimatch@^3.0.4: version "3.0.4" - resolved "https://registry.nlark.com/minimatch/download/minimatch-3.0.4.tgz?cache=0&sync_timestamp=1618846754554&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fminimatch%2Fdownload%2Fminimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + resolved "https://registry.nlark.com/minimatch/download/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM= dependencies: brace-expansion "^1.1.7" minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" - resolved "https://registry.nlark.com/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1618847017774&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + resolved "https://registry.nlark.com/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1622685831901&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI= mkdirp@^0.5.5, mkdirp@~0.5.1: @@ -5307,7 +5307,7 @@ multicast-dns-service-types@^1.1.0: multicast-dns@^6.0.1: version "6.2.3" - resolved "https://registry.npmmirror.com/multicast-dns/download/multicast-dns-6.2.3.tgz?cache=0&sync_timestamp=1633354862495&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmulticast-dns%2Fdownload%2Fmulticast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" + resolved "https://registry.npmmirror.com/multicast-dns/download/multicast-dns-6.2.3.tgz?cache=0&sync_timestamp=1633354996608&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmulticast-dns%2Fdownload%2Fmulticast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" integrity sha1-oOx72QVcQoL3kMPIL04o2zsxsik= dependencies: dns-packet "^1.3.1" @@ -5338,7 +5338,7 @@ no-case@^3.0.4: node-emoji@^1.10.0: version "1.11.0" - resolved "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" + resolved "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz?cache=0&sync_timestamp=1628672589230&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-emoji%2Fdownload%2Fnode-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" integrity sha1-aaAVDmlG4vEV6dfqTfeXHiYoMBw= dependencies: lodash "^4.17.21" @@ -5365,17 +5365,17 @@ normalize-range@^0.1.2: normalize-url@^4.1.0: version "4.5.1" - resolved "https://registry.nlark.com/normalize-url/download/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + resolved "https://registry.nlark.com/normalize-url/download/normalize-url-4.5.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnormalize-url%2Fdownload%2Fnormalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" integrity sha1-DdkM8SiO4dExO4cIHJpZMu5IUYo= normalize-url@^6.0.1: version "6.1.0" - resolved "https://registry.nlark.com/normalize-url/download/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + resolved "https://registry.nlark.com/normalize-url/download/normalize-url-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnormalize-url%2Fdownload%2Fnormalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" integrity sha1-QNCIW1Nd7/4/MUe+yHfQX+TFZoo= npm-run-path@^4.0.1: version "4.0.1" - resolved "https://registry.npmmirror.com/npm-run-path/download/npm-run-path-4.0.1.tgz?cache=0&sync_timestamp=1633420566316&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnpm-run-path%2Fdownload%2Fnpm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + resolved "https://registry.npmmirror.com/npm-run-path/download/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha1-t+zR5e1T2o43pV4cImnguX7XSOo= dependencies: path-key "^3.0.0" @@ -5401,7 +5401,7 @@ nth-check@^2.0.1: object-assign@^4.1.1: version "4.1.1" - resolved "https://registry.npmmirror.com/object-assign/download/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + resolved "https://registry.nlark.com/object-assign/download/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= object-hash@^2.2.0: @@ -5416,7 +5416,7 @@ object-inspect@^1.11.0, object-inspect@^1.9.0: object-is@^1.0.1: version "1.1.5" - resolved "https://registry.npm.taobao.org/object-is/download/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + resolved "https://registry.nlark.com/object-is/download/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" integrity sha1-ud7qpfx/GEag+uzc7sE45XePU6w= dependencies: call-bind "^1.0.2" @@ -5448,7 +5448,7 @@ object.getownpropertydescriptors@^2.1.0: object.values@^1.1.0: version "1.1.5" - resolved "https://registry.npmmirror.com/object.values/download/object.values-1.1.5.tgz?cache=0&sync_timestamp=1633327765894&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.values%2Fdownload%2Fobject.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" + resolved "https://registry.npmmirror.com/object.values/download/object.values-1.1.5.tgz?cache=0&sync_timestamp=1633326983597&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.values%2Fdownload%2Fobject.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" integrity sha1-lZ9j486e8QhyAzMIITHkpFm3Fqw= dependencies: call-bind "^1.0.2" @@ -5481,14 +5481,14 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: onetime@^5.1.2: version "5.1.2" - resolved "https://registry.npm.taobao.org/onetime/download/onetime-5.1.2.tgz?cache=0&sync_timestamp=1617889724435&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fonetime%2Fdownload%2Fonetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + resolved "https://registry.nlark.com/onetime/download/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha1-0Oluu1awdHbfHdnEgG5SN5hcpF4= dependencies: mimic-fn "^2.1.0" open@^7.0.2: version "7.4.2" - resolved "https://registry.npmmirror.com/open/download/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" + resolved "https://registry.npmmirror.com/open/download/open-7.4.2.tgz?cache=0&sync_timestamp=1635048715897&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fopen%2Fdownload%2Fopen-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" integrity sha1-uBR+Jtzz5CYxbHMAif1x7dKcIyE= dependencies: is-docker "^2.0.0" @@ -5496,7 +5496,7 @@ open@^7.0.2: open@^8.0.9: version "8.4.0" - resolved "https://registry.npmmirror.com/open/download/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" + resolved "https://registry.npmmirror.com/open/download/open-8.4.0.tgz?cache=0&sync_timestamp=1635048715897&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fopen%2Fdownload%2Fopen-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" integrity sha1-NFMhrhj4E4+CVlqRD9xrOejCRPg= dependencies: define-lazy-prop "^2.0.0" @@ -5505,7 +5505,7 @@ open@^8.0.9: opener@^1.5.2: version "1.5.2" - resolved "https://registry.nlark.com/opener/download/opener-1.5.2.tgz?cache=0&sync_timestamp=1618847055043&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fopener%2Fdownload%2Fopener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" + resolved "https://registry.nlark.com/opener/download/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" integrity sha1-XTfh81B3udysQwE3InGv3rKhNZg= p-cancelable@^1.0.0: @@ -5515,7 +5515,7 @@ p-cancelable@^1.0.0: p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" - resolved "https://registry.nlark.com/p-limit/download/p-limit-2.3.0.tgz?cache=0&sync_timestamp=1628812721654&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-limit%2Fdownload%2Fp-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + resolved "https://registry.nlark.com/p-limit/download/p-limit-2.3.0.tgz?cache=0&sync_timestamp=1628812766275&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-limit%2Fdownload%2Fp-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" integrity sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE= dependencies: p-try "^2.0.0" @@ -5536,14 +5536,14 @@ p-locate@^4.1.0: p-map@^4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/p-map/download/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + resolved "https://registry.npmmirror.com/p-map/download/p-map-4.0.0.tgz?cache=0&sync_timestamp=1635931861684&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-map%2Fdownload%2Fp-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" integrity sha1-uy+Vpe2i7BaOySdOBqdHw+KQTSs= dependencies: aggregate-error "^3.0.0" p-retry@^4.5.0: version "4.6.1" - resolved "https://registry.npmmirror.com/p-retry/download/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" + resolved "https://registry.npmmirror.com/p-retry/download/p-retry-4.6.1.tgz?cache=0&sync_timestamp=1635966813736&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-retry%2Fdownload%2Fp-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" integrity sha1-j83dXN96Z6CRGpzy7w5d9/YCMWw= dependencies: "@types/retry" "^0.12.0" @@ -5551,12 +5551,12 @@ p-retry@^4.5.0: p-try@^2.0.0: version "2.2.0" - resolved "https://registry.npmmirror.com/p-try/download/p-try-2.2.0.tgz?cache=0&sync_timestamp=1633364397780&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-try%2Fdownload%2Fp-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + resolved "https://registry.npmmirror.com/p-try/download/p-try-2.2.0.tgz?cache=0&sync_timestamp=1633364600466&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-try%2Fdownload%2Fp-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha1-yyhoVA4xPWHeWPr741zpAE1VQOY= package-json@^6.3.0: version "6.5.0" - resolved "https://registry.nlark.com/package-json/download/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" + resolved "https://registry.nlark.com/package-json/download/package-json-6.5.0.tgz?cache=0&sync_timestamp=1624550102187&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpackage-json%2Fdownload%2Fpackage-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" integrity sha1-b+7ayjXnVyWHbQsOZJdGl/7RRbA= dependencies: got "^9.6.0" @@ -5593,7 +5593,7 @@ parse-entities@^2.0.0: parse-json@^5.0.0: version "5.2.0" - resolved "https://registry.npmmirror.com/parse-json/download/parse-json-5.2.0.tgz?cache=0&sync_timestamp=1637475717072&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fparse-json%2Fdownload%2Fparse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + resolved "https://registry.npmmirror.com/parse-json/download/parse-json-5.2.0.tgz?cache=0&sync_timestamp=1637475636838&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fparse-json%2Fdownload%2Fparse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" integrity sha1-x2/Gbe5UIxyWKyK8yKcs8vmXU80= dependencies: "@babel/code-frame" "^7.0.0" @@ -5603,7 +5603,7 @@ parse-json@^5.0.0: parse-numeric-range@^1.2.0: version "1.3.0" - resolved "https://registry.nlark.com/parse-numeric-range/download/parse-numeric-range-1.3.0.tgz#7c63b61190d61e4d53a1197f0c83c47bb670ffa3" + resolved "https://registry.nlark.com/parse-numeric-range/download/parse-numeric-range-1.3.0.tgz?cache=0&sync_timestamp=1629604699749&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fparse-numeric-range%2Fdownload%2Fparse-numeric-range-1.3.0.tgz#7c63b61190d61e4d53a1197f0c83c47bb670ffa3" integrity sha1-fGO2EZDWHk1ToRl/DIPEe7Zw/6M= parse5@^5.0.0: @@ -5631,12 +5631,12 @@ pascal-case@^3.1.2: path-exists@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/path-exists/download/path-exists-3.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpath-exists%2Fdownload%2Fpath-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + resolved "https://registry.nlark.com/path-exists/download/path-exists-3.0.0.tgz?cache=0&sync_timestamp=1628765027018&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpath-exists%2Fdownload%2Fpath-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= path-exists@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/path-exists/download/path-exists-4.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpath-exists%2Fdownload%2Fpath-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + resolved "https://registry.nlark.com/path-exists/download/path-exists-4.0.0.tgz?cache=0&sync_timestamp=1628765027018&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpath-exists%2Fdownload%2Fpath-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" integrity sha1-UTvb4tO5XXdi6METfvoZXGxhtbM= path-is-absolute@^1.0.0: @@ -5651,7 +5651,7 @@ path-is-inside@1.0.2: path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" - resolved "https://registry.npm.taobao.org/path-key/download/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + resolved "https://registry.nlark.com/path-key/download/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha1-WB9q3mWMu6ZaDTOA3ndTKVBU83U= path-parse@^1.0.6: @@ -5661,56 +5661,56 @@ path-parse@^1.0.6: path-to-regexp@0.1.7: version "0.1.7" - resolved "https://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= path-to-regexp@2.2.1: version "2.2.1" - resolved "https://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" + resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" integrity sha1-kLYXAloWOBqHm8gqONTovesrz0U= path-to-regexp@^1.7.0: version "1.8.0" - resolved "https://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" + resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" integrity sha1-iHs7qdhDk+h6CgufTLdWGYtTVIo= dependencies: isarray "0.0.1" path-type@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/path-type/download/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + resolved "https://registry.nlark.com/path-type/download/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs= picocolors@^1.0.0: version "1.0.0" - resolved "https://registry.npmmirror.com/picocolors/download/picocolors-1.0.0.tgz?cache=0&sync_timestamp=1634093339035&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + resolved "https://registry.npmmirror.com/picocolors/download/picocolors-1.0.0.tgz?cache=0&sync_timestamp=1634093378416&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha1-y1vcdP8/UYkiNur3nWi8RFZKuBw= picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: version "2.3.0" - resolved "https://registry.nlark.com/picomatch/download/picomatch-2.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpicomatch%2Fdownload%2Fpicomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + resolved "https://registry.nlark.com/picomatch/download/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" integrity sha1-8fBh3o9qS/AiiS4tEoI0+5gwKXI= pify@^2.3.0: version "2.3.0" - resolved "https://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + resolved "https://registry.nlark.com/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= pify@^4.0.1: version "4.0.1" - resolved "https://registry.npm.taobao.org/pify/download/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + resolved "https://registry.nlark.com/pify/download/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" integrity sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE= pkg-dir@^4.1.0: version "4.2.0" - resolved "https://registry.npmmirror.com/pkg-dir/download/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + resolved "https://registry.npmmirror.com/pkg-dir/download/pkg-dir-4.2.0.tgz?cache=0&sync_timestamp=1633498116014&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-dir%2Fdownload%2Fpkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" integrity sha1-8JkTPfft5CLoHR2ESCcO6z5CYfM= dependencies: find-up "^4.0.0" pkg-up@^3.1.0: version "3.1.0" - resolved "https://registry.npmmirror.com/pkg-up/download/pkg-up-3.1.0.tgz?cache=0&sync_timestamp=1636035062199&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-up%2Fdownload%2Fpkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" + resolved "https://registry.npmmirror.com/pkg-up/download/pkg-up-3.1.0.tgz?cache=0&sync_timestamp=1636035118070&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-up%2Fdownload%2Fpkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" integrity sha1-EA7CNcwVDk/UJRlBJZaihRKg3vU= dependencies: find-up "^3.0.0" @@ -5744,19 +5744,19 @@ postcss-colormin@^5.2.2: postcss-convert-values@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-convert-values/download/postcss-convert-values-5.0.2.tgz#879b849dc3677c7d6bc94b6a2c1a3f0808798059" + resolved "https://registry.npmmirror.com/postcss-convert-values/download/postcss-convert-values-5.0.2.tgz?cache=0&sync_timestamp=1635857664165&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-convert-values%2Fdownload%2Fpostcss-convert-values-5.0.2.tgz#879b849dc3677c7d6bc94b6a2c1a3f0808798059" integrity sha1-h5uEncNnfH1ryUtqLBo/CAh5gFk= dependencies: postcss-value-parser "^4.1.0" postcss-discard-comments@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-comments/download/postcss-discard-comments-5.0.1.tgz?cache=0&sync_timestamp=1621449558287&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-comments%2Fdownload%2Fpostcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" + resolved "https://registry.nlark.com/postcss-discard-comments/download/postcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" integrity sha1-nq5LdHz3YNMfJEfCfwYZ1XGJAf4= postcss-discard-duplicates@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-duplicates/download/postcss-discard-duplicates-5.0.1.tgz?cache=0&sync_timestamp=1621449558296&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-duplicates%2Fdownload%2Fpostcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" + resolved "https://registry.nlark.com/postcss-discard-duplicates/download/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" integrity sha1-aPfMZFj+a6suRsn1WuUoafaA5m0= postcss-discard-empty@^5.0.1: @@ -5766,7 +5766,7 @@ postcss-discard-empty@^5.0.1: postcss-discard-overridden@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-overridden/download/postcss-discard-overridden-5.0.1.tgz?cache=0&sync_timestamp=1621449732464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-overridden%2Fdownload%2Fpostcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" + resolved "https://registry.nlark.com/postcss-discard-overridden/download/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" integrity sha1-RUtB9wcwC5gQmnUAXKSrD/J0OsY= postcss-discard-unused@^5.0.1: @@ -5778,7 +5778,7 @@ postcss-discard-unused@^5.0.1: postcss-import@^14.0.2: version "14.0.2" - resolved "https://registry.nlark.com/postcss-import/download/postcss-import-14.0.2.tgz?cache=0&sync_timestamp=1620671193913&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-import%2Fdownload%2Fpostcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1" + resolved "https://registry.nlark.com/postcss-import/download/postcss-import-14.0.2.tgz?cache=0&sync_timestamp=1620671991111&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-import%2Fdownload%2Fpostcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1" integrity sha1-YO/3fmvpLntn/kaex5fZQkyuGqE= dependencies: postcss-value-parser "^4.0.0" @@ -5787,7 +5787,7 @@ postcss-import@^14.0.2: postcss-js@^3.0.3: version "3.0.3" - resolved "https://registry.npm.taobao.org/postcss-js/download/postcss-js-3.0.3.tgz#2f0bd370a2e8599d45439f6970403b5873abda33" + resolved "https://registry.nlark.com/postcss-js/download/postcss-js-3.0.3.tgz#2f0bd370a2e8599d45439f6970403b5873abda33" integrity sha1-LwvTcKLoWZ1FQ59pcEA7WHOr2jM= dependencies: camelcase-css "^2.0.1" @@ -5821,7 +5821,7 @@ postcss-merge-idents@^5.0.1: postcss-merge-longhand@^5.0.4: version "5.0.4" - resolved "https://registry.npmmirror.com/postcss-merge-longhand/download/postcss-merge-longhand-5.0.4.tgz?cache=0&sync_timestamp=1637084835421&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-longhand%2Fdownload%2Fpostcss-merge-longhand-5.0.4.tgz#41f4f3270282ea1a145ece078b7679f0cef21c32" + resolved "https://registry.npmmirror.com/postcss-merge-longhand/download/postcss-merge-longhand-5.0.4.tgz?cache=0&sync_timestamp=1637084982494&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-longhand%2Fdownload%2Fpostcss-merge-longhand-5.0.4.tgz#41f4f3270282ea1a145ece078b7679f0cef21c32" integrity sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw== dependencies: postcss-value-parser "^4.1.0" @@ -5829,7 +5829,7 @@ postcss-merge-longhand@^5.0.4: postcss-merge-rules@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-merge-rules/download/postcss-merge-rules-5.0.3.tgz?cache=0&sync_timestamp=1637085530842&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-rules%2Fdownload%2Fpostcss-merge-rules-5.0.3.tgz#b5cae31f53129812a77e3eb1eeee448f8cf1a1db" + resolved "https://registry.npmmirror.com/postcss-merge-rules/download/postcss-merge-rules-5.0.3.tgz?cache=0&sync_timestamp=1637085799347&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-rules%2Fdownload%2Fpostcss-merge-rules-5.0.3.tgz#b5cae31f53129812a77e3eb1eeee448f8cf1a1db" integrity sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg== dependencies: browserslist "^4.16.6" @@ -5846,7 +5846,7 @@ postcss-minify-font-values@^5.0.1: postcss-minify-gradients@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-minify-gradients/download/postcss-minify-gradients-5.0.3.tgz#f970a11cc71e08e9095e78ec3a6b34b91c19550e" + resolved "https://registry.npmmirror.com/postcss-minify-gradients/download/postcss-minify-gradients-5.0.3.tgz?cache=0&sync_timestamp=1635856887200&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-minify-gradients%2Fdownload%2Fpostcss-minify-gradients-5.0.3.tgz#f970a11cc71e08e9095e78ec3a6b34b91c19550e" integrity sha1-+XChHMceCOkJXnjsOms0uRwZVQ4= dependencies: colord "^2.9.1" @@ -5855,7 +5855,7 @@ postcss-minify-gradients@^5.0.3: postcss-minify-params@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-minify-params/download/postcss-minify-params-5.0.2.tgz?cache=0&sync_timestamp=1637084835630&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-minify-params%2Fdownload%2Fpostcss-minify-params-5.0.2.tgz#1b644da903473fbbb18fbe07b8e239883684b85c" + resolved "https://registry.npmmirror.com/postcss-minify-params/download/postcss-minify-params-5.0.2.tgz#1b644da903473fbbb18fbe07b8e239883684b85c" integrity sha512-qJAPuBzxO1yhLad7h2Dzk/F7n1vPyfHfCCh5grjGfjhi1ttCnq4ZXGIW77GSrEbh9Hus9Lc/e/+tB4vh3/GpDg== dependencies: alphanum-sort "^1.0.2" @@ -5865,7 +5865,7 @@ postcss-minify-params@^5.0.2: postcss-minify-selectors@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/postcss-minify-selectors/download/postcss-minify-selectors-5.1.0.tgz?cache=0&sync_timestamp=1621449558355&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-minify-selectors%2Fdownload%2Fpostcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" + resolved "https://registry.nlark.com/postcss-minify-selectors/download/postcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" integrity sha1-Q4XIRdOXn/FgKRd0Uj/6VOr9WlQ= dependencies: alphanum-sort "^1.0.2" @@ -5873,7 +5873,7 @@ postcss-minify-selectors@^5.1.0: postcss-modules-extract-imports@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/postcss-modules-extract-imports/download/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" + resolved "https://registry.nlark.com/postcss-modules-extract-imports/download/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" integrity sha1-zaHwR8CugMl9vijD52pDuIAldB0= postcss-modules-local-by-default@^4.0.0: @@ -5894,26 +5894,26 @@ postcss-modules-scope@^3.0.0: postcss-modules-values@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/postcss-modules-values/download/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + resolved "https://registry.nlark.com/postcss-modules-values/download/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" integrity sha1-18Xn5ow7s8myfL9Iyguz/7RgLJw= dependencies: icss-utils "^5.0.0" postcss-nested@5.0.6: version "5.0.6" - resolved "https://registry.nlark.com/postcss-nested/download/postcss-nested-5.0.6.tgz?cache=0&sync_timestamp=1627468102377&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-nested%2Fdownload%2Fpostcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" + resolved "https://registry.nlark.com/postcss-nested/download/postcss-nested-5.0.6.tgz?cache=0&sync_timestamp=1627468715175&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-nested%2Fdownload%2Fpostcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" integrity sha1-RmND9/yNPUavPn26P81H0FKpRbw= dependencies: postcss-selector-parser "^6.0.6" postcss-normalize-charset@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-charset/download/postcss-normalize-charset-5.0.1.tgz?cache=0&sync_timestamp=1621449558308&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-charset%2Fdownload%2Fpostcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" + resolved "https://registry.nlark.com/postcss-normalize-charset/download/postcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" integrity sha1-EhVZ0b68VayNJK839nvU2p79kdA= postcss-normalize-display-values@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-display-values/download/postcss-normalize-display-values-5.0.1.tgz?cache=0&sync_timestamp=1621449652268&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-display-values%2Fdownload%2Fpostcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" + resolved "https://registry.nlark.com/postcss-normalize-display-values/download/postcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" integrity sha1-YmULllmBqVXf/ugzY0U9uC9q0f0= dependencies: cssnano-utils "^2.0.1" @@ -5928,7 +5928,7 @@ postcss-normalize-positions@^5.0.1: postcss-normalize-repeat-style@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-repeat-style/download/postcss-normalize-repeat-style-5.0.1.tgz?cache=0&sync_timestamp=1621449596114&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-repeat-style%2Fdownload%2Fpostcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" + resolved "https://registry.nlark.com/postcss-normalize-repeat-style/download/postcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" integrity sha1-y8DeE4O1f1u2Hd1qhGU7XoZlsrU= dependencies: cssnano-utils "^2.0.1" @@ -5974,7 +5974,7 @@ postcss-normalize-whitespace@^5.0.1: postcss-ordered-values@^5.0.2: version "5.0.2" - resolved "https://registry.nlark.com/postcss-ordered-values/download/postcss-ordered-values-5.0.2.tgz?cache=0&sync_timestamp=1623330460500&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-ordered-values%2Fdownload%2Fpostcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" + resolved "https://registry.nlark.com/postcss-ordered-values/download/postcss-ordered-values-5.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-ordered-values%2Fdownload%2Fpostcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" integrity sha1-HzUUJpd74A4PdlsxZK11PayO0EQ= dependencies: cssnano-utils "^2.0.1" @@ -5997,7 +5997,7 @@ postcss-reduce-initial@^5.0.2: postcss-reduce-transforms@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-reduce-transforms/download/postcss-reduce-transforms-5.0.1.tgz?cache=0&sync_timestamp=1621449730895&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-reduce-transforms%2Fdownload%2Fpostcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640" + resolved "https://registry.nlark.com/postcss-reduce-transforms/download/postcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640" integrity sha1-k8EvahWUdKpxHVJpkj4jg87c9kA= dependencies: cssnano-utils "^2.0.1" @@ -6020,7 +6020,7 @@ postcss-sort-media-queries@^4.1.0: postcss-svgo@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-svgo/download/postcss-svgo-5.0.3.tgz?cache=0&sync_timestamp=1635857761721&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-svgo%2Fdownload%2Fpostcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30" + resolved "https://registry.npmmirror.com/postcss-svgo/download/postcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30" integrity sha1-2UUYV1bl36rgf57bDTyuf/efmzA= dependencies: postcss-value-parser "^4.1.0" @@ -6028,7 +6028,7 @@ postcss-svgo@^5.0.3: postcss-unique-selectors@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-unique-selectors/download/postcss-unique-selectors-5.0.2.tgz?cache=0&sync_timestamp=1637084835538&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-unique-selectors%2Fdownload%2Fpostcss-unique-selectors-5.0.2.tgz#5d6893daf534ae52626708e0d62250890108c0c1" + resolved "https://registry.npmmirror.com/postcss-unique-selectors/download/postcss-unique-selectors-5.0.2.tgz?cache=0&sync_timestamp=1637084982907&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-unique-selectors%2Fdownload%2Fpostcss-unique-selectors-5.0.2.tgz#5d6893daf534ae52626708e0d62250890108c0c1" integrity sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA== dependencies: alphanum-sort "^1.0.2" @@ -6055,7 +6055,7 @@ postcss@^8.1.6, postcss@^8.2.15, postcss@^8.3.5, postcss@^8.3.7: prepend-http@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/prepend-http/download/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + resolved "https://registry.nlark.com/prepend-http/download/prepend-http-2.0.0.tgz?cache=0&sync_timestamp=1628547381568&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fprepend-http%2Fdownload%2Fprepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= prettier@^2.5.0: @@ -6065,7 +6065,7 @@ prettier@^2.5.0: pretty-error@^4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/pretty-error/download/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6" + resolved "https://registry.npmmirror.com/pretty-error/download/pretty-error-4.0.0.tgz?cache=0&sync_timestamp=1635212589197&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpretty-error%2Fdownload%2Fpretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6" integrity sha1-kKcD9G3XI0rbRtD4SCPp0cuPENY= dependencies: lodash "^4.17.20" @@ -6073,7 +6073,7 @@ pretty-error@^4.0.0: pretty-time@^1.1.0: version "1.1.0" - resolved "https://registry.npm.taobao.org/pretty-time/download/pretty-time-1.1.0.tgz#ffb7429afabb8535c346a34e41873adf3d74dd0e" + resolved "https://registry.nlark.com/pretty-time/download/pretty-time-1.1.0.tgz#ffb7429afabb8535c346a34e41873adf3d74dd0e" integrity sha1-/7dCmvq7hTXDRqNOQYc63z103Q4= prism-react-renderer@^1.2.1: @@ -6088,12 +6088,12 @@ prismjs@^1.23.0: process-nextick-args@~2.0.0: version "2.0.1" - resolved "https://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + resolved "https://registry.nlark.com/process-nextick-args/download/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha1-eCDZsWEgzFXKmud5JoCufbptf+I= prompts@^2.4.0, prompts@^2.4.1: version "2.4.2" - resolved "https://registry.npmmirror.com/prompts/download/prompts-2.4.2.tgz?cache=0&sync_timestamp=1633642460453&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fprompts%2Fdownload%2Fprompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" + resolved "https://registry.npmmirror.com/prompts/download/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" integrity sha1-e1fnOzpIAprRDr1E90sBcipMsGk= dependencies: kleur "^3.0.3" @@ -6125,7 +6125,7 @@ proxy-addr@~2.0.7: pump@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + resolved "https://registry.nlark.com/pump/download/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" integrity sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ= dependencies: end-of-stream "^1.1.0" @@ -6148,7 +6148,7 @@ punycode@^2.1.0: pupa@^2.1.1: version "2.1.1" - resolved "https://registry.nlark.com/pupa/download/pupa-2.1.1.tgz?cache=0&sync_timestamp=1631543593292&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpupa%2Fdownload%2Fpupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" + resolved "https://registry.nlark.com/pupa/download/pupa-2.1.1.tgz?cache=0&sync_timestamp=1631543442281&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpupa%2Fdownload%2Fpupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" integrity sha1-9ej9SvwsXZeCj6pSNUnth0SiDWI= dependencies: escape-goat "^2.0.0" @@ -6175,7 +6175,7 @@ queue-microtask@^1.2.2: quick-lru@^5.1.1: version "5.1.1" - resolved "https://registry.npmmirror.com/quick-lru/download/quick-lru-5.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fquick-lru%2Fdownload%2Fquick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + resolved "https://registry.npmmirror.com/quick-lru/download/quick-lru-5.1.1.tgz?cache=0&sync_timestamp=1637478611226&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fquick-lru%2Fdownload%2Fquick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" integrity sha1-NmST5rPkKjpoheLpnRj4D7eoyTI= randombytes@^2.1.0: @@ -6187,17 +6187,17 @@ randombytes@^2.1.0: range-parser@1.2.0: version "1.2.0" - resolved "https://registry.npm.taobao.org/range-parser/download/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" + resolved "https://registry.nlark.com/range-parser/download/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4= range-parser@^1.2.1, range-parser@~1.2.1: version "1.2.1" - resolved "https://registry.npm.taobao.org/range-parser/download/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + resolved "https://registry.nlark.com/range-parser/download/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE= raw-body@2.4.2: version "2.4.2" - resolved "https://registry.npmmirror.com/raw-body/download/raw-body-2.4.2.tgz?cache=0&sync_timestamp=1637116849434&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fraw-body%2Fdownload%2Fraw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32" + resolved "https://registry.npmmirror.com/raw-body/download/raw-body-2.4.2.tgz?cache=0&sync_timestamp=1637116791214&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fraw-body%2Fdownload%2Fraw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32" integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ== dependencies: bytes "3.1.1" @@ -6207,7 +6207,7 @@ raw-body@2.4.2: rc@^1.2.8: version "1.2.8" - resolved "https://registry.npm.taobao.org/rc/download/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + resolved "https://registry.nlark.com/rc/download/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha1-zZJL9SAKB1uDwYjNa54hG3/A0+0= dependencies: deep-extend "^0.6.0" @@ -6276,7 +6276,7 @@ react-fast-compare@^3.1.1: react-helmet@^6.1.0: version "6.1.0" - resolved "https://registry.nlark.com/react-helmet/download/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726" + resolved "https://registry.npm.taobao.org/react-helmet/download/react-helmet-6.1.0.tgz#a750d5165cb13cf213e44747502652e794468726" integrity sha1-p1DVFlyxPPIT5EdHUCZS55RGhyY= dependencies: object-assign "^4.1.1" @@ -6298,7 +6298,7 @@ react-loadable-ssr-addon-v5-slorber@^1.0.1: react-router-config@^5.1.1: version "5.1.1" - resolved "https://registry.npm.taobao.org/react-router-config/download/react-router-config-5.1.1.tgz#0f4263d1a80c6b2dc7b9c1902c9526478194a988" + resolved "https://registry.nlark.com/react-router-config/download/react-router-config-5.1.1.tgz#0f4263d1a80c6b2dc7b9c1902c9526478194a988" integrity sha1-D0Jj0agMay3HucGQLJUmR4GUqYg= dependencies: "@babel/runtime" "^7.1.2" @@ -6388,7 +6388,7 @@ reading-time@^1.5.0: rechoir@^0.6.2: version "0.6.2" - resolved "https://registry.nlark.com/rechoir/download/rechoir-0.6.2.tgz?cache=0&sync_timestamp=1627101677944&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frechoir%2Fdownload%2Frechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" + resolved "https://registry.nlark.com/rechoir/download/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= dependencies: resolve "^1.1.6" @@ -6402,7 +6402,7 @@ recursive-readdir@^2.2.2: regenerate-unicode-properties@^9.0.0: version "9.0.0" - resolved "https://registry.nlark.com/regenerate-unicode-properties/download/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" + resolved "https://registry.nlark.com/regenerate-unicode-properties/download/regenerate-unicode-properties-9.0.0.tgz?cache=0&sync_timestamp=1631617208210&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerate-unicode-properties%2Fdownload%2Fregenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" integrity sha1-VNCccRXh9T3CMUqXSzLBw0Tv4yY= dependencies: regenerate "^1.4.2" @@ -6414,12 +6414,12 @@ regenerate@^1.4.2: regenerator-runtime@^0.13.4: version "0.13.9" - resolved "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.13.9.tgz?cache=0&sync_timestamp=1626993001371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" + resolved "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" integrity sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I= regenerator-transform@^0.14.2: version "0.14.5" - resolved "https://registry.nlark.com/regenerator-transform/download/regenerator-transform-0.14.5.tgz?cache=0&sync_timestamp=1627057502723&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-transform%2Fdownload%2Fregenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" + resolved "https://registry.nlark.com/regenerator-transform/download/regenerator-transform-0.14.5.tgz?cache=0&sync_timestamp=1627057533376&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-transform%2Fdownload%2Fregenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" integrity sha1-yY2hVGg2ccnE3LFuznNlF+G3/rQ= dependencies: "@babel/runtime" "^7.8.4" @@ -6434,7 +6434,7 @@ regexp.prototype.flags@^1.2.0: regexpu-core@^4.5.4, regexpu-core@^4.7.1: version "4.8.0" - resolved "https://registry.nlark.com/regexpu-core/download/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" + resolved "https://registry.nlark.com/regexpu-core/download/regexpu-core-4.8.0.tgz?cache=0&sync_timestamp=1631619101495&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregexpu-core%2Fdownload%2Fregexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" integrity sha1-5WBbo2G2excYR4UBMnUC9EeamPA= dependencies: regenerate "^1.4.2" @@ -6453,7 +6453,7 @@ registry-auth-token@^4.0.0: registry-url@^5.0.0: version "5.1.0" - resolved "https://registry.npm.taobao.org/registry-url/download/registry-url-5.1.0.tgz?cache=0&sync_timestamp=1618682318998&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregistry-url%2Fdownload%2Fregistry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + resolved "https://registry.nlark.com/registry-url/download/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" integrity sha1-6YM0tQ1UNLgRNrROxjjZwgCcUAk= dependencies: rc "^1.2.8" @@ -6472,7 +6472,7 @@ regjsparser@^0.7.0: rehype-parse@^6.0.2: version "6.0.2" - resolved "https://registry.nlark.com/rehype-parse/download/rehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" + resolved "https://registry.nlark.com/rehype-parse/download/rehype-parse-6.0.2.tgz?cache=0&sync_timestamp=1630416388593&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frehype-parse%2Fdownload%2Frehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" integrity sha1-rrP91oCF+feW8dMTeuK4WphAaWQ= dependencies: hast-util-from-parse5 "^5.0.0" @@ -6486,7 +6486,7 @@ relateurl@^0.2.7: remark-admonitions@^1.2.1: version "1.2.1" - resolved "https://registry.npm.taobao.org/remark-admonitions/download/remark-admonitions-1.2.1.tgz#87caa1a442aa7b4c0cafa04798ed58a342307870" + resolved "https://registry.nlark.com/remark-admonitions/download/remark-admonitions-1.2.1.tgz#87caa1a442aa7b4c0cafa04798ed58a342307870" integrity sha1-h8qhpEKqe0wMr6BHmO1Yo0IweHA= dependencies: rehype-parse "^6.0.2" @@ -6495,7 +6495,7 @@ remark-admonitions@^1.2.1: remark-emoji@^2.1.0: version "2.2.0" - resolved "https://registry.npmmirror.com/remark-emoji/download/remark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" + resolved "https://registry.npmmirror.com/remark-emoji/download/remark-emoji-2.2.0.tgz?cache=0&sync_timestamp=1636025412972&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-emoji%2Fdownload%2Fremark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" integrity sha1-HHAgkKFSXaW4DhWo+WPvLII2ysc= dependencies: emoticon "^3.2.0" @@ -6537,7 +6537,7 @@ remark-mdx@1.6.22: remark-parse@8.0.3: version "8.0.3" - resolved "https://registry.npmmirror.com/remark-parse/download/remark-parse-8.0.3.tgz?cache=0&sync_timestamp=1637259967297&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-parse%2Fdownload%2Fremark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1" + resolved "https://registry.npmmirror.com/remark-parse/download/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1" integrity sha1-nGKqOzW3mkhkVMaQRykGB19Ax+E= dependencies: ccount "^1.0.0" @@ -6559,14 +6559,14 @@ remark-parse@8.0.3: remark-squeeze-paragraphs@4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/remark-squeeze-paragraphs/download/remark-squeeze-paragraphs-4.0.0.tgz?cache=0&sync_timestamp=1635765426012&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-squeeze-paragraphs%2Fdownload%2Fremark-squeeze-paragraphs-4.0.0.tgz#76eb0e085295131c84748c8e43810159c5653ead" + resolved "https://registry.npmmirror.com/remark-squeeze-paragraphs/download/remark-squeeze-paragraphs-4.0.0.tgz#76eb0e085295131c84748c8e43810159c5653ead" integrity sha1-dusOCFKVExyEdIyOQ4EBWcVlPq0= dependencies: mdast-squeeze-paragraphs "^4.0.0" renderkid@^3.0.0: version "3.0.0" - resolved "https://registry.npmmirror.com/renderkid/download/renderkid-3.0.0.tgz#5fd823e4d6951d37358ecc9a58b1f06836b6268a" + resolved "https://registry.npmmirror.com/renderkid/download/renderkid-3.0.0.tgz?cache=0&sync_timestamp=1635212582997&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Frenderkid%2Fdownload%2Frenderkid-3.0.0.tgz#5fd823e4d6951d37358ecc9a58b1f06836b6268a" integrity sha1-X9gj5NaVHTc1jsyaWLHwaDa2Joo= dependencies: css-select "^4.1.3" @@ -6577,17 +6577,17 @@ renderkid@^3.0.0: repeat-string@^1.5.4: version "1.6.1" - resolved "https://registry.npm.taobao.org/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + resolved "https://registry.nlark.com/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= require-from-string@^2.0.2: version "2.0.2" - resolved "https://registry.npmmirror.com/require-from-string/download/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + resolved "https://registry.nlark.com/require-from-string/download/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha1-iaf92TgmEmcxjq/hT5wy5ZjDaQk= "require-like@>= 0.1.1": version "0.1.2" - resolved "https://registry.npm.taobao.org/require-like/download/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa" + resolved "https://registry.nlark.com/require-like/download/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa" integrity sha1-rW8wwTvs15cBDEaK+ndcDAprR/o= requires-port@^1.0.0: @@ -6597,12 +6597,12 @@ requires-port@^1.0.0: resolve-from@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz?cache=0&sync_timestamp=1622605305717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fresolve-from%2Fdownload%2Fresolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + resolved "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY= resolve-from@^5.0.0: version "5.0.0" - resolved "https://registry.nlark.com/resolve-from/download/resolve-from-5.0.0.tgz?cache=0&sync_timestamp=1622605305717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fresolve-from%2Fdownload%2Fresolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + resolved "https://registry.nlark.com/resolve-from/download/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha1-w1IlhD3493bfIcV1V7wIfp39/Gk= resolve-pathname@^3.0.0: @@ -6612,7 +6612,7 @@ resolve-pathname@^3.0.0: resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2: version "1.20.0" - resolved "https://registry.nlark.com/resolve/download/resolve-1.20.0.tgz?cache=0&sync_timestamp=1631633008759&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fresolve%2Fdownload%2Fresolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + resolved "https://registry.nlark.com/resolve/download/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha1-YpoBP7P3B1XW8LeTXMHCxTeLGXU= dependencies: is-core-module "^2.2.0" @@ -6649,7 +6649,7 @@ rtl-detect@^1.0.4: run-parallel@^1.1.9: version "1.2.0" - resolved "https://registry.npm.taobao.org/run-parallel/download/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + resolved "https://registry.nlark.com/run-parallel/download/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" integrity sha1-ZtE2jae9+SHrnZW9GpIp5/IaQ+4= dependencies: queue-microtask "^1.2.2" @@ -6663,12 +6663,12 @@ rxjs@^7.1.0: safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" - resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.1.2.tgz?cache=0&sync_timestamp=1618847044058&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsafe-buffer%2Fdownload%2Fsafe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha1-mR7GnSluAxN0fVm9/St0XDX4go0= safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: version "5.2.1" - resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.2.1.tgz?cache=0&sync_timestamp=1618847044058&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsafe-buffer%2Fdownload%2Fsafe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha1-Hq+fqb2x/dTsdfWPnNtOa3gn7sY= "safer-buffer@>= 2.1.2 < 3": @@ -6678,7 +6678,7 @@ safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, sax@^1.2.4, sax@~1.2.4: version "1.2.4" - resolved "https://registry.npm.taobao.org/sax/download/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + resolved "https://registry.nlark.com/sax/download/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha1-KBYjTiN4vdxOU1T6tcqold9xANk= scheduler@^0.20.2: @@ -6691,7 +6691,7 @@ scheduler@^0.20.2: schema-utils@2.7.0: version "2.7.0" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1637075888461&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" integrity sha1-FxUfdtjq5n+793lgwzxnatn078c= dependencies: "@types/json-schema" "^7.0.4" @@ -6700,7 +6700,7 @@ schema-utils@2.7.0: schema-utils@^2.6.5: version "2.7.1" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1637075888461&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha1-HKTzLRskxZDCA7jnpQvw6kzTlNc= dependencies: "@types/json-schema" "^7.0.5" @@ -6709,7 +6709,7 @@ schema-utils@^2.6.5: schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: version "3.1.1" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-3.1.1.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-3.1.1.tgz?cache=0&sync_timestamp=1637075888461&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" integrity sha1-vHTEtraZXB2I92qLd76nIZ4MgoE= dependencies: "@types/json-schema" "^7.0.8" @@ -6718,7 +6718,7 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: schema-utils@^4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-4.0.0.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-4.0.0.tgz?cache=0&sync_timestamp=1637075888461&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== dependencies: "@types/json-schema" "^7.0.9" @@ -6736,7 +6736,7 @@ section-matter@^1.0.0: select-hose@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" + resolved "https://registry.nlark.com/select-hose/download/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= selfsigned@^1.10.11: @@ -6755,22 +6755,22 @@ semver-diff@^3.1.1: semver@7.0.0: version "7.0.0" - resolved "https://registry.npm.taobao.org/semver/download/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + resolved "https://registry.nlark.com/semver/download/semver-7.0.0.tgz?cache=0&sync_timestamp=1622685835879&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha1-XzyjV2HkfgWyBsba/yz4FPAxa44= semver@^5.4.1: version "5.7.1" - resolved "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + resolved "https://registry.nlark.com/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1622685835879&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha1-qVT5Ma66UI0we78Gnv8MAclhFvc= semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" - resolved "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + resolved "https://registry.nlark.com/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1622685835879&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0= semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.5" - resolved "https://registry.npm.taobao.org/semver/download/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + resolved "https://registry.nlark.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1622685835879&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc= dependencies: lru-cache "^6.0.0" @@ -6803,7 +6803,7 @@ serialize-javascript@^6.0.0: serve-handler@^6.1.3: version "6.1.3" - resolved "https://registry.npm.taobao.org/serve-handler/download/serve-handler-6.1.3.tgz#1bf8c5ae138712af55c758477533b9117f6435e8" + resolved "https://registry.nlark.com/serve-handler/download/serve-handler-6.1.3.tgz#1bf8c5ae138712af55c758477533b9117f6435e8" integrity sha1-G/jFrhOHEq9Vx1hHdTO5EX9kNeg= dependencies: bytes "3.0.0" @@ -6857,24 +6857,24 @@ shallow-clone@^3.0.0: shebang-command@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/shebang-command/download/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + resolved "https://registry.nlark.com/shebang-command/download/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" integrity sha1-zNCvT4g1+9wmW4JGGq8MNmY/NOo= dependencies: shebang-regex "^3.0.0" shebang-regex@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/shebang-regex/download/shebang-regex-3.0.0.tgz?cache=0&sync_timestamp=1628896299850&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fshebang-regex%2Fdownload%2Fshebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + resolved "https://registry.nlark.com/shebang-regex/download/shebang-regex-3.0.0.tgz?cache=0&sync_timestamp=1628896304371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fshebang-regex%2Fdownload%2Fshebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha1-rhbxZE2HPsrYQ7AwexQzYtTEIXI= shell-quote@^1.7.2: version "1.7.3" - resolved "https://registry.npmmirror.com/shell-quote/download/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" + resolved "https://registry.npmmirror.com/shell-quote/download/shell-quote-1.7.3.tgz?cache=0&sync_timestamp=1634798333958&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fshell-quote%2Fdownload%2Fshell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" integrity sha1-qkDtrBcERbmkMeF7tiwLiBucQSM= shelljs@^0.8.4: version "0.8.4" - resolved "https://registry.npm.taobao.org/shelljs/download/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2" + resolved "https://registry.nlark.com/shelljs/download/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2" integrity sha1-3naE/ut2f4cWsyYHiooAh1iQ48I= dependencies: glob "^7.0.0" @@ -6892,7 +6892,7 @@ side-channel@^1.0.4: signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.6" - resolved "https://registry.npmmirror.com/signal-exit/download/signal-exit-3.0.6.tgz?cache=0&sync_timestamp=1637255687504&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsignal-exit%2Fdownload%2Fsignal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + resolved "https://registry.npmmirror.com/signal-exit/download/signal-exit-3.0.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsignal-exit%2Fdownload%2Fsignal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== sirv@^1.0.7: @@ -6930,17 +6930,17 @@ sort-css-media-queries@2.0.4: source-list-map@^2.0.0: version "2.0.1" - resolved "https://registry.npm.taobao.org/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" + resolved "https://registry.nlark.com/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha1-OZO9hzv8SEecyp6jpUeDXHwVSzQ= source-map-js@^1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/source-map-js/download/source-map-js-1.0.1.tgz?cache=0&sync_timestamp=1636400772640&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-js%2Fdownload%2Fsource-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" + resolved "https://registry.npmmirror.com/source-map-js/download/source-map-js-1.0.1.tgz?cache=0&sync_timestamp=1636401089874&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-js%2Fdownload%2Fsource-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA== source-map-support@~0.5.20: version "0.5.21" - resolved "https://registry.npmmirror.com/source-map-support/download/source-map-support-0.5.21.tgz?cache=0&sync_timestamp=1637320322789&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-support%2Fdownload%2Fsource-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + resolved "https://registry.npmmirror.com/source-map-support/download/source-map-support-0.5.21.tgz?cache=0&sync_timestamp=1637320290160&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-support%2Fdownload%2Fsource-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" @@ -6968,12 +6968,12 @@ sourcemap-codec@^1.4.4: space-separated-tokens@^1.0.0: version "1.1.5" - resolved "https://registry.npmmirror.com/space-separated-tokens/download/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899" + resolved "https://registry.nlark.com/space-separated-tokens/download/space-separated-tokens-1.1.5.tgz?cache=0&sync_timestamp=1619456046361&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fspace-separated-tokens%2Fdownload%2Fspace-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899" integrity sha1-hfMsPRDZaCAH6RdBTdxcJtGqaJk= spdy-transport@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/spdy-transport/download/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" + resolved "https://registry.nlark.com/spdy-transport/download/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" integrity sha1-ANSGOmQArXXfkzYaFghgXl3NzzE= dependencies: debug "^4.1.0" @@ -6985,7 +6985,7 @@ spdy-transport@^3.0.0: spdy@^4.0.2: version "4.0.2" - resolved "https://registry.npm.taobao.org/spdy/download/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" + resolved "https://registry.nlark.com/spdy/download/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" integrity sha1-t09GYgOj7aRSwCSSuR+56EonZ3s= dependencies: debug "^4.1.0" @@ -6996,7 +6996,7 @@ spdy@^4.0.2: sprintf-js@~1.0.2: version "1.0.3" - resolved "https://registry.nlark.com/sprintf-js/download/sprintf-js-1.0.3.tgz?cache=0&sync_timestamp=1618847174560&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsprintf-js%2Fdownload%2Fsprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + resolved "https://registry.nlark.com/sprintf-js/download/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= stable@^0.1.8: @@ -7011,24 +7011,24 @@ state-toggle@^1.0.0: "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" - resolved "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + resolved "https://registry.nlark.com/statuses/download/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= std-env@^2.2.1: version "2.3.1" - resolved "https://registry.npmmirror.com/std-env/download/std-env-2.3.1.tgz?cache=0&sync_timestamp=1636125537684&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-2.3.1.tgz#d42271908819c243f8defc77a140fc1fcee336a1" + resolved "https://registry.npmmirror.com/std-env/download/std-env-2.3.1.tgz#d42271908819c243f8defc77a140fc1fcee336a1" integrity sha1-1CJxkIgZwkP43vx3oUD8H87jNqE= dependencies: ci-info "^3.1.1" std-env@^3.0.1: version "3.0.1" - resolved "https://registry.npmmirror.com/std-env/download/std-env-3.0.1.tgz?cache=0&sync_timestamp=1636125537684&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" + resolved "https://registry.npmmirror.com/std-env/download/std-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" integrity sha1-vEy8DkOGEBl+NMLXnD3zC0kfUYI= string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.2: version "4.2.3" - resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz?cache=0&sync_timestamp=1632421013520&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstring-width%2Fdownload%2Fstring-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha1-JpxxF9J7Ba0uU2gwqOyJXvnG0BA= dependencies: emoji-regex "^8.0.0" @@ -7045,7 +7045,7 @@ string.prototype.trimend@^1.0.4: string.prototype.trimstart@^1.0.4: version "1.0.4" - resolved "https://registry.npm.taobao.org/string.prototype.trimstart/download/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + resolved "https://registry.nlark.com/string.prototype.trimstart/download/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" integrity sha1-s2OZr0qymZtMnGSL16P7K7Jv7u0= dependencies: call-bind "^1.0.2" @@ -7067,7 +7067,7 @@ string_decoder@~1.1.1: stringify-object@^3.3.0: version "3.3.0" - resolved "https://registry.nlark.com/stringify-object/download/stringify-object-3.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstringify-object%2Fdownload%2Fstringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" + resolved "https://registry.nlark.com/stringify-object/download/stringify-object-3.3.0.tgz?cache=0&sync_timestamp=1629674903267&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstringify-object%2Fdownload%2Fstringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" integrity sha1-cDBlrvyhkwDTzoivT1s5VtdVZik= dependencies: get-own-enumerable-property-symbols "^3.0.0" @@ -7076,26 +7076,26 @@ stringify-object@^3.3.0: strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" - resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-6.0.1.tgz?cache=0&sync_timestamp=1632432619223&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-6.0.1.tgz?cache=0&sync_timestamp=1632420562057&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha1-nibGPTD1NEPpSJSVshBdN7Z6hdk= dependencies: ansi-regex "^5.0.1" strip-ansi@^7.0.0: version "7.0.1" - resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-7.0.1.tgz?cache=0&sync_timestamp=1632432619223&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" + resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-7.0.1.tgz?cache=0&sync_timestamp=1632420562057&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" integrity sha1-YXQKCM42th5Q5lZT8HBg0ACXX7I= dependencies: ansi-regex "^6.0.1" strip-bom-string@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/strip-bom-string/download/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" + resolved "https://registry.nlark.com/strip-bom-string/download/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" integrity sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI= strip-final-newline@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/strip-final-newline/download/strip-final-newline-2.0.0.tgz?cache=0&sync_timestamp=1620046435959&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstrip-final-newline%2Fdownload%2Fstrip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + resolved "https://registry.nlark.com/strip-final-newline/download/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha1-ibhS+y/L6Tb29LMYevsKEsGrWK0= strip-json-comments@~2.0.1: @@ -7105,14 +7105,14 @@ strip-json-comments@~2.0.1: style-to-object@0.3.0, style-to-object@^0.3.0: version "0.3.0" - resolved "https://registry.npm.taobao.org/style-to-object/download/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" + resolved "https://registry.nlark.com/style-to-object/download/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" integrity sha1-sbeQ0gWZHMeDgBlnIUl57hmnbkY= dependencies: inline-style-parser "0.1.1" stylehacks@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/stylehacks/download/stylehacks-5.0.1.tgz?cache=0&sync_timestamp=1621449652268&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstylehacks%2Fdownload%2Fstylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" + resolved "https://registry.nlark.com/stylehacks/download/stylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" integrity sha1-Mj7FVBmFIJhoBjiMf9rrw40sBvs= dependencies: browserslist "^4.16.0" @@ -7141,7 +7141,7 @@ supports-color@^8.0.0: svg-parser@^2.0.2: version "2.0.4" - resolved "https://registry.npm.taobao.org/svg-parser/download/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" + resolved "https://registry.nlark.com/svg-parser/download/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" integrity sha1-/cLinhOVFzYUC3bLEiyO5mMOtrU= svgo@^1.2.2: @@ -7226,7 +7226,7 @@ terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.4: terser@^5.10.0, terser@^5.7.2: version "5.10.0" - resolved "https://registry.npmmirror.com/terser/download/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" + resolved "https://registry.npmmirror.com/terser/download/terser-5.10.0.tgz?cache=0&sync_timestamp=1636988182324&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fterser%2Fdownload%2Fterser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA== dependencies: commander "^2.20.0" @@ -7235,7 +7235,7 @@ terser@^5.10.0, terser@^5.7.2: text-table@^0.2.0: version "0.2.0" - resolved "https://registry.nlark.com/text-table/download/text-table-0.2.0.tgz?cache=0&sync_timestamp=1618847142316&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftext-table%2Fdownload%2Ftext-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + resolved "https://registry.nlark.com/text-table/download/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= thunky@^1.0.2: @@ -7260,14 +7260,14 @@ tiny-warning@^1.0.0, tiny-warning@^1.0.3: tmp@^0.2.1: version "0.2.1" - resolved "https://registry.nlark.com/tmp/download/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + resolved "https://registry.npm.taobao.org/tmp/download/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" integrity sha1-hFf8MDfc9HGcJRNnoa9lAO4czxQ= dependencies: rimraf "^3.0.0" to-fast-properties@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/to-fast-properties/download/to-fast-properties-2.0.0.tgz?cache=0&sync_timestamp=1628418893613&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fto-fast-properties%2Fdownload%2Fto-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + resolved "https://registry.nlark.com/to-fast-properties/download/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= to-readable-stream@^1.0.0: @@ -7284,7 +7284,7 @@ to-regex-range@^5.0.1: toidentifier@1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/toidentifier/download/toidentifier-1.0.1.tgz?cache=0&sync_timestamp=1636938512912&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftoidentifier%2Fdownload%2Ftoidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + resolved "https://registry.npmmirror.com/toidentifier/download/toidentifier-1.0.1.tgz?cache=0&sync_timestamp=1636938521998&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftoidentifier%2Fdownload%2Ftoidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== totalist@^1.0.0: @@ -7304,12 +7304,12 @@ trim@0.0.1: trough@^1.0.0: version "1.0.5" - resolved "https://registry.nlark.com/trough/download/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" + resolved "https://registry.nlark.com/trough/download/trough-1.0.5.tgz?cache=0&sync_timestamp=1625401006146&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftrough%2Fdownload%2Ftrough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" integrity sha1-uLY5zvrX0LsqvTfUM/+Ck++l9AY= tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1: version "2.3.1" - resolved "https://registry.nlark.com/tslib/download/tslib-2.3.1.tgz?cache=0&sync_timestamp=1628722556410&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftslib%2Fdownload%2Ftslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + resolved "https://registry.nlark.com/tslib/download/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha1-6KM1rdXOrlGqJh0ypJAVjvBC7wE= type-fest@^0.20.2: @@ -7349,7 +7349,7 @@ unbox-primitive@^1.0.1: unherit@^1.0.4: version "1.1.3" - resolved "https://registry.nlark.com/unherit/download/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" + resolved "https://registry.nlark.com/unherit/download/unherit-1.1.3.tgz?cache=0&sync_timestamp=1626423513229&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funherit%2Fdownload%2Funherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" integrity sha1-bJtQPytBsmIzDIDpHIYUq9qmnCI= dependencies: inherits "^2.0.0" @@ -7362,7 +7362,7 @@ unicode-canonical-property-names-ecmascript@^2.0.0: unicode-match-property-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-match-property-ecmascript/download/unicode-match-property-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618601397&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-ecmascript%2Fdownload%2Funicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" + resolved "https://registry.nlark.com/unicode-match-property-ecmascript/download/unicode-match-property-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618696521&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-ecmascript%2Fdownload%2Funicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" integrity sha1-VP0W4OyxZ88Ezx91a9zJLrp5dsM= dependencies: unicode-canonical-property-names-ecmascript "^2.0.0" @@ -7375,12 +7375,12 @@ unicode-match-property-value-ecmascript@^2.0.0: unicode-property-aliases-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-property-aliases-ecmascript/download/unicode-property-aliases-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631609367398&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-property-aliases-ecmascript%2Fdownload%2Funicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" + resolved "https://registry.nlark.com/unicode-property-aliases-ecmascript/download/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" integrity sha1-CjbLmlhcT2q9Ua0d7dsoXBZSl8g= unified@9.2.0: version "9.2.0" - resolved "https://registry.npmmirror.com/unified/download/unified-9.2.0.tgz?cache=0&sync_timestamp=1637256247526&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" + resolved "https://registry.npmmirror.com/unified/download/unified-9.2.0.tgz?cache=0&sync_timestamp=1637256306228&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" integrity sha1-Z6YsYnxAWJ7eu/YPU+39TYIgJ/g= dependencies: bail "^1.0.0" @@ -7392,7 +7392,7 @@ unified@9.2.0: unified@^8.4.2: version "8.4.2" - resolved "https://registry.npmmirror.com/unified/download/unified-8.4.2.tgz?cache=0&sync_timestamp=1637256247526&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" + resolved "https://registry.npmmirror.com/unified/download/unified-8.4.2.tgz?cache=0&sync_timestamp=1637256306228&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" integrity sha1-E61YtKQ3+qJ1GkpMahb2gMUA//E= dependencies: bail "^1.0.0" @@ -7403,7 +7403,7 @@ unified@^8.4.2: unique-string@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/unique-string/download/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" + resolved "https://registry.nlark.com/unique-string/download/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" integrity sha1-OcZFH4GvsnSd4rIz4/fF6IQ72J0= dependencies: crypto-random-string "^2.0.0" @@ -7415,22 +7415,22 @@ unist-builder@2.0.3, unist-builder@^2.0.0: unist-util-generated@^1.0.0: version "1.1.6" - resolved "https://registry.npm.taobao.org/unist-util-generated/download/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" + resolved "https://registry.npm.taobao.org/unist-util-generated/download/unist-util-generated-1.1.6.tgz?cache=0&sync_timestamp=1618396508779&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funist-util-generated%2Fdownload%2Funist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" integrity sha1-WrUfaJ4pkqRyvrGzXyzn/y8yTUs= unist-util-is@^4.0.0: version "4.1.0" - resolved "https://registry.nlark.com/unist-util-is/download/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797" + resolved "https://registry.nlark.com/unist-util-is/download/unist-util-is-4.1.0.tgz?cache=0&sync_timestamp=1626874870978&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-is%2Fdownload%2Funist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797" integrity sha1-l25fRip6Xec9lLcGusG5BnG1d5c= unist-util-position@^3.0.0: version "3.1.0" - resolved "https://registry.nlark.com/unist-util-position/download/unist-util-position-3.1.0.tgz?cache=0&sync_timestamp=1620915237724&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-position%2Fdownload%2Funist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" + resolved "https://registry.nlark.com/unist-util-position/download/unist-util-position-3.1.0.tgz?cache=0&sync_timestamp=1620915084174&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-position%2Fdownload%2Funist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" integrity sha1-HELuYwH41S9H0U9iu9t5ZXH6LUc= unist-util-remove-position@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/unist-util-remove-position/download/unist-util-remove-position-2.0.1.tgz?cache=0&sync_timestamp=1627848251490&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-remove-position%2Fdownload%2Funist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" + resolved "https://registry.nlark.com/unist-util-remove-position/download/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" integrity sha1-XRnKef26cSMBmZsrc1U8qPOzUsw= dependencies: unist-util-visit "^2.0.0" @@ -7451,7 +7451,7 @@ unist-util-remove@^2.0.0: unist-util-stringify-position@^2.0.0: version "2.0.3" - resolved "https://registry.nlark.com/unist-util-stringify-position/download/unist-util-stringify-position-2.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-stringify-position%2Fdownload%2Funist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" + resolved "https://registry.nlark.com/unist-util-stringify-position/download/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" integrity sha1-zOO/oc34W6c3XR1bF73Eytqb2do= dependencies: "@types/unist" "^2.0.2" @@ -7466,7 +7466,7 @@ unist-util-visit-parents@^3.0.0: unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist-util-visit@^2.0.2, unist-util-visit@^2.0.3: version "2.0.3" - resolved "https://registry.npmmirror.com/unist-util-visit/download/unist-util-visit-2.0.3.tgz?cache=0&sync_timestamp=1632405961713&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funist-util-visit%2Fdownload%2Funist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" + resolved "https://registry.npmmirror.com/unist-util-visit/download/unist-util-visit-2.0.3.tgz?cache=0&sync_timestamp=1632405265959&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funist-util-visit%2Fdownload%2Funist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" integrity sha1-w3A4kxRt9HIDu4qXla9H17lxIIw= dependencies: "@types/unist" "^2.0.0" @@ -7480,7 +7480,7 @@ universalify@^2.0.0: unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/unpipe/download/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + resolved "https://registry.nlark.com/unpipe/download/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= unquote@~1.1.1: @@ -7510,7 +7510,7 @@ update-notifier@^5.1.0: uri-js@^4.2.2: version "4.4.1" - resolved "https://registry.nlark.com/uri-js/download/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + resolved "https://registry.npm.taobao.org/uri-js/download/uri-js-4.4.1.tgz?cache=0&sync_timestamp=1610237530009&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Furi-js%2Fdownload%2Furi-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" integrity sha1-mxpSWVIlhZ5V9mnZKPiMbFfyp34= dependencies: punycode "^2.1.0" @@ -7526,7 +7526,7 @@ url-loader@^4.1.1: url-parse-lax@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/url-parse-lax/download/url-parse-lax-3.0.0.tgz?cache=0&sync_timestamp=1628547550655&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl-parse-lax%2Fdownload%2Furl-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + resolved "https://registry.nlark.com/url-parse-lax/download/url-parse-lax-3.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl-parse-lax%2Fdownload%2Furl-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= dependencies: prepend-http "^2.0.0" @@ -7561,7 +7561,7 @@ utila@~0.4: utility-types@^3.10.0: version "3.10.0" - resolved "https://registry.npm.taobao.org/utility-types/download/utility-types-3.10.0.tgz#ea4148f9a741015f05ed74fd615e1d20e6bed82b" + resolved "https://registry.nlark.com/utility-types/download/utility-types-3.10.0.tgz#ea4148f9a741015f05ed74fd615e1d20e6bed82b" integrity sha1-6kFI+adBAV8F7XT9YV4dIOa+2Cs= utils-merge@1.0.1: @@ -7599,7 +7599,7 @@ vfile-message@^2.0.0: vfile@^4.0.0: version "4.2.1" - resolved "https://registry.npmmirror.com/vfile/download/vfile-4.2.1.tgz?cache=0&sync_timestamp=1635657951041&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvfile%2Fdownload%2Fvfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624" + resolved "https://registry.npmmirror.com/vfile/download/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624" integrity sha1-A/Hc4o/GJcYlvGUUNQ+9sA+p5iQ= dependencies: "@types/unist" "^2.0.0" @@ -7635,12 +7635,12 @@ wbuf@^1.1.0, wbuf@^1.7.3: web-namespaces@^1.0.0, web-namespaces@^1.1.2: version "1.1.4" - resolved "https://registry.npmmirror.com/web-namespaces/download/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec" + resolved "https://registry.npmmirror.com/web-namespaces/download/web-namespaces-1.1.4.tgz?cache=0&sync_timestamp=1636136109313&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fweb-namespaces%2Fdownload%2Fweb-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec" integrity sha1-vJij3mDa3X+u/EA9EHbVKfXgMOw= webpack-bundle-analyzer@^4.4.2: version "4.5.0" - resolved "https://registry.npmmirror.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-4.5.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-bundle-analyzer%2Fdownload%2Fwebpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" + resolved "https://registry.npmmirror.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-4.5.0.tgz?cache=0&sync_timestamp=1634019921368&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-bundle-analyzer%2Fdownload%2Fwebpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" integrity sha1-Gw7qKUfnNSh1Sm+a8+kbK24PedU= dependencies: acorn "^8.0.4" @@ -7701,7 +7701,7 @@ webpack-dev-server@^4.4.0: webpack-merge@^5.8.0: version "5.8.0" - resolved "https://registry.nlark.com/webpack-merge/download/webpack-merge-5.8.0.tgz?cache=0&sync_timestamp=1623054906070&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwebpack-merge%2Fdownload%2Fwebpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" + resolved "https://registry.nlark.com/webpack-merge/download/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" integrity sha1-Kznb8ir4d3atdEw5AiNzHTCmj2E= dependencies: clone-deep "^4.0.1" @@ -7709,7 +7709,7 @@ webpack-merge@^5.8.0: webpack-sources@^1.1.0, webpack-sources@^1.4.3: version "1.4.3" - resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1636982763649&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" + resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1636982731420&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha1-7t2OwLko+/HL/plOItLYkPMwqTM= dependencies: source-list-map "^2.0.0" @@ -7717,7 +7717,7 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.3: webpack-sources@^3.2.2: version "3.2.2" - resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-3.2.2.tgz?cache=0&sync_timestamp=1636982763649&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260" + resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-3.2.2.tgz?cache=0&sync_timestamp=1636982731420&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260" integrity sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw== webpack@^5.61.0: @@ -7752,7 +7752,7 @@ webpack@^5.61.0: webpackbar@^5.0.0-3: version "5.0.2" - resolved "https://registry.npmmirror.com/webpackbar/download/webpackbar-5.0.2.tgz?cache=0&sync_timestamp=1636125538348&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpackbar%2Fdownload%2Fwebpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" + resolved "https://registry.npmmirror.com/webpackbar/download/webpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" integrity sha1-091GYhHHOFJ0HfyEK3VW3LwrBXA= dependencies: chalk "^4.1.0" @@ -7771,7 +7771,7 @@ websocket-driver@>=0.5.1, websocket-driver@^0.7.4: websocket-extensions@>=0.1.1: version "0.1.4" - resolved "https://registry.npm.taobao.org/websocket-extensions/download/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + resolved "https://registry.nlark.com/websocket-extensions/download/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha1-f4RzvIOd/YdgituV1+sHUhFXikI= which-boxed-primitive@^1.0.2: @@ -7801,7 +7801,7 @@ which@^2.0.1: widest-line@^3.1.0: version "3.1.0" - resolved "https://registry.npmmirror.com/widest-line/download/widest-line-3.1.0.tgz?cache=0&sync_timestamp=1634023966185&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwidest-line%2Fdownload%2Fwidest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" + resolved "https://registry.npmmirror.com/widest-line/download/widest-line-3.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwidest-line%2Fdownload%2Fwidest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" integrity sha1-gpIzO79my0X/DeFgOxNreuFJbso= dependencies: string-width "^4.0.0" @@ -7813,7 +7813,7 @@ wildcard@^2.0.0: wrap-ansi@^7.0.0: version "7.0.0" - resolved "https://registry.nlark.com/wrap-ansi/download/wrap-ansi-7.0.0.tgz?cache=0&sync_timestamp=1631557201275&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwrap-ansi%2Fdownload%2Fwrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + resolved "https://registry.nlark.com/wrap-ansi/download/wrap-ansi-7.0.0.tgz?cache=0&sync_timestamp=1631557327268&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwrap-ansi%2Fdownload%2Fwrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha1-Z+FFz/UQpqaYS98RUpEdadLrnkM= dependencies: ansi-styles "^4.0.0" @@ -7822,12 +7822,12 @@ wrap-ansi@^7.0.0: wrappy@1: version "1.0.2" - resolved "https://registry.nlark.com/wrappy/download/wrappy-1.0.2.tgz?cache=0&sync_timestamp=1619133505879&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwrappy%2Fdownload%2Fwrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + resolved "https://registry.nlark.com/wrappy/download/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= write-file-atomic@^3.0.0: version "3.0.3" - resolved "https://registry.npm.taobao.org/write-file-atomic/download/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + resolved "https://registry.nlark.com/write-file-atomic/download/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" integrity sha1-Vr1cWlxwSBzRnFcb05q5ZaXeVug= dependencies: imurmurhash "^0.1.4" @@ -7852,7 +7852,7 @@ xdg-basedir@^4.0.0: xml-js@^1.6.11: version "1.6.11" - resolved "https://registry.npm.taobao.org/xml-js/download/xml-js-1.6.11.tgz#927d2f6947f7f1c19a316dd8eea3614e8b18f8e9" + resolved "https://registry.nlark.com/xml-js/download/xml-js-1.6.11.tgz#927d2f6947f7f1c19a316dd8eea3614e8b18f8e9" integrity sha1-kn0vaUf38cGaMW3Y7qNhTosY+Ok= dependencies: sax "^1.2.4" @@ -7864,15 +7864,15 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2: yallist@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/yallist/download/yallist-4.0.0.tgz?cache=0&sync_timestamp=1622604530774&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fyallist%2Fdownload%2Fyallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + resolved "https://registry.nlark.com/yallist/download/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI= yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: version "1.10.2" - resolved "https://registry.npmmirror.com/yaml/download/yaml-1.10.2.tgz?cache=0&sync_timestamp=1636797252827&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyaml%2Fdownload%2Fyaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + resolved "https://registry.npmmirror.com/yaml/download/yaml-1.10.2.tgz?cache=0&sync_timestamp=1636797325177&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyaml%2Fdownload%2Fyaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha1-IwHF/78StGfejaIzOkWeKeeSDks= zwitch@^1.0.0: version "1.0.5" - resolved "https://registry.nlark.com/zwitch/download/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" + resolved "https://registry.npmmirror.com/zwitch/download/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" integrity sha1-0R1zgf/tFrdC9q97PyI9XNn+mSA= From 5cfeb4e79dd090645401a16fc71e5cb5e74bae2a Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 28 Dec 2021 14:33:03 +0800 Subject: [PATCH 141/174] :bug: fix log level bug --- nonebot/log.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nonebot/log.py b/nonebot/log.py index b39a0497..1caa4789 100644 --- a/nonebot/log.py +++ b/nonebot/log.py @@ -91,6 +91,7 @@ default_format = ( ) logger_id = logger.add( sys.stdout, + level=0, colorize=True, diagnose=False, filter=default_filter, From 33233932613e9b9806f12f3934dc26110c595d03 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 28 Dec 2021 15:06:28 +0800 Subject: [PATCH 142/174] :memo: add create matcher doc --- .../docs/tutorial/plugin/create-matcher.md | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/website/docs/tutorial/plugin/create-matcher.md b/website/docs/tutorial/plugin/create-matcher.md index 59489073..50a8a180 100644 --- a/website/docs/tutorial/plugin/create-matcher.md +++ b/website/docs/tutorial/plugin/create-matcher.md @@ -99,6 +99,38 @@ async def handle(matcher: Matcher): - `temp` 属性：配置事件响应器在下一次响应之后移除。 - `expire_time` 属性：配置事件响应器在指定时间之后移除。 +## 创建事件响应器 + +在前面的介绍中，我们已经了解了事件响应器的组成，接下来我们就可以使用 `nonebot.plugin` 模块中定义的辅助函数来创建事件响应器。 + +```python {3} +from nonebot import on_message + +matcher = on_message() +``` + +用于定义事件响应器的辅助函数已经在 `nonebot` 主模块中被 `re-export` ，所以直接从 `nonebot` 导入即可。 + +辅助函数有以下几种： + +1. `on`: 创建任何类型的事件响应器。 +2. `on_metaevent`: 创建元事件响应器。 +3. `on_message`: 创建消息事件响应器。 +4. `on_request`: 创建请求事件响应器。 +5. `on_notice`: 创建通知事件响应器。 +6. `on_startswith`: 创建消息开头匹配事件响应器。 +7. `on_endswith`: 创建消息结尾匹配事件响应器。 +8. `on_keyword`: 创建消息关键词匹配事件响应器。 +9. `on_command`: 创建命令消息事件响应器。 +10. `on_shell_command`: 创建 shell 命令消息事件响应器。 +11. `on_regex`: 创建正则表达式匹配事件响应器。 +12. `CommandGroup`: 创建具有共同命令名称前缀的命令组。 +13. `MatcherGroup`: 创建具有共同参数的响应器组。 + +其中，`on_metaevent` `on_message` `on_request` `on_notice` 函数都是在 `on` 的基础上添加了对应的事件类型 `type`；`on_startswith` `on_endswith` `on_keyword` `on_command` `on_shell_command` `on_regex` 函数都是在 `on_message` 的基础上添加了对应的匹配规则 `rule`。 + ## 自定义规则 + + ## 自定义权限 From f06b78054c4bf661a21a7a0695de33f5606a5e6c Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 28 Dec 2021 15:19:53 +0800 Subject: [PATCH 143/174] :fire: remove debug option --- nonebot/__init__.py | 6 +----- nonebot/config.py | 13 ++----------- nonebot/drivers/fastapi.py | 12 ++++-------- nonebot/drivers/quart.py | 11 ++++------- nonebot/log.py | 4 ++-- nonebot/plugin/on.py | 2 -- nonebot/utils.py | 2 +- website/docs/tutorial/choose-driver.md | 2 ++ website/docs/tutorial/configuration.md | 1 - 9 files changed, 16 insertions(+), 37 deletions(-) diff --git a/nonebot/__init__.py b/nonebot/__init__.py index 74811e10..8d2a78f3 100644 --- a/nonebot/__init__.py +++ b/nonebot/__init__.py @@ -262,11 +262,7 @@ def init(*, _env_file: Optional[str] = None, **kwargs): _env_file=_env_file or f".env.{env.environment}", ) - default_filter.level = ( - ("DEBUG" if config.debug else "INFO") - if config.log_level is None - else config.log_level - ) + default_filter.level = config.log_level logger.opt(colors=True).info( f"Current Env: {escape_tag(env.environment)}" ) diff --git a/nonebot/config.py b/nonebot/config.py index 818f7c36..d8b4b5e4 100644 --- a/nonebot/config.py +++ b/nonebot/config.py @@ -189,19 +189,10 @@ class Config(BaseConfig): NoneBot 的 HTTP 和 WebSocket 服务端监听的端口。 """ - debug: bool = False - """ - - **类型**: ``bool`` - - **默认值**: ``False`` - - :说明: - - 是否以调试模式运行 NoneBot。 - """ - log_level: Optional[Union[int, str]] = None + log_level: Union[int, str] = "INFO" """ - **类型**: ``Union[int, str]`` - - **默认值**: ``None`` + - **默认值**: ``INFO`` :说明: diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index 57170a59..a9e93aca 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -63,15 +63,15 @@ class Config(BaseSettings): ``redoc`` 地址，默认为 ``None`` 即关闭 """ - fastapi_reload: Optional[bool] = None + fastapi_reload: bool = False """ :类型: - ``Optional[bool]`` + ``bool`` :说明: - 开启/关闭冷重载，默认会在配置了 app 的 debug 模式启用 + 开启/关闭冷重载 """ fastapi_reload_dirs: Optional[List[str]] = None """ @@ -127,7 +127,6 @@ class Driver(ReverseDriver): self.fastapi_config: Config = Config(**config.dict()) self._server_app = FastAPI( - debug=config.debug, openapi_url=self.fastapi_config.fastapi_openapi_url, docs_url=self.fastapi_config.fastapi_docs_url, redoc_url=self.fastapi_config.fastapi_redoc_url, @@ -221,14 +220,11 @@ class Driver(ReverseDriver): app or self.server_app, # type: ignore host=host or str(self.config.host), port=port or self.config.port, - reload=self.fastapi_config.fastapi_reload - if self.fastapi_config.fastapi_reload is not None - else (bool(app) and self.config.debug), + reload=self.fastapi_config.fastapi_reload, reload_dirs=self.fastapi_config.fastapi_reload_dirs, reload_delay=self.fastapi_config.fastapi_reload_delay, reload_includes=self.fastapi_config.fastapi_reload_includes, reload_excludes=self.fastapi_config.fastapi_reload_excludes, - debug=self.config.debug, log_config=LOGGING_CONFIG, **kwargs, ) diff --git a/nonebot/drivers/quart.py b/nonebot/drivers/quart.py index fbd66a25..1f5df4c6 100644 --- a/nonebot/drivers/quart.py +++ b/nonebot/drivers/quart.py @@ -40,15 +40,15 @@ class Config(BaseSettings): Quart 驱动框架设置 """ - quart_reload: Optional[bool] = None + quart_reload: bool = False """ :类型: - ``Optional[bool]`` + ``bool`` :说明: - 开启/关闭冷重载，默认会在配置了 app 的 debug 模式启用 + 开启/关闭冷重载 """ quart_reload_dirs: Optional[List[str]] = None """ @@ -199,14 +199,11 @@ class Driver(ReverseDriver): app or self.server_app, # type: ignore host=host or str(self.config.host), port=port or self.config.port, - reload=self.quart_config.quart_reload - if self.quart_config.quart_reload is not None - else (bool(app) and self.config.debug), + reload=self.quart_config.quart_reload, reload_dirs=self.quart_config.quart_reload_dirs, reload_delay=self.quart_config.quart_reload_delay, reload_includes=self.quart_config.quart_reload_includes, reload_excludes=self.quart_config.quart_reload_excludes, - debug=self.config.debug, log_config=LOGGING_CONFIG, **kwargs, ) diff --git a/nonebot/log.py b/nonebot/log.py index 1caa4789..b3c520cd 100644 --- a/nonebot/log.py +++ b/nonebot/log.py @@ -31,7 +31,7 @@ logger: "Logger" = loguru.logger :默认信息: * 格式: ``[%(asctime)s %(name)s] %(levelname)s: %(message)s`` - * 等级: ``DEBUG`` / ``INFO`` ，根据 config 配置改变 + * 等级: ``INFO`` ，根据 ``config,log_level`` 配置改变 * 输出: 输出至 stdout :用法: @@ -49,7 +49,7 @@ logger: "Logger" = loguru.logger class Filter: def __init__(self) -> None: - self.level: Union[int, str] = "DEBUG" + self.level: Union[int, str] = "INFO" def __call__(self, record): module_name: str = record["name"] diff --git a/nonebot/plugin/on.py b/nonebot/plugin/on.py index 0520488a..e9b56395 100644 --- a/nonebot/plugin/on.py +++ b/nonebot/plugin/on.py @@ -4,8 +4,6 @@ import inspect from types import ModuleType from typing import Any, Set, Dict, List, Type, Tuple, Union, Optional -from nonebot.params import State -from nonebot.adapters import Event from nonebot.matcher import Matcher from .manager import _current_plugin from nonebot.permission import Permission diff --git a/nonebot/utils.py b/nonebot/utils.py index 50044074..b8bc4af5 100644 --- a/nonebot/utils.py +++ b/nonebot/utils.py @@ -155,7 +155,7 @@ def logger_wrapper(logger_name: str): :log 参数: - * ``level: Literal['WARNING', 'DEBUG', 'INFO']``: 日志等级 + * ``level: Literal["CRETICAL", "WARNING", "INFO", "DEBUG", "TRACE"]``: 日志等级 * ``message: str``: 日志信息 * ``exception: Optional[Exception]``: 异常信息 """ diff --git a/website/docs/tutorial/choose-driver.md b/website/docs/tutorial/choose-driver.md index 898d9f24..fea1dabb 100644 --- a/website/docs/tutorial/choose-driver.md +++ b/website/docs/tutorial/choose-driver.md @@ -62,6 +62,8 @@ FastAPI: [文档](https://fastapi.tiangolo.com/), [仓库](https://github.com/ti DRIVER=~fastapi ``` + + ### Quart 类型: `ReverseDriver` diff --git a/website/docs/tutorial/configuration.md b/website/docs/tutorial/configuration.md index 94ee90cd..d6af925c 100644 --- a/website/docs/tutorial/configuration.md +++ b/website/docs/tutorial/configuration.md @@ -65,7 +65,6 @@ NoneBot 默认会从 `.env.{ENVIRONMENT}` 文件加载配置，但是可以在 N ```bash HOST=0.0.0.0 # 配置 NoneBot 监听的 IP/主机名 PORT=8080 # 配置 NoneBot 监听的端口 -DEBUG=true # 开启 debug 模式 **请勿在生产环境开启** SUPERUSERS=["123456789", "987654321"] # 配置 NoneBot 超级用户 NICKNAME=["awesome", "bot"] # 配置机器人的昵称 COMMAND_START=["/", ""] # 配置命令起始字符 From 0aea7f13e30604e8c546d4a96e2a2cb0eabafa14 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 29 Dec 2021 00:24:52 +0800 Subject: [PATCH 144/174] :memo: add handler doc --- website/docs/tutorial/plugin/create-handler.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 website/docs/tutorial/plugin/create-handler.md diff --git a/website/docs/tutorial/plugin/create-handler.md b/website/docs/tutorial/plugin/create-handler.md new file mode 100644 index 00000000..7504aa42 --- /dev/null +++ b/website/docs/tutorial/plugin/create-handler.md @@ -0,0 +1,17 @@ +--- +sidebar_position: 4 +description: 定义事件处理流程，完成事件响应 + +options: + menu: + weight: 27 + category: guide +--- + +# 定义事件处理流程 + +在上一章节中，我们已经定义了事件响应器，在这一章中，我们将会为事件响应器填充处理流程。 + +## 添加一个处理依赖 + +## 事件处理流程 From 39fd8b2dcd5f273800d4e1e8fe816fcfb03bb8cc Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 29 Dec 2021 13:33:36 +0800 Subject: [PATCH 145/174] :memo: add store base layout --- website/docs/tutorial/plugin/introduction.md | 2 +- website/docs/tutorial/plugin/load-plugin.md | 4 + website/src/components/Adapter.tsx | 5 + website/src/components/Bot.tsx | 5 + website/src/components/Driver.tsx | 5 + website/src/components/Plugin.tsx | 5 + website/src/pages/changelog.md | 4 + website/src/pages/store.md | 1 - website/src/pages/store.mdx | 31 + yarn.lock | 870 +++++++++---------- 10 files changed, 495 insertions(+), 437 deletions(-) create mode 100644 website/src/components/Adapter.tsx create mode 100644 website/src/components/Bot.tsx create mode 100644 website/src/components/Driver.tsx create mode 100644 website/src/components/Plugin.tsx delete mode 100644 website/src/pages/store.md create mode 100644 website/src/pages/store.mdx diff --git a/website/docs/tutorial/plugin/introduction.md b/website/docs/tutorial/plugin/introduction.md index fcc50161..b146502b 100644 --- a/website/docs/tutorial/plugin/introduction.md +++ b/website/docs/tutorial/plugin/introduction.md @@ -9,7 +9,7 @@ description: 插件入门 在编写插件之前，首先我们需要了解一下插件的概念。 -在 NoneBot 中，插件可以是 Python 的一个模块 `module` ，也可以是一个包 `package` 。NoneBot 会在导入时对这些模块或包做一些特殊的处理使得他们成为一个插件。 +在 NoneBot 中，插件可以是 Python 的一个模块 `module` ，也可以是一个包 `package` 。NoneBot 会在导入时对这些模块或包做一些特殊的处理使得他们成为一个插件。插件间应尽量减少耦合，可以进行有限制的插件间调用，NoneBot 能够正确解析插件间的依赖关系。 下面详细介绍两种插件的结构： diff --git a/website/docs/tutorial/plugin/load-plugin.md b/website/docs/tutorial/plugin/load-plugin.md index 3b92dc6e..90aed864 100644 --- a/website/docs/tutorial/plugin/load-plugin.md +++ b/website/docs/tutorial/plugin/load-plugin.md @@ -100,3 +100,7 @@ nonebot.load_from_toml("plugin_config.toml", encoding="utf-8") ```python nonebot.load_builtin_plugin("echo") ``` + +## 嵌套插件 + + diff --git a/website/src/components/Adapter.tsx b/website/src/components/Adapter.tsx new file mode 100644 index 00000000..42fd868e --- /dev/null +++ b/website/src/components/Adapter.tsx @@ -0,0 +1,5 @@ +import React from "react"; + +export default function Adapter() { + return <>; +} diff --git a/website/src/components/Bot.tsx b/website/src/components/Bot.tsx new file mode 100644 index 00000000..63fd515c --- /dev/null +++ b/website/src/components/Bot.tsx @@ -0,0 +1,5 @@ +import React from "react"; + +export default function Bot() { + return <>; +} diff --git a/website/src/components/Driver.tsx b/website/src/components/Driver.tsx new file mode 100644 index 00000000..49b11359 --- /dev/null +++ b/website/src/components/Driver.tsx @@ -0,0 +1,5 @@ +import React from "react"; + +export default function Driver() { + return <>; +} diff --git a/website/src/components/Plugin.tsx b/website/src/components/Plugin.tsx new file mode 100644 index 00000000..ef4c6684 --- /dev/null +++ b/website/src/components/Plugin.tsx @@ -0,0 +1,5 @@ +import React from "react"; + +export default function Plugin() { + return <>; +} diff --git a/website/src/pages/changelog.md b/website/src/pages/changelog.md index 3a068096..69618083 100644 --- a/website/src/pages/changelog.md +++ b/website/src/pages/changelog.md @@ -1,3 +1,7 @@ +--- +description: Changelog +--- + # 更新日志 ## v2.0.0b1 diff --git a/website/src/pages/store.md b/website/src/pages/store.md deleted file mode 100644 index 2ec9919f..00000000 --- a/website/src/pages/store.md +++ /dev/null @@ -1 +0,0 @@ -# 商店 diff --git a/website/src/pages/store.mdx b/website/src/pages/store.mdx new file mode 100644 index 00000000..8c6910ff --- /dev/null +++ b/website/src/pages/store.mdx @@ -0,0 +1,31 @@ +--- +description: NoneBot Store +hide_table_of_contents: true +--- + +import Tabs from "@theme/Tabs"; +import TabItem from "@theme/TabItem"; + +import Driver from "../components/Driver"; +import Adapter from "../components/Adapter"; +import Plugin from "../components/Plugin"; +import Bot from "../components/Bot"; + +# 商店 + +
+ + + + + + + + + + + + + + +
diff --git a/yarn.lock b/yarn.lock index 33e2758b..a3095696 100644 --- a/yarn.lock +++ b/yarn.lock @@ -132,14 +132,14 @@ "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.8.3": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/code-frame/download/@babel/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" + resolved "https://registry.npmmirror.com/@babel/code-frame/download/@babel/code-frame-7.16.0.tgz?cache=0&sync_timestamp=1635560657003&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcode-frame%2Fdownload%2F%40babel%2Fcode-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" integrity sha1-DfyAMJvuyEEeZecGRhxAiwu5tDE= dependencies: "@babel/highlight" "^7.16.0" "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.0", "@babel/compat-data@^7.16.4": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/compat-data/download/@babel/compat-data-7.16.4.tgz?cache=0&sync_timestamp=1637102913685&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcompat-data%2Fdownload%2F%40babel%2Fcompat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" + resolved "https://registry.npmmirror.com/@babel/compat-data/download/@babel/compat-data-7.16.4.tgz?cache=0&sync_timestamp=1637102860099&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcompat-data%2Fdownload%2F%40babel%2Fcompat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q== "@babel/core@7.12.9": @@ -211,7 +211,7 @@ "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.3": version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/download/@babel/helper-compilation-targets-7.16.3.tgz?cache=0&sync_timestamp=1636495224047&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-compilation-targets%2Fdownload%2F%40babel%2Fhelper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" + resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/download/@babel/helper-compilation-targets-7.16.3.tgz?cache=0&sync_timestamp=1636496295030&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-compilation-targets%2Fdownload%2F%40babel%2Fhelper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA== dependencies: "@babel/compat-data" "^7.16.0" @@ -234,7 +234,7 @@ "@babel/helper-create-regexp-features-plugin@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/download/@babel/helper-create-regexp-features-plugin-7.16.0.tgz?cache=0&sync_timestamp=1635567064344&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-create-regexp-features-plugin%2Fdownload%2F%40babel%2Fhelper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" + resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/download/@babel/helper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" integrity sha1-BrI0jON/zMT14Y3NjXUFPyp8RP8= dependencies: "@babel/helper-annotate-as-pure" "^7.16.0" @@ -242,7 +242,7 @@ "@babel/helper-define-polyfill-provider@^0.3.0": version "0.3.0" - resolved "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/download/@babel/helper-define-polyfill-provider-0.3.0.tgz?cache=0&sync_timestamp=1636799929688&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-define-polyfill-provider%2Fdownload%2F%40babel%2Fhelper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971" + resolved "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/download/@babel/helper-define-polyfill-provider-0.3.0.tgz?cache=0&sync_timestamp=1636799795992&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-define-polyfill-provider%2Fdownload%2F%40babel%2Fhelper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971" integrity sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg== dependencies: "@babel/helper-compilation-targets" "^7.13.0" @@ -263,7 +263,7 @@ "@babel/helper-explode-assignable-expression@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-explode-assignable-expression/download/@babel/helper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778" + resolved "https://registry.npmmirror.com/@babel/helper-explode-assignable-expression/download/@babel/helper-explode-assignable-expression-7.16.0.tgz?cache=0&sync_timestamp=1635567269941&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-explode-assignable-expression%2Fdownload%2F%40babel%2Fhelper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778" integrity sha1-dTAXM3oV9G+cCfZ0z/EM7pudd3g= dependencies: "@babel/types" "^7.16.0" @@ -286,7 +286,7 @@ "@babel/helper-hoist-variables@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-hoist-variables/download/@babel/helper-hoist-variables-7.16.0.tgz?cache=0&sync_timestamp=1635560943828&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-hoist-variables%2Fdownload%2F%40babel%2Fhelper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" + resolved "https://registry.npmmirror.com/@babel/helper-hoist-variables/download/@babel/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" integrity sha1-TJAjwvHe9+KP9G/B2802o5vqqBo= dependencies: "@babel/types" "^7.16.0" @@ -300,7 +300,7 @@ "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-module-imports/download/@babel/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" + resolved "https://registry.npmmirror.com/@babel/helper-module-imports/download/@babel/helper-module-imports-7.16.0.tgz?cache=0&sync_timestamp=1635560941965&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-module-imports%2Fdownload%2F%40babel%2Fhelper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" integrity sha1-kFOOYLZy7PG0SPX09UM9N+eaPsM= dependencies: "@babel/types" "^7.16.0" @@ -365,7 +365,7 @@ "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/download/@babel/helper-skip-transparent-expression-wrappers-7.16.0.tgz?cache=0&sync_timestamp=1635567064131&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-skip-transparent-expression-wrappers%2Fdownload%2F%40babel%2Fhelper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" + resolved "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/download/@babel/helper-skip-transparent-expression-wrappers-7.16.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-skip-transparent-expression-wrappers%2Fdownload%2F%40babel%2Fhelper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" integrity sha1-DuM4gHAUfDrgUeSH7KPrsOLouwk= dependencies: "@babel/types" "^7.16.0" @@ -379,7 +379,7 @@ "@babel/helper-validator-identifier@^7.15.7": version "7.15.7" - resolved "https://registry.nlark.com/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.15.7.tgz?cache=0&sync_timestamp=1631920000984&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-validator-identifier%2Fdownload%2F%40babel%2Fhelper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" + resolved "https://registry.nlark.com/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.15.7.tgz?cache=0&sync_timestamp=1631920857390&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-validator-identifier%2Fdownload%2F%40babel%2Fhelper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" integrity sha1-Ig35k7/pBKSmsCq08zhaXr9uI4k= "@babel/helper-validator-option@^7.14.5": @@ -429,7 +429,7 @@ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/download/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz?cache=0&sync_timestamp=1635566443788&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-bugfix-v8-spread-parameters-in-optional-chaining%2Fdownload%2F%40babel%2Fplugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz#358972eaab006f5eb0826183b0c93cbcaf13e1e2" + resolved "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/download/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz#358972eaab006f5eb0826183b0c93cbcaf13e1e2" integrity sha1-NYly6qsAb16wgmGDsMk8vK8T4eI= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -582,7 +582,7 @@ "@babel/plugin-syntax-class-properties@^7.12.13": version "7.12.13" - resolved "https://registry.nlark.com/@babel/plugin-syntax-class-properties/download/@babel/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-class-properties/download/@babel/plugin-syntax-class-properties-7.12.13.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-syntax-class-properties%2Fdownload%2F%40babel%2Fplugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" integrity sha1-tcmHJ0xKOoK4lxR5aTGmtTVErhA= dependencies: "@babel/helper-plugin-utils" "^7.12.13" @@ -596,7 +596,7 @@ "@babel/plugin-syntax-dynamic-import@^7.8.3": version "7.8.3" - resolved "https://registry.nlark.com/@babel/plugin-syntax-dynamic-import/download/@babel/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" + resolved "https://registry.nlark.com/@babel/plugin-syntax-dynamic-import/download/@babel/plugin-syntax-dynamic-import-7.8.3.tgz?cache=0&sync_timestamp=1618847125283&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-dynamic-import%2Fdownload%2F%40babel%2Fplugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" integrity sha1-Yr+Ysto80h1iYVT8lu5bPLaOrLM= dependencies: "@babel/helper-plugin-utils" "^7.8.0" @@ -645,7 +645,7 @@ "@babel/plugin-syntax-numeric-separator@^7.10.4": version "7.10.4" - resolved "https://registry.nlark.com/@babel/plugin-syntax-numeric-separator/download/@babel/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-numeric-separator/download/@babel/plugin-syntax-numeric-separator-7.10.4.tgz?cache=0&sync_timestamp=1593522054358&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-syntax-numeric-separator%2Fdownload%2F%40babel%2Fplugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" integrity sha1-ubBws+M1cM2f0Hun+pHA3Te5r5c= dependencies: "@babel/helper-plugin-utils" "^7.10.4" @@ -659,7 +659,7 @@ "@babel/plugin-syntax-optional-catch-binding@^7.8.3": version "7.8.3" - resolved "https://registry.nlark.com/@babel/plugin-syntax-optional-catch-binding/download/@babel/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-optional-catch-binding/download/@babel/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" integrity sha1-YRGiZbz7Ag6579D9/X0mQCue1sE= dependencies: "@babel/helper-plugin-utils" "^7.8.0" @@ -673,14 +673,14 @@ "@babel/plugin-syntax-private-property-in-object@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-private-property-in-object/download/@babel/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" + resolved "https://registry.nlark.com/@babel/plugin-syntax-private-property-in-object/download/@babel/plugin-syntax-private-property-in-object-7.14.5.tgz?cache=0&sync_timestamp=1623280423879&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-private-property-in-object%2Fdownload%2F%40babel%2Fplugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" integrity sha1-DcZnHsDqIrbpShEU+FeXDNOd4a0= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-top-level-await@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-top-level-await/download/@babel/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" + resolved "https://registry.nlark.com/@babel/plugin-syntax-top-level-await/download/@babel/plugin-syntax-top-level-await-7.14.5.tgz?cache=0&sync_timestamp=1623280427172&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-top-level-await%2Fdownload%2F%40babel%2Fplugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" integrity sha1-wc/a3DWmRiQAAfBhOCR7dBw02Uw= dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -1084,7 +1084,7 @@ "@babel/preset-modules@^0.1.5": version "0.1.5" - resolved "https://registry.npmmirror.com/@babel/preset-modules/download/@babel/preset-modules-0.1.5.tgz?cache=0&sync_timestamp=1635094707880&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-modules%2Fdownload%2F%40babel%2Fpreset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" + resolved "https://registry.npmmirror.com/@babel/preset-modules/download/@babel/preset-modules-0.1.5.tgz?cache=0&sync_timestamp=1635094844477&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-modules%2Fdownload%2F%40babel%2Fpreset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" integrity sha1-75Odbn8miCfhhBY43G/5VRXhFdk= dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -1131,7 +1131,7 @@ "@babel/template@^7.12.7", "@babel/template@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/template/download/@babel/template-7.16.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Ftemplate%2Fdownload%2F%40babel%2Ftemplate-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" + resolved "https://registry.npmmirror.com/@babel/template/download/@babel/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" integrity sha1-0Wo16/TNdOICCDNW+rId2JNj3dY= dependencies: "@babel/code-frame" "^7.16.0" @@ -1484,7 +1484,7 @@ "@hapi/hoek@^9.0.0": version "9.2.1" - resolved "https://registry.npmmirror.com/@hapi/hoek/download/@hapi/hoek-9.2.1.tgz?cache=0&sync_timestamp=1632776440309&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40hapi%2Fhoek%2Fdownload%2F%40hapi%2Fhoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" + resolved "https://registry.npmmirror.com/@hapi/hoek/download/@hapi/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" integrity sha1-lVEUKhmAUDdSU2tQUP2Z9KfxOxc= "@hapi/topo@^5.0.0": @@ -1526,7 +1526,7 @@ "@mdx-js/runtime@^1.6.22": version "1.6.22" - resolved "https://registry.npmmirror.com/@mdx-js/runtime/download/@mdx-js/runtime-1.6.22.tgz#3edd388bf68a519ffa1aaf9c446b548165102345" + resolved "https://registry.nlark.com/@mdx-js/runtime/download/@mdx-js/runtime-1.6.22.tgz#3edd388bf68a519ffa1aaf9c446b548165102345" integrity sha1-Pt04i/aKUZ/6Gq+cRGtUgWUQI0U= dependencies: "@mdx-js/mdx" "1.6.22" @@ -1535,12 +1535,12 @@ "@mdx-js/util@1.6.22": version "1.6.22" - resolved "https://registry.nlark.com/@mdx-js/util/download/@mdx-js/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" + resolved "https://registry.npm.taobao.org/@mdx-js/util/download/@mdx-js/util-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40mdx-js%2Futil%2Fdownload%2F%40mdx-js%2Futil-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" integrity sha1-IZ39ia5bl6iAHwFTI/+kti9FcYs= "@nodelib/fs.scandir@2.1.5": version "2.1.5" - resolved "https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + resolved "https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz?cache=0&sync_timestamp=1622792738877&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.scandir%2Fdownload%2F%40nodelib%2Ffs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" integrity sha1-dhnC6yGyVIP20WdUi0z9WnSIw9U= dependencies: "@nodelib/fs.stat" "2.0.5" @@ -1548,7 +1548,7 @@ "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" - resolved "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + resolved "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&sync_timestamp=1622792616417&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha1-W9Jir5Tp0lvR5xsF3u1Eh2oiLos= "@nodelib/fs.walk@^1.2.3": @@ -1561,12 +1561,12 @@ "@polka/url@^1.0.0-next.20": version "1.0.0-next.21" - resolved "https://registry.npmmirror.com/@polka/url/download/@polka/url-1.0.0-next.21.tgz?cache=0&sync_timestamp=1633093128630&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40polka%2Furl%2Fdownload%2F%40polka%2Furl-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" + resolved "https://registry.npmmirror.com/@polka/url/download/@polka/url-1.0.0-next.21.tgz?cache=0&sync_timestamp=1633093101880&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40polka%2Furl%2Fdownload%2F%40polka%2Furl-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha1-XeWiOFo1MJQn9gEZkrVEUU1VmqE= "@seznam/compose-react-refs@^1.0.6": version "1.0.6" - resolved "https://registry.nlark.com/@seznam/compose-react-refs/download/@seznam/compose-react-refs-1.0.6.tgz#6ec4e70bdd6e32f8e70b4100f27267cf306bd8df" + resolved "https://registry.npm.taobao.org/@seznam/compose-react-refs/download/@seznam/compose-react-refs-1.0.6.tgz#6ec4e70bdd6e32f8e70b4100f27267cf306bd8df" integrity sha1-bsTnC91uMvjnC0EA8nJnzzBr2N8= "@sideway/address@^4.1.3": @@ -1578,7 +1578,7 @@ "@sideway/formula@^3.0.0": version "3.0.0" - resolved "https://registry.nlark.com/@sideway/formula/download/@sideway/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" + resolved "https://registry.npm.taobao.org/@sideway/formula/download/@sideway/formula-3.0.0.tgz?cache=0&sync_timestamp=1603525579815&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40sideway%2Fformula%2Fdownload%2F%40sideway%2Fformula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" integrity sha1-/hWK7jLmvV3oUES+YVvAhHigoTw= "@sideway/pinpoint@^2.0.0": @@ -1588,7 +1588,7 @@ "@sindresorhus/is@^0.14.0": version "0.14.0" - resolved "https://registry.nlark.com/@sindresorhus/is/download/@sindresorhus/is-0.14.0.tgz?cache=0&sync_timestamp=1631543441871&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40sindresorhus%2Fis%2Fdownload%2F%40sindresorhus%2Fis-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" + resolved "https://registry.nlark.com/@sindresorhus/is/download/@sindresorhus/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" integrity sha1-n7OjzzEyMoFR81PeRjLgHlIQK+o= "@slorber/static-site-generator-webpack-plugin@^4.0.0": @@ -1734,7 +1734,7 @@ "@types/body-parser@*": version "1.19.2" - resolved "https://registry.npmmirror.com/@types/body-parser/download/@types/body-parser-1.19.2.tgz?cache=0&sync_timestamp=1637265217498&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fbody-parser%2Fdownload%2F%40types%2Fbody-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" + resolved "https://registry.npmmirror.com/@types/body-parser/download/@types/body-parser-1.19.2.tgz?cache=0&sync_timestamp=1637265159940&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fbody-parser%2Fdownload%2F%40types%2Fbody-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== dependencies: "@types/connect" "*" @@ -1749,7 +1749,7 @@ "@types/connect-history-api-fallback@^1.3.5": version "1.3.5" - resolved "https://registry.npmmirror.com/@types/connect-history-api-fallback/download/@types/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" + resolved "https://registry.npmmirror.com/@types/connect-history-api-fallback/download/@types/connect-history-api-fallback-1.3.5.tgz?cache=0&sync_timestamp=1637265708376&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fconnect-history-api-fallback%2Fdownload%2F%40types%2Fconnect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" integrity sha1-0feooJ0O1aV67lrpwYq5uAMgXa4= dependencies: "@types/express-serve-static-core" "*" @@ -1757,7 +1757,7 @@ "@types/connect@*": version "3.4.35" - resolved "https://registry.npmmirror.com/@types/connect/download/@types/connect-3.4.35.tgz?cache=0&sync_timestamp=1637264533049&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fconnect%2Fdownload%2F%40types%2Fconnect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" + resolved "https://registry.npmmirror.com/@types/connect/download/@types/connect-3.4.35.tgz?cache=0&sync_timestamp=1637265718046&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fconnect%2Fdownload%2F%40types%2Fconnect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" integrity sha1-X89q5EXkAh0fwiGaSHPMc6O7KtE= dependencies: "@types/node" "*" @@ -1794,7 +1794,7 @@ "@types/express@*": version "4.17.13" - resolved "https://registry.npmmirror.com/@types/express/download/@types/express-4.17.13.tgz?cache=0&sync_timestamp=1637265368217&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fexpress%2Fdownload%2F%40types%2Fexpress-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + resolved "https://registry.npmmirror.com/@types/express/download/@types/express-4.17.13.tgz?cache=0&sync_timestamp=1637265378123&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fexpress%2Fdownload%2F%40types%2Fexpress-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" integrity sha1-p24plXKJmbq1GjP6vOHXBaNwkDQ= dependencies: "@types/body-parser" "*" @@ -1833,12 +1833,12 @@ "@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.9" - resolved "https://registry.npmmirror.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz?cache=0&sync_timestamp=1637266234284&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fjson-schema%2Fdownload%2F%40types%2Fjson-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + resolved "https://registry.npmmirror.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz?cache=0&sync_timestamp=1637266073261&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fjson-schema%2Fdownload%2F%40types%2Fjson-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha1-l+3JA36gw4WFMgsolk3eOznkZg0= "@types/mdast@^3.0.0": version "3.0.10" - resolved "https://registry.npmmirror.com/@types/mdast/download/@types/mdast-3.0.10.tgz?cache=0&sync_timestamp=1637267193135&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fmdast%2Fdownload%2F%40types%2Fmdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af" + resolved "https://registry.npmmirror.com/@types/mdast/download/@types/mdast-3.0.10.tgz?cache=0&sync_timestamp=1637267171178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fmdast%2Fdownload%2F%40types%2Fmdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af" integrity sha1-RyQkSoKkWYiEy76bz9c9/5J+6K8= dependencies: "@types/unist" "*" @@ -1870,7 +1870,7 @@ "@types/q@^1.5.1": version "1.5.5" - resolved "https://registry.npmmirror.com/@types/q/download/@types/q-1.5.5.tgz?cache=0&sync_timestamp=1637269985043&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fq%2Fdownload%2F%40types%2Fq-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" + resolved "https://registry.npmmirror.com/@types/q/download/@types/q-1.5.5.tgz?cache=0&sync_timestamp=1637268455272&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fq%2Fdownload%2F%40types%2Fq-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" integrity sha1-daKo59irSyMEFFBdkjNdHctTpt8= "@types/qs@*": @@ -1880,7 +1880,7 @@ "@types/range-parser@*": version "1.2.4" - resolved "https://registry.npmmirror.com/@types/range-parser/download/@types/range-parser-1.2.4.tgz?cache=0&sync_timestamp=1637268455466&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Frange-parser%2Fdownload%2F%40types%2Frange-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" + resolved "https://registry.npmmirror.com/@types/range-parser/download/@types/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha1-zWZ7z90CUhOq+3ylkVqTJZCs3Nw= "@types/react-helmet@*": @@ -1901,7 +1901,7 @@ "@types/react-router-dom@*": version "5.3.2" - resolved "https://registry.npmmirror.com/@types/react-router-dom/download/@types/react-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee" + resolved "https://registry.npmmirror.com/@types/react-router-dom/download/@types/react-router-dom-5.3.2.tgz?cache=0&sync_timestamp=1637449508387&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Freact-router-dom%2Fdownload%2F%40types%2Freact-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee" integrity sha1-69jhRc8FbbXGbrHaxjxy9S6FQu4= dependencies: "@types/history" "*" @@ -1937,14 +1937,14 @@ "@types/serve-index@^1.9.1": version "1.9.1" - resolved "https://registry.npmmirror.com/@types/serve-index/download/@types/serve-index-1.9.1.tgz?cache=0&sync_timestamp=1637273328244&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fserve-index%2Fdownload%2F%40types%2Fserve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" + resolved "https://registry.npmmirror.com/@types/serve-index/download/@types/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" integrity sha1-G16FNwoZLAHsbOxHNc8pFzN6Yng= dependencies: "@types/express" "*" "@types/serve-static@*": version "1.13.10" - resolved "https://registry.npmmirror.com/@types/serve-static/download/@types/serve-static-1.13.10.tgz?cache=0&sync_timestamp=1637270717450&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fserve-static%2Fdownload%2F%40types%2Fserve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" + resolved "https://registry.npmmirror.com/@types/serve-static/download/@types/serve-static-1.13.10.tgz?cache=0&sync_timestamp=1637270770552&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fserve-static%2Fdownload%2F%40types%2Fserve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" integrity sha1-9eDOh5fS18xevtpIpSyWxPpHqNk= dependencies: "@types/mime" "^1" @@ -1971,7 +1971,7 @@ "@webassemblyjs/ast@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.1.tgz?cache=0&sync_timestamp=1625473368618&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fast%2Fdownload%2F%40webassemblyjs%2Fast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" + resolved "https://registry.nlark.com/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.1.tgz?cache=0&sync_timestamp=1625473420080&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fast%2Fdownload%2F%40webassemblyjs%2Fast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" integrity sha1-K/12fq4aaZb0Mv9+jX/HVnnAtqc= dependencies: "@webassemblyjs/helper-numbers" "1.11.1" @@ -1984,17 +1984,17 @@ "@webassemblyjs/helper-api-error@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.11.1.tgz?cache=0&sync_timestamp=1625473460936&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-api-error%2Fdownload%2F%40webassemblyjs%2Fhelper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" + resolved "https://registry.nlark.com/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.11.1.tgz?cache=0&sync_timestamp=1625473412127&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-api-error%2Fdownload%2F%40webassemblyjs%2Fhelper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" integrity sha1-GmMZLYeI5cASgAump6RscFKI/RY= "@webassemblyjs/helper-buffer@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.11.1.tgz?cache=0&sync_timestamp=1625473462686&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-buffer%2Fdownload%2F%40webassemblyjs%2Fhelper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" + resolved "https://registry.nlark.com/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.11.1.tgz?cache=0&sync_timestamp=1625473414638&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-buffer%2Fdownload%2F%40webassemblyjs%2Fhelper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" integrity sha1-gyqQDrREiEzemnytRn+BUA9eWrU= "@webassemblyjs/helper-numbers@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-numbers/download/@webassemblyjs/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" + resolved "https://registry.nlark.com/@webassemblyjs/helper-numbers/download/@webassemblyjs/helper-numbers-1.11.1.tgz?cache=0&sync_timestamp=1625473464260&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-numbers%2Fdownload%2F%40webassemblyjs%2Fhelper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" integrity sha1-ZNgdohn7u6HjvRv8dPboxOEKYq4= dependencies: "@webassemblyjs/floating-point-hex-parser" "1.11.1" @@ -2003,7 +2003,7 @@ "@webassemblyjs/helper-wasm-bytecode@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" + resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.11.1.tgz?cache=0&sync_timestamp=1625473415013&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-wasm-bytecode%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" integrity sha1-8ygkHkHnsZnQsgwY6IQpxEMyleE= "@webassemblyjs/helper-wasm-section@1.11.1": @@ -2018,26 +2018,26 @@ "@webassemblyjs/ieee754@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/ieee754/download/@webassemblyjs/ieee754-1.11.1.tgz?cache=0&sync_timestamp=1625473454591&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fieee754%2Fdownload%2F%40webassemblyjs%2Fieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" + resolved "https://registry.nlark.com/@webassemblyjs/ieee754/download/@webassemblyjs/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" integrity sha1-ljkp6bvQVwnn4SJDoJkYCBKZJhQ= dependencies: "@xtuc/ieee754" "^1.2.0" "@webassemblyjs/leb128@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/leb128/download/@webassemblyjs/leb128-1.11.1.tgz?cache=0&sync_timestamp=1625473456730&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fleb128%2Fdownload%2F%40webassemblyjs%2Fleb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" + resolved "https://registry.nlark.com/@webassemblyjs/leb128/download/@webassemblyjs/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" integrity sha1-zoFLRVdOk9drrh+yZEq5zdlSeqU= dependencies: "@xtuc/long" "4.2.2" "@webassemblyjs/utf8@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.11.1.tgz?cache=0&sync_timestamp=1625474622442&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Futf8%2Fdownload%2F%40webassemblyjs%2Futf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" + resolved "https://registry.nlark.com/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.11.1.tgz?cache=0&sync_timestamp=1625473462317&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Futf8%2Fdownload%2F%40webassemblyjs%2Futf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" integrity sha1-0fi3ZDaefG5rrjUOhU3smlnwo/8= "@webassemblyjs/wasm-edit@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.11.1.tgz?cache=0&sync_timestamp=1625473490556&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-edit%2Fdownload%2F%40webassemblyjs%2Fwasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" integrity sha1-rSBuv0v5WgWM6YgKjAksXeyBk9Y= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2051,7 +2051,7 @@ "@webassemblyjs/wasm-gen@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.11.1.tgz?cache=0&sync_timestamp=1625473361759&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-gen%2Fdownload%2F%40webassemblyjs%2Fwasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" integrity sha1-hsXqMEhJdZt9iMR6MvTwOa48j3Y= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2062,7 +2062,7 @@ "@webassemblyjs/wasm-opt@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-opt/download/@webassemblyjs/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-opt/download/@webassemblyjs/wasm-opt-1.11.1.tgz?cache=0&sync_timestamp=1625473467198&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-opt%2Fdownload%2F%40webassemblyjs%2Fwasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" integrity sha1-ZXtMIgL0zzs0X4pMZGHIwkGJhfI= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2072,7 +2072,7 @@ "@webassemblyjs/wasm-parser@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-parser/download/@webassemblyjs/wasm-parser-1.11.1.tgz?cache=0&sync_timestamp=1625473358573&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-parser%2Fdownload%2F%40webassemblyjs%2Fwasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-parser/download/@webassemblyjs/wasm-parser-1.11.1.tgz?cache=0&sync_timestamp=1625473464593&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-parser%2Fdownload%2F%40webassemblyjs%2Fwasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" integrity sha1-hspzRTT0F+m9PGfHocddi+QfsZk= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2097,12 +2097,12 @@ "@xtuc/long@4.2.2": version "4.2.2" - resolved "https://registry.nlark.com/@xtuc/long/download/@xtuc/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" + resolved "https://registry.npm.taobao.org/@xtuc/long/download/@xtuc/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha1-0pHGpOl5ibXGHZrPOWrk/hM6cY0= accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: version "1.3.7" - resolved "https://registry.npmmirror.com/accepts/download/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + resolved "https://registry.npm.taobao.org/accepts/download/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" integrity sha1-UxvHJlF6OytB+FACHGzBXqq1B80= dependencies: mime-types "~2.1.24" @@ -2110,22 +2110,22 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: acorn-dynamic-import@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/acorn-dynamic-import/download/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" + resolved "https://registry.npm.taobao.org/acorn-dynamic-import/download/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" integrity sha1-SCIQFAWCo2uDw+NC4c/ryqkkCUg= acorn-import-assertions@^1.7.6: version "1.8.0" - resolved "https://registry.npmmirror.com/acorn-import-assertions/download/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" + resolved "https://registry.npmmirror.com/acorn-import-assertions/download/acorn-import-assertions-1.8.0.tgz?cache=0&sync_timestamp=1633349407828&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Facorn-import-assertions%2Fdownload%2Facorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" integrity sha1-uitZOc5iwjjbbZPYHJsRGym4Vek= acorn-jsx@^5.0.1: version "5.3.2" - resolved "https://registry.nlark.com/acorn-jsx/download/acorn-jsx-5.3.2.tgz?cache=0&sync_timestamp=1625793240297&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-jsx%2Fdownload%2Facorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + resolved "https://registry.nlark.com/acorn-jsx/download/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha1-ftW7VZCLOy8bxVxq8WU7rafweTc= acorn-node@^1.6.1: version "1.8.2" - resolved "https://registry.nlark.com/acorn-node/download/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" + resolved "https://registry.npm.taobao.org/acorn-node/download/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" integrity sha1-EUyV1kU55T3t4j3oudlt98euKvg= dependencies: acorn "^7.0.0" @@ -2159,12 +2159,12 @@ acorn@^8.0.4, acorn@^8.4.1: address@^1.0.1, address@^1.1.2: version "1.1.2" - resolved "https://registry.nlark.com/address/download/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" + resolved "https://registry.npm.taobao.org/address/download/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" integrity sha1-vxEWycdYxRt6kz0pa3LCIe2UKLY= aggregate-error@^3.0.0: version "3.1.0" - resolved "https://registry.nlark.com/aggregate-error/download/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + resolved "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.1.0.tgz?cache=0&sync_timestamp=1618681553608&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faggregate-error%2Fdownload%2Faggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" integrity sha1-kmcP9Q9TWb23o+DUDQ7DDFc3aHo= dependencies: clean-stack "^2.0.0" @@ -2179,12 +2179,12 @@ ajv-formats@^2.1.1: ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: version "3.5.2" - resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1637524478967&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1637523824664&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha1-MfKdpatuANHC0yms97WSlhTVAU0= ajv-keywords@^5.0.0: version "5.1.0" - resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-5.1.0.tgz?cache=0&sync_timestamp=1637524478967&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-5.1.0.tgz?cache=0&sync_timestamp=1637523824664&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== dependencies: fast-deep-equal "^3.1.3" @@ -2218,7 +2218,7 @@ algoliasearch-helper@^3.5.5: algoliasearch@^4.0.0, algoliasearch@^4.11.0: version "4.11.0" - resolved "https://registry.npmmirror.com/algoliasearch/download/algoliasearch-4.11.0.tgz#234befb3ac355c094077f0edf3777240b1ee013c" + resolved "https://registry.npmmirror.com/algoliasearch/download/algoliasearch-4.11.0.tgz?cache=0&sync_timestamp=1634738335372&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Falgoliasearch%2Fdownload%2Falgoliasearch-4.11.0.tgz#234befb3ac355c094077f0edf3777240b1ee013c" integrity sha1-I0vvs6w1XAlAd/Dt83dyQLHuATw= dependencies: "@algolia/cache-browser-local-storage" "4.11.0" @@ -2238,7 +2238,7 @@ algoliasearch@^4.0.0, algoliasearch@^4.11.0: alphanum-sort@^1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/alphanum-sort/download/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" + resolved "https://registry.npm.taobao.org/alphanum-sort/download/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= ansi-align@^3.0.0: @@ -2250,17 +2250,17 @@ ansi-align@^3.0.0: ansi-html-community@^0.0.8: version "0.0.8" - resolved "https://registry.nlark.com/ansi-html-community/download/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" + resolved "https://registry.nlark.com/ansi-html-community/download/ansi-html-community-0.0.8.tgz?cache=0&sync_timestamp=1631016068950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-html-community%2Fdownload%2Fansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" integrity sha1-afvE1sy+OD+XNpNK40w/gpDxv0E= ansi-regex@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-5.0.1.tgz?cache=0&sync_timestamp=1631634988487&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-regex%2Fdownload%2Fansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha1-CCyyyJyf6GWaMRpTvWpNxTAdswQ= ansi-regex@^6.0.1: version "6.0.1" - resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-6.0.1.tgz?cache=0&sync_timestamp=1631634988487&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-regex%2Fdownload%2Fansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" integrity sha1-MYPjj66aZdfLXlOUXNWJfQJgoGo= ansi-styles@^3.2.1: @@ -2304,17 +2304,17 @@ argparse@^2.0.1: array-flatten@1.1.1: version "1.1.1" - resolved "https://registry.nlark.com/array-flatten/download/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + resolved "https://registry.npm.taobao.org/array-flatten/download/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= array-flatten@^2.1.0: version "2.1.2" - resolved "https://registry.nlark.com/array-flatten/download/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" + resolved "https://registry.npm.taobao.org/array-flatten/download/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha1-JO+AoowaiTYX4hSbDG0NeIKTsJk= array-union@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/array-union/download/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + resolved "https://registry.npm.taobao.org/array-union/download/array-union-2.1.0.tgz?cache=0&sync_timestamp=1614624262896&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Farray-union%2Fdownload%2Farray-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha1-t5hCCtvrHego2ErNii4j0+/oXo0= async@^2.6.2: @@ -2350,7 +2350,7 @@ axios@^0.21.1: babel-loader@^8.2.2: version "8.2.3" - resolved "https://registry.npmmirror.com/babel-loader/download/babel-loader-8.2.3.tgz?cache=0&sync_timestamp=1634769717079&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-loader%2Fdownload%2Fbabel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" + resolved "https://registry.npmmirror.com/babel-loader/download/babel-loader-8.2.3.tgz?cache=0&sync_timestamp=1634769533620&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-loader%2Fdownload%2Fbabel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" integrity sha1-iYa0Dxpkys/LS4QpMgCF72ixNC0= dependencies: find-cache-dir "^3.3.1" @@ -2360,7 +2360,7 @@ babel-loader@^8.2.2: babel-plugin-apply-mdx-type-prop@1.6.22: version "1.6.22" - resolved "https://registry.nlark.com/babel-plugin-apply-mdx-type-prop/download/babel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b" + resolved "https://registry.npm.taobao.org/babel-plugin-apply-mdx-type-prop/download/babel-plugin-apply-mdx-type-prop-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-apply-mdx-type-prop%2Fdownload%2Fbabel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b" integrity sha1-0hbo/Q3pHePxR47zIx4FRGvIcFs= dependencies: "@babel/helper-plugin-utils" "7.10.4" @@ -2368,28 +2368,28 @@ babel-plugin-apply-mdx-type-prop@1.6.22: babel-plugin-dynamic-import-node@2.3.0: version "2.3.0" - resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" + resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.0.tgz?cache=0&sync_timestamp=1618846958717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" integrity sha1-8A9Qe9qjw+P/bn5emNkKesq5b38= dependencies: object.assign "^4.1.0" babel-plugin-dynamic-import-node@^2.3.3: version "2.3.3" - resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" + resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.3.tgz?cache=0&sync_timestamp=1618846958717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" integrity sha1-hP2hnJduxcbe/vV/lCez3vZuF6M= dependencies: object.assign "^4.1.0" babel-plugin-extract-import-names@1.6.22: version "1.6.22" - resolved "https://registry.npm.taobao.org/babel-plugin-extract-import-names/download/babel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc" + resolved "https://registry.npm.taobao.org/babel-plugin-extract-import-names/download/babel-plugin-extract-import-names-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-extract-import-names%2Fdownload%2Fbabel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc" integrity sha1-3l+aKOsS8+sleL90RyIE5m0aE9w= dependencies: "@babel/helper-plugin-utils" "7.10.4" babel-plugin-polyfill-corejs2@^0.3.0: version "0.3.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/download/babel-plugin-polyfill-corejs2-0.3.0.tgz?cache=0&sync_timestamp=1636799927981&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs2%2Fdownload%2Fbabel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/download/babel-plugin-polyfill-corejs2-0.3.0.tgz?cache=0&sync_timestamp=1636799843170&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs2%2Fdownload%2Fbabel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd" integrity sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA== dependencies: "@babel/compat-data" "^7.13.11" @@ -2398,7 +2398,7 @@ babel-plugin-polyfill-corejs2@^0.3.0: babel-plugin-polyfill-corejs3@^0.4.0: version "0.4.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/download/babel-plugin-polyfill-corejs3-0.4.0.tgz?cache=0&sync_timestamp=1636799928071&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs3%2Fdownload%2Fbabel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/download/babel-plugin-polyfill-corejs3-0.4.0.tgz?cache=0&sync_timestamp=1636799842810&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs3%2Fdownload%2Fbabel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087" integrity sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.0" @@ -2406,19 +2406,19 @@ babel-plugin-polyfill-corejs3@^0.4.0: babel-plugin-polyfill-regenerator@^0.3.0: version "0.3.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/download/babel-plugin-polyfill-regenerator-0.3.0.tgz?cache=0&sync_timestamp=1636799927789&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-regenerator%2Fdownload%2Fbabel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/download/babel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be" integrity sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.0" bail@^1.0.0: version "1.0.5" - resolved "https://registry.npmmirror.com/bail/download/bail-1.0.5.tgz?cache=0&sync_timestamp=1636274637966&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbail%2Fdownload%2Fbail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" + resolved "https://registry.npmmirror.com/bail/download/bail-1.0.5.tgz?cache=0&sync_timestamp=1636274632406&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbail%2Fdownload%2Fbail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" integrity sha1-tvoTNASjksvB+MS/Y/WVM1Hnp3Y= balanced-match@^1.0.0: version "1.0.2" - resolved "https://registry.nlark.com/balanced-match/download/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.2.tgz?cache=0&sync_timestamp=1617714233441&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbalanced-match%2Fdownload%2Fbalanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4= batch@0.6.1: @@ -2438,7 +2438,7 @@ binary-extensions@^2.0.0: bluebird@^3.7.1: version "3.7.2" - resolved "https://registry.nlark.com/bluebird/download/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + resolved "https://registry.npm.taobao.org/bluebird/download/bluebird-3.7.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbluebird%2Fdownload%2Fbluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha1-nyKcFb4nJFT/qXOs4NvueaGww28= body-parser@1.19.1: @@ -2459,7 +2459,7 @@ body-parser@1.19.1: bonjour@^3.5.0: version "3.5.0" - resolved "https://registry.nlark.com/bonjour/download/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" + resolved "https://registry.npm.taobao.org/bonjour/download/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU= dependencies: array-flatten "^2.1.0" @@ -2476,7 +2476,7 @@ boolbase@^1.0.0, boolbase@~1.0.0: boxen@^5.0.0, boxen@^5.0.1: version "5.1.2" - resolved "https://registry.npmmirror.com/boxen/download/boxen-5.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fboxen%2Fdownload%2Fboxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" + resolved "https://registry.npmmirror.com/boxen/download/boxen-5.1.2.tgz?cache=0&sync_timestamp=1634028659618&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fboxen%2Fdownload%2Fboxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" integrity sha1-eIy2hvyDwfSG36ikDGj8K4MdK1A= dependencies: ansi-align "^3.0.0" @@ -2529,7 +2529,7 @@ buble-jsx-only@^0.19.8: buffer-from@^1.0.0: version "1.1.2" - resolved "https://registry.nlark.com/buffer-from/download/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + resolved "https://registry.nlark.com/buffer-from/download/buffer-from-1.1.2.tgz?cache=0&sync_timestamp=1627578450949&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbuffer-from%2Fdownload%2Fbuffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha1-KxRqb9cugLT1XSVfNe1Zo6mkG9U= buffer-indexof@^1.0.0: @@ -2539,12 +2539,12 @@ buffer-indexof@^1.0.0: bytes@3.0.0: version "3.0.0" - resolved "https://registry.npmmirror.com/bytes/download/bytes-3.0.0.tgz?cache=0&sync_timestamp=1637015110760&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbytes%2Fdownload%2Fbytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" + resolved "https://registry.npmmirror.com/bytes/download/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= bytes@3.1.1: version "3.1.1" - resolved "https://registry.npmmirror.com/bytes/download/bytes-3.1.1.tgz?cache=0&sync_timestamp=1637015110760&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbytes%2Fdownload%2Fbytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a" + resolved "https://registry.npmmirror.com/bytes/download/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a" integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg== cacheable-request@^6.0.0: @@ -2562,7 +2562,7 @@ cacheable-request@^6.0.0: call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/call-bind/download/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + resolved "https://registry.npm.taobao.org/call-bind/download/call-bind-1.0.2.tgz?cache=0&sync_timestamp=1610403020286&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcall-bind%2Fdownload%2Fcall-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha1-sdTonmiBGcPJqQOtMKuy9qkZvjw= dependencies: function-bind "^1.1.1" @@ -2570,7 +2570,7 @@ call-bind@^1.0.0, call-bind@^1.0.2: callsites@^3.0.0: version "3.1.0" - resolved "https://registry.npmmirror.com/callsites/download/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + resolved "https://registry.nlark.com/callsites/download/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha1-s2MKvYlDQy9Us/BRkjjjPNffL3M= camel-case@^4.1.2: @@ -2583,12 +2583,12 @@ camel-case@^4.1.2: camelcase-css@2.0.1, camelcase-css@^2.0.1: version "2.0.1" - resolved "https://registry.nlark.com/camelcase-css/download/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" + resolved "https://registry.npm.taobao.org/camelcase-css/download/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" integrity sha1-7pePaUeRTMMMa0R0G27R338EP9U= camelcase@^6.2.0: version "6.2.1" - resolved "https://registry.npmmirror.com/camelcase/download/camelcase-6.2.1.tgz?cache=0&sync_timestamp=1636945205805&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" + resolved "https://registry.npmmirror.com/camelcase/download/camelcase-6.2.1.tgz?cache=0&sync_timestamp=1636945130104&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== caniuse-api@^3.0.0: @@ -2602,9 +2602,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001286: - version "1.0.30001292" - resolved "https://registry.npmmirror.com/caniuse-lite/download/caniuse-lite-1.0.30001292.tgz#4a55f61c06abc9595965cfd77897dc7bc1cdc456" - integrity sha512-jnT4Tq0Q4ma+6nncYQVe7d73kmDmE9C3OGTx3MvW7lBM/eY1S1DZTMBON7dqV481RhNiS5OxD7k9JQvmDOTirw== + version "1.0.30001294" + resolved "https://registry.npmmirror.com/caniuse-lite/download/caniuse-lite-1.0.30001294.tgz#4849f27b101fd59ddee3751598c663801032533d" + integrity sha512-LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g== ccount@^1.0.0, ccount@^1.0.3: version "1.1.0" @@ -2630,22 +2630,22 @@ chalk@^4.1.0, chalk@^4.1.2: character-entities-legacy@^1.0.0: version "1.1.4" - resolved "https://registry.npmmirror.com/character-entities-legacy/download/character-entities-legacy-1.1.4.tgz?cache=0&sync_timestamp=1635911762988&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities-legacy%2Fdownload%2Fcharacter-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" + resolved "https://registry.npmmirror.com/character-entities-legacy/download/character-entities-legacy-1.1.4.tgz?cache=0&sync_timestamp=1635911807340&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities-legacy%2Fdownload%2Fcharacter-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" integrity sha1-lLwYRdznClu50uzHSHJWYSk9j8E= character-entities@^1.0.0: version "1.2.4" - resolved "https://registry.npmmirror.com/character-entities/download/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" + resolved "https://registry.npmmirror.com/character-entities/download/character-entities-1.2.4.tgz?cache=0&sync_timestamp=1635868930605&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities%2Fdownload%2Fcharacter-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" integrity sha1-4Sw5Obfq9OWxXnrUxeKOHUjFsWs= character-reference-invalid@^1.0.0: version "1.1.4" - resolved "https://registry.npmmirror.com/character-reference-invalid/download/character-reference-invalid-1.1.4.tgz?cache=0&sync_timestamp=1636446344223&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-reference-invalid%2Fdownload%2Fcharacter-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" + resolved "https://registry.npmmirror.com/character-reference-invalid/download/character-reference-invalid-1.1.4.tgz?cache=0&sync_timestamp=1636446304022&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-reference-invalid%2Fdownload%2Fcharacter-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" integrity sha1-CDMpzaDq4nKrPbvzfpo4LBOvFWA= cheerio@^0.22.0: version "0.22.0" - resolved "https://registry.nlark.com/cheerio/download/cheerio-0.22.0.tgz?cache=0&sync_timestamp=1623167586610&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcheerio%2Fdownload%2Fcheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" + resolved "https://registry.nlark.com/cheerio/download/cheerio-0.22.0.tgz?cache=0&sync_timestamp=1623167648923&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcheerio%2Fdownload%2Fcheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4= dependencies: css-select "~1.2.0" @@ -2704,7 +2704,7 @@ clean-css@^5.1.5, clean-css@^5.2.2: clean-stack@^2.0.0: version "2.2.0" - resolved "https://registry.nlark.com/clean-stack/download/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + resolved "https://registry.nlark.com/clean-stack/download/clean-stack-2.2.0.tgz?cache=0&sync_timestamp=1621915044030&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fclean-stack%2Fdownload%2Fclean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha1-7oRy27Ep5yezHooQpCfe6d/kAIs= cli-boxes@^2.2.1: @@ -2723,14 +2723,14 @@ clone-deep@^4.0.1: clone-response@^1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/clone-response/download/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" + resolved "https://registry.npm.taobao.org/clone-response/download/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= dependencies: mimic-response "^1.0.0" clsx@^1.1.1: version "1.1.1" - resolved "https://registry.nlark.com/clsx/download/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" + resolved "https://registry.npm.taobao.org/clsx/download/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" integrity sha1-mLMTT5q73yOyZjSRrOE8XAOnMYg= coa@^2.0.2: @@ -2763,12 +2763,12 @@ color-convert@^2.0.1: color-name@1.1.3: version "1.1.3" - resolved "https://registry.nlark.com/color-name/download/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + resolved "https://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= color-name@^1.1.4, color-name@~1.1.4: version "1.1.4" - resolved "https://registry.nlark.com/color-name/download/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + resolved "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha1-wqCah6y95pVD3m9j+jmVyCbFNqI= colord@^2.9.1: @@ -2778,7 +2778,7 @@ colord@^2.9.1: colorette@^2.0.10: version "2.0.16" - resolved "https://registry.npmmirror.com/colorette/download/colorette-2.0.16.tgz?cache=0&sync_timestamp=1633673060735&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcolorette%2Fdownload%2Fcolorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" + resolved "https://registry.npmmirror.com/colorette/download/colorette-2.0.16.tgz?cache=0&sync_timestamp=1633673160250&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcolorette%2Fdownload%2Fcolorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" integrity sha1-cTua+E/bAAE58EVGvUqT9ipQhdo= combine-promises@^1.1.0: @@ -2788,7 +2788,7 @@ combine-promises@^1.1.0: comma-separated-tokens@^1.0.0: version "1.0.8" - resolved "https://registry.nlark.com/comma-separated-tokens/download/comma-separated-tokens-1.0.8.tgz?cache=0&sync_timestamp=1619456046501&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcomma-separated-tokens%2Fdownload%2Fcomma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" + resolved "https://registry.nlark.com/comma-separated-tokens/download/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" integrity sha1-YyuAthF4Z6FY8QgK1Jiy++fj9eo= commander@^2.20.0: @@ -2818,7 +2818,7 @@ commondir@^1.0.1: compressible@~2.0.16: version "2.0.18" - resolved "https://registry.nlark.com/compressible/download/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" + resolved "https://registry.npm.taobao.org/compressible/download/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" integrity sha1-r1PMprBw1MPAdQ+9dyhqbXzEb7o= dependencies: mime-db ">= 1.43.0 < 2" @@ -2838,12 +2838,12 @@ compression@^1.7.4: concat-map@0.0.1: version "0.0.1" - resolved "https://registry.nlark.com/concat-map/download/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + resolved "https://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= configstore@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/configstore/download/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" + resolved "https://registry.npm.taobao.org/configstore/download/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" integrity sha1-02UCG130uYzdGH1qOw4/anzF7ZY= dependencies: dot-prop "^5.2.0" @@ -2855,12 +2855,12 @@ configstore@^5.0.1: connect-history-api-fallback@^1.6.0: version "1.6.0" - resolved "https://registry.nlark.com/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" + resolved "https://registry.npm.taobao.org/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha1-izIIk1kwjRERFdgcrT/Oq4iPl7w= consola@^2.15.3: version "2.15.3" - resolved "https://registry.nlark.com/consola/download/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550" + resolved "https://registry.npm.taobao.org/consola/download/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550" integrity sha1-LhH5jWpL5x/3LgvfB70j4Sy2FVA= content-disposition@0.5.2: @@ -2882,7 +2882,7 @@ content-type@~1.0.4: convert-source-map@^1.7.0: version "1.8.0" - resolved "https://registry.nlark.com/convert-source-map/download/convert-source-map-1.8.0.tgz?cache=0&sync_timestamp=1624045508580&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fconvert-source-map%2Fdownload%2Fconvert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + resolved "https://registry.nlark.com/convert-source-map/download/convert-source-map-1.8.0.tgz?cache=0&sync_timestamp=1624045420970&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fconvert-source-map%2Fdownload%2Fconvert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" integrity sha1-8zc8MtIbTXgN2ABFFGhPt5HKQ2k= dependencies: safe-buffer "~5.1.1" @@ -2894,7 +2894,7 @@ cookie-signature@1.0.6: cookie@0.4.1: version "0.4.1" - resolved "https://registry.nlark.com/cookie/download/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" + resolved "https://registry.npm.taobao.org/cookie/download/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha1-r9cT/ibr0hupXOth+agRblClN9E= copy-text-to-clipboard@^3.0.1: @@ -2934,12 +2934,12 @@ core-js@^3.18.0: core-util-is@~1.0.0: version "1.0.3" - resolved "https://registry.nlark.com/core-util-is/download/core-util-is-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcore-util-is%2Fdownload%2Fcore-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + resolved "https://registry.nlark.com/core-util-is/download/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha1-pgQtNjTCsn6TKPg3uWX6yDgI24U= cosmiconfig@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" + resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-6.0.0.tgz?cache=0&sync_timestamp=1629586119976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" integrity sha1-2k/uhTxS9rHmk19BwaL8UL1KmYI= dependencies: "@types/parse-json" "^4.0.0" @@ -2950,7 +2950,7 @@ cosmiconfig@^6.0.0: cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: version "7.0.1" - resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz?cache=0&sync_timestamp=1629586119976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" integrity sha1-cU11ZSLKzoZ4Z8y0R0xdAbuuXW0= dependencies: "@types/parse-json" "^4.0.0" @@ -3017,7 +3017,7 @@ css-minimizer-webpack-plugin@^3.0.2: css-select-base-adapter@^0.1.1: version "0.1.1" - resolved "https://registry.nlark.com/css-select-base-adapter/download/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" + resolved "https://registry.npm.taobao.org/css-select-base-adapter/download/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" integrity sha1-Oy/0lyzDYquIVhUHqVQIoUMhNdc= css-select@^2.0.0: @@ -3157,7 +3157,7 @@ csso@^4.0.2, csso@^4.2.0: csstype@^3.0.2: version "3.0.10" - resolved "https://registry.npmmirror.com/csstype/download/csstype-3.0.10.tgz?cache=0&sync_timestamp=1637224507298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcsstype%2Fdownload%2Fcsstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" + resolved "https://registry.npmmirror.com/csstype/download/csstype-3.0.10.tgz?cache=0&sync_timestamp=1637224514674&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcsstype%2Fdownload%2Fcsstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5" integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA== debug@2.6.9, debug@^2.6.0: @@ -3190,7 +3190,7 @@ decompress-response@^3.3.0: deep-equal@^1.0.1: version "1.1.1" - resolved "https://registry.nlark.com/deep-equal/download/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + resolved "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz?cache=0&sync_timestamp=1606860754950&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeep-equal%2Fdownload%2Fdeep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" integrity sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o= dependencies: is-arguments "^1.0.4" @@ -3224,24 +3224,24 @@ defer-to-connect@^1.0.1: define-lazy-prop@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/define-lazy-prop/download/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + resolved "https://registry.npmmirror.com/define-lazy-prop/download/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha1-P3rkIRKbyqrJvHSQXJigAJ7J7n8= define-properties@^1.1.3: version "1.1.3" - resolved "https://registry.nlark.com/define-properties/download/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + resolved "https://registry.npm.taobao.org/define-properties/download/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" integrity sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE= dependencies: object-keys "^1.0.12" defined@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/defined/download/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" + resolved "https://registry.npm.taobao.org/defined/download/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= del@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/del/download/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" + resolved "https://registry.npm.taobao.org/del/download/del-6.0.0.tgz?cache=0&sync_timestamp=1618321540358&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdel%2Fdownload%2Fdel-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" integrity sha1-C0DQMyzqdD8WFPgYvk/rcXcUyVI= dependencies: globby "^11.0.1" @@ -3265,19 +3265,19 @@ destroy@~1.0.4: detab@2.0.4: version "2.0.4" - resolved "https://registry.nlark.com/detab/download/detab-2.0.4.tgz?cache=0&sync_timestamp=1629724198325&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdetab%2Fdownload%2Fdetab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43" + resolved "https://registry.nlark.com/detab/download/detab-2.0.4.tgz?cache=0&sync_timestamp=1629724300992&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdetab%2Fdownload%2Fdetab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43" integrity sha1-uSeJIGmv9AX7uaGG/pekSpKpS0M= dependencies: repeat-string "^1.5.4" detect-node@^2.0.4: version "2.1.0" - resolved "https://registry.nlark.com/detect-node/download/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + resolved "https://registry.nlark.com/detect-node/download/detect-node-2.1.0.tgz?cache=0&sync_timestamp=1621146902208&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdetect-node%2Fdownload%2Fdetect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha1-yccHdaScPQO8LAbZpzvlUPl4+LE= detect-port-alt@^1.1.6: version "1.1.6" - resolved "https://registry.nlark.com/detect-port-alt/download/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275" + resolved "https://registry.npm.taobao.org/detect-port-alt/download/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275" integrity sha1-JHB96r6TLUo89iEwICfCsmZWgnU= dependencies: address "^1.0.1" @@ -3293,7 +3293,7 @@ detect-port@^1.3.0: detective@^5.2.0: version "5.2.0" - resolved "https://registry.nlark.com/detective/download/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b" + resolved "https://registry.npm.taobao.org/detective/download/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b" integrity sha1-/rKnfoW5BOzepFmtiXzJCpm9Kns= dependencies: acorn-node "^1.6.1" @@ -3302,24 +3302,24 @@ detective@^5.2.0: didyoumean@^1.2.2: version "1.2.2" - resolved "https://registry.nlark.com/didyoumean/download/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" + resolved "https://registry.nlark.com/didyoumean/download/didyoumean-1.2.2.tgz?cache=0&sync_timestamp=1624543452248&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdidyoumean%2Fdownload%2Fdidyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" integrity sha1-mJNG/+noObRVXs9WZu3qDT6K0Dc= dir-glob@^3.0.1: version "3.0.1" - resolved "https://registry.nlark.com/dir-glob/download/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + resolved "https://registry.npm.taobao.org/dir-glob/download/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" integrity sha1-Vtv3PZkqSpO6FYT0U0Bj/S5BcX8= dependencies: path-type "^4.0.0" dlv@^1.1.3: version "1.1.3" - resolved "https://registry.nlark.com/dlv/download/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" + resolved "https://registry.npm.taobao.org/dlv/download/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" integrity sha1-XBmKihFFNZbnUUlNSYdLx3MvLnk= dns-equal@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/dns-equal/download/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" + resolved "https://registry.npm.taobao.org/dns-equal/download/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= dns-packet@^1.3.1: @@ -3338,19 +3338,19 @@ dns-txt@^2.0.2: buffer-indexof "^1.0.0" docusaurus-preset-nonepress@canary: - version "0.0.0-124" - resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-124.tgz#f53645c2f79ad07b6cc575fc0e36101306c8ad2b" - integrity sha512-DvNe8aUh/8biSkn2qyCoz5DCTHsqZVRqUkpWdV+kBOGEH4UvtHCEzAgy8g/MZDHaFh6BlSjUX5TqtK4vZ3+0jg== + version "0.0.0-125" + resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-125.tgz#4f53ae052b20486e0a4d0f76634d703683b3a98d" + integrity sha512-V6H4JULwlAyc4tkff+ptvPXjhuMftiJILQr3mOshMq6/be7bkMNGX/0nJRqf+gAtj7ddmRAiuZBgfMF7pkTiXA== dependencies: "@docusaurus/core" "2.0.0-beta.9" "@docusaurus/plugin-content-docs" "2.0.0-beta.9" "@docusaurus/plugin-content-pages" "2.0.0-beta.9" - docusaurus-theme-nonepress "0.0.0-124" + docusaurus-theme-nonepress "0.0.0-125" -docusaurus-theme-nonepress@0.0.0-124: - version "0.0.0-124" - resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-124.tgz#460d6ac2b9f962b975bcd321b330b02a3c7f0704" - integrity sha512-m2jNAKKXdL+ENroKf4kk0xmxz2R7CUwOIWHnR2oOomQtpl/UR0mIOcpqfY3TSMW6UYnQkaOQoLgIWzC3SwT6sA== +docusaurus-theme-nonepress@0.0.0-125: + version "0.0.0-125" + resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-125.tgz#2213d7f0942ddc1e993b2873c3467643d521a7a4" + integrity sha512-cE8+WQgJAaQu5rFz01ZQT6uXx5SgMa3YrY7xNG5l0O++ejEefpYufX5KClzx3fDcNPTjFFAefjWgQk6rMTPjfw== dependencies: "@docsearch/react" "^3.0.0-alpha.39" "@docusaurus/core" "2.0.0-beta.9" @@ -3389,14 +3389,14 @@ docusaurus-theme-nonepress@0.0.0-124: dom-converter@^0.2.0: version "0.2.0" - resolved "https://registry.nlark.com/dom-converter/download/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" + resolved "https://registry.npm.taobao.org/dom-converter/download/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" integrity sha1-ZyGp2u4uKTaClVtq/kFncWJ7t2g= dependencies: utila "~0.4" dom-serializer@0: version "0.2.2" - resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" + resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.2.2.tgz?cache=0&sync_timestamp=1621256918158&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" integrity sha1-GvuB9TNxcXXUeGVd68XjMtn5u1E= dependencies: domelementtype "^2.0.1" @@ -3404,7 +3404,7 @@ dom-serializer@0: dom-serializer@^1.0.1: version "1.3.2" - resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" + resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-1.3.2.tgz?cache=0&sync_timestamp=1621256918158&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" integrity sha1-YgZDfTLO767HFhgDIwx6ILwbTZE= dependencies: domelementtype "^2.0.1" @@ -3413,7 +3413,7 @@ dom-serializer@^1.0.1: dom-serializer@~0.1.0: version "0.1.1" - resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" + resolved "https://registry.nlark.com/dom-serializer/download/dom-serializer-0.1.1.tgz?cache=0&sync_timestamp=1621256918158&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom-serializer%2Fdownload%2Fdom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" integrity sha1-HsQFnihLq+027sKUHUqXChic58A= dependencies: domelementtype "^1.3.0" @@ -3470,7 +3470,7 @@ domutils@^2.5.2, domutils@^2.8.0: dot-case@^3.0.4: version "3.0.4" - resolved "https://registry.nlark.com/dot-case/download/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" + resolved "https://registry.npm.taobao.org/dot-case/download/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" integrity sha1-mytnDQCkMWZ6inW6Kc0bmICc51E= dependencies: no-case "^3.0.4" @@ -3478,7 +3478,7 @@ dot-case@^3.0.4: dot-prop@^5.2.0: version "5.3.0" - resolved "https://registry.nlark.com/dot-prop/download/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + resolved "https://registry.npm.taobao.org/dot-prop/download/dot-prop-5.3.0.tgz?cache=0&sync_timestamp=1605778245785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdot-prop%2Fdownload%2Fdot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" integrity sha1-kMzOcIzZzYLMTcjD3dmr3VWyDog= dependencies: is-obj "^2.0.0" @@ -3490,22 +3490,22 @@ duplexer3@^0.1.4: duplexer@^0.1.1, duplexer@^0.1.2: version "0.1.2" - resolved "https://registry.nlark.com/duplexer/download/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" + resolved "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fduplexer%2Fdownload%2Fduplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha1-Or5DrvODX4rgd9E23c4PJ2sEAOY= ee-first@1.1.1: version "1.1.1" - resolved "https://registry.nlark.com/ee-first/download/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + resolved "https://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.4.17: - version "1.4.28" - resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.28.tgz#fef0e92e281df6d568f482d8d53c34ca5374de48" - integrity sha512-Gzbf0wUtKfyPaqf0Plz+Ctinf9eQIzxEqBHwSvbGfeOm9GMNdLxyu1dNiCUfM+x6r4BE0xUJNh3Nmg9gfAtTmg== + version "1.4.29" + resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.29.tgz#a9b85ab888d0122124c9647c04d8dd246fae94b6" + integrity sha512-N2Jbwxo5Rum8G2YXeUxycs1sv4Qme/ry71HG73bv8BvZl+I/4JtRgK/En+ST/Wh/yF1fqvVCY4jZBgMxnhjtBA== emoji-regex@^8.0.0: version "8.0.0" - resolved "https://registry.npmmirror.com/emoji-regex/download/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + resolved "https://registry.npmmirror.com/emoji-regex/download/emoji-regex-8.0.0.tgz?cache=0&sync_timestamp=1632751333727&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Femoji-regex%2Fdownload%2Femoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha1-6Bj9ac5cz8tARZT4QpY79TFkzDc= emojis-list@^3.0.0: @@ -3515,7 +3515,7 @@ emojis-list@^3.0.0: emoticon@^3.2.0: version "3.2.0" - resolved "https://registry.npmmirror.com/emoticon/download/emoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f" + resolved "https://registry.npmmirror.com/emoticon/download/emoticon-3.2.0.tgz?cache=0&sync_timestamp=1636290949842&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Femoticon%2Fdownload%2Femoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f" integrity sha1-wAjKfXYg+sdC/hv0r4/4/tFUrn8= encodeurl@~1.0.2: @@ -3532,7 +3532,7 @@ end-of-stream@^1.1.0: enhanced-resolve@^5.8.3: version "5.8.3" - resolved "https://registry.nlark.com/enhanced-resolve/download/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" + resolved "https://registry.nlark.com/enhanced-resolve/download/enhanced-resolve-5.8.3.tgz?cache=0&sync_timestamp=1632130840337&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" integrity sha1-bVUtRlzOBCP1s9cYUR6lOCansvA= dependencies: graceful-fs "^4.2.4" @@ -3550,14 +3550,14 @@ entities@^2.0.0: error-ex@^1.3.1: version "1.3.2" - resolved "https://registry.nlark.com/error-ex/download/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + resolved "https://registry.npm.taobao.org/error-ex/download/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" integrity sha1-tKxAZIEH/c3PriQvQovqihTU8b8= dependencies: is-arrayish "^0.2.1" es-abstract@^1.17.2, es-abstract@^1.19.1: version "1.19.1" - resolved "https://registry.npmmirror.com/es-abstract/download/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" + resolved "https://registry.npmmirror.com/es-abstract/download/es-abstract-1.19.1.tgz?cache=0&sync_timestamp=1633234313248&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-abstract%2Fdownload%2Fes-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" integrity sha1-1IhXlodpFpWd547aoN9FZicRXsM= dependencies: call-bind "^1.0.2" @@ -3583,12 +3583,12 @@ es-abstract@^1.17.2, es-abstract@^1.19.1: es-module-lexer@^0.9.0: version "0.9.3" - resolved "https://registry.npmmirror.com/es-module-lexer/download/es-module-lexer-0.9.3.tgz?cache=0&sync_timestamp=1633645560577&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-module-lexer%2Fdownload%2Fes-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" + resolved "https://registry.npmmirror.com/es-module-lexer/download/es-module-lexer-0.9.3.tgz?cache=0&sync_timestamp=1633646154044&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-module-lexer%2Fdownload%2Fes-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" integrity sha1-bxPbAMw4QXE32vdDZvU1yOtDjxk= es-to-primitive@^1.2.1: version "1.2.1" - resolved "https://registry.npmmirror.com/es-to-primitive/download/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + resolved "https://registry.npm.taobao.org/es-to-primitive/download/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" integrity sha1-5VzUyc3BiLzvsDs2bHNjI/xciYo= dependencies: is-callable "^1.1.4" @@ -3597,12 +3597,12 @@ es-to-primitive@^1.2.1: escalade@^3.1.1: version "3.1.1" - resolved "https://registry.npmmirror.com/escalade/download/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + resolved "https://registry.npm.taobao.org/escalade/download/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha1-2M/ccACWXFoBdLSoLqpcBVJ0LkA= escape-goat@^2.0.0: version "2.1.1" - resolved "https://registry.nlark.com/escape-goat/download/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" + resolved "https://registry.npm.taobao.org/escape-goat/download/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" integrity sha1-Gy3HcANnbEV+x2Cy3GjttkgYhnU= escape-html@^1.0.3, escape-html@~1.0.3: @@ -3627,7 +3627,7 @@ escape-string-regexp@^4.0.0: eslint-scope@5.1.1: version "5.1.1" - resolved "https://registry.npmmirror.com/eslint-scope/download/eslint-scope-5.1.1.tgz?cache=0&sync_timestamp=1637466929956&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Feslint-scope%2Fdownload%2Feslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + resolved "https://registry.npmmirror.com/eslint-scope/download/eslint-scope-5.1.1.tgz?cache=0&sync_timestamp=1637466913662&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Feslint-scope%2Fdownload%2Feslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha1-54blmmbLkrP2wfsNUIqrF0hI9Iw= dependencies: esrecurse "^4.3.0" @@ -3640,7 +3640,7 @@ esprima@^4.0.0: esrecurse@^4.3.0: version "4.3.0" - resolved "https://registry.nlark.com/esrecurse/download/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + resolved "https://registry.npm.taobao.org/esrecurse/download/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" integrity sha1-eteWTWeauyi+5yzsY3WLHF0smSE= dependencies: estraverse "^5.2.0" @@ -3657,7 +3657,7 @@ estraverse@^5.2.0: esutils@^2.0.2: version "2.0.3" - resolved "https://registry.nlark.com/esutils/download/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + resolved "https://registry.npm.taobao.org/esutils/download/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q= eta@^1.12.3: @@ -3672,7 +3672,7 @@ etag@~1.8.1: eval@^0.1.4: version "0.1.6" - resolved "https://registry.nlark.com/eval/download/eval-0.1.6.tgz#9620d7d8c85515e97e6b47c5814f46ae381cb3cc" + resolved "https://registry.npm.taobao.org/eval/download/eval-0.1.6.tgz#9620d7d8c85515e97e6b47c5814f46ae381cb3cc" integrity sha1-liDX2MhVFel+a0fFgU9Grjgcs8w= dependencies: require-like ">= 0.1.1" @@ -3684,12 +3684,12 @@ eventemitter3@^4.0.0: events@^3.2.0: version "3.3.0" - resolved "https://registry.npmmirror.com/events/download/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + resolved "https://registry.npmmirror.com/events/download/events-3.3.0.tgz?cache=0&sync_timestamp=1636449286836&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fevents%2Fdownload%2Fevents-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha1-Mala0Kkk4tLEGagTrrLE6HjqdAA= execa@^5.0.0: version "5.1.1" - resolved "https://registry.npmmirror.com/execa/download/execa-5.1.1.tgz?cache=0&sync_timestamp=1637147245057&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fexeca%2Fdownload%2Fexeca-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + resolved "https://registry.npmmirror.com/execa/download/execa-5.1.1.tgz?cache=0&sync_timestamp=1637147188673&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fexeca%2Fdownload%2Fexeca-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" integrity sha1-+ArZy/Qpj3vR1MlVXCHpN0HEEd0= dependencies: cross-spawn "^7.0.3" @@ -3747,7 +3747,7 @@ extend-shallow@^2.0.1: extend@^3.0.0: version "3.0.2" - resolved "https://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + resolved "https://registry.nlark.com/extend/download/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo= fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: @@ -3757,7 +3757,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: fast-glob@^3.1.1, fast-glob@^3.2.7: version "3.2.7" - resolved "https://registry.nlark.com/fast-glob/download/fast-glob-3.2.7.tgz?cache=0&sync_timestamp=1625773305786&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffast-glob%2Fdownload%2Ffast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + resolved "https://registry.nlark.com/fast-glob/download/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" integrity sha1-/Wy3otfpqnp4RhEehaGW1rL3ZqE= dependencies: "@nodelib/fs.stat" "^2.0.2" @@ -3773,7 +3773,7 @@ fast-json-stable-stringify@^2.0.0: fast-url-parser@1.1.3: version "1.1.3" - resolved "https://registry.npm.taobao.org/fast-url-parser/download/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" + resolved "https://registry.nlark.com/fast-url-parser/download/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" integrity sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0= dependencies: punycode "^1.3.2" @@ -3814,7 +3814,7 @@ filesize@^6.1.0: fill-range@^7.0.1: version "7.0.1" - resolved "https://registry.nlark.com/fill-range/download/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + resolved "https://registry.npm.taobao.org/fill-range/download/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" integrity sha1-GRmmp8df44ssfHflGYU12prN2kA= dependencies: to-regex-range "^5.0.1" @@ -3834,7 +3834,7 @@ finalhandler@~1.1.2: find-cache-dir@^3.3.1: version "3.3.2" - resolved "https://registry.nlark.com/find-cache-dir/download/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + resolved "https://registry.nlark.com/find-cache-dir/download/find-cache-dir-3.3.2.tgz?cache=0&sync_timestamp=1630259965392&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffind-cache-dir%2Fdownload%2Ffind-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" integrity sha1-swxbbv8HMHMa6pu9nb7L2AJW1ks= dependencies: commondir "^1.0.1" @@ -3843,14 +3843,14 @@ find-cache-dir@^3.3.1: find-up@^3.0.0: version "3.0.0" - resolved "https://registry.npmmirror.com/find-up/download/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + resolved "https://registry.npmmirror.com/find-up/download/find-up-3.0.0.tgz?cache=0&sync_timestamp=1633620747957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffind-up%2Fdownload%2Ffind-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" integrity sha1-SRafHXmTQwZG2mHsxa41XCHJe3M= dependencies: locate-path "^3.0.0" find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" - resolved "https://registry.npmmirror.com/find-up/download/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + resolved "https://registry.npmmirror.com/find-up/download/find-up-4.1.0.tgz?cache=0&sync_timestamp=1633620747957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffind-up%2Fdownload%2Ffind-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" integrity sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk= dependencies: locate-path "^5.0.0" @@ -3892,7 +3892,7 @@ fraction.js@^4.1.1: fresh@0.5.2: version "0.5.2" - resolved "https://registry.nlark.com/fresh/download/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + resolved "https://registry.npm.taobao.org/fresh/download/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= fs-extra@^10.0.0: @@ -3916,7 +3916,7 @@ fs-extra@^9.0.0: fs-monkey@1.0.3: version "1.0.3" - resolved "https://registry.nlark.com/fs-monkey/download/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" + resolved "https://registry.npm.taobao.org/fs-monkey/download/fs-monkey-1.0.3.tgz?cache=0&sync_timestamp=1617593422622&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-monkey%2Fdownload%2Ffs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" integrity sha1-rjrJLVO7Mo7+DpodlUH2rY1I4tM= fs.realpath@^1.0.0: @@ -3941,7 +3941,7 @@ gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2: get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: version "1.1.1" - resolved "https://registry.npmmirror.com/get-intrinsic/download/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + resolved "https://registry.npm.taobao.org/get-intrinsic/download/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" integrity sha1-FfWfN2+FXERpY5SPDSTNNje0q8Y= dependencies: function-bind "^1.1.1" @@ -3950,7 +3950,7 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: get-own-enumerable-property-symbols@^3.0.0: version "3.0.2" - resolved "https://registry.nlark.com/get-own-enumerable-property-symbols/download/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" + resolved "https://registry.npm.taobao.org/get-own-enumerable-property-symbols/download/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" integrity sha1-tf3nfyLL4185C04ImSLFC85u9mQ= get-stream@^4.1.0: @@ -3982,19 +3982,19 @@ get-symbol-description@^1.0.0: github-slugger@^1.4.0: version "1.4.0" - resolved "https://registry.nlark.com/github-slugger/download/github-slugger-1.4.0.tgz?cache=0&sync_timestamp=1629817305312&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fgithub-slugger%2Fdownload%2Fgithub-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" + resolved "https://registry.nlark.com/github-slugger/download/github-slugger-1.4.0.tgz?cache=0&sync_timestamp=1629817837468&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fgithub-slugger%2Fdownload%2Fgithub-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" integrity sha1-IG65bNsi7lb9xToo1aMCM4RjRE4= glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" - resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-5.1.2.tgz?cache=0&sync_timestamp=1632953810778&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha1-hpgyxYA0/mikCTwX3BXoNA2EAcQ= dependencies: is-glob "^4.0.1" glob-parent@^6.0.1, glob-parent@^6.0.2: version "6.0.2" - resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-6.0.2.tgz?cache=0&sync_timestamp=1632953810778&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" integrity sha1-bSN9mQg5UMeSkPJMdkKj3poo+eM= dependencies: is-glob "^4.0.3" @@ -4018,7 +4018,7 @@ glob@^7.0.0, glob@^7.1.3, glob@^7.1.6: global-dirs@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/global-dirs/download/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" + resolved "https://registry.npm.taobao.org/global-dirs/download/global-dirs-3.0.0.tgz?cache=0&sync_timestamp=1610454716901&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobal-dirs%2Fdownload%2Fglobal-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" integrity sha1-cKdv6E6jFas3sfVXbL3n1I73JoY= dependencies: ini "2.0.0" @@ -4041,12 +4041,12 @@ global-prefix@^3.0.0: globals@^11.1.0: version "11.12.0" - resolved "https://registry.npmmirror.com/globals/download/globals-11.12.0.tgz?cache=0&sync_timestamp=1635390798667&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglobals%2Fdownload%2Fglobals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + resolved "https://registry.npmmirror.com/globals/download/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha1-q4eVM4hooLq9hSV1gBjCp+uVxC4= globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.0.4: version "11.0.4" - resolved "https://registry.nlark.com/globby/download/globby-11.0.4.tgz?cache=0&sync_timestamp=1629801109090&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglobby%2Fdownload%2Fglobby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" + resolved "https://registry.nlark.com/globby/download/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" integrity sha1-LLr/d8Lypi5x6bKBOme5ejowAaU= dependencies: array-union "^2.1.0" @@ -4125,7 +4125,7 @@ has-flag@^4.0.0: has-symbols@^1.0.1, has-symbols@^1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/has-symbols/download/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + resolved "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.2.tgz?cache=0&sync_timestamp=1614443557459&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhas-symbols%2Fdownload%2Fhas-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha1-Fl0wcMADCXUqEjakeTMeOsVvFCM= has-tostringtag@^1.0.0: @@ -4137,19 +4137,19 @@ has-tostringtag@^1.0.0: has-yarn@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/has-yarn/download/has-yarn-2.1.0.tgz?cache=0&sync_timestamp=1631298792738&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-yarn%2Fdownload%2Fhas-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" + resolved "https://registry.nlark.com/has-yarn/download/has-yarn-2.1.0.tgz?cache=0&sync_timestamp=1631299286113&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-yarn%2Fdownload%2Fhas-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" integrity sha1-E34RNUp7W/EapctknPDG8/8rLnc= has@^1.0.3: version "1.0.3" - resolved "https://registry.nlark.com/has/download/has-1.0.3.tgz?cache=0&sync_timestamp=1618847173393&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas%2Fdownload%2Fhas-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + resolved "https://registry.nlark.com/has/download/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" integrity sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y= dependencies: function-bind "^1.1.1" hast-to-hyperscript@^9.0.0: version "9.0.1" - resolved "https://registry.nlark.com/hast-to-hyperscript/download/hast-to-hyperscript-9.0.1.tgz?cache=0&sync_timestamp=1627031086157&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-to-hyperscript%2Fdownload%2Fhast-to-hyperscript-9.0.1.tgz#9b67fd188e4c81e8ad66f803855334173920218d" + resolved "https://registry.nlark.com/hast-to-hyperscript/download/hast-to-hyperscript-9.0.1.tgz?cache=0&sync_timestamp=1627029601196&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-to-hyperscript%2Fdownload%2Fhast-to-hyperscript-9.0.1.tgz#9b67fd188e4c81e8ad66f803855334173920218d" integrity sha1-m2f9GI5MgeitZvgDhVM0FzkgIY0= dependencies: "@types/unist" "^2.0.3" @@ -4162,7 +4162,7 @@ hast-to-hyperscript@^9.0.0: hast-util-from-parse5@^5.0.0: version "5.0.3" - resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-5.0.3.tgz?cache=0&sync_timestamp=1627032254562&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-util-from-parse5%2Fdownload%2Fhast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" + resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" integrity sha1-MIncDuLM9uyLxBaRm1GlSlieCXw= dependencies: ccount "^1.0.3" @@ -4173,7 +4173,7 @@ hast-util-from-parse5@^5.0.0: hast-util-from-parse5@^6.0.0: version "6.0.1" - resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-6.0.1.tgz?cache=0&sync_timestamp=1627032254562&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-util-from-parse5%2Fdownload%2Fhast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" + resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" integrity sha1-VU40q97qJax29b2VCh8BgOCzvCo= dependencies: "@types/parse5" "^5.0.0" @@ -4190,7 +4190,7 @@ hast-util-parse-selector@^2.0.0: hast-util-raw@6.0.1: version "6.0.1" - resolved "https://registry.npmmirror.com/hast-util-raw/download/hast-util-raw-6.0.1.tgz?cache=0&sync_timestamp=1636449731286&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhast-util-raw%2Fdownload%2Fhast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977" + resolved "https://registry.npmmirror.com/hast-util-raw/download/hast-util-raw-6.0.1.tgz?cache=0&sync_timestamp=1636450214370&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhast-util-raw%2Fdownload%2Fhast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977" integrity sha1-lzsVkwt1Kae2aYTJgUi0ZSaIWXc= dependencies: "@types/hast" "^2.0.0" @@ -4262,7 +4262,7 @@ hoist-non-react-statics@^3.1.0: hpack.js@^2.1.6: version "2.1.6" - resolved "https://registry.nlark.com/hpack.js/download/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" + resolved "https://registry.npm.taobao.org/hpack.js/download/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI= dependencies: inherits "^2.0.1" @@ -4272,7 +4272,7 @@ hpack.js@^2.1.6: html-entities@^2.3.2: version "2.3.2" - resolved "https://registry.nlark.com/html-entities/download/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" + resolved "https://registry.npm.taobao.org/html-entities/download/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" integrity sha1-dgtARoXLHXlOT0t0QzLjsA3P5Ig= html-minifier-terser@^6.0.2: @@ -4311,7 +4311,7 @@ html-webpack-plugin@^5.4.0: htmlparser2@^3.9.1: version "3.10.1" - resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-3.10.1.tgz?cache=0&sync_timestamp=1636640853072&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" + resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-3.10.1.tgz?cache=0&sync_timestamp=1636640841489&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" integrity sha1-vWedw/WYl7ajS7EHSchVu1OpOS8= dependencies: domelementtype "^1.3.1" @@ -4323,7 +4323,7 @@ htmlparser2@^3.9.1: htmlparser2@^6.1.0: version "6.1.0" - resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-6.1.0.tgz?cache=0&sync_timestamp=1636640853072&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" + resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-6.1.0.tgz?cache=0&sync_timestamp=1636640841489&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" integrity sha1-xNditsM3GgXb5l6UrkOp+EX7j7c= dependencies: domelementtype "^2.0.1" @@ -4338,7 +4338,7 @@ http-cache-semantics@^4.0.0: http-deceiver@^1.2.7: version "1.2.7" - resolved "https://registry.nlark.com/http-deceiver/download/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" + resolved "https://registry.npm.taobao.org/http-deceiver/download/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= http-errors@1.8.1: @@ -4369,7 +4369,7 @@ http-parser-js@>=0.5.1: http-proxy-middleware@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/http-proxy-middleware/download/http-proxy-middleware-2.0.1.tgz#7ef3417a479fb7666a571e09966c66a39bd2c15f" + resolved "https://registry.nlark.com/http-proxy-middleware/download/http-proxy-middleware-2.0.1.tgz?cache=0&sync_timestamp=1625172260511&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhttp-proxy-middleware%2Fdownload%2Fhttp-proxy-middleware-2.0.1.tgz#7ef3417a479fb7666a571e09966c66a39bd2c15f" integrity sha1-fvNBekeft2ZqVx4Jlmxmo5vSwV8= dependencies: "@types/http-proxy" "^1.17.5" @@ -4380,7 +4380,7 @@ http-proxy-middleware@^2.0.0: http-proxy@^1.18.1: version "1.18.1" - resolved "https://registry.nlark.com/http-proxy/download/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + resolved "https://registry.npm.taobao.org/http-proxy/download/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" integrity sha1-QBVB8FNIhLv5UmAzTnL4juOXZUk= dependencies: eventemitter3 "^4.0.0" @@ -4394,7 +4394,7 @@ human-signals@^2.1.0: iconv-lite@0.4.24: version "0.4.24" - resolved "https://registry.nlark.com/iconv-lite/download/iconv-lite-0.4.24.tgz?cache=0&sync_timestamp=1622686400731&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ficonv-lite%2Fdownload%2Ficonv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + resolved "https://registry.nlark.com/iconv-lite/download/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha1-ICK0sl+93CHS9SSXSkdKr+czkIs= dependencies: safer-buffer ">= 2.1.2 < 3" @@ -4423,7 +4423,7 @@ import-cwd@^3.0.0: import-fresh@^3.1.0, import-fresh@^3.2.1, import-fresh@^3.2.2, import-fresh@^3.3.0: version "3.3.0" - resolved "https://registry.nlark.com/import-fresh/download/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + resolved "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz?cache=0&sync_timestamp=1608469579940&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimport-fresh%2Fdownload%2Fimport-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha1-NxYsJfy566oublPVtNiM4X2eDCs= dependencies: parent-module "^1.0.0" @@ -4453,7 +4453,7 @@ indent-string@^4.0.0: inflight@^1.0.4: version "1.0.6" - resolved "https://registry.nlark.com/inflight/download/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + resolved "https://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= dependencies: once "^1.3.0" @@ -4495,7 +4495,7 @@ internal-slot@^1.0.3: interpret@^1.0.0: version "1.4.0" - resolved "https://registry.nlark.com/interpret/download/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + resolved "https://registry.nlark.com/interpret/download/interpret-1.4.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Finterpret%2Fdownload%2Finterpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha1-Zlq4vE2iendKQFhOgS4+D6RbGh4= ip@^1.1.0: @@ -4520,7 +4520,7 @@ is-alphabetical@1.0.4, is-alphabetical@^1.0.0: is-alphanumerical@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-alphanumerical/download/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf" + resolved "https://registry.npmmirror.com/is-alphanumerical/download/is-alphanumerical-1.0.4.tgz?cache=0&sync_timestamp=1636009316820&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-alphanumerical%2Fdownload%2Fis-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf" integrity sha1-frmiQx+FX2se8aeOMm31FWlsTb8= dependencies: is-alphabetical "^1.0.0" @@ -4528,7 +4528,7 @@ is-alphanumerical@^1.0.0: is-arguments@^1.0.4: version "1.1.1" - resolved "https://registry.nlark.com/is-arguments/download/is-arguments-1.1.1.tgz?cache=0&sync_timestamp=1628202102318&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-arguments%2Fdownload%2Fis-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + resolved "https://registry.nlark.com/is-arguments/download/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" integrity sha1-FbP4j9oB8ql/7ITKdhpWDxI++ps= dependencies: call-bind "^1.0.2" @@ -4536,7 +4536,7 @@ is-arguments@^1.0.4: is-arrayish@^0.2.1: version "0.2.1" - resolved "https://registry.nlark.com/is-arrayish/download/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + resolved "https://registry.npm.taobao.org/is-arrayish/download/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= is-bigint@^1.0.1: @@ -4555,7 +4555,7 @@ is-binary-path@~2.1.0: is-boolean-object@^1.1.0: version "1.1.2" - resolved "https://registry.nlark.com/is-boolean-object/download/is-boolean-object-1.1.2.tgz?cache=0&sync_timestamp=1628207133571&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-boolean-object%2Fdownload%2Fis-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + resolved "https://registry.nlark.com/is-boolean-object/download/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" integrity sha1-XG3CACRt2TIa5LiFoRS7H3X2Nxk= dependencies: call-bind "^1.0.2" @@ -4563,24 +4563,24 @@ is-boolean-object@^1.1.0: is-buffer@^2.0.0: version "2.0.5" - resolved "https://registry.nlark.com/is-buffer/download/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" + resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.5.tgz?cache=0&sync_timestamp=1604429876103&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-buffer%2Fdownload%2Fis-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha1-68JS5ADSL/jXf6CYiIIaJKZYwZE= is-callable@^1.1.4, is-callable@^1.2.4: version "1.2.4" - resolved "https://registry.nlark.com/is-callable/download/is-callable-1.2.4.tgz?cache=0&sync_timestamp=1628260416925&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-callable%2Fdownload%2Fis-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + resolved "https://registry.nlark.com/is-callable/download/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha1-RzAdWN0CWUB4ZVR4U99tYf5HGUU= is-ci@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/is-ci/download/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + resolved "https://registry.npmmirror.com/is-ci/download/is-ci-2.0.0.tgz?cache=0&sync_timestamp=1635261114993&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-ci%2Fdownload%2Fis-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" integrity sha1-a8YzQYGBDgS1wis9WJ/cpVAmQEw= dependencies: ci-info "^2.0.0" is-core-module@^2.2.0: version "2.8.0" - resolved "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz?cache=0&sync_timestamp=1634236539354&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-core-module%2Fdownload%2Fis-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" + resolved "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" integrity sha1-AyEzbD0JJeSX/Zf12VyxFKXM1Ug= dependencies: has "^1.0.3" @@ -4594,22 +4594,22 @@ is-date-object@^1.0.1: is-decimal@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-decimal/download/is-decimal-1.0.4.tgz?cache=0&sync_timestamp=1636008973005&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-decimal%2Fdownload%2Fis-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" + resolved "https://registry.npmmirror.com/is-decimal/download/is-decimal-1.0.4.tgz?cache=0&sync_timestamp=1636008960795&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-decimal%2Fdownload%2Fis-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" integrity sha1-ZaOllYocW2OnBuGzM9fNn2MNP6U= is-docker@^2.0.0, is-docker@^2.1.1: version "2.2.1" - resolved "https://registry.nlark.com/is-docker/download/is-docker-2.2.1.tgz?cache=0&sync_timestamp=1630451108035&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-docker%2Fdownload%2Fis-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + resolved "https://registry.nlark.com/is-docker/download/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha1-M+6r4jz+hvFL3kQIoCwM+4U6zao= is-extendable@^0.1.0: version "0.1.1" - resolved "https://registry.nlark.com/is-extendable/download/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + resolved "https://registry.npm.taobao.org/is-extendable/download/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= is-extglob@^2.1.1: version "2.1.1" - resolved "https://registry.nlark.com/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + resolved "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= is-fullwidth-code-point@^3.0.0: @@ -4626,12 +4626,12 @@ is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: is-hexadecimal@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-hexadecimal/download/is-hexadecimal-1.0.4.tgz?cache=0&sync_timestamp=1636011609614&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-hexadecimal%2Fdownload%2Fis-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" + resolved "https://registry.npmmirror.com/is-hexadecimal/download/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" integrity sha1-zDXJdYjaS9Saju3WvECC1E3LI6c= is-installed-globally@^0.4.0: version "0.4.0" - resolved "https://registry.nlark.com/is-installed-globally/download/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" + resolved "https://registry.npm.taobao.org/is-installed-globally/download/is-installed-globally-0.4.0.tgz?cache=0&sync_timestamp=1610875398433&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-installed-globally%2Fdownload%2Fis-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" integrity sha1-mg/UB5ScMPhutpWe8beZTtC3tSA= dependencies: global-dirs "^3.0.0" @@ -4676,7 +4676,7 @@ is-path-cwd@^2.2.0: is-path-inside@^3.0.2: version "3.0.3" - resolved "https://registry.nlark.com/is-path-inside/download/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + resolved "https://registry.nlark.com/is-path-inside/download/is-path-inside-3.0.3.tgz?cache=0&sync_timestamp=1620046845369&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-path-inside%2Fdownload%2Fis-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha1-0jE2LlOgf/Kw4Op/7QSRYf/RYoM= is-plain-obj@^2.0.0: @@ -4691,7 +4691,7 @@ is-plain-obj@^3.0.0: is-plain-object@^2.0.4: version "2.0.4" - resolved "https://registry.nlark.com/is-plain-object/download/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + resolved "https://registry.npm.taobao.org/is-plain-object/download/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" integrity sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc= dependencies: isobject "^3.0.1" @@ -4711,7 +4711,7 @@ is-regexp@^1.0.0: is-root@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/is-root/download/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" + resolved "https://registry.npm.taobao.org/is-root/download/is-root-2.1.0.tgz?cache=0&sync_timestamp=1617783382597&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-root%2Fdownload%2Fis-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" integrity sha1-gJ4YEpzxEpZEMCpPhUQDXVGYSpw= is-shared-array-buffer@^1.0.1: @@ -4733,14 +4733,14 @@ is-string@^1.0.5, is-string@^1.0.7: is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" - resolved "https://registry.nlark.com/is-symbol/download/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + resolved "https://registry.nlark.com/is-symbol/download/is-symbol-1.0.4.tgz?cache=0&sync_timestamp=1620501182675&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-symbol%2Fdownload%2Fis-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" integrity sha1-ptrJO2NbBjymhyI23oiRClevE5w= dependencies: has-symbols "^1.0.2" is-typedarray@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/is-typedarray/download/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + resolved "https://registry.npm.taobao.org/is-typedarray/download/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= is-weakref@^1.0.1: @@ -4762,14 +4762,14 @@ is-word-character@^1.0.0: is-wsl@^2.1.1, is-wsl@^2.2.0: version "2.2.0" - resolved "https://registry.nlark.com/is-wsl/download/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + resolved "https://registry.npm.taobao.org/is-wsl/download/is-wsl-2.2.0.tgz?cache=0&sync_timestamp=1592843177178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-wsl%2Fdownload%2Fis-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" integrity sha1-dKTHbnfKn9P5MvKQwX6jJs0VcnE= dependencies: is-docker "^2.0.0" is-yarn-global@^0.3.0: version "0.3.0" - resolved "https://registry.nlark.com/is-yarn-global/download/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" + resolved "https://registry.nlark.com/is-yarn-global/download/is-yarn-global-0.3.0.tgz?cache=0&sync_timestamp=1619356824740&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-yarn-global%2Fdownload%2Fis-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" integrity sha1-1QLTOCWQ6jAEiTdGdUyJE5lz4jI= isarray@0.0.1: @@ -4784,7 +4784,7 @@ isarray@~1.0.0: isexe@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + resolved "https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= isobject@^3.0.1: @@ -4844,7 +4844,7 @@ jsesc@~0.5.0: json-buffer@3.0.0: version "3.0.0" - resolved "https://registry.npmmirror.com/json-buffer/download/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" + resolved "https://registry.npm.taobao.org/json-buffer/download/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= json-parse-better-errors@^1.0.2: @@ -4854,36 +4854,36 @@ json-parse-better-errors@^1.0.2: json-parse-even-better-errors@^2.3.0: version "2.3.1" - resolved "https://registry.nlark.com/json-parse-even-better-errors/download/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + resolved "https://registry.npm.taobao.org/json-parse-even-better-errors/download/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha1-fEeAWpQxmSjgV3dAXcEuH3pO4C0= json-schema-traverse@^0.4.1: version "0.4.1" - resolved "https://registry.nlark.com/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + resolved "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha1-afaofZUTq4u4/mO9sJecRI5oRmA= json-schema-traverse@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/json-schema-traverse/download/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + resolved "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha1-rnvLNlard6c7pcSb9lTzjmtoYOI= json5@^1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/json5/download/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" + resolved "https://registry.npm.taobao.org/json5/download/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" integrity sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4= dependencies: minimist "^1.2.0" json5@^2.1.2: version "2.2.0" - resolved "https://registry.nlark.com/json5/download/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + resolved "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" integrity sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM= dependencies: minimist "^1.2.5" jsonfile@^6.0.1: version "6.1.0" - resolved "https://registry.nlark.com/jsonfile/download/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + resolved "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" integrity sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4= dependencies: universalify "^2.0.0" @@ -4892,7 +4892,7 @@ jsonfile@^6.0.1: keyv@^3.0.0: version "3.1.0" - resolved "https://registry.npmmirror.com/keyv/download/keyv-3.1.0.tgz?cache=0&sync_timestamp=1635869184957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fkeyv%2Fdownload%2Fkeyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" + resolved "https://registry.npmmirror.com/keyv/download/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" integrity sha1-7MIoSG9pmR5J6UdkhaW+Ho/FxNk= dependencies: json-buffer "3.0.0" @@ -4909,24 +4909,24 @@ kleur@^3.0.3: klona@^2.0.5: version "2.0.5" - resolved "https://registry.npmmirror.com/klona/download/klona-2.0.5.tgz?cache=0&sync_timestamp=1635385749251&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fklona%2Fdownload%2Fklona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" + resolved "https://registry.npmmirror.com/klona/download/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" integrity sha1-0WZXTZAHY5XZljqnqSj6u412r7w= latest-version@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/latest-version/download/latest-version-5.1.0.tgz?cache=0&sync_timestamp=1626951703884&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flatest-version%2Fdownload%2Flatest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + resolved "https://registry.nlark.com/latest-version/download/latest-version-5.1.0.tgz?cache=0&sync_timestamp=1626951682795&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flatest-version%2Fdownload%2Flatest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" integrity sha1-EZ3+kI/jjRXfpD7NE/oS7Igy+s4= dependencies: package-json "^6.3.0" leven@^3.1.0: version "3.1.0" - resolved "https://registry.nlark.com/leven/download/leven-3.1.0.tgz?cache=0&sync_timestamp=1628597922950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fleven%2Fdownload%2Fleven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + resolved "https://registry.nlark.com/leven/download/leven-3.1.0.tgz?cache=0&sync_timestamp=1628597917913&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fleven%2Fdownload%2Fleven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" integrity sha1-d4kd6DQGTMy6gq54QrtrFKE+1/I= lilconfig@^2.0.3: version "2.0.4" - resolved "https://registry.npmmirror.com/lilconfig/download/lilconfig-2.0.4.tgz?cache=0&sync_timestamp=1636150567131&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flilconfig%2Fdownload%2Flilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" + resolved "https://registry.npmmirror.com/lilconfig/download/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" integrity sha1-9FB9BD1wWLOAtqj1y3vNSzTO4II= lines-and-columns@^1.1.6: @@ -4959,7 +4959,7 @@ loader-utils@^2.0.0: locate-path@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/locate-path/download/locate-path-3.0.0.tgz?cache=0&sync_timestamp=1629895618224&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flocate-path%2Fdownload%2Flocate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + resolved "https://registry.nlark.com/locate-path/download/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" integrity sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4= dependencies: p-locate "^3.0.0" @@ -4967,24 +4967,24 @@ locate-path@^3.0.0: locate-path@^5.0.0: version "5.0.0" - resolved "https://registry.nlark.com/locate-path/download/locate-path-5.0.0.tgz?cache=0&sync_timestamp=1629895618224&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flocate-path%2Fdownload%2Flocate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + resolved "https://registry.nlark.com/locate-path/download/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" integrity sha1-Gvujlq/WdqbUJQTQpno6frn2KqA= dependencies: p-locate "^4.1.0" lodash.assignin@^4.0.9: version "4.2.0" - resolved "https://registry.nlark.com/lodash.assignin/download/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" + resolved "https://registry.npm.taobao.org/lodash.assignin/download/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI= lodash.bind@^4.1.4: version "4.2.1" - resolved "https://registry.nlark.com/lodash.bind/download/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35" + resolved "https://registry.npm.taobao.org/lodash.bind/download/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35" integrity sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU= lodash.castarray@^4.4.0: version "4.4.0" - resolved "https://registry.nlark.com/lodash.castarray/download/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" + resolved "https://registry.npm.taobao.org/lodash.castarray/download/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU= lodash.debounce@^4.0.8: @@ -4999,7 +4999,7 @@ lodash.defaults@^4.0.1: lodash.filter@^4.4.0: version "4.6.0" - resolved "https://registry.nlark.com/lodash.filter/download/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" + resolved "https://registry.npm.taobao.org/lodash.filter/download/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4= lodash.flatten@^4.2.0: @@ -5009,17 +5009,17 @@ lodash.flatten@^4.2.0: lodash.foreach@^4.3.0: version "4.5.0" - resolved "https://registry.nlark.com/lodash.foreach/download/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" + resolved "https://registry.npm.taobao.org/lodash.foreach/download/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM= lodash.isplainobject@^4.0.6: version "4.0.6" - resolved "https://registry.nlark.com/lodash.isplainobject/download/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + resolved "https://registry.npm.taobao.org/lodash.isplainobject/download/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= lodash.map@^4.4.0: version "4.6.0" - resolved "https://registry.nlark.com/lodash.map/download/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" + resolved "https://registry.npm.taobao.org/lodash.map/download/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= lodash.memoize@^4.1.2: @@ -5029,12 +5029,12 @@ lodash.memoize@^4.1.2: lodash.merge@^4.4.0, lodash.merge@^4.6.2: version "4.6.2" - resolved "https://registry.nlark.com/lodash.merge/download/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + resolved "https://registry.npm.taobao.org/lodash.merge/download/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha1-VYqlO0O2YeGSWgr9+japoQhf5Xo= lodash.pick@^4.2.1: version "4.4.0" - resolved "https://registry.nlark.com/lodash.pick/download/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" + resolved "https://registry.npm.taobao.org/lodash.pick/download/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= lodash.reduce@^4.4.0: @@ -5044,17 +5044,17 @@ lodash.reduce@^4.4.0: lodash.reject@^4.4.0: version "4.6.0" - resolved "https://registry.nlark.com/lodash.reject/download/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415" + resolved "https://registry.npm.taobao.org/lodash.reject/download/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415" integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU= lodash.some@^4.4.0: version "4.6.0" - resolved "https://registry.nlark.com/lodash.some/download/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" + resolved "https://registry.npm.taobao.org/lodash.some/download/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0= lodash.uniq@4.5.0, lodash.uniq@^4.5.0: version "4.5.0" - resolved "https://registry.nlark.com/lodash.uniq/download/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + resolved "https://registry.npm.taobao.org/lodash.uniq/download/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: @@ -5064,38 +5064,38 @@ lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" - resolved "https://registry.nlark.com/loose-envify/download/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + resolved "https://registry.nlark.com/loose-envify/download/loose-envify-1.4.0.tgz?cache=0&sync_timestamp=1627566748051&other_urls=https%3A%2F%2Fregistry.nlark.com%2Floose-envify%2Fdownload%2Floose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8= dependencies: js-tokens "^3.0.0 || ^4.0.0" lower-case@^2.0.2: version "2.0.2" - resolved "https://registry.nlark.com/lower-case/download/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" + resolved "https://registry.npm.taobao.org/lower-case/download/lower-case-2.0.2.tgz?cache=0&sync_timestamp=1606867514181&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flower-case%2Fdownload%2Flower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" integrity sha1-b6I3xj29xKgsoP2ILkci3F5jTig= dependencies: tslib "^2.0.3" lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-1.0.1.tgz?cache=0&sync_timestamp=1634551769618&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flowercase-keys%2Fdownload%2Flowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" integrity sha1-b54wtHCE2XGnyCD/FabFFnt0wm8= lowercase-keys@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-2.0.0.tgz?cache=0&sync_timestamp=1634551769618&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flowercase-keys%2Fdownload%2Flowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha1-JgPni3tLAAbLyi+8yKMgJVislHk= lru-cache@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/lru-cache/download/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + resolved "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" integrity sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ= dependencies: yallist "^4.0.0" magic-string@^0.25.3: version "0.25.7" - resolved "https://registry.nlark.com/magic-string/download/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" + resolved "https://registry.npm.taobao.org/magic-string/download/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" integrity sha1-P0l9b9NMZpxnmNy4IfLvMfVEUFE= dependencies: sourcemap-codec "^1.4.4" @@ -5114,14 +5114,14 @@ markdown-escapes@^1.0.0: mdast-squeeze-paragraphs@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/mdast-squeeze-paragraphs/download/mdast-squeeze-paragraphs-4.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-squeeze-paragraphs%2Fdownload%2Fmdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97" + resolved "https://registry.nlark.com/mdast-squeeze-paragraphs/download/mdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97" integrity sha1-fEwRRnnDvuJ+8QtY4uAVvnnx75c= dependencies: unist-util-remove "^2.0.0" mdast-util-definitions@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/mdast-util-definitions/download/mdast-util-definitions-4.0.0.tgz?cache=0&sync_timestamp=1627293815940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-util-definitions%2Fdownload%2Fmdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2" + resolved "https://registry.nlark.com/mdast-util-definitions/download/mdast-util-definitions-4.0.0.tgz#c5c1a84db799173b4dcf7643cda999e440c24db2" integrity sha1-xcGoTbeZFztNz3ZDzamZ5EDCTbI= dependencies: unist-util-visit "^2.0.0" @@ -5142,7 +5142,7 @@ mdast-util-to-hast@10.0.1: mdast-util-to-string@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/mdast-util-to-string/download/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" + resolved "https://registry.nlark.com/mdast-util-to-string/download/mdast-util-to-string-2.0.0.tgz?cache=0&sync_timestamp=1619426190900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-util-to-string%2Fdownload%2Fmdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" integrity sha1-uM/mpxPhCRy1tyj8SIhaR2f4uXs= mdn-data@2.0.14: @@ -5157,7 +5157,7 @@ mdn-data@2.0.4: mdurl@^1.0.0: version "1.0.1" - resolved "https://registry.nlark.com/mdurl/download/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" + resolved "https://registry.npm.taobao.org/mdurl/download/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= media-typer@0.3.0: @@ -5184,7 +5184,7 @@ merge-stream@^2.0.0: merge2@^1.3.0: version "1.4.1" - resolved "https://registry.nlark.com/merge2/download/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + resolved "https://registry.npm.taobao.org/merge2/download/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha1-Q2iJL4hekHRVpv19xVwMnUBJkK4= methods@~1.1.2: @@ -5202,24 +5202,24 @@ micromatch@^4.0.2, micromatch@^4.0.4: mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": version "1.51.0" - resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.51.0.tgz?cache=0&sync_timestamp=1636425960296&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.51.0.tgz?cache=0&sync_timestamp=1636425932298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== mime-db@~1.33.0: version "1.33.0" - resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.33.0.tgz?cache=0&sync_timestamp=1636425960296&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" + resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.33.0.tgz?cache=0&sync_timestamp=1636425932298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" integrity sha1-o0kgUKXLm2NFBUHjnZeI0icng9s= mime-types@2.1.18: version "2.1.18" - resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.18.tgz?cache=0&sync_timestamp=1636432302620&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" + resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.18.tgz?cache=0&sync_timestamp=1636432275511&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" integrity sha1-bzI/YKg9ERRvgx/xH9ZuL+VQO7g= dependencies: mime-db "~1.33.0" mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24: version "2.1.34" - resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.34.tgz?cache=0&sync_timestamp=1636432302620&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" + resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.34.tgz?cache=0&sync_timestamp=1636432275511&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== dependencies: mime-db "1.51.0" @@ -5236,7 +5236,7 @@ mimic-fn@^2.1.0: mimic-response@^1.0.0, mimic-response@^1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/mimic-response/download/mimic-response-1.0.1.tgz?cache=0&sync_timestamp=1628692424254&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmimic-response%2Fdownload%2Fmimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + resolved "https://registry.nlark.com/mimic-response/download/mimic-response-1.0.1.tgz?cache=0&sync_timestamp=1628692524926&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmimic-response%2Fdownload%2Fmimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" integrity sha1-SSNTiHju9CBjy4o+OweYeBSHqxs= mini-create-react-context@^0.4.0: @@ -5249,7 +5249,7 @@ mini-create-react-context@^0.4.0: mini-css-extract-plugin@^1.6.0: version "1.6.2" - resolved "https://registry.npmmirror.com/mini-css-extract-plugin/download/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" + resolved "https://registry.npmmirror.com/mini-css-extract-plugin/download/mini-css-extract-plugin-1.6.2.tgz?cache=0&sync_timestamp=1637170529830&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" integrity sha1-gxcrT9gS+PxKCdb20W+ST1OZDKg= dependencies: loader-utils "^2.0.0" @@ -5263,14 +5263,14 @@ minimalistic-assert@^1.0.0: minimatch@3.0.4, minimatch@^3.0.4: version "3.0.4" - resolved "https://registry.nlark.com/minimatch/download/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + resolved "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM= dependencies: brace-expansion "^1.1.7" minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" - resolved "https://registry.nlark.com/minimist/download/minimist-1.2.5.tgz?cache=0&sync_timestamp=1622685831901&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fminimist%2Fdownload%2Fminimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + resolved "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI= mkdirp@^0.5.5, mkdirp@~0.5.1: @@ -5307,7 +5307,7 @@ multicast-dns-service-types@^1.1.0: multicast-dns@^6.0.1: version "6.2.3" - resolved "https://registry.npmmirror.com/multicast-dns/download/multicast-dns-6.2.3.tgz?cache=0&sync_timestamp=1633354996608&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmulticast-dns%2Fdownload%2Fmulticast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" + resolved "https://registry.npmmirror.com/multicast-dns/download/multicast-dns-6.2.3.tgz?cache=0&sync_timestamp=1633354862495&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmulticast-dns%2Fdownload%2Fmulticast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" integrity sha1-oOx72QVcQoL3kMPIL04o2zsxsik= dependencies: dns-packet "^1.3.1" @@ -5320,12 +5320,12 @@ nanoid@^3.1.30: negotiator@0.6.2: version "0.6.2" - resolved "https://registry.nlark.com/negotiator/download/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + resolved "https://registry.npm.taobao.org/negotiator/download/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha1-/qz3zPUlp3rpY0Q2pkiD/+yjRvs= neo-async@^2.6.2: version "2.6.2" - resolved "https://registry.nlark.com/neo-async/download/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + resolved "https://registry.npm.taobao.org/neo-async/download/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha1-tKr7k+OustgXTKU88WOrfXMIMF8= no-case@^3.0.4: @@ -5338,24 +5338,24 @@ no-case@^3.0.4: node-emoji@^1.10.0: version "1.11.0" - resolved "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz?cache=0&sync_timestamp=1628672589230&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-emoji%2Fdownload%2Fnode-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" + resolved "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz?cache=0&sync_timestamp=1628672555671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-emoji%2Fdownload%2Fnode-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" integrity sha1-aaAVDmlG4vEV6dfqTfeXHiYoMBw= dependencies: lodash "^4.17.21" node-forge@^0.10.0: version "0.10.0" - resolved "https://registry.nlark.com/node-forge/download/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" + resolved "https://registry.npm.taobao.org/node-forge/download/node-forge-0.10.0.tgz?cache=0&sync_timestamp=1599010726129&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-forge%2Fdownload%2Fnode-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha1-Mt6ir7Ppkm8C7lzoeUkCaRpna/M= node-releases@^2.0.1: version "2.0.1" - resolved "https://registry.npmmirror.com/node-releases/download/node-releases-2.0.1.tgz?cache=0&sync_timestamp=1634806960337&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnode-releases%2Fdownload%2Fnode-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" + resolved "https://registry.npmmirror.com/node-releases/download/node-releases-2.0.1.tgz?cache=0&sync_timestamp=1634806914912&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnode-releases%2Fdownload%2Fnode-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" integrity sha1-PR05XyBPHy8ppUNYuftnh2WtL8U= normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/normalize-path/download/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + resolved "https://registry.npm.taobao.org/normalize-path/download/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU= normalize-range@^0.1.2: @@ -5365,12 +5365,12 @@ normalize-range@^0.1.2: normalize-url@^4.1.0: version "4.5.1" - resolved "https://registry.nlark.com/normalize-url/download/normalize-url-4.5.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnormalize-url%2Fdownload%2Fnormalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + resolved "https://registry.nlark.com/normalize-url/download/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" integrity sha1-DdkM8SiO4dExO4cIHJpZMu5IUYo= normalize-url@^6.0.1: version "6.1.0" - resolved "https://registry.nlark.com/normalize-url/download/normalize-url-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnormalize-url%2Fdownload%2Fnormalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + resolved "https://registry.nlark.com/normalize-url/download/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" integrity sha1-QNCIW1Nd7/4/MUe+yHfQX+TFZoo= npm-run-path@^4.0.1: @@ -5387,21 +5387,21 @@ nprogress@^0.2.0: nth-check@^1.0.2, nth-check@~1.0.1: version "1.0.2" - resolved "https://registry.nlark.com/nth-check/download/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" + resolved "https://registry.nlark.com/nth-check/download/nth-check-1.0.2.tgz?cache=0&sync_timestamp=1631793617973&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" integrity sha1-sr0pXDfj3VijvwcAN2Zjuk2c8Fw= dependencies: boolbase "~1.0.0" nth-check@^2.0.1: version "2.0.1" - resolved "https://registry.nlark.com/nth-check/download/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" + resolved "https://registry.nlark.com/nth-check/download/nth-check-2.0.1.tgz?cache=0&sync_timestamp=1631793617973&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" integrity sha1-Lv4WL1w9oGoolZ+9PbddvuqfD8I= dependencies: boolbase "^1.0.0" object-assign@^4.1.1: version "4.1.1" - resolved "https://registry.nlark.com/object-assign/download/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + resolved "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= object-hash@^2.2.0: @@ -5439,7 +5439,7 @@ object.assign@^4.1.0, object.assign@^4.1.2: object.getownpropertydescriptors@^2.1.0: version "2.1.3" - resolved "https://registry.npmmirror.com/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.1.3.tgz?cache=0&sync_timestamp=1633321702182&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" + resolved "https://registry.npmmirror.com/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.1.3.tgz?cache=0&sync_timestamp=1633321822200&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" integrity sha1-siPPOOF/77l6Y8EMkd9yzLOG354= dependencies: call-bind "^1.0.2" @@ -5448,7 +5448,7 @@ object.getownpropertydescriptors@^2.1.0: object.values@^1.1.0: version "1.1.5" - resolved "https://registry.npmmirror.com/object.values/download/object.values-1.1.5.tgz?cache=0&sync_timestamp=1633326983597&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.values%2Fdownload%2Fobject.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" + resolved "https://registry.npmmirror.com/object.values/download/object.values-1.1.5.tgz?cache=0&sync_timestamp=1633326898457&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.values%2Fdownload%2Fobject.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" integrity sha1-lZ9j486e8QhyAzMIITHkpFm3Fqw= dependencies: call-bind "^1.0.2" @@ -5457,12 +5457,12 @@ object.values@^1.1.0: obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" - resolved "https://registry.nlark.com/obuf/download/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" + resolved "https://registry.npm.taobao.org/obuf/download/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha1-Cb6jND1BhZ69RGKS0RydTbYZCE4= on-finished@~2.3.0: version "2.3.0" - resolved "https://registry.nlark.com/on-finished/download/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + resolved "https://registry.npm.taobao.org/on-finished/download/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= dependencies: ee-first "1.1.1" @@ -5488,7 +5488,7 @@ onetime@^5.1.2: open@^7.0.2: version "7.4.2" - resolved "https://registry.npmmirror.com/open/download/open-7.4.2.tgz?cache=0&sync_timestamp=1635048715897&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fopen%2Fdownload%2Fopen-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" + resolved "https://registry.npmmirror.com/open/download/open-7.4.2.tgz?cache=0&sync_timestamp=1635048357738&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fopen%2Fdownload%2Fopen-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" integrity sha1-uBR+Jtzz5CYxbHMAif1x7dKcIyE= dependencies: is-docker "^2.0.0" @@ -5496,7 +5496,7 @@ open@^7.0.2: open@^8.0.9: version "8.4.0" - resolved "https://registry.npmmirror.com/open/download/open-8.4.0.tgz?cache=0&sync_timestamp=1635048715897&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fopen%2Fdownload%2Fopen-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" + resolved "https://registry.npmmirror.com/open/download/open-8.4.0.tgz?cache=0&sync_timestamp=1635048357738&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fopen%2Fdownload%2Fopen-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" integrity sha1-NFMhrhj4E4+CVlqRD9xrOejCRPg= dependencies: define-lazy-prop "^2.0.0" @@ -5515,21 +5515,21 @@ p-cancelable@^1.0.0: p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" - resolved "https://registry.nlark.com/p-limit/download/p-limit-2.3.0.tgz?cache=0&sync_timestamp=1628812766275&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-limit%2Fdownload%2Fp-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + resolved "https://registry.nlark.com/p-limit/download/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" integrity sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE= dependencies: p-try "^2.0.0" p-locate@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/p-locate/download/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + resolved "https://registry.nlark.com/p-locate/download/p-locate-3.0.0.tgz?cache=0&sync_timestamp=1629892721671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-locate%2Fdownload%2Fp-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" integrity sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ= dependencies: p-limit "^2.0.0" p-locate@^4.1.0: version "4.1.0" - resolved "https://registry.nlark.com/p-locate/download/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + resolved "https://registry.nlark.com/p-locate/download/p-locate-4.1.0.tgz?cache=0&sync_timestamp=1629892721671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-locate%2Fdownload%2Fp-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" integrity sha1-o0KLtwiLOmApL2aRkni3wpetTwc= dependencies: p-limit "^2.2.0" @@ -5543,7 +5543,7 @@ p-map@^4.0.0: p-retry@^4.5.0: version "4.6.1" - resolved "https://registry.npmmirror.com/p-retry/download/p-retry-4.6.1.tgz?cache=0&sync_timestamp=1635966813736&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-retry%2Fdownload%2Fp-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" + resolved "https://registry.npmmirror.com/p-retry/download/p-retry-4.6.1.tgz?cache=0&sync_timestamp=1635967027504&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-retry%2Fdownload%2Fp-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" integrity sha1-j83dXN96Z6CRGpzy7w5d9/YCMWw= dependencies: "@types/retry" "^0.12.0" @@ -5551,12 +5551,12 @@ p-retry@^4.5.0: p-try@^2.0.0: version "2.2.0" - resolved "https://registry.npmmirror.com/p-try/download/p-try-2.2.0.tgz?cache=0&sync_timestamp=1633364600466&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-try%2Fdownload%2Fp-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + resolved "https://registry.npmmirror.com/p-try/download/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha1-yyhoVA4xPWHeWPr741zpAE1VQOY= package-json@^6.3.0: version "6.5.0" - resolved "https://registry.nlark.com/package-json/download/package-json-6.5.0.tgz?cache=0&sync_timestamp=1624550102187&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpackage-json%2Fdownload%2Fpackage-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" + resolved "https://registry.nlark.com/package-json/download/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" integrity sha1-b+7ayjXnVyWHbQsOZJdGl/7RRbA= dependencies: got "^9.6.0" @@ -5593,7 +5593,7 @@ parse-entities@^2.0.0: parse-json@^5.0.0: version "5.2.0" - resolved "https://registry.npmmirror.com/parse-json/download/parse-json-5.2.0.tgz?cache=0&sync_timestamp=1637475636838&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fparse-json%2Fdownload%2Fparse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + resolved "https://registry.npmmirror.com/parse-json/download/parse-json-5.2.0.tgz?cache=0&sync_timestamp=1637475717072&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fparse-json%2Fdownload%2Fparse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" integrity sha1-x2/Gbe5UIxyWKyK8yKcs8vmXU80= dependencies: "@babel/code-frame" "^7.0.0" @@ -5603,7 +5603,7 @@ parse-json@^5.0.0: parse-numeric-range@^1.2.0: version "1.3.0" - resolved "https://registry.nlark.com/parse-numeric-range/download/parse-numeric-range-1.3.0.tgz?cache=0&sync_timestamp=1629604699749&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fparse-numeric-range%2Fdownload%2Fparse-numeric-range-1.3.0.tgz#7c63b61190d61e4d53a1197f0c83c47bb670ffa3" + resolved "https://registry.nlark.com/parse-numeric-range/download/parse-numeric-range-1.3.0.tgz#7c63b61190d61e4d53a1197f0c83c47bb670ffa3" integrity sha1-fGO2EZDWHk1ToRl/DIPEe7Zw/6M= parse5@^5.0.0: @@ -5618,7 +5618,7 @@ parse5@^6.0.0: parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" - resolved "https://registry.nlark.com/parseurl/download/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + resolved "https://registry.npm.taobao.org/parseurl/download/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ= pascal-case@^3.1.2: @@ -5631,12 +5631,12 @@ pascal-case@^3.1.2: path-exists@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/path-exists/download/path-exists-3.0.0.tgz?cache=0&sync_timestamp=1628765027018&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpath-exists%2Fdownload%2Fpath-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + resolved "https://registry.nlark.com/path-exists/download/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= path-exists@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/path-exists/download/path-exists-4.0.0.tgz?cache=0&sync_timestamp=1628765027018&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpath-exists%2Fdownload%2Fpath-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + resolved "https://registry.nlark.com/path-exists/download/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" integrity sha1-UTvb4tO5XXdi6METfvoZXGxhtbM= path-is-absolute@^1.0.0: @@ -5646,7 +5646,7 @@ path-is-absolute@^1.0.0: path-is-inside@1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/path-is-inside/download/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" + resolved "https://registry.npm.taobao.org/path-is-inside/download/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= path-key@^3.0.0, path-key@^3.1.0: @@ -5688,7 +5688,7 @@ picocolors@^1.0.0: picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: version "2.3.0" - resolved "https://registry.nlark.com/picomatch/download/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + resolved "https://registry.nlark.com/picomatch/download/picomatch-2.3.0.tgz?cache=0&sync_timestamp=1621648246651&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpicomatch%2Fdownload%2Fpicomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" integrity sha1-8fBh3o9qS/AiiS4tEoI0+5gwKXI= pify@^2.3.0: @@ -5703,7 +5703,7 @@ pify@^4.0.1: pkg-dir@^4.1.0: version "4.2.0" - resolved "https://registry.npmmirror.com/pkg-dir/download/pkg-dir-4.2.0.tgz?cache=0&sync_timestamp=1633498116014&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-dir%2Fdownload%2Fpkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + resolved "https://registry.npmmirror.com/pkg-dir/download/pkg-dir-4.2.0.tgz?cache=0&sync_timestamp=1633498133295&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-dir%2Fdownload%2Fpkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" integrity sha1-8JkTPfft5CLoHR2ESCcO6z5CYfM= dependencies: find-up "^4.0.0" @@ -5751,7 +5751,7 @@ postcss-convert-values@^5.0.2: postcss-discard-comments@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-comments/download/postcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" + resolved "https://registry.nlark.com/postcss-discard-comments/download/postcss-discard-comments-5.0.1.tgz?cache=0&sync_timestamp=1621449592883&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-comments%2Fdownload%2Fpostcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" integrity sha1-nq5LdHz3YNMfJEfCfwYZ1XGJAf4= postcss-discard-duplicates@^5.0.1: @@ -5778,7 +5778,7 @@ postcss-discard-unused@^5.0.1: postcss-import@^14.0.2: version "14.0.2" - resolved "https://registry.nlark.com/postcss-import/download/postcss-import-14.0.2.tgz?cache=0&sync_timestamp=1620671991111&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-import%2Fdownload%2Fpostcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1" + resolved "https://registry.nlark.com/postcss-import/download/postcss-import-14.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-import%2Fdownload%2Fpostcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1" integrity sha1-YO/3fmvpLntn/kaex5fZQkyuGqE= dependencies: postcss-value-parser "^4.0.0" @@ -5821,7 +5821,7 @@ postcss-merge-idents@^5.0.1: postcss-merge-longhand@^5.0.4: version "5.0.4" - resolved "https://registry.npmmirror.com/postcss-merge-longhand/download/postcss-merge-longhand-5.0.4.tgz?cache=0&sync_timestamp=1637084982494&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-longhand%2Fdownload%2Fpostcss-merge-longhand-5.0.4.tgz#41f4f3270282ea1a145ece078b7679f0cef21c32" + resolved "https://registry.npmmirror.com/postcss-merge-longhand/download/postcss-merge-longhand-5.0.4.tgz#41f4f3270282ea1a145ece078b7679f0cef21c32" integrity sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw== dependencies: postcss-value-parser "^4.1.0" @@ -5829,7 +5829,7 @@ postcss-merge-longhand@^5.0.4: postcss-merge-rules@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-merge-rules/download/postcss-merge-rules-5.0.3.tgz?cache=0&sync_timestamp=1637085799347&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-rules%2Fdownload%2Fpostcss-merge-rules-5.0.3.tgz#b5cae31f53129812a77e3eb1eeee448f8cf1a1db" + resolved "https://registry.npmmirror.com/postcss-merge-rules/download/postcss-merge-rules-5.0.3.tgz?cache=0&sync_timestamp=1637085394901&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-rules%2Fdownload%2Fpostcss-merge-rules-5.0.3.tgz#b5cae31f53129812a77e3eb1eeee448f8cf1a1db" integrity sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg== dependencies: browserslist "^4.16.6" @@ -5846,7 +5846,7 @@ postcss-minify-font-values@^5.0.1: postcss-minify-gradients@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-minify-gradients/download/postcss-minify-gradients-5.0.3.tgz?cache=0&sync_timestamp=1635856887200&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-minify-gradients%2Fdownload%2Fpostcss-minify-gradients-5.0.3.tgz#f970a11cc71e08e9095e78ec3a6b34b91c19550e" + resolved "https://registry.npmmirror.com/postcss-minify-gradients/download/postcss-minify-gradients-5.0.3.tgz#f970a11cc71e08e9095e78ec3a6b34b91c19550e" integrity sha1-+XChHMceCOkJXnjsOms0uRwZVQ4= dependencies: colord "^2.9.1" @@ -5865,7 +5865,7 @@ postcss-minify-params@^5.0.2: postcss-minify-selectors@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/postcss-minify-selectors/download/postcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" + resolved "https://registry.nlark.com/postcss-minify-selectors/download/postcss-minify-selectors-5.1.0.tgz?cache=0&sync_timestamp=1621449593365&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-minify-selectors%2Fdownload%2Fpostcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" integrity sha1-Q4XIRdOXn/FgKRd0Uj/6VOr9WlQ= dependencies: alphanum-sort "^1.0.2" @@ -5878,7 +5878,7 @@ postcss-modules-extract-imports@^3.0.0: postcss-modules-local-by-default@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/postcss-modules-local-by-default/download/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" + resolved "https://registry.npm.taobao.org/postcss-modules-local-by-default/download/postcss-modules-local-by-default-4.0.0.tgz?cache=0&sync_timestamp=1602587625149&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-local-by-default%2Fdownload%2Fpostcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" integrity sha1-67tU+uFZjuz99pGgKz/zs5ClpRw= dependencies: icss-utils "^5.0.0" @@ -5887,7 +5887,7 @@ postcss-modules-local-by-default@^4.0.0: postcss-modules-scope@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/postcss-modules-scope/download/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" + resolved "https://registry.npm.taobao.org/postcss-modules-scope/download/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" integrity sha1-nvMVFFbTu/oSDKRImN/Kby+gHwY= dependencies: postcss-selector-parser "^6.0.4" @@ -5901,19 +5901,19 @@ postcss-modules-values@^4.0.0: postcss-nested@5.0.6: version "5.0.6" - resolved "https://registry.nlark.com/postcss-nested/download/postcss-nested-5.0.6.tgz?cache=0&sync_timestamp=1627468715175&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-nested%2Fdownload%2Fpostcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" + resolved "https://registry.nlark.com/postcss-nested/download/postcss-nested-5.0.6.tgz?cache=0&sync_timestamp=1627468122159&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-nested%2Fdownload%2Fpostcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" integrity sha1-RmND9/yNPUavPn26P81H0FKpRbw= dependencies: postcss-selector-parser "^6.0.6" postcss-normalize-charset@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-charset/download/postcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" + resolved "https://registry.nlark.com/postcss-normalize-charset/download/postcss-normalize-charset-5.0.1.tgz?cache=0&sync_timestamp=1621449593655&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-charset%2Fdownload%2Fpostcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" integrity sha1-EhVZ0b68VayNJK839nvU2p79kdA= postcss-normalize-display-values@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-display-values/download/postcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" + resolved "https://registry.nlark.com/postcss-normalize-display-values/download/postcss-normalize-display-values-5.0.1.tgz?cache=0&sync_timestamp=1621449599414&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-display-values%2Fdownload%2Fpostcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" integrity sha1-YmULllmBqVXf/ugzY0U9uC9q0f0= dependencies: cssnano-utils "^2.0.1" @@ -5928,7 +5928,7 @@ postcss-normalize-positions@^5.0.1: postcss-normalize-repeat-style@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-repeat-style/download/postcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" + resolved "https://registry.nlark.com/postcss-normalize-repeat-style/download/postcss-normalize-repeat-style-5.0.1.tgz?cache=0&sync_timestamp=1621449596114&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-repeat-style%2Fdownload%2Fpostcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" integrity sha1-y8DeE4O1f1u2Hd1qhGU7XoZlsrU= dependencies: cssnano-utils "^2.0.1" @@ -5967,14 +5967,14 @@ postcss-normalize-url@^5.0.4: postcss-normalize-whitespace@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-whitespace/download/postcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" + resolved "https://registry.nlark.com/postcss-normalize-whitespace/download/postcss-normalize-whitespace-5.0.1.tgz?cache=0&sync_timestamp=1621449593892&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-whitespace%2Fdownload%2Fpostcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" integrity sha1-sLQLW8rINYX/B+rS2vLc++7vjpo= dependencies: postcss-value-parser "^4.1.0" postcss-ordered-values@^5.0.2: version "5.0.2" - resolved "https://registry.nlark.com/postcss-ordered-values/download/postcss-ordered-values-5.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-ordered-values%2Fdownload%2Fpostcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" + resolved "https://registry.nlark.com/postcss-ordered-values/download/postcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" integrity sha1-HzUUJpd74A4PdlsxZK11PayO0EQ= dependencies: cssnano-utils "^2.0.1" @@ -6028,7 +6028,7 @@ postcss-svgo@^5.0.3: postcss-unique-selectors@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-unique-selectors/download/postcss-unique-selectors-5.0.2.tgz?cache=0&sync_timestamp=1637084982907&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-unique-selectors%2Fdownload%2Fpostcss-unique-selectors-5.0.2.tgz#5d6893daf534ae52626708e0d62250890108c0c1" + resolved "https://registry.npmmirror.com/postcss-unique-selectors/download/postcss-unique-selectors-5.0.2.tgz#5d6893daf534ae52626708e0d62250890108c0c1" integrity sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA== dependencies: alphanum-sort "^1.0.2" @@ -6055,7 +6055,7 @@ postcss@^8.1.6, postcss@^8.2.15, postcss@^8.3.5, postcss@^8.3.7: prepend-http@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/prepend-http/download/prepend-http-2.0.0.tgz?cache=0&sync_timestamp=1628547381568&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fprepend-http%2Fdownload%2Fprepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + resolved "https://registry.nlark.com/prepend-http/download/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= prettier@^2.5.0: @@ -6065,7 +6065,7 @@ prettier@^2.5.0: pretty-error@^4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/pretty-error/download/pretty-error-4.0.0.tgz?cache=0&sync_timestamp=1635212589197&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpretty-error%2Fdownload%2Fpretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6" + resolved "https://registry.npmmirror.com/pretty-error/download/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6" integrity sha1-kKcD9G3XI0rbRtD4SCPp0cuPENY= dependencies: lodash "^4.17.20" @@ -6073,7 +6073,7 @@ pretty-error@^4.0.0: pretty-time@^1.1.0: version "1.1.0" - resolved "https://registry.nlark.com/pretty-time/download/pretty-time-1.1.0.tgz#ffb7429afabb8535c346a34e41873adf3d74dd0e" + resolved "https://registry.npm.taobao.org/pretty-time/download/pretty-time-1.1.0.tgz#ffb7429afabb8535c346a34e41873adf3d74dd0e" integrity sha1-/7dCmvq7hTXDRqNOQYc63z103Q4= prism-react-renderer@^1.2.1: @@ -6088,7 +6088,7 @@ prismjs@^1.23.0: process-nextick-args@~2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/process-nextick-args/download/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + resolved "https://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha1-eCDZsWEgzFXKmud5JoCufbptf+I= prompts@^2.4.0, prompts@^2.4.1: @@ -6117,7 +6117,7 @@ property-information@^5.0.0, property-information@^5.3.0: proxy-addr@~2.0.7: version "2.0.7" - resolved "https://registry.nlark.com/proxy-addr/download/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + resolved "https://registry.nlark.com/proxy-addr/download/proxy-addr-2.0.7.tgz?cache=0&sync_timestamp=1622509170257&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fproxy-addr%2Fdownload%2Fproxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" integrity sha1-8Z/mnOqzEe65S0LnDowgcPm6ECU= dependencies: forwarded "0.2.0" @@ -6148,7 +6148,7 @@ punycode@^2.1.0: pupa@^2.1.1: version "2.1.1" - resolved "https://registry.nlark.com/pupa/download/pupa-2.1.1.tgz?cache=0&sync_timestamp=1631543442281&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpupa%2Fdownload%2Fpupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" + resolved "https://registry.nlark.com/pupa/download/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" integrity sha1-9ej9SvwsXZeCj6pSNUnth0SiDWI= dependencies: escape-goat "^2.0.0" @@ -6175,12 +6175,12 @@ queue-microtask@^1.2.2: quick-lru@^5.1.1: version "5.1.1" - resolved "https://registry.npmmirror.com/quick-lru/download/quick-lru-5.1.1.tgz?cache=0&sync_timestamp=1637478611226&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fquick-lru%2Fdownload%2Fquick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + resolved "https://registry.npmmirror.com/quick-lru/download/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" integrity sha1-NmST5rPkKjpoheLpnRj4D7eoyTI= randombytes@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + resolved "https://registry.nlark.com/randombytes/download/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" integrity sha1-32+ENy8CcNxlzfYpE0mrekc9Tyo= dependencies: safe-buffer "^5.1.0" @@ -6197,7 +6197,7 @@ range-parser@^1.2.1, range-parser@~1.2.1: raw-body@2.4.2: version "2.4.2" - resolved "https://registry.npmmirror.com/raw-body/download/raw-body-2.4.2.tgz?cache=0&sync_timestamp=1637116791214&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fraw-body%2Fdownload%2Fraw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32" + resolved "https://registry.npmmirror.com/raw-body/download/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32" integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ== dependencies: bytes "3.1.1" @@ -6319,7 +6319,7 @@ react-router-dom@^5.2.0: react-router@5.2.1, react-router@^5.2.0: version "5.2.1" resolved "https://registry.npmmirror.com/react-router/download/react-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d" - integrity sha1-TS5OnVrpQlCRhFuNvG2dJ2I5d00= + integrity sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ== dependencies: "@babel/runtime" "^7.12.13" history "^4.9.0" @@ -6334,7 +6334,7 @@ react-router@5.2.1, react-router@^5.2.0: react-side-effect@^2.1.0: version "2.1.1" - resolved "https://registry.nlark.com/react-side-effect/download/react-side-effect-2.1.1.tgz#66c5701c3e7560ab4822a4ee2742dee215d72eb3" + resolved "https://registry.npm.taobao.org/react-side-effect/download/react-side-effect-2.1.1.tgz#66c5701c3e7560ab4822a4ee2742dee215d72eb3" integrity sha1-ZsVwHD51YKtIIqTuJ0Le4hXXLrM= react@^17.0.1: @@ -6347,7 +6347,7 @@ react@^17.0.1: read-cache@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/read-cache/download/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" + resolved "https://registry.npm.taobao.org/read-cache/download/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q= dependencies: pify "^2.3.0" @@ -6376,7 +6376,7 @@ readable-stream@^3.0.6, readable-stream@^3.1.1: readdirp@~3.6.0: version "3.6.0" - resolved "https://registry.nlark.com/readdirp/download/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + resolved "https://registry.npm.taobao.org/readdirp/download/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" integrity sha1-dKNwvYVxFuJFspzJc0DNQxoCpsc= dependencies: picomatch "^2.2.1" @@ -6395,14 +6395,14 @@ rechoir@^0.6.2: recursive-readdir@^2.2.2: version "2.2.2" - resolved "https://registry.nlark.com/recursive-readdir/download/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f" + resolved "https://registry.npm.taobao.org/recursive-readdir/download/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f" integrity sha1-mUb7MnThYo3m42svZxSVO0hFCU8= dependencies: minimatch "3.0.4" regenerate-unicode-properties@^9.0.0: version "9.0.0" - resolved "https://registry.nlark.com/regenerate-unicode-properties/download/regenerate-unicode-properties-9.0.0.tgz?cache=0&sync_timestamp=1631617208210&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerate-unicode-properties%2Fdownload%2Fregenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" + resolved "https://registry.nlark.com/regenerate-unicode-properties/download/regenerate-unicode-properties-9.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerate-unicode-properties%2Fdownload%2Fregenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" integrity sha1-VNCccRXh9T3CMUqXSzLBw0Tv4yY= dependencies: regenerate "^1.4.2" @@ -6414,12 +6414,12 @@ regenerate@^1.4.2: regenerator-runtime@^0.13.4: version "0.13.9" - resolved "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" + resolved "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.13.9.tgz?cache=0&sync_timestamp=1626993001371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" integrity sha1-iSV0Kpj/2QgUmI11Zq0wyjsmO1I= regenerator-transform@^0.14.2: version "0.14.5" - resolved "https://registry.nlark.com/regenerator-transform/download/regenerator-transform-0.14.5.tgz?cache=0&sync_timestamp=1627057533376&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-transform%2Fdownload%2Fregenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" + resolved "https://registry.nlark.com/regenerator-transform/download/regenerator-transform-0.14.5.tgz?cache=0&sync_timestamp=1627057502723&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerator-transform%2Fdownload%2Fregenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" integrity sha1-yY2hVGg2ccnE3LFuznNlF+G3/rQ= dependencies: "@babel/runtime" "^7.8.4" @@ -6434,7 +6434,7 @@ regexp.prototype.flags@^1.2.0: regexpu-core@^4.5.4, regexpu-core@^4.7.1: version "4.8.0" - resolved "https://registry.nlark.com/regexpu-core/download/regexpu-core-4.8.0.tgz?cache=0&sync_timestamp=1631619101495&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregexpu-core%2Fdownload%2Fregexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" + resolved "https://registry.nlark.com/regexpu-core/download/regexpu-core-4.8.0.tgz?cache=0&sync_timestamp=1631619103170&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregexpu-core%2Fdownload%2Fregexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" integrity sha1-5WBbo2G2excYR4UBMnUC9EeamPA= dependencies: regenerate "^1.4.2" @@ -6446,14 +6446,14 @@ regexpu-core@^4.5.4, regexpu-core@^4.7.1: registry-auth-token@^4.0.0: version "4.2.1" - resolved "https://registry.nlark.com/registry-auth-token/download/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" + resolved "https://registry.npm.taobao.org/registry-auth-token/download/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" integrity sha1-bXtABkQZGJcszV/tzUHcMix5slA= dependencies: rc "^1.2.8" registry-url@^5.0.0: version "5.1.0" - resolved "https://registry.nlark.com/registry-url/download/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + resolved "https://registry.npm.taobao.org/registry-url/download/registry-url-5.1.0.tgz?cache=0&sync_timestamp=1618681893788&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregistry-url%2Fdownload%2Fregistry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" integrity sha1-6YM0tQ1UNLgRNrROxjjZwgCcUAk= dependencies: rc "^1.2.8" @@ -6472,7 +6472,7 @@ regjsparser@^0.7.0: rehype-parse@^6.0.2: version "6.0.2" - resolved "https://registry.nlark.com/rehype-parse/download/rehype-parse-6.0.2.tgz?cache=0&sync_timestamp=1630416388593&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frehype-parse%2Fdownload%2Frehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" + resolved "https://registry.nlark.com/rehype-parse/download/rehype-parse-6.0.2.tgz?cache=0&sync_timestamp=1630413716153&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frehype-parse%2Fdownload%2Frehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" integrity sha1-rrP91oCF+feW8dMTeuK4WphAaWQ= dependencies: hast-util-from-parse5 "^5.0.0" @@ -6486,7 +6486,7 @@ relateurl@^0.2.7: remark-admonitions@^1.2.1: version "1.2.1" - resolved "https://registry.nlark.com/remark-admonitions/download/remark-admonitions-1.2.1.tgz#87caa1a442aa7b4c0cafa04798ed58a342307870" + resolved "https://registry.npm.taobao.org/remark-admonitions/download/remark-admonitions-1.2.1.tgz#87caa1a442aa7b4c0cafa04798ed58a342307870" integrity sha1-h8qhpEKqe0wMr6BHmO1Yo0IweHA= dependencies: rehype-parse "^6.0.2" @@ -6495,7 +6495,7 @@ remark-admonitions@^1.2.1: remark-emoji@^2.1.0: version "2.2.0" - resolved "https://registry.npmmirror.com/remark-emoji/download/remark-emoji-2.2.0.tgz?cache=0&sync_timestamp=1636025412972&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-emoji%2Fdownload%2Fremark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" + resolved "https://registry.npmmirror.com/remark-emoji/download/remark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" integrity sha1-HHAgkKFSXaW4DhWo+WPvLII2ysc= dependencies: emoticon "^3.2.0" @@ -6523,7 +6523,7 @@ remark-mdx-remove-imports@^1.6.22: remark-mdx@1.6.22: version "1.6.22" - resolved "https://registry.npmmirror.com/remark-mdx/download/remark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd" + resolved "https://registry.npmmirror.com/remark-mdx/download/remark-mdx-1.6.22.tgz?cache=0&sync_timestamp=1637012565094&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-mdx%2Fdownload%2Fremark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd" integrity sha1-BqjasH3P3VfzNzr3+GvQ6ZIQi70= dependencies: "@babel/core" "7.12.9" @@ -6566,7 +6566,7 @@ remark-squeeze-paragraphs@4.0.0: renderkid@^3.0.0: version "3.0.0" - resolved "https://registry.npmmirror.com/renderkid/download/renderkid-3.0.0.tgz?cache=0&sync_timestamp=1635212582997&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Frenderkid%2Fdownload%2Frenderkid-3.0.0.tgz#5fd823e4d6951d37358ecc9a58b1f06836b6268a" + resolved "https://registry.npmmirror.com/renderkid/download/renderkid-3.0.0.tgz#5fd823e4d6951d37358ecc9a58b1f06836b6268a" integrity sha1-X9gj5NaVHTc1jsyaWLHwaDa2Joo= dependencies: css-select "^4.1.3" @@ -6587,7 +6587,7 @@ require-from-string@^2.0.2: "require-like@>= 0.1.1": version "0.1.2" - resolved "https://registry.nlark.com/require-like/download/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa" + resolved "https://registry.npm.taobao.org/require-like/download/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa" integrity sha1-rW8wwTvs15cBDEaK+ndcDAprR/o= requires-port@^1.0.0: @@ -6607,12 +6607,12 @@ resolve-from@^5.0.0: resolve-pathname@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/resolve-pathname/download/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" + resolved "https://registry.npm.taobao.org/resolve-pathname/download/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" integrity sha1-mdAiJNPPJjaJvsuzk7xWAxMCXc0= resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2: version "1.20.0" - resolved "https://registry.nlark.com/resolve/download/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha1-YpoBP7P3B1XW8LeTXMHCxTeLGXU= dependencies: is-core-module "^2.2.0" @@ -6620,7 +6620,7 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2 responselike@^1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/responselike/download/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + resolved "https://registry.npm.taobao.org/responselike/download/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= dependencies: lowercase-keys "^1.0.0" @@ -6632,7 +6632,7 @@ retry@^0.13.1: reusify@^1.0.4: version "1.0.4" - resolved "https://registry.nlark.com/reusify/download/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + resolved "https://registry.npm.taobao.org/reusify/download/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha1-kNo4Kx4SbvwCFG6QhFqI2xKSXXY= rimraf@^3.0.0, rimraf@^3.0.2: @@ -6691,7 +6691,7 @@ scheduler@^0.20.2: schema-utils@2.7.0: version "2.7.0" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1637075888461&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" integrity sha1-FxUfdtjq5n+793lgwzxnatn078c= dependencies: "@types/json-schema" "^7.0.4" @@ -6700,7 +6700,7 @@ schema-utils@2.7.0: schema-utils@^2.6.5: version "2.7.1" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1637075888461&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha1-HKTzLRskxZDCA7jnpQvw6kzTlNc= dependencies: "@types/json-schema" "^7.0.5" @@ -6709,7 +6709,7 @@ schema-utils@^2.6.5: schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: version "3.1.1" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-3.1.1.tgz?cache=0&sync_timestamp=1637075888461&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-3.1.1.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" integrity sha1-vHTEtraZXB2I92qLd76nIZ4MgoE= dependencies: "@types/json-schema" "^7.0.8" @@ -6718,7 +6718,7 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: schema-utils@^4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-4.0.0.tgz?cache=0&sync_timestamp=1637075888461&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-4.0.0.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== dependencies: "@types/json-schema" "^7.0.9" @@ -6728,7 +6728,7 @@ schema-utils@^4.0.0: section-matter@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/section-matter/download/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167" + resolved "https://registry.npm.taobao.org/section-matter/download/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167" integrity sha1-6QQZU1BngOwB1Z8pKhnHuFC4QWc= dependencies: extend-shallow "^2.0.1" @@ -6736,7 +6736,7 @@ section-matter@^1.0.0: select-hose@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/select-hose/download/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" + resolved "https://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= selfsigned@^1.10.11: @@ -6748,29 +6748,29 @@ selfsigned@^1.10.11: semver-diff@^3.1.1: version "3.1.1" - resolved "https://registry.nlark.com/semver-diff/download/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" + resolved "https://registry.nlark.com/semver-diff/download/semver-diff-3.1.1.tgz?cache=0&sync_timestamp=1620044887257&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver-diff%2Fdownload%2Fsemver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" integrity sha1-Bfd85Z8yXgDicGr9Z7tQbdscoys= dependencies: semver "^6.3.0" semver@7.0.0: version "7.0.0" - resolved "https://registry.nlark.com/semver/download/semver-7.0.0.tgz?cache=0&sync_timestamp=1622685835879&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + resolved "https://registry.nlark.com/semver/download/semver-7.0.0.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha1-XzyjV2HkfgWyBsba/yz4FPAxa44= semver@^5.4.1: version "5.7.1" - resolved "https://registry.nlark.com/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1622685835879&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + resolved "https://registry.nlark.com/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha1-qVT5Ma66UI0we78Gnv8MAclhFvc= semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" - resolved "https://registry.nlark.com/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1622685835879&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + resolved "https://registry.nlark.com/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0= semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.5" - resolved "https://registry.nlark.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1622685835879&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + resolved "https://registry.nlark.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc= dependencies: lru-cache "^6.0.0" @@ -6796,14 +6796,14 @@ send@0.17.2: serialize-javascript@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/serialize-javascript/download/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + resolved "https://registry.nlark.com/serialize-javascript/download/serialize-javascript-6.0.0.tgz?cache=0&sync_timestamp=1624284111898&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" integrity sha1-765diPRdeSQUHai1w6en5mP+/rg= dependencies: randombytes "^2.1.0" serve-handler@^6.1.3: version "6.1.3" - resolved "https://registry.nlark.com/serve-handler/download/serve-handler-6.1.3.tgz#1bf8c5ae138712af55c758477533b9117f6435e8" + resolved "https://registry.npm.taobao.org/serve-handler/download/serve-handler-6.1.3.tgz#1bf8c5ae138712af55c758477533b9117f6435e8" integrity sha1-G/jFrhOHEq9Vx1hHdTO5EX9kNeg= dependencies: bytes "3.0.0" @@ -6817,7 +6817,7 @@ serve-handler@^6.1.3: serve-index@^1.9.1: version "1.9.1" - resolved "https://registry.nlark.com/serve-index/download/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" + resolved "https://registry.npm.taobao.org/serve-index/download/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk= dependencies: accepts "~1.3.4" @@ -6840,17 +6840,17 @@ serve-static@1.14.2: setprototypeof@1.1.0: version "1.1.0" - resolved "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" + resolved "https://registry.nlark.com/setprototypeof/download/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" integrity sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY= setprototypeof@1.2.0: version "1.2.0" - resolved "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + resolved "https://registry.nlark.com/setprototypeof/download/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" integrity sha1-ZsmiSnP5/CjL5msJ/tPTPcrxtCQ= shallow-clone@^3.0.0: version "3.0.1" - resolved "https://registry.nlark.com/shallow-clone/download/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" + resolved "https://registry.npm.taobao.org/shallow-clone/download/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" integrity sha1-jymBrZJTH1UDWwH7IwdppA4C76M= dependencies: kind-of "^6.0.2" @@ -6864,17 +6864,17 @@ shebang-command@^2.0.0: shebang-regex@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/shebang-regex/download/shebang-regex-3.0.0.tgz?cache=0&sync_timestamp=1628896304371&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fshebang-regex%2Fdownload%2Fshebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + resolved "https://registry.nlark.com/shebang-regex/download/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha1-rhbxZE2HPsrYQ7AwexQzYtTEIXI= shell-quote@^1.7.2: version "1.7.3" - resolved "https://registry.npmmirror.com/shell-quote/download/shell-quote-1.7.3.tgz?cache=0&sync_timestamp=1634798333958&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fshell-quote%2Fdownload%2Fshell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" + resolved "https://registry.npmmirror.com/shell-quote/download/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123" integrity sha1-qkDtrBcERbmkMeF7tiwLiBucQSM= shelljs@^0.8.4: version "0.8.4" - resolved "https://registry.nlark.com/shelljs/download/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2" + resolved "https://registry.npm.taobao.org/shelljs/download/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2" integrity sha1-3naE/ut2f4cWsyYHiooAh1iQ48I= dependencies: glob "^7.0.0" @@ -6883,7 +6883,7 @@ shelljs@^0.8.4: side-channel@^1.0.4: version "1.0.4" - resolved "https://registry.nlark.com/side-channel/download/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + resolved "https://registry.npm.taobao.org/side-channel/download/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" integrity sha1-785cj9wQTudRslxY1CkAEfpeos8= dependencies: call-bind "^1.0.0" @@ -6892,7 +6892,7 @@ side-channel@^1.0.4: signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.6" - resolved "https://registry.npmmirror.com/signal-exit/download/signal-exit-3.0.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsignal-exit%2Fdownload%2Fsignal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + resolved "https://registry.npmmirror.com/signal-exit/download/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== sirv@^1.0.7: @@ -6906,7 +6906,7 @@ sirv@^1.0.7: sisteransi@^1.0.5: version "1.0.5" - resolved "https://registry.nlark.com/sisteransi/download/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" + resolved "https://registry.npm.taobao.org/sisteransi/download/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" integrity sha1-E01oEpd1ZDfMBcoBNw06elcQde0= slash@^3.0.0: @@ -6935,12 +6935,12 @@ source-list-map@^2.0.0: source-map-js@^1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/source-map-js/download/source-map-js-1.0.1.tgz?cache=0&sync_timestamp=1636401089874&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-js%2Fdownload%2Fsource-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" + resolved "https://registry.npmmirror.com/source-map-js/download/source-map-js-1.0.1.tgz?cache=0&sync_timestamp=1636400753943&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-js%2Fdownload%2Fsource-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA== source-map-support@~0.5.20: version "0.5.21" - resolved "https://registry.npmmirror.com/source-map-support/download/source-map-support-0.5.21.tgz?cache=0&sync_timestamp=1637320290160&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-support%2Fdownload%2Fsource-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + resolved "https://registry.npmmirror.com/source-map-support/download/source-map-support-0.5.21.tgz?cache=0&sync_timestamp=1637320298732&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-support%2Fdownload%2Fsource-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" @@ -6948,27 +6948,27 @@ source-map-support@~0.5.20: source-map@^0.5.0: version "0.5.7" - resolved "https://registry.nlark.com/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" - resolved "https://registry.nlark.com/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM= source-map@~0.7.2: version "0.7.3" - resolved "https://registry.nlark.com/source-map/download/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha1-UwL4FpAxc1ImVECS5kmB91F1A4M= sourcemap-codec@^1.4.4: version "1.4.8" - resolved "https://registry.nlark.com/sourcemap-codec/download/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" + resolved "https://registry.npm.taobao.org/sourcemap-codec/download/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" integrity sha1-6oBL2UhXQC5pktBaOO8a41qatMQ= space-separated-tokens@^1.0.0: version "1.1.5" - resolved "https://registry.nlark.com/space-separated-tokens/download/space-separated-tokens-1.1.5.tgz?cache=0&sync_timestamp=1619456046361&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fspace-separated-tokens%2Fdownload%2Fspace-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899" + resolved "https://registry.nlark.com/space-separated-tokens/download/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899" integrity sha1-hfMsPRDZaCAH6RdBTdxcJtGqaJk= spdy-transport@^3.0.0: @@ -7006,29 +7006,29 @@ stable@^0.1.8: state-toggle@^1.0.0: version "1.0.3" - resolved "https://registry.nlark.com/state-toggle/download/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" + resolved "https://registry.npm.taobao.org/state-toggle/download/state-toggle-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstate-toggle%2Fdownload%2Fstate-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" integrity sha1-4SOxaojhQxObCcaFIiG8mBWRff4= "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" - resolved "https://registry.nlark.com/statuses/download/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + resolved "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz?cache=0&sync_timestamp=1609654090567&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstatuses%2Fdownload%2Fstatuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= std-env@^2.2.1: version "2.3.1" - resolved "https://registry.npmmirror.com/std-env/download/std-env-2.3.1.tgz#d42271908819c243f8defc77a140fc1fcee336a1" + resolved "https://registry.npmmirror.com/std-env/download/std-env-2.3.1.tgz?cache=0&sync_timestamp=1636124771178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-2.3.1.tgz#d42271908819c243f8defc77a140fc1fcee336a1" integrity sha1-1CJxkIgZwkP43vx3oUD8H87jNqE= dependencies: ci-info "^3.1.1" std-env@^3.0.1: version "3.0.1" - resolved "https://registry.npmmirror.com/std-env/download/std-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" + resolved "https://registry.npmmirror.com/std-env/download/std-env-3.0.1.tgz?cache=0&sync_timestamp=1636124771178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" integrity sha1-vEy8DkOGEBl+NMLXnD3zC0kfUYI= string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.2: version "4.2.3" - resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz?cache=0&sync_timestamp=1632421013520&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstring-width%2Fdownload%2Fstring-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz?cache=0&sync_timestamp=1632421309919&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstring-width%2Fdownload%2Fstring-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha1-JpxxF9J7Ba0uU2gwqOyJXvnG0BA= dependencies: emoji-regex "^8.0.0" @@ -7045,7 +7045,7 @@ string.prototype.trimend@^1.0.4: string.prototype.trimstart@^1.0.4: version "1.0.4" - resolved "https://registry.nlark.com/string.prototype.trimstart/download/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + resolved "https://registry.npm.taobao.org/string.prototype.trimstart/download/string.prototype.trimstart-1.0.4.tgz?cache=0&sync_timestamp=1614127232940&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring.prototype.trimstart%2Fdownload%2Fstring.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" integrity sha1-s2OZr0qymZtMnGSL16P7K7Jv7u0= dependencies: call-bind "^1.0.2" @@ -7067,7 +7067,7 @@ string_decoder@~1.1.1: stringify-object@^3.3.0: version "3.3.0" - resolved "https://registry.nlark.com/stringify-object/download/stringify-object-3.3.0.tgz?cache=0&sync_timestamp=1629674903267&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstringify-object%2Fdownload%2Fstringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" + resolved "https://registry.nlark.com/stringify-object/download/stringify-object-3.3.0.tgz?cache=0&sync_timestamp=1629673547261&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstringify-object%2Fdownload%2Fstringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" integrity sha1-cDBlrvyhkwDTzoivT1s5VtdVZik= dependencies: get-own-enumerable-property-symbols "^3.0.0" @@ -7076,21 +7076,21 @@ stringify-object@^3.3.0: strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" - resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-6.0.1.tgz?cache=0&sync_timestamp=1632420562057&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha1-nibGPTD1NEPpSJSVshBdN7Z6hdk= dependencies: ansi-regex "^5.0.1" strip-ansi@^7.0.0: version "7.0.1" - resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-7.0.1.tgz?cache=0&sync_timestamp=1632420562057&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" + resolved "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" integrity sha1-YXQKCM42th5Q5lZT8HBg0ACXX7I= dependencies: ansi-regex "^6.0.1" strip-bom-string@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/strip-bom-string/download/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" + resolved "https://registry.npm.taobao.org/strip-bom-string/download/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" integrity sha1-5SEekiQ2n7uB1jOi8ABE3IztrZI= strip-final-newline@^2.0.0: @@ -7112,7 +7112,7 @@ style-to-object@0.3.0, style-to-object@^0.3.0: stylehacks@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/stylehacks/download/stylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" + resolved "https://registry.nlark.com/stylehacks/download/stylehacks-5.0.1.tgz?cache=0&sync_timestamp=1621449595596&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstylehacks%2Fdownload%2Fstylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" integrity sha1-Mj7FVBmFIJhoBjiMf9rrw40sBvs= dependencies: browserslist "^4.16.0" @@ -7141,7 +7141,7 @@ supports-color@^8.0.0: svg-parser@^2.0.2: version "2.0.4" - resolved "https://registry.nlark.com/svg-parser/download/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" + resolved "https://registry.npm.taobao.org/svg-parser/download/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" integrity sha1-/cLinhOVFzYUC3bLEiyO5mMOtrU= svgo@^1.2.2: @@ -7177,9 +7177,9 @@ svgo@^2.7.0: stable "^0.1.8" tailwindcss@^3.0.0: - version "3.0.7" - resolved "https://registry.npmmirror.com/tailwindcss/download/tailwindcss-3.0.7.tgz#15936881f042a7eb8d6f2b6a454bac9f51181bbd" - integrity sha512-rZdKNHtC64jcQncLoWOuCzj4lQDTAgLtgK3WmQS88tTdpHh9OwLqULTQxI3tw9AMJsqSpCKlmcjW/8CSnni6zQ== + version "3.0.8" + resolved "https://registry.npmmirror.com/tailwindcss/download/tailwindcss-3.0.8.tgz#6c751c3d2ee8e1fa18b108303b73f44a5e868992" + integrity sha512-Yww1eRYO1AxITJmW/KduZPxNvYdHuedeKwPju9Oakp7MdiixRi5xkpLhirsc81QCxHL0eoce6qKmxXwYGt4Cjw== dependencies: arg "^5.0.1" chalk "^4.1.2" @@ -7226,7 +7226,7 @@ terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.4: terser@^5.10.0, terser@^5.7.2: version "5.10.0" - resolved "https://registry.npmmirror.com/terser/download/terser-5.10.0.tgz?cache=0&sync_timestamp=1636988182324&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fterser%2Fdownload%2Fterser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" + resolved "https://registry.npmmirror.com/terser/download/terser-5.10.0.tgz?cache=0&sync_timestamp=1636988229781&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fterser%2Fdownload%2Fterser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA== dependencies: commander "^2.20.0" @@ -7235,7 +7235,7 @@ terser@^5.10.0, terser@^5.7.2: text-table@^0.2.0: version "0.2.0" - resolved "https://registry.nlark.com/text-table/download/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + resolved "https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= thunky@^1.0.2: @@ -7245,29 +7245,29 @@ thunky@^1.0.2: timsort@^0.3.0: version "0.3.0" - resolved "https://registry.nlark.com/timsort/download/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" + resolved "https://registry.npm.taobao.org/timsort/download/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= tiny-invariant@^1.0.2: version "1.2.0" - resolved "https://registry.npmmirror.com/tiny-invariant/download/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" + resolved "https://registry.npmmirror.com/tiny-invariant/download/tiny-invariant-1.2.0.tgz?cache=0&sync_timestamp=1635822367356&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftiny-invariant%2Fdownload%2Ftiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" integrity sha1-oRQfhrZyqRSMcul4oZpzublKFak= tiny-warning@^1.0.0, tiny-warning@^1.0.3: version "1.0.3" - resolved "https://registry.nlark.com/tiny-warning/download/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" + resolved "https://registry.npm.taobao.org/tiny-warning/download/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" integrity sha1-lKMNtFPfTGQ9D9VmBg1gqHXYR1Q= tmp@^0.2.1: version "0.2.1" - resolved "https://registry.npm.taobao.org/tmp/download/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + resolved "https://registry.nlark.com/tmp/download/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" integrity sha1-hFf8MDfc9HGcJRNnoa9lAO4czxQ= dependencies: rimraf "^3.0.0" to-fast-properties@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/to-fast-properties/download/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + resolved "https://registry.nlark.com/to-fast-properties/download/to-fast-properties-2.0.0.tgz?cache=0&sync_timestamp=1628418893613&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fto-fast-properties%2Fdownload%2Fto-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= to-readable-stream@^1.0.0: @@ -7284,7 +7284,7 @@ to-regex-range@^5.0.1: toidentifier@1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/toidentifier/download/toidentifier-1.0.1.tgz?cache=0&sync_timestamp=1636938521998&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftoidentifier%2Fdownload%2Ftoidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + resolved "https://registry.npmmirror.com/toidentifier/download/toidentifier-1.0.1.tgz?cache=0&sync_timestamp=1636938467744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftoidentifier%2Fdownload%2Ftoidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== totalist@^1.0.0: @@ -7294,17 +7294,17 @@ totalist@^1.0.0: trim-trailing-lines@^1.0.0: version "1.1.4" - resolved "https://registry.nlark.com/trim-trailing-lines/download/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0" + resolved "https://registry.npm.taobao.org/trim-trailing-lines/download/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0" integrity sha1-vUq77HzIgEYvELLItc4djR7HwsA= trim@0.0.1: version "0.0.1" - resolved "https://registry.nlark.com/trim/download/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" + resolved "https://registry.npm.taobao.org/trim/download/trim-0.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftrim%2Fdownload%2Ftrim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0= trough@^1.0.0: version "1.0.5" - resolved "https://registry.nlark.com/trough/download/trough-1.0.5.tgz?cache=0&sync_timestamp=1625401006146&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftrough%2Fdownload%2Ftrough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" + resolved "https://registry.nlark.com/trough/download/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" integrity sha1-uLY5zvrX0LsqvTfUM/+Ck++l9AY= tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1: @@ -7327,7 +7327,7 @@ type-is@~1.6.18: typedarray-to-buffer@^3.1.5: version "3.1.5" - resolved "https://registry.nlark.com/typedarray-to-buffer/download/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + resolved "https://registry.npm.taobao.org/typedarray-to-buffer/download/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" integrity sha1-qX7nqf9CaRufeD/xvFES/j/KkIA= dependencies: is-typedarray "^1.0.0" @@ -7339,7 +7339,7 @@ typescript@^4.3.5: unbox-primitive@^1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/unbox-primitive/download/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + resolved "https://registry.npm.taobao.org/unbox-primitive/download/unbox-primitive-1.0.1.tgz?cache=0&sync_timestamp=1616706302651&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funbox-primitive%2Fdownload%2Funbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" integrity sha1-CF4hViXsMWJXTciFmr7nilmxRHE= dependencies: function-bind "^1.1.1" @@ -7349,7 +7349,7 @@ unbox-primitive@^1.0.1: unherit@^1.0.4: version "1.1.3" - resolved "https://registry.nlark.com/unherit/download/unherit-1.1.3.tgz?cache=0&sync_timestamp=1626423513229&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funherit%2Fdownload%2Funherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" + resolved "https://registry.nlark.com/unherit/download/unherit-1.1.3.tgz?cache=0&sync_timestamp=1626423419302&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funherit%2Fdownload%2Funherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" integrity sha1-bJtQPytBsmIzDIDpHIYUq9qmnCI= dependencies: inherits "^2.0.0" @@ -7357,12 +7357,12 @@ unherit@^1.0.4: unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" + resolved "https://registry.nlark.com/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631615505724&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-canonical-property-names-ecmascript%2Fdownload%2Funicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" integrity sha1-MBrNxSVjFnDTn2FG4Od/9rvevdw= unicode-match-property-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-match-property-ecmascript/download/unicode-match-property-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618696521&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-ecmascript%2Fdownload%2Funicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" + resolved "https://registry.nlark.com/unicode-match-property-ecmascript/download/unicode-match-property-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618607567&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-ecmascript%2Fdownload%2Funicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" integrity sha1-VP0W4OyxZ88Ezx91a9zJLrp5dsM= dependencies: unicode-canonical-property-names-ecmascript "^2.0.0" @@ -7370,17 +7370,17 @@ unicode-match-property-ecmascript@^2.0.0: unicode-match-property-value-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-match-property-value-ecmascript/download/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" + resolved "https://registry.nlark.com/unicode-match-property-value-ecmascript/download/unicode-match-property-value-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618107717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-value-ecmascript%2Fdownload%2Funicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" integrity sha1-GgGqVyR8FMVouJd1pUk4eIGJpxQ= unicode-property-aliases-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-property-aliases-ecmascript/download/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" + resolved "https://registry.nlark.com/unicode-property-aliases-ecmascript/download/unicode-property-aliases-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631609408629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-property-aliases-ecmascript%2Fdownload%2Funicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" integrity sha1-CjbLmlhcT2q9Ua0d7dsoXBZSl8g= unified@9.2.0: version "9.2.0" - resolved "https://registry.npmmirror.com/unified/download/unified-9.2.0.tgz?cache=0&sync_timestamp=1637256306228&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" + resolved "https://registry.npmmirror.com/unified/download/unified-9.2.0.tgz?cache=0&sync_timestamp=1637256334405&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" integrity sha1-Z6YsYnxAWJ7eu/YPU+39TYIgJ/g= dependencies: bail "^1.0.0" @@ -7392,7 +7392,7 @@ unified@9.2.0: unified@^8.4.2: version "8.4.2" - resolved "https://registry.npmmirror.com/unified/download/unified-8.4.2.tgz?cache=0&sync_timestamp=1637256306228&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" + resolved "https://registry.npmmirror.com/unified/download/unified-8.4.2.tgz?cache=0&sync_timestamp=1637256334405&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" integrity sha1-E61YtKQ3+qJ1GkpMahb2gMUA//E= dependencies: bail "^1.0.0" @@ -7410,22 +7410,22 @@ unique-string@^2.0.0: unist-builder@2.0.3, unist-builder@^2.0.0: version "2.0.3" - resolved "https://registry.nlark.com/unist-builder/download/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436" + resolved "https://registry.nlark.com/unist-builder/download/unist-builder-2.0.3.tgz?cache=0&sync_timestamp=1618816093327&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-builder%2Fdownload%2Funist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436" integrity sha1-d2SHEbXYavCULzNDl6M8XpFRZDY= unist-util-generated@^1.0.0: version "1.1.6" - resolved "https://registry.npm.taobao.org/unist-util-generated/download/unist-util-generated-1.1.6.tgz?cache=0&sync_timestamp=1618396508779&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funist-util-generated%2Fdownload%2Funist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" + resolved "https://registry.nlark.com/unist-util-generated/download/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" integrity sha1-WrUfaJ4pkqRyvrGzXyzn/y8yTUs= unist-util-is@^4.0.0: version "4.1.0" - resolved "https://registry.nlark.com/unist-util-is/download/unist-util-is-4.1.0.tgz?cache=0&sync_timestamp=1626874870978&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-is%2Fdownload%2Funist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797" + resolved "https://registry.nlark.com/unist-util-is/download/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797" integrity sha1-l25fRip6Xec9lLcGusG5BnG1d5c= unist-util-position@^3.0.0: version "3.1.0" - resolved "https://registry.nlark.com/unist-util-position/download/unist-util-position-3.1.0.tgz?cache=0&sync_timestamp=1620915084174&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-position%2Fdownload%2Funist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" + resolved "https://registry.nlark.com/unist-util-position/download/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" integrity sha1-HELuYwH41S9H0U9iu9t5ZXH6LUc= unist-util-remove-position@^2.0.0: @@ -7466,7 +7466,7 @@ unist-util-visit-parents@^3.0.0: unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist-util-visit@^2.0.2, unist-util-visit@^2.0.3: version "2.0.3" - resolved "https://registry.npmmirror.com/unist-util-visit/download/unist-util-visit-2.0.3.tgz?cache=0&sync_timestamp=1632405265959&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funist-util-visit%2Fdownload%2Funist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" + resolved "https://registry.npmmirror.com/unist-util-visit/download/unist-util-visit-2.0.3.tgz?cache=0&sync_timestamp=1632405194557&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funist-util-visit%2Fdownload%2Funist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" integrity sha1-w3A4kxRt9HIDu4qXla9H17lxIIw= dependencies: "@types/unist" "^2.0.0" @@ -7475,22 +7475,22 @@ unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist- universalify@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/universalify/download/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + resolved "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz?cache=0&sync_timestamp=1603180004159&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc= unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/unpipe/download/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + resolved "https://registry.npm.taobao.org/unpipe/download/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= unquote@~1.1.1: version "1.1.1" - resolved "https://registry.nlark.com/unquote/download/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" + resolved "https://registry.npm.taobao.org/unquote/download/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ= update-notifier@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/update-notifier/download/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" + resolved "https://registry.npm.taobao.org/update-notifier/download/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" integrity sha1-SrDXx/NqIx3XMWz3cpMT8CFNmtk= dependencies: boxen "^5.0.0" @@ -7510,7 +7510,7 @@ update-notifier@^5.1.0: uri-js@^4.2.2: version "4.4.1" - resolved "https://registry.npm.taobao.org/uri-js/download/uri-js-4.4.1.tgz?cache=0&sync_timestamp=1610237530009&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Furi-js%2Fdownload%2Furi-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + resolved "https://registry.npm.taobao.org/uri-js/download/uri-js-4.4.1.tgz?cache=0&sync_timestamp=1610237641463&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Furi-js%2Fdownload%2Furi-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" integrity sha1-mxpSWVIlhZ5V9mnZKPiMbFfyp34= dependencies: punycode "^2.1.0" @@ -7526,7 +7526,7 @@ url-loader@^4.1.1: url-parse-lax@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/url-parse-lax/download/url-parse-lax-3.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl-parse-lax%2Fdownload%2Furl-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + resolved "https://registry.nlark.com/url-parse-lax/download/url-parse-lax-3.0.0.tgz?cache=0&sync_timestamp=1628548236896&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl-parse-lax%2Fdownload%2Furl-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= dependencies: prepend-http "^2.0.0" @@ -7541,7 +7541,7 @@ url@^0.11.0: util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" - resolved "https://registry.nlark.com/util-deprecate/download/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + resolved "https://registry.npm.taobao.org/util-deprecate/download/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= util.promisify@~1.0.0: @@ -7561,12 +7561,12 @@ utila@~0.4: utility-types@^3.10.0: version "3.10.0" - resolved "https://registry.nlark.com/utility-types/download/utility-types-3.10.0.tgz#ea4148f9a741015f05ed74fd615e1d20e6bed82b" + resolved "https://registry.npm.taobao.org/utility-types/download/utility-types-3.10.0.tgz#ea4148f9a741015f05ed74fd615e1d20e6bed82b" integrity sha1-6kFI+adBAV8F7XT9YV4dIOa+2Cs= utils-merge@1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/utils-merge/download/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + resolved "https://registry.npm.taobao.org/utils-merge/download/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= uuid@^8.3.2: @@ -7576,7 +7576,7 @@ uuid@^8.3.2: value-equal@^1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/value-equal/download/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" + resolved "https://registry.npm.taobao.org/value-equal/download/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" integrity sha1-Hgt5THNMXAyt4XnEN9NW2TGjTWw= vary@~1.1.2: @@ -7635,12 +7635,12 @@ wbuf@^1.1.0, wbuf@^1.7.3: web-namespaces@^1.0.0, web-namespaces@^1.1.2: version "1.1.4" - resolved "https://registry.npmmirror.com/web-namespaces/download/web-namespaces-1.1.4.tgz?cache=0&sync_timestamp=1636136109313&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fweb-namespaces%2Fdownload%2Fweb-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec" + resolved "https://registry.npmmirror.com/web-namespaces/download/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec" integrity sha1-vJij3mDa3X+u/EA9EHbVKfXgMOw= webpack-bundle-analyzer@^4.4.2: version "4.5.0" - resolved "https://registry.npmmirror.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-4.5.0.tgz?cache=0&sync_timestamp=1634019921368&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-bundle-analyzer%2Fdownload%2Fwebpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" + resolved "https://registry.npmmirror.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" integrity sha1-Gw7qKUfnNSh1Sm+a8+kbK24PedU= dependencies: acorn "^8.0.4" @@ -7709,7 +7709,7 @@ webpack-merge@^5.8.0: webpack-sources@^1.1.0, webpack-sources@^1.4.3: version "1.4.3" - resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1636982731420&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" + resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1636982701357&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha1-7t2OwLko+/HL/plOItLYkPMwqTM= dependencies: source-list-map "^2.0.0" @@ -7717,7 +7717,7 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.3: webpack-sources@^3.2.2: version "3.2.2" - resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-3.2.2.tgz?cache=0&sync_timestamp=1636982731420&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260" + resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-3.2.2.tgz?cache=0&sync_timestamp=1636982701357&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260" integrity sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw== webpack@^5.61.0: @@ -7752,7 +7752,7 @@ webpack@^5.61.0: webpackbar@^5.0.0-3: version "5.0.2" - resolved "https://registry.npmmirror.com/webpackbar/download/webpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" + resolved "https://registry.npmmirror.com/webpackbar/download/webpackbar-5.0.2.tgz?cache=0&sync_timestamp=1636124846959&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpackbar%2Fdownload%2Fwebpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" integrity sha1-091GYhHHOFJ0HfyEK3VW3LwrBXA= dependencies: chalk "^4.1.0" @@ -7801,19 +7801,19 @@ which@^2.0.1: widest-line@^3.1.0: version "3.1.0" - resolved "https://registry.npmmirror.com/widest-line/download/widest-line-3.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwidest-line%2Fdownload%2Fwidest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" + resolved "https://registry.npmmirror.com/widest-line/download/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" integrity sha1-gpIzO79my0X/DeFgOxNreuFJbso= dependencies: string-width "^4.0.0" wildcard@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/wildcard/download/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" + resolved "https://registry.npm.taobao.org/wildcard/download/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" integrity sha1-p30g5SAMb6qsl55LOq3Hs91/j+w= wrap-ansi@^7.0.0: version "7.0.0" - resolved "https://registry.nlark.com/wrap-ansi/download/wrap-ansi-7.0.0.tgz?cache=0&sync_timestamp=1631557327268&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwrap-ansi%2Fdownload%2Fwrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + resolved "https://registry.nlark.com/wrap-ansi/download/wrap-ansi-7.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwrap-ansi%2Fdownload%2Fwrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha1-Z+FFz/UQpqaYS98RUpEdadLrnkM= dependencies: ansi-styles "^4.0.0" @@ -7822,12 +7822,12 @@ wrap-ansi@^7.0.0: wrappy@1: version "1.0.2" - resolved "https://registry.nlark.com/wrappy/download/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + resolved "https://registry.nlark.com/wrappy/download/wrappy-1.0.2.tgz?cache=0&sync_timestamp=1619133505879&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwrappy%2Fdownload%2Fwrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= write-file-atomic@^3.0.0: version "3.0.3" - resolved "https://registry.nlark.com/write-file-atomic/download/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + resolved "https://registry.npm.taobao.org/write-file-atomic/download/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" integrity sha1-Vr1cWlxwSBzRnFcb05q5ZaXeVug= dependencies: imurmurhash "^0.1.4" @@ -7852,14 +7852,14 @@ xdg-basedir@^4.0.0: xml-js@^1.6.11: version "1.6.11" - resolved "https://registry.nlark.com/xml-js/download/xml-js-1.6.11.tgz#927d2f6947f7f1c19a316dd8eea3614e8b18f8e9" + resolved "https://registry.npm.taobao.org/xml-js/download/xml-js-1.6.11.tgz#927d2f6947f7f1c19a316dd8eea3614e8b18f8e9" integrity sha1-kn0vaUf38cGaMW3Y7qNhTosY+Ok= dependencies: sax "^1.2.4" xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2: version "4.0.2" - resolved "https://registry.nlark.com/xtend/download/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + resolved "https://registry.npm.taobao.org/xtend/download/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q= yallist@^4.0.0: @@ -7869,10 +7869,10 @@ yallist@^4.0.0: yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: version "1.10.2" - resolved "https://registry.npmmirror.com/yaml/download/yaml-1.10.2.tgz?cache=0&sync_timestamp=1636797325177&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyaml%2Fdownload%2Fyaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + resolved "https://registry.npmmirror.com/yaml/download/yaml-1.10.2.tgz?cache=0&sync_timestamp=1636797186957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyaml%2Fdownload%2Fyaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha1-IwHF/78StGfejaIzOkWeKeeSDks= zwitch@^1.0.0: version "1.0.5" - resolved "https://registry.npmmirror.com/zwitch/download/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" + resolved "https://registry.npm.taobao.org/zwitch/download/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" integrity sha1-0R1zgf/tFrdC9q97PyI9XNn+mSA= From c7f428795b0d2bccd1c5676f1a25ca4f34415bf7 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 29 Dec 2021 21:09:31 +0800 Subject: [PATCH 146/174] :art: add store components --- .../nonebot_plugin_docs/__init__.py | 4 +- packages/nonebot-plugin-docs/pyproject.toml | 2 +- website/docs/advanced/README.md | 12 ++-- website/docs/advanced/images/Handle-Event.png | Bin 0 -> 129775 bytes website/docs/advanced/permission.md | 2 +- website/docs/advanced/publish-plugin.md | 2 +- website/docs/advanced/test/unittest.md | 0 website/package.json | 2 + website/src/components/Driver.tsx | 20 ++++++- website/src/components/Paginate.tsx | 5 ++ website/src/libs/store.tsx | 45 +++++++++++++++ website/src/pages/index.tsx | 10 ++-- website/static/drivers.json | 52 ++++++++++++++++++ website/tsconfig.json | 3 +- yarn.lock | 51 ++++++++++++++++- 15 files changed, 193 insertions(+), 17 deletions(-) create mode 100644 website/docs/advanced/images/Handle-Event.png create mode 100644 website/docs/advanced/test/unittest.md create mode 100644 website/src/components/Paginate.tsx create mode 100644 website/src/libs/store.tsx create mode 100644 website/static/drivers.json diff --git a/packages/nonebot-plugin-docs/nonebot_plugin_docs/__init__.py b/packages/nonebot-plugin-docs/nonebot_plugin_docs/__init__.py index 98a40f8c..243b53db 100644 --- a/packages/nonebot-plugin-docs/nonebot_plugin_docs/__init__.py +++ b/packages/nonebot-plugin-docs/nonebot_plugin_docs/__init__.py @@ -7,7 +7,9 @@ from nonebot.log import logger def init(): driver = nonebot.get_driver() try: - _module = importlib.import_module(f"nonebot_plugin_docs.drivers.{driver.type}") + _module = importlib.import_module( + f"nonebot_plugin_docs.drivers.{driver.type.split('+')[0]}" + ) except ImportError: logger.warning(f"Driver {driver.type} not supported") return diff --git a/packages/nonebot-plugin-docs/pyproject.toml b/packages/nonebot-plugin-docs/pyproject.toml index 48349e9e..521d6ad0 100644 --- a/packages/nonebot-plugin-docs/pyproject.toml +++ b/packages/nonebot-plugin-docs/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nonebot-plugin-docs" -version = "2.0.0-alpha.11" +version = "2.0.0-beta.1" description = "View NoneBot2 Docs Locally" authors = ["yanyongyu "] license = "MIT" diff --git a/website/docs/advanced/README.md b/website/docs/advanced/README.md index ea64f8ec..06c6dacc 100644 --- a/website/docs/advanced/README.md +++ b/website/docs/advanced/README.md @@ -10,6 +10,10 @@ options: # 深入 +:::danger 警告 +进阶部分尚未更新完成 +::: + ## 它如何工作？ 如同[概览](../README.md)所言: @@ -36,7 +40,7 @@ options: 2. **调用 `API`**, 在**事件处理**的过程中，`nonebot` 可以通过 `bot` 调用协议端指定的 `API` 来获取更多数据，或者反馈响应给协议端; `nonebot` 也可以通过调用 `API` 向协议端主动请求数据或者主动推送数据。 - +在**指南**模块， 我们已经叙述了[如何配置 nonebot](../tutorial/configuration.md), [如何注册协议适配器](../tutorial/register-adapter.md)，[如何加载插件](../tutorial/plugin/load-plugin.md), 在这里便不再赘述。 下面，我们将对**事件处理**， **调用 API**进行说明。 @@ -44,7 +48,7 @@ options: 我们可以先看事件处理的流程图： - +![handle-event](./images/Handle-Event.png) 在流程图里，我们可以看到，`nonebot` 会有三个阶段来处理事件： @@ -94,14 +98,14 @@ options: 关于`hook`的更多信息，可以查阅[这里](./runtime-hook.md) ::: - +2. **Matcher**与**matcher**，在**指南**中，我们讲述了[如何注册事件响应器](../tutorial/plugin/create-matcher.md)，这里的事件响应器或者说 `Matcher` 并不是一个具体的实例 `instance`，而是一个具有特定属性的类 `class`。只有当 `Matcher` **响应事件**时，才会实例化为具体的 `instance`，也就是 `matcher`。`matcher` 可以认为是 `nonebot` 处理 `Event` 的基本单位，运行 `matcher` 是`nonebot`工作的主要内容。 3. **handler**，或者说**事件处理函数**, 它们可以认为是 `nonebot` 处理 `Event` 的最小单位。在不考虑 `hook` 的情况下，**运行 matcher 就是顺序运行 matcher.handlers**，这句话换种表达方式就是，`handler` 只有添加到 `matcher.handlers` 时，才可以参与到 `nonebot` 的工作中来。 ::: tip 如何让 `handler` 添加到 `matcher.handlers`？ - + 一方面，我们可以参照[这里](../tutorial/plugin/create-handler.md)利用装饰器来添加；另一方面，我们在用 `on()` 或者 `on_*()` 注册事件响应器时，可以添加 `handlers=[handler1, handler2, ...]` 这样的关键词参数来添加。 ::: diff --git a/website/docs/advanced/images/Handle-Event.png b/website/docs/advanced/images/Handle-Event.png new file mode 100644 index 0000000000000000000000000000000000000000..70a12ec7ba7b70449f979172a362aa335fd22e7f GIT binary patch literal 129775 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%0ALdu6k`#JjG3{9J8i*1p7^ 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�n2gD$|I4K_1H0>|>{$zQxMhEjKM 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 V)P|mn{TTe*yQ3tNBlYC<{{VwVc3%Jh literal 0 HcmV?d00001 diff --git a/website/docs/advanced/permission.md b/website/docs/advanced/permission.md index 870f909e..a8ba5738 100644 --- a/website/docs/advanced/permission.md +++ b/website/docs/advanced/permission.md @@ -11,7 +11,7 @@ options: ## 应用 - +如同 `Rule` 一样, `Permission` 可以在[注册事件响应器](../tutorial/plugin/create-matcher.md)时添加 `permission` 参数来加以应用，这样 `Nonebot` 会在事件响应时检测事件主体的权限。下面我们以 `SUPERUSER` 为例，对该机制的应用做一下介绍。 ```python from nonebot.permission import SUPERUSER diff --git a/website/docs/advanced/publish-plugin.md b/website/docs/advanced/publish-plugin.md index 16c51324..f709bf93 100644 --- a/website/docs/advanced/publish-plugin.md +++ b/website/docs/advanced/publish-plugin.md @@ -9,7 +9,7 @@ options: ## 前注 - +本章节仅包含插件发布流程指导，插件开发请查阅 **[创建插件](../tutorial/plugin/config-plugin.md)** 章节与 **[Plugin API 文档](../api/plugin.md)** 。 ## 插件发布流程 diff --git a/website/docs/advanced/test/unittest.md b/website/docs/advanced/test/unittest.md new file mode 100644 index 00000000..e69de29b diff --git a/website/package.json b/website/package.json index a94c92f5..fe001205 100644 --- a/website/package.json +++ b/website/package.json @@ -30,7 +30,9 @@ "file-loader": "^6.2.0", "prism-react-renderer": "^1.2.1", "react": "^17.0.1", + "react-color": "^2.19.3", "react-dom": "^17.0.1", + "react-paginate": "^8.1.0", "url-loader": "^4.1.1" }, "devDependencies": { diff --git a/website/src/components/Driver.tsx b/website/src/components/Driver.tsx index 49b11359..71b7f4f7 100644 --- a/website/src/components/Driver.tsx +++ b/website/src/components/Driver.tsx @@ -1,5 +1,23 @@ import React from "react"; +import drivers from "../../static/drivers.json"; +import { useFilteredObjs } from "../libs/store"; + export default function Driver() { - return <>; + const { + filter, + setFilter, + filteredObjs: filteredDrivers, + } = useFilteredObjs(drivers); + return ( + <> +

+ setFilter(event.target.value)} + /> +
+
{filteredDrivers.toString()}
+ + ); } diff --git a/website/src/components/Paginate.tsx b/website/src/components/Paginate.tsx new file mode 100644 index 00000000..935fe4f9 --- /dev/null +++ b/website/src/components/Paginate.tsx @@ -0,0 +1,5 @@ +import ReactPaginate from "react-paginate"; + +export function usePagination() { + return {}; +} diff --git a/website/src/libs/store.tsx b/website/src/libs/store.tsx new file mode 100644 index 00000000..13da1518 --- /dev/null +++ b/website/src/libs/store.tsx @@ -0,0 +1,45 @@ +import { useState } from "react"; + +type Tag = { + label: string; + color: string; +}; + +type Obj = { + module_name?: string; + project_link?: string; + name: string; + desc: string; + author: string; + homepage: string; + tags: Tag[]; + is_official: boolean; +}; + +export function filterObjs(filter: string, objs: Obj[]): Obj[] { + return objs.filter((o) => { + return ( + o.module_name?.indexOf(filter) != -1 || + o.project_link?.indexOf(filter) != -1 || + o.name.indexOf(filter) != -1 || + o.desc.indexOf(filter) != -1 || + o.author.indexOf(filter) != -1 + ); + }); +} + +type useFilteredObjsReturn = { + filter: string; + setFilter: (filter: string) => void; + filteredObjs: Obj[]; +}; + +export function useFilteredObjs(objs: Obj[]): useFilteredObjsReturn { + const [filter, setFilter] = useState(""); + const filteredObjs = filterObjs(filter, objs); + return { + filter, + setFilter, + filteredObjs, + }; +} diff --git a/website/src/pages/index.tsx b/website/src/pages/index.tsx index 71ef0276..d900b931 100644 --- a/website/src/pages/index.tsx +++ b/website/src/pages/index.tsx @@ -10,30 +10,30 @@ import styles from "../css/index.module.css"; export default function Home() { const firstFeature: Feature = { - title: "Develop", + title: "开发", tagline: "fast to code", description: "仅需两步，即可开始编写你的机器人", } as const; const secondFeatures = [ { - title: "Plugin", + title: "插件", tagline: "build bot with plugins", description: "插件化开发，模块化管理", }, { - title: "Multi-Platform", + title: "跨平台", tagline: "write once run everywhere", description: "支持多种平台，以及多样的事件响应方式", }, ] as const; const thirdFeatures = [ { - title: "Async", + title: "异步", tagline: "asynchronous first", description: "异步优先式开发，提高运行效率", }, { - title: "DI", + title: "依赖注入", tagline: "bultin dependency injection system", description: "简单清晰的依赖注入系统，内置依赖函数减少用户代码", }, diff --git a/website/static/drivers.json b/website/static/drivers.json new file mode 100644 index 00000000..c9b28f1d --- /dev/null +++ b/website/static/drivers.json @@ -0,0 +1,52 @@ +[ + { + "module_name": "nonebot.drivers.fastapi", + "project_link": "", + "name": "FastAPI", + "desc": "FastAPI 驱动器", + "author": "yanyongyu", + "homepage": "https://v2.nonebot.dev/docs/tutorial/choose-driver", + "tags": [], + "is_official": true + }, + { + "module_name": "nonebot.drivers.quart", + "project_link": "quart", + "name": "Quart", + "desc": "Quart 驱动器", + "author": "yanyongyu", + "homepage": "https://v2.nonebot.dev/docs/tutorial/choose-driver", + "tags": [], + "is_official": true + }, + { + "module_name": "nonebot.drivers.httpx", + "project_link": "", + "name": "HTTPX", + "desc": "HTTPX 驱动器", + "author": "yanyongyu", + "homepage": "https://v2.nonebot.dev/docs/tutorial/choose-driver", + "tags": [], + "is_official": true + }, + { + "module_name": "nonebot.drivers.websockets", + "project_link": "websockets", + "name": "websockets", + "desc": "websockets 驱动器", + "author": "yanyongyu", + "homepage": "https://v2.nonebot.dev/docs/tutorial/choose-driver", + "tags": [], + "is_official": true + }, + { + "module_name": "nonebot.drivers.aiohttp", + "project_link": "", + "name": "AIOHTTP", + "desc": "AIOHTTP 驱动器", + "author": "yanyongyu", + "homepage": "https://v2.nonebot.dev/docs/tutorial/choose-driver", + "tags": [], + "is_official": true + } +] diff --git a/website/tsconfig.json b/website/tsconfig.json index 402bc222..4f52e128 100644 --- a/website/tsconfig.json +++ b/website/tsconfig.json @@ -7,6 +7,7 @@ "node", "@docusaurus/module-type-aliases", "docusaurus-theme-nonepress" - ] + ], + "resolveJsonModule": true } } diff --git a/yarn.lock b/yarn.lock index a3095696..5f32dbea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1494,6 +1494,11 @@ dependencies: "@hapi/hoek" "^9.0.0" +"@icons/material@^0.2.4": + version "0.2.4" + resolved "https://registry.npm.taobao.org/@icons/material/download/@icons/material-0.2.4.tgz#e90c9f71768b3736e76d7dd6783fc6c2afa88bc8" + integrity sha1-6QyfcXaLNzbnbX3WeD/Gwq+oi8g= + "@mdx-js/mdx@1.6.22", "@mdx-js/mdx@^1.6.21": version "1.6.22" resolved "https://registry.npmmirror.com/@mdx-js/mdx/download/@mdx-js/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba" @@ -4972,6 +4977,11 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +lodash-es@^4.17.15: + version "4.17.21" + resolved "https://registry.nlark.com/lodash-es/download/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" + integrity sha1-Q+YmxG5lkbd1C+srUBFzkMYJ4+4= + lodash.assignin@^4.0.9: version "4.2.0" resolved "https://registry.npm.taobao.org/lodash.assignin/download/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" @@ -5057,7 +5067,7 @@ lodash.uniq@4.5.0, lodash.uniq@^4.5.0: resolved "https://registry.npm.taobao.org/lodash.uniq/download/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: +lodash@^4.0.1, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" resolved "https://registry.npmmirror.com/lodash/download/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -5112,6 +5122,11 @@ markdown-escapes@^1.0.0: resolved "https://registry.npmmirror.com/markdown-escapes/download/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" integrity sha1-yVQV70UUmddgK5EJXzyOiXX3hTU= +material-colors@^1.2.1: + version "1.2.6" + resolved "https://registry.nlark.com/material-colors/download/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46" + integrity sha1-bRlYhxEmmSzuzHL0vMTY8BCGX0Y= + mdast-squeeze-paragraphs@^4.0.0: version "4.0.0" resolved "https://registry.nlark.com/mdast-squeeze-paragraphs/download/mdast-squeeze-paragraphs-4.0.0.tgz#7c4c114679c3bee27ef10b58e2e015be79f1ef97" @@ -6099,7 +6114,7 @@ prompts@^2.4.0, prompts@^2.4.1: kleur "^3.0.3" sisteransi "^1.0.5" -prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@^15.5.10, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: version "15.8.0" resolved "https://registry.npmmirror.com/prop-types/download/prop-types-15.8.0.tgz#d237e624c45a9846e469f5f31117f970017ff588" integrity sha512-fDGekdaHh65eI3lMi5OnErU6a8Ighg2KjcjQxO7m8VHyWjcPyj5kiOgV1LQDOOOgVy3+5FgjXvdSSX7B8/5/4g== @@ -6215,6 +6230,19 @@ rc@^1.2.8: minimist "^1.2.0" strip-json-comments "~2.0.1" +react-color@^2.19.3: + version "2.19.3" + resolved "https://registry.npmmirror.com/react-color/download/react-color-2.19.3.tgz#ec6c6b4568312a3c6a18420ab0472e146aa5683d" + integrity sha1-7GxrRWgxKjxqGEIKsEcuFGqlaD0= + dependencies: + "@icons/material" "^0.2.4" + lodash "^4.17.15" + lodash-es "^4.17.15" + material-colors "^1.2.1" + prop-types "^15.5.10" + reactcss "^1.2.0" + tinycolor2 "^1.4.1" + react-cool-onclickoutside@^1.6.2: version "1.7.0" resolved "https://registry.npmmirror.com/react-cool-onclickoutside/download/react-cool-onclickoutside-1.7.0.tgz#abc844e14852220fe15f81d7ef44976d15cd9980" @@ -6296,6 +6324,13 @@ react-loadable-ssr-addon-v5-slorber@^1.0.1: dependencies: "@babel/runtime" "^7.10.3" +react-paginate@^8.1.0: + version "8.1.0" + resolved "https://registry.npmmirror.com/react-paginate/download/react-paginate-8.1.0.tgz#8c4c6c5b7d90e8a4f33653262204fd32c5dfd207" + integrity sha512-XK8cgcX8Zk4De6F4Iozd91a2xm/U+mdD4SB5k4xcBabqZj86U20N7kMiMzOFk1AEGCj6Kg1374xXK03dz7BTRA== + dependencies: + prop-types "^15.6.1" + react-router-config@^5.1.1: version "5.1.1" resolved "https://registry.nlark.com/react-router-config/download/react-router-config-5.1.1.tgz#0f4263d1a80c6b2dc7b9c1902c9526478194a988" @@ -6345,6 +6380,13 @@ react@^17.0.1: loose-envify "^1.1.0" object-assign "^4.1.1" +reactcss@^1.2.0: + version "1.2.3" + resolved "https://registry.npm.taobao.org/reactcss/download/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd" + integrity sha1-wAATh15Vexzw39mjaKHD2rO1SN0= + dependencies: + lodash "^4.0.1" + read-cache@^1.0.0: version "1.0.0" resolved "https://registry.npm.taobao.org/read-cache/download/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" @@ -7258,6 +7300,11 @@ tiny-warning@^1.0.0, tiny-warning@^1.0.3: resolved "https://registry.npm.taobao.org/tiny-warning/download/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" integrity sha1-lKMNtFPfTGQ9D9VmBg1gqHXYR1Q= +tinycolor2@^1.4.1: + version "1.4.2" + resolved "https://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803" + integrity sha1-P2pNEHGtB2dtf6Ry4frECnGdiAM= + tmp@^0.2.1: version "0.2.1" resolved "https://registry.nlark.com/tmp/download/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" From 4bd2156929a457b60276bd6d2054895651bdd7b0 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 29 Dec 2021 21:52:46 +0800 Subject: [PATCH 147/174] :bug: fix matcher.skip missing --- nonebot/dependencies/__init__.py | 4 ++-- nonebot/exception.py | 10 +++++++++- nonebot/matcher.py | 23 +++++++++++++++-------- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index 147dcb1d..6040401a 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -15,7 +15,7 @@ from pydantic.fields import Required, FieldInfo, Undefined, ModelField from nonebot.log import logger from .utils import get_typed_signature -from nonebot.exception import SkippedException +from nonebot.exception import TypeMisMatch from nonebot.utils import run_sync, is_coroutine_callable T = TypeVar("T", bound="Dependent") @@ -182,7 +182,7 @@ class Dependent(Generic[R]): f"type {type(value)} not match depends {self.call} " f"annotation {field._type_display()}, ignored" ) - raise SkippedException(field, value) + raise TypeMisMatch(field, value) else: values[field.name] = value diff --git a/nonebot/exception.py b/nonebot/exception.py index ce2fb9e6..62eb23b7 100644 --- a/nonebot/exception.py +++ b/nonebot/exception.py @@ -126,12 +126,20 @@ class SkippedException(MatcherException): 可以在 ``Handler`` 中通过 ``Matcher.skip()`` 抛出。 """ + +class TypeMisMatch(SkippedException): + """ + :说明: + + 当前 ``Handler`` 的参数类型不匹配。 + """ + def __init__(self, param: ModelField, value: Any): self.param: ModelField = param self.value: Any = value def __repr__(self): - return f"" + return f"" def __str__(self): self.__repr__() diff --git a/nonebot/matcher.py b/nonebot/matcher.py index b55287f7..af7cd8d2 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -42,13 +42,6 @@ from nonebot.consts import ( LAST_RECEIVE_KEY, REJECT_CACHE_TARGET, ) -from nonebot.exception import ( - PausedException, - StopPropagation, - SkippedException, - FinishedException, - RejectedException, -) from nonebot.typing import ( Any, T_State, @@ -58,6 +51,14 @@ from nonebot.typing import ( T_DependencyCache, T_PermissionUpdater, ) +from nonebot.exception import ( + TypeMisMatch, + PausedException, + StopPropagation, + SkippedException, + FinishedException, + RejectedException, +) if TYPE_CHECKING: from nonebot.plugin import Plugin @@ -646,6 +647,10 @@ class Matcher(metaclass=MatcherMeta): await cls.send(prompt, **kwargs) raise RejectedException + @classmethod + def skip(cls) -> NoReturn: + raise SkippedException + def get_receive(self, id: str, default: T = None) -> Union[Event, T]: return self.state.get(RECEIVE_KEY.format(id=id), default) @@ -729,11 +734,13 @@ class Matcher(metaclass=MatcherMeta): stack=stack, dependency_cache=dependency_cache, ) - except SkippedException as e: + except TypeMisMatch as e: logger.debug( f"Handler {handler} param {e.param.name} value {e.value} " f"mismatch type {e.param._type_display()}, skipped" ) + except SkippedException as e: + logger.debug(f"Handler {handler} skipped") except StopPropagation: self.block = True finally: From af03188f8894fe98768f5e576944064317971b97 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 29 Dec 2021 22:23:35 +0800 Subject: [PATCH 148/174] :bug: fix on_command block cannot set --- nonebot/plugin/on.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nonebot/plugin/on.py b/nonebot/plugin/on.py index e9b56395..b0ab2377 100644 --- a/nonebot/plugin/on.py +++ b/nonebot/plugin/on.py @@ -391,8 +391,9 @@ def on_command( """ commands = set([cmd]) | (aliases or set()) + block = kwargs.pop("block", False) return on_message( - command(*commands) & rule, block=False, **kwargs, _depth=_depth + 1 + command(*commands) & rule, block=block, **kwargs, _depth=_depth + 1 ) From 80c0ac54563a821a9694da1ebb7fa9e6c682be6d Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Wed, 29 Dec 2021 23:06:47 +0800 Subject: [PATCH 149/174] :pencil2: fix typo --- nonebot/log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nonebot/log.py b/nonebot/log.py index b3c520cd..859353c2 100644 --- a/nonebot/log.py +++ b/nonebot/log.py @@ -31,7 +31,7 @@ logger: "Logger" = loguru.logger :默认信息: * 格式: ``[%(asctime)s %(name)s] %(levelname)s: %(message)s`` - * 等级: ``INFO`` ，根据 ``config,log_level`` 配置改变 + * 等级: ``INFO`` ，根据 ``config.log_level`` 配置改变 * 输出: 输出至 stdout :用法: From 23d0b2509e9cbf55f46b4919007af7962462604c Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 30 Dec 2021 12:11:31 +0800 Subject: [PATCH 150/174] :bug: fix ws close exception not catch in server --- nonebot/drivers/fastapi.py | 17 ++++++++++++++++- nonebot/drivers/quart.py | 16 ++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py index a9e93aca..59f82563 100644 --- a/nonebot/drivers/fastapi.py +++ b/nonebot/drivers/fastapi.py @@ -11,23 +11,36 @@ FastAPI 驱动适配 """ import logging +from functools import wraps from typing import Any, List, Tuple, Callable, Optional import uvicorn from pydantic import BaseSettings from fastapi.responses import Response from fastapi import FastAPI, Request, UploadFile, status -from starlette.websockets import WebSocket, WebSocketState +from starlette.websockets import WebSocket, WebSocketState, WebSocketDisconnect from ._model import FileTypes from nonebot.config import Env from nonebot.typing import overrides +from nonebot.exception import WebSocketClosed from nonebot.config import Config as NoneBotConfig from nonebot.drivers import Request as BaseRequest from nonebot.drivers import WebSocket as BaseWebSocket from nonebot.drivers import ReverseDriver, HTTPServerSetup, WebSocketServerSetup +def catch_closed(func): + @wraps(func) + async def decorator(*args, **kwargs): + try: + return await func(*args, **kwargs) + except WebSocketDisconnect as e: + raise WebSocketClosed(e.code) + + return decorator + + class Config(BaseSettings): """ FastAPI 驱动框架设置，详情参考 FastAPI 文档 @@ -311,10 +324,12 @@ class FastAPIWebSocket(BaseWebSocket): await self.websocket.close(code) @overrides(BaseWebSocket) + @catch_closed async def receive(self) -> str: return await self.websocket.receive_text() @overrides(BaseWebSocket) + @catch_closed async def receive_bytes(self) -> bytes: return await self.websocket.receive_bytes() diff --git a/nonebot/drivers/quart.py b/nonebot/drivers/quart.py index 1f5df4c6..c9fccf26 100644 --- a/nonebot/drivers/quart.py +++ b/nonebot/drivers/quart.py @@ -8,6 +8,8 @@ Quart 驱动适配 https://pgjones.gitlab.io/quart/index.html """ +import asyncio +from functools import wraps from typing import List, Tuple, TypeVar, Callable, Optional, Coroutine import uvicorn @@ -16,6 +18,7 @@ from pydantic import BaseSettings from ._model import FileTypes from nonebot.config import Env from nonebot.typing import overrides +from nonebot.exception import WebSocketClosed from nonebot.config import Config as NoneBotConfig from nonebot.drivers import Request as BaseRequest from nonebot.drivers import WebSocket as BaseWebSocket @@ -35,6 +38,17 @@ except ImportError: _AsyncCallable = TypeVar("_AsyncCallable", bound=Callable[..., Coroutine]) +def catch_closed(func): + @wraps(func) + async def decorator(*args, **kwargs): + try: + return await func(*args, **kwargs) + except asyncio.CancelledError as e: + raise WebSocketClosed(1000) + + return decorator + + class Config(BaseSettings): """ Quart 驱动框架设置 @@ -281,6 +295,7 @@ class WebSocket(BaseWebSocket): await self.websocket.close(code, reason) @overrides(BaseWebSocket) + @catch_closed async def receive(self) -> str: msg = await self.websocket.receive() if isinstance(msg, bytes): @@ -288,6 +303,7 @@ class WebSocket(BaseWebSocket): return msg @overrides(BaseWebSocket) + @catch_closed async def receive_bytes(self) -> bytes: msg = await self.websocket.receive() if isinstance(msg, str): From d1706e438bf63af40bd26e304478ee120214c4f4 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 30 Dec 2021 12:50:30 +0800 Subject: [PATCH 151/174] :construction: add store pagination --- nonebot/drivers/quart.py | 2 +- website/package.json | 1 + website/src/components/Driver.tsx | 31 +++++++++++++++++++++--- website/src/components/Paginate.tsx | 29 ++++++++++++++++++++-- website/src/libs/{store.tsx => store.ts} | 0 website/src/pages/index.tsx | 25 ++++++++++--------- yarn.lock | 5 ++++ 7 files changed, 75 insertions(+), 18 deletions(-) rename website/src/libs/{store.tsx => store.ts} (100%) diff --git a/nonebot/drivers/quart.py b/nonebot/drivers/quart.py index c9fccf26..a8330044 100644 --- a/nonebot/drivers/quart.py +++ b/nonebot/drivers/quart.py @@ -43,7 +43,7 @@ def catch_closed(func): async def decorator(*args, **kwargs): try: return await func(*args, **kwargs) - except asyncio.CancelledError as e: + except asyncio.CancelledError: raise WebSocketClosed(1000) return decorator diff --git a/website/package.json b/website/package.json index fe001205..7b4fb2f3 100644 --- a/website/package.json +++ b/website/package.json @@ -33,6 +33,7 @@ "react-color": "^2.19.3", "react-dom": "^17.0.1", "react-paginate": "^8.1.0", + "react-use-pagination": "^2.0.1", "url-loader": "^4.1.1" }, "devDependencies": { diff --git a/website/src/components/Driver.tsx b/website/src/components/Driver.tsx index 71b7f4f7..fb8971ec 100644 --- a/website/src/components/Driver.tsx +++ b/website/src/components/Driver.tsx @@ -1,23 +1,48 @@ import React from "react"; +import { usePagination } from "react-use-pagination"; import drivers from "../../static/drivers.json"; import { useFilteredObjs } from "../libs/store"; +import Paginate from "./Paginate"; -export default function Driver() { +export default function Driver(): JSX.Element { const { filter, setFilter, filteredObjs: filteredDrivers, } = useFilteredObjs(drivers); + + const props = usePagination({ + totalItems: filteredDrivers.length, + initialPageSize: 10, + }); + const { startIndex, endIndex } = props; + const currentDrivers = filteredDrivers.slice(startIndex, endIndex); + return ( <> -
+
setFilter(event.target.value)} /> + +
+
+ +
+
+ {currentDrivers.map((driver, index) => ( +

{driver.name}

+ ))} +
+
+
-
{filteredDrivers.toString()}
); } diff --git a/website/src/components/Paginate.tsx b/website/src/components/Paginate.tsx index 935fe4f9..3fd1c4a9 100644 --- a/website/src/components/Paginate.tsx +++ b/website/src/components/Paginate.tsx @@ -1,5 +1,30 @@ +import React, { useCallback } from "react"; import ReactPaginate from "react-paginate"; +import { usePagination } from "react-use-pagination"; -export function usePagination() { - return {}; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; + +export default function Paginate({ + totalPages, + setPage, +}: ReturnType): JSX.Element { + const onPageChange = useCallback( + (selectedItem: { selected: number }) => { + setPage(selectedItem.selected); + }, + [setPage] + ); + + return ( + + ); } diff --git a/website/src/libs/store.tsx b/website/src/libs/store.ts similarity index 100% rename from website/src/libs/store.tsx rename to website/src/libs/store.ts diff --git a/website/src/pages/index.tsx b/website/src/pages/index.tsx index d900b931..b7aafd77 100644 --- a/website/src/pages/index.tsx +++ b/website/src/pages/index.tsx @@ -10,31 +10,31 @@ import styles from "../css/index.module.css"; export default function Home() { const firstFeature: Feature = { - title: "开发", - tagline: "fast to code", - description: "仅需两步，即可开始编写你的机器人", + title: "开箱即用", + tagline: "out of box", + description: "使用 NB-CLI 快速构建属于你的机器人", } as const; const secondFeatures = [ { - title: "插件", - tagline: "build bot with plugins", + title: "插件系统", + tagline: "plugin system", description: "插件化开发，模块化管理", }, { - title: "跨平台", - tagline: "write once run everywhere", + title: "跨平台支持", + tagline: "cross-platform support", description: "支持多种平台，以及多样的事件响应方式", }, ] as const; const thirdFeatures = [ { - title: "异步", + title: "异步开发", tagline: "asynchronous first", description: "异步优先式开发，提高运行效率", }, { title: "依赖注入", - tagline: "bultin dependency injection system", + tagline: "builtin dependency injection system", description: "简单清晰的依赖注入系统，内置依赖函数减少用户代码", }, ]; @@ -60,8 +60,9 @@ export default function Home() { "[?] What do you want to do?", "❯ Create a New Project", " Run the Bot in Current Folder", - " Create a New NoneBot Plugin", - " List All Published Plugins", + " Driver ->", + " Adapter ->", + " Plugin ->", " ...", ].join("\n")} @@ -153,7 +154,7 @@ export default function Home() { "# 通过依赖注入获得命令名以及参数", "@matcher.handle()", "async def handler(cmd = Command(), arg = CommandArg()) -> None:", - " await matcher.send()", + " await matcher.finish()", ].join("\n")} diff --git a/yarn.lock b/yarn.lock index 5f32dbea..45533adf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6372,6 +6372,11 @@ react-side-effect@^2.1.0: resolved "https://registry.npm.taobao.org/react-side-effect/download/react-side-effect-2.1.1.tgz#66c5701c3e7560ab4822a4ee2742dee215d72eb3" integrity sha1-ZsVwHD51YKtIIqTuJ0Le4hXXLrM= +react-use-pagination@^2.0.1: + version "2.0.1" + resolved "https://registry.npmmirror.com/react-use-pagination/download/react-use-pagination-2.0.1.tgz#debc6322cd3f14a4cdf082d913f7736d5cbed170" + integrity sha1-3rxjIs0/FKTN8ILZE/dzbVy+0XA= + react@^17.0.1: version "17.0.2" resolved "https://registry.npmmirror.com/react/download/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" From 2beed6bf16ff6f38ff184e17df5661c184f41fb6 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 30 Dec 2021 16:05:05 +0800 Subject: [PATCH 152/174] :construction: process store pagination --- website/src/components/Adapter.tsx | 47 +++++++++++++++++- website/src/components/Bot.tsx | 47 +++++++++++++++++- website/src/components/Card/index.tsx | 23 +++++++++ website/src/components/Driver.tsx | 4 +- .../{Paginate.tsx => Paginate/index.tsx} | 12 ++++- .../src/components/Paginate/styles.module.css | 29 +++++++++++ website/src/components/Plugin.tsx | 48 ++++++++++++++++++- website/src/libs/store.ts | 4 +- website/src/pages/store.mdx | 2 +- website/static/adapters.json | 44 ++++++++++++----- website/static/plugins.json | 22 +++------ 11 files changed, 242 insertions(+), 40 deletions(-) create mode 100644 website/src/components/Card/index.tsx rename website/src/components/{Paginate.tsx => Paginate/index.tsx} (68%) create mode 100644 website/src/components/Paginate/styles.module.css diff --git a/website/src/components/Adapter.tsx b/website/src/components/Adapter.tsx index 42fd868e..b956bbfc 100644 --- a/website/src/components/Adapter.tsx +++ b/website/src/components/Adapter.tsx @@ -1,5 +1,48 @@ import React from "react"; +import { usePagination } from "react-use-pagination"; -export default function Adapter() { - return <>; +import adapters from "../../static/adapters.json"; +import { useFilteredObjs } from "../libs/store"; +import Paginate from "./Paginate"; + +export default function Adapter(): JSX.Element { + const { + filter, + setFilter, + filteredObjs: filteredAdapters, + } = useFilteredObjs(adapters); + + const props = usePagination({ + totalItems: filteredAdapters.length, + initialPageSize: 10, + }); + const { startIndex, endIndex } = props; + const currentAdapters = filteredAdapters.slice(startIndex, endIndex + 1); + + return ( + <> +
+ setFilter(event.target.value)} + /> + +
+
+ +
+
+ {currentAdapters.map((driver, index) => ( +

{driver.name}

+ ))} +
+
+ +
+ + ); } diff --git a/website/src/components/Bot.tsx b/website/src/components/Bot.tsx index 63fd515c..d690e5ac 100644 --- a/website/src/components/Bot.tsx +++ b/website/src/components/Bot.tsx @@ -1,5 +1,48 @@ import React from "react"; +import { usePagination } from "react-use-pagination"; -export default function Bot() { - return <>; +import bots from "../../static/bots.json"; +import { useFilteredObjs } from "../libs/store"; +import Paginate from "./Paginate"; + +export default function Adapter(): JSX.Element { + const { + filter, + setFilter, + filteredObjs: filteredBots, + } = useFilteredObjs(bots); + + const props = usePagination({ + totalItems: filteredBots.length, + initialPageSize: 10, + }); + const { startIndex, endIndex } = props; + const currentBots = filteredBots.slice(startIndex, endIndex + 1); + + return ( + <> +
+ setFilter(event.target.value)} + /> + +
+
+ +
+
+ {currentBots.map((driver, index) => ( +

{driver.name}

+ ))} +
+
+ +
+ + ); } diff --git a/website/src/components/Card/index.tsx b/website/src/components/Card/index.tsx new file mode 100644 index 00000000..b5fb74dc --- /dev/null +++ b/website/src/components/Card/index.tsx @@ -0,0 +1,23 @@ +import React from "react"; + +import Link from "@docusaurus/Link"; + +import type { Obj } from "../../libs/store"; + +export default function Card({ + name, + desc, + author, + homepage, +}: Obj): JSX.Element { + return ( +
+
+ {name} + {homepage && } +
+
{desc}
+
{author}
+
+ ); +} diff --git a/website/src/components/Driver.tsx b/website/src/components/Driver.tsx index fb8971ec..a8d1f027 100644 --- a/website/src/components/Driver.tsx +++ b/website/src/components/Driver.tsx @@ -17,7 +17,7 @@ export default function Driver(): JSX.Element { initialPageSize: 10, }); const { startIndex, endIndex } = props; - const currentDrivers = filteredDrivers.slice(startIndex, endIndex); + const currentDrivers = filteredDrivers.slice(startIndex, endIndex + 1); return ( <> @@ -28,7 +28,7 @@ export default function Driver(): JSX.Element { placeholder="搜索驱动器" onChange={(event) => setFilter(event.target.value)} /> -
diff --git a/website/src/components/Paginate.tsx b/website/src/components/Paginate/index.tsx similarity index 68% rename from website/src/components/Paginate.tsx rename to website/src/components/Paginate/index.tsx index 3fd1c4a9..67d748df 100644 --- a/website/src/components/Paginate.tsx +++ b/website/src/components/Paginate/index.tsx @@ -4,6 +4,8 @@ import { usePagination } from "react-use-pagination"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import styles from "./styles.module.css"; + export default function Paginate({ totalPages, setPage, @@ -20,7 +22,15 @@ export default function Paginate({ } previousLabel={} nextLabel={} diff --git a/website/src/components/Paginate/styles.module.css b/website/src/components/Paginate/styles.module.css new file mode 100644 index 00000000..4d6d1caa --- /dev/null +++ b/website/src/components/Paginate/styles.module.css @@ -0,0 +1,29 @@ +.container { + @apply w-full max-w-full inline-flex justify-center items-center m-0 pl-0 list-none; +} + +.li { + @apply flex items-center; +} + +.a { + height: 34px; + width: auto; + min-width: 34px; + @apply m-1 px-1 border-2 rounded shadow-lg text-center; + @apply text-black; + @apply bg-light-nonepress-100; +} + +:global(.dark) .a { + @apply text-white bg-dark-nonepress-100; +} + +.active { + @apply bg-hero text-white border-hero; +} + + +.disabled { + @apply opacity-60 pointer-events-none; +} diff --git a/website/src/components/Plugin.tsx b/website/src/components/Plugin.tsx index ef4c6684..50ab9795 100644 --- a/website/src/components/Plugin.tsx +++ b/website/src/components/Plugin.tsx @@ -1,5 +1,49 @@ import React from "react"; +import { usePagination } from "react-use-pagination"; -export default function Plugin() { - return <>; +import plugins from "../../static/plugins.json"; +import { useFilteredObjs } from "../libs/store"; +import Card from "./Card"; +import Paginate from "./Paginate"; + +export default function Adapter(): JSX.Element { + const { + filter, + setFilter, + filteredObjs: filteredPlugins, + } = useFilteredObjs(plugins); + + const props = usePagination({ + totalItems: filteredPlugins.length, + initialPageSize: 10, + }); + const { startIndex, endIndex } = props; + const currentPlugins = filteredPlugins.slice(startIndex, endIndex + 1); + + return ( + <> +
+ setFilter(event.target.value)} + /> + +
+
+ +
+
+ {currentPlugins.map((driver, index) => ( + + ))} +
+
+ +
+ + ); } diff --git a/website/src/libs/store.ts b/website/src/libs/store.ts index 13da1518..ddfdf9a0 100644 --- a/website/src/libs/store.ts +++ b/website/src/libs/store.ts @@ -1,11 +1,11 @@ import { useState } from "react"; -type Tag = { +export type Tag = { label: string; color: string; }; -type Obj = { +export type Obj = { module_name?: string; project_link?: string; name: string; diff --git a/website/src/pages/store.mdx b/website/src/pages/store.mdx index 8c6910ff..24037f56 100644 --- a/website/src/pages/store.mdx +++ b/website/src/pages/store.mdx @@ -14,7 +14,7 @@ import Bot from "../components/Bot"; # 商店
- + diff --git a/website/static/adapters.json b/website/static/adapters.json index 7a76e548..bec23133 100644 --- a/website/static/adapters.json +++ b/website/static/adapters.json @@ -1,13 +1,13 @@ [ { - "module_name": "nonebot.adapters.cqhttp", - "project_link": "nonebot-adapter-cqhttp", - "name": "cqhttp", - "desc": "OneBot(CQHTTP) 协议", + "module_name": "nonebot.adapters.onebot.v11", + "project_link": "nonebot-adapter-onebot", + "name": "OneBot V11", + "desc": "OneBot V11 协议", "author": "yanyongyu", - "homepage": "https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-adapter-cqhttp", + "homepage": "https://github.com/nonebot/adapter-onebot", "tags": [], - "is_official": false + "is_official": true }, { "module_name": "nonebot.adapters.ding", @@ -15,9 +15,9 @@ "name": "ding", "desc": "钉钉协议", "author": "Artin", - "homepage": "https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-adapter-ding", + "homepage": "https://github.com/nonebot/adapter-ding", "tags": [], - "is_official": false + "is_official": true }, { "module_name": "nonebot.adapters.mirai", @@ -25,9 +25,9 @@ "name": "mirai", "desc": "Mirai-Api-HTTP 协议", "author": "Mix", - "homepage": "https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-adapter-mirai", + "homepage": "https://github.com/nonebot/adapter-mirai", "tags": [], - "is_official": false + "is_official": true }, { "module_name": "nonebot.adapters.feishu", @@ -35,8 +35,28 @@ "name": "feishu", "desc": "飞书协议", "author": "StarHeartHunt", - "homepage": "https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-adapter-feishu", + "homepage": "https://github.com/nonebot/adapter-feishu", "tags": [], - "is_official": false + "is_official": true + }, + { + "module_name": "nonebot.adapters.telegram", + "project_link": "nonebot-adapter-telegram", + "name": "telegram", + "desc": "Telegram 协议", + "author": "StarHeartHunt", + "homepage": "https://github.com/nonebot/adapter-telegram", + "tags": [], + "is_official": true + }, + { + "module_name": "nonebot.adapters.qqguild", + "project_link": "nonebot-adapter-qqguild", + "name": "QQ 频道", + "desc": "QQ 频道官方机器人", + "author": "yanyongyu", + "homepage": "https://github.com/nonebot/adapter-qqguild", + "tags": [], + "is_official": true } ] diff --git a/website/static/plugins.json b/website/static/plugins.json index 9e039904..90233bc6 100644 --- a/website/static/plugins.json +++ b/website/static/plugins.json @@ -7,7 +7,7 @@ "author": "yanyongyu", "homepage": "https://github.com/cscs181/QQ-GitHub-Bot/tree/master/src/plugins/nonebot_plugin_status", "tags": [], - "is_official": false + "is_official": true }, { "module_name": "haruka_bot", @@ -37,7 +37,7 @@ "name": "NoneBot离线文档", "homepage": "https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-plugin-docs", "tags": [], - "is_official": false + "is_official": true }, { "module_name": "nonebot_plugin_sentry", @@ -47,17 +47,7 @@ "name": "Sentry日志监控", "homepage": "https://github.com/cscs181/QQ-GitHub-Bot/tree/master/src/plugins/nonebot_plugin_sentry", "tags": [], - "is_official": false - }, - { - "module_name": "nonebot_plugin_test", - "project_link": "nonebot-plugin-test", - "author": "yanyongyu", - "desc": "在浏览器中测试你的 NoneBot 机器人", - "name": "前端测试机器人插件", - "homepage": "https://github.com/nonebot/plugin-test", - "tags": [], - "is_official": false + "is_official": true }, { "module_name": "nonebot_plugin_apscheduler", @@ -67,7 +57,7 @@ "name": "定时任务", "homepage": "https://github.com/nonebot/plugin-apscheduler", "tags": [], - "is_official": false + "is_official": true }, { "module_name": "nonebot_plugin_picsearcher", @@ -287,7 +277,7 @@ "author": "yanyongyu", "homepage": "https://github.com/nonebot/plugin-localstore", "tags": [], - "is_official": false + "is_official": true }, { "module_name": "nonebot_plugin_puppet", @@ -497,7 +487,7 @@ "author": "mnixry", "homepage": "https://github.com/mnixry/nonebot-plugin-filehost", "tags": [], - "is_official": false + "is_official": true }, { "module_name": "nonebot_plugin_simplemusic", From e4691f05256c8d94c7ef3c38903178f1ec326c41 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 30 Dec 2021 22:46:15 +0800 Subject: [PATCH 153/174] :construction: add store tags --- website/src/components/Adapter.tsx | 9 ++- website/src/components/Bot.tsx | 9 ++- website/src/components/Card/index.tsx | 74 +++++++++++++++++-- website/src/components/Driver.tsx | 5 +- website/src/components/Paginate/index.tsx | 2 + .../src/components/Paginate/styles.module.css | 9 ++- website/src/components/Plugin.tsx | 6 +- website/static/plugins.json | 14 +++- 8 files changed, 103 insertions(+), 25 deletions(-) diff --git a/website/src/components/Adapter.tsx b/website/src/components/Adapter.tsx index b956bbfc..d72305b1 100644 --- a/website/src/components/Adapter.tsx +++ b/website/src/components/Adapter.tsx @@ -3,6 +3,7 @@ import { usePagination } from "react-use-pagination"; import adapters from "../../static/adapters.json"; import { useFilteredObjs } from "../libs/store"; +import Card from "./Card"; import Paginate from "./Paginate"; export default function Adapter(): JSX.Element { @@ -28,16 +29,16 @@ export default function Adapter(): JSX.Element { placeholder="搜索适配器" onChange={(event) => setFilter(event.target.value)} /> -
-
- {currentAdapters.map((driver, index) => ( -

{driver.name}

+
+ {currentAdapters.map((adapter, index) => ( + ))}
diff --git a/website/src/components/Bot.tsx b/website/src/components/Bot.tsx index d690e5ac..3994f14e 100644 --- a/website/src/components/Bot.tsx +++ b/website/src/components/Bot.tsx @@ -3,6 +3,7 @@ import { usePagination } from "react-use-pagination"; import bots from "../../static/bots.json"; import { useFilteredObjs } from "../libs/store"; +import Card from "./Card"; import Paginate from "./Paginate"; export default function Adapter(): JSX.Element { @@ -28,16 +29,16 @@ export default function Adapter(): JSX.Element { placeholder="搜索机器人" onChange={(event) => setFilter(event.target.value)} /> -
-
- {currentBots.map((driver, index) => ( -

{driver.name}

+
+ {currentBots.map((bot, index) => ( + ))}
diff --git a/website/src/components/Card/index.tsx b/website/src/components/Card/index.tsx index b5fb74dc..a37ca74a 100644 --- a/website/src/components/Card/index.tsx +++ b/website/src/components/Card/index.tsx @@ -1,23 +1,85 @@ import React from "react"; import Link from "@docusaurus/Link"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import type { Obj } from "../../libs/store"; +function pickTextColor(bgColor, lightColor, darkColor) { + var color = bgColor.charAt(0) === "#" ? bgColor.substring(1, 7) : bgColor; + var r = parseInt(color.substring(0, 2), 16); // hexToR + var g = parseInt(color.substring(2, 4), 16); // hexToG + var b = parseInt(color.substring(4, 6), 16); // hexToB + return r * 0.299 + g * 0.587 + b * 0.114 > 186 ? darkColor : lightColor; +} + export default function Card({ + module_name, name, desc, author, homepage, + tags, + is_official, }: Obj): JSX.Element { + const isGithub = /^https:\/\/github.com\/[^/]+\/[^/]+/.test(homepage); + return ( -
-
- {name} - {homepage && } +
+
+ + {name} + {is_official && ( + + )} + + {homepage && ( + + {isGithub ? ( + + ) : ( + + )} + + )}
-
{desc}
-
{author}
+ {tags && ( +
+ {tags.map((tag, index) => ( + + {tag.label} + + ))} +
+ )} + {desc && ( +
{desc}
+ )} + {module_name && ( +
+ + {module_name} +
+ )} + {author && ( +
+ + {author} +
+ )}
); } diff --git a/website/src/components/Driver.tsx b/website/src/components/Driver.tsx index a8d1f027..4f646f48 100644 --- a/website/src/components/Driver.tsx +++ b/website/src/components/Driver.tsx @@ -3,6 +3,7 @@ import { usePagination } from "react-use-pagination"; import drivers from "../../static/drivers.json"; import { useFilteredObjs } from "../libs/store"; +import Card from "./Card"; import Paginate from "./Paginate"; export default function Driver(): JSX.Element { @@ -35,9 +36,9 @@ export default function Driver(): JSX.Element {
-
+
{currentDrivers.map((driver, index) => ( -

{driver.name}

+ ))}
diff --git a/website/src/components/Paginate/index.tsx b/website/src/components/Paginate/index.tsx index 67d748df..24681dc9 100644 --- a/website/src/components/Paginate/index.tsx +++ b/website/src/components/Paginate/index.tsx @@ -9,6 +9,7 @@ import styles from "./styles.module.css"; export default function Paginate({ totalPages, setPage, + currentPage, }: ReturnType): JSX.Element { const onPageChange = useCallback( (selectedItem: { selected: number }) => { @@ -21,6 +22,7 @@ export default function Paginate({
@@ -37,8 +37,8 @@ export default function Adapter(): JSX.Element {
- {currentPlugins.map((driver, index) => ( - + {currentPlugins.map((plugin, index) => ( + ))}
diff --git a/website/static/plugins.json b/website/static/plugins.json index 90233bc6..ad3a2c33 100644 --- a/website/static/plugins.json +++ b/website/static/plugins.json @@ -6,7 +6,12 @@ "desc": "通过戳一戳获取服务器状态", "author": "yanyongyu", "homepage": "https://github.com/cscs181/QQ-GitHub-Bot/tree/master/src/plugins/nonebot_plugin_status", - "tags": [], + "tags": [ + { + "label": "server", + "color": "#ff0000" + } + ], "is_official": true }, { @@ -16,7 +21,12 @@ "desc": "将B站UP主的动态和直播信息推送至QQ", "author": "SK-415", "homepage": "https://github.com/SK-415/HarukaBot", - "tags": [], + "tags": [ + { + "label": "bilibili", + "color": "#e55d80" + } + ], "is_official": false }, { From 21a958ffd98bf52eec155e64cfec38a00578872a Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Thu, 30 Dec 2021 23:29:32 +0800 Subject: [PATCH 154/174] :construction_worker: update ci version --- .github/workflows/codecov.yml | 7 ++++++- .github/workflows/release-plugin-docs.yml | 23 ++++++++++++++--------- .github/workflows/release.yml | 6 +++--- .github/workflows/website-deploy.yml | 6 +++--- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 953d2038..60b869a3 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -17,7 +17,12 @@ jobs: python-version: "3.9" architecture: "x64" - - uses: Gr1N/setup-poetry@v4 + - uses: Gr1N/setup-poetry@v7 + + - uses: actions/cache@v2 + with: + path: ~/.cache/pypoetry/virtualenvs + key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }} - name: Install dependencies run: poetry install -E all diff --git a/.github/workflows/release-plugin-docs.yml b/.github/workflows/release-plugin-docs.yml index fbc226a1..df784236 100644 --- a/.github/workflows/release-plugin-docs.yml +++ b/.github/workflows/release-plugin-docs.yml @@ -11,8 +11,21 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: 3.8 + architecture: "x64" + + - uses: Gr1N/setup-poetry@v7 + + - uses: actions/cache@v2 + with: + path: ~/.cache/pypoetry/virtualenvs + key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }} + - name: Setup Node - uses: actions/setup-node@v1 + uses: actions/setup-node@v2 with: node-version: "16" @@ -26,14 +39,6 @@ jobs: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - architecture: "x64" - - - uses: Gr1N/setup-poetry@v4 - - name: Install and build run: | poetry install -E all diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 75443deb..219bfbda 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,15 +18,15 @@ jobs: python-version: 3.8 architecture: "x64" - - uses: Gr1N/setup-poetry@v4 + - uses: Gr1N/setup-poetry@v7 - - uses: actions/cache@v1 + - uses: actions/cache@v2 with: path: ~/.cache/pypoetry/virtualenvs key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }} - name: Setup Node - uses: actions/setup-node@v1 + uses: actions/setup-node@v2 with: node-version: "16" diff --git a/.github/workflows/website-deploy.yml b/.github/workflows/website-deploy.yml index 0d6271d4..e5956fd3 100644 --- a/.github/workflows/website-deploy.yml +++ b/.github/workflows/website-deploy.yml @@ -23,15 +23,15 @@ jobs: python-version: 3.8 architecture: "x64" - - uses: Gr1N/setup-poetry@v4 + - uses: Gr1N/setup-poetry@v7 - - uses: actions/cache@v1 + - uses: actions/cache@v2 with: path: ~/.cache/pypoetry/virtualenvs key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }} - name: Setup Node - uses: actions/setup-node@v1 + uses: actions/setup-node@v2 with: node-version: "16" From ab2c73856dc79a9cb9613aea4716242e5ac7a0d6 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 31 Dec 2021 02:06:20 +0800 Subject: [PATCH 155/174] :construction: add modal --- website/package.json | 1 + website/src/components/Modal/index.tsx | 39 ++++++++ website/src/components/Paginate/index.tsx | 9 +- website/src/components/Plugin.tsx | 103 +++++++++++++++++++++- website/src/libs/resize.ts | 67 ++++++++++++++ website/src/libs/store.ts | 3 +- website/src/libs/width.ts | 64 ++++++++++++++ yarn.lock | 5 ++ 8 files changed, 286 insertions(+), 5 deletions(-) create mode 100644 website/src/components/Modal/index.tsx create mode 100644 website/src/libs/resize.ts create mode 100644 website/src/libs/width.ts diff --git a/website/package.json b/website/package.json index 7b4fb2f3..bdbe2031 100644 --- a/website/package.json +++ b/website/package.json @@ -34,6 +34,7 @@ "react-dom": "^17.0.1", "react-paginate": "^8.1.0", "react-use-pagination": "^2.0.1", + "resize-observer-polyfill": "^1.5.1", "url-loader": "^4.1.1" }, "devDependencies": { diff --git a/website/src/components/Modal/index.tsx b/website/src/components/Modal/index.tsx new file mode 100644 index 00000000..06e4551b --- /dev/null +++ b/website/src/components/Modal/index.tsx @@ -0,0 +1,39 @@ +import clsx from "clsx"; +import React from "react"; + +export default function Modal({ + active, + setActive, + children, +}: { + active: boolean; + setActive: (active: boolean) => void; + children: React.ReactNode; +}): JSX.Element { + return ( + <> + {/* overlay */} +
setActive(false)} + > +
+
+ {/* modal */} +
+ {children} +
+ + ); +} diff --git a/website/src/components/Paginate/index.tsx b/website/src/components/Paginate/index.tsx index 24681dc9..3e288faa 100644 --- a/website/src/components/Paginate/index.tsx +++ b/website/src/components/Paginate/index.tsx @@ -1,9 +1,10 @@ -import React, { useCallback } from "react"; +import React, { useCallback, useRef } from "react"; import ReactPaginate from "react-paginate"; import { usePagination } from "react-use-pagination"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { useContentWidth } from "../../libs/width"; import styles from "./styles.module.css"; export default function Paginate({ @@ -11,6 +12,9 @@ export default function Paginate({ setPage, currentPage, }: ReturnType): JSX.Element { + const ref = useRef(); + const maxWidth = useContentWidth(ref.current?.parentElement ?? undefined); + const onPageChange = useCallback( (selectedItem: { selected: number }) => { setPage(selectedItem.selected); @@ -18,8 +22,9 @@ export default function Paginate({ [setPage] ); + // FIXME: responsive width return ( -
+
+ +
+
+ + +
+ + +
+
-
); diff --git a/website/src/components/ModalAction/index.tsx b/website/src/components/ModalAction/index.tsx new file mode 100644 index 00000000..e77e4add --- /dev/null +++ b/website/src/components/ModalAction/index.tsx @@ -0,0 +1,9 @@ +import React from "react"; + +export default function ModalAction({ + children, +}: { + children: React.ReactNode; +}): JSX.Element { + return
{children}
; +} diff --git a/website/src/components/ModalContent/index.tsx b/website/src/components/ModalContent/index.tsx new file mode 100644 index 00000000..4c2fab51 --- /dev/null +++ b/website/src/components/ModalContent/index.tsx @@ -0,0 +1,9 @@ +import React from "react"; + +export default function ModalContent({ + children, +}: { + children: React.ReactNode; +}): JSX.Element { + return
{children}
; +} diff --git a/website/src/components/ModalTitle/index.tsx b/website/src/components/ModalTitle/index.tsx new file mode 100644 index 00000000..d0f00b56 --- /dev/null +++ b/website/src/components/ModalTitle/index.tsx @@ -0,0 +1,9 @@ +import React from "react"; + +export default function ModalTitle({ title }: { title: string }): JSX.Element { + return ( +
+ {title} +
+ ); +} diff --git a/website/src/components/Plugin.tsx b/website/src/components/Plugin.tsx index 9651a167..28b669dc 100644 --- a/website/src/components/Plugin.tsx +++ b/website/src/components/Plugin.tsx @@ -1,13 +1,17 @@ import clsx from "clsx"; -import React, { useState } from "react"; +import React, { useRef, useState } from "react"; import { ChromePicker } from "react-color"; import { usePagination } from "react-use-pagination"; import plugins from "../../static/plugins.json"; import { Tag, useFilteredObjs } from "../libs/store"; -import Card, { Tag as TagComponent } from "./Card"; +import Card from "./Card"; import Modal from "./Modal"; +import ModalAction from "./ModalAction"; +import ModalContent from "./ModalContent"; +import ModalTitle from "./ModalTitle"; import Paginate from "./Paginate"; +import TagComponent from "./Tag"; export default function Adapter(): JSX.Element { const [modalOpen, setModalOpen] = useState(false); @@ -31,9 +35,12 @@ export default function Adapter(): JSX.Element { moduleName: string; homepage: string; }>({ name: "", desc: "", projectLink: "", moduleName: "", homepage: "" }); + + const ref = useRef(null); const [tags, setTags] = useState([]); const [label, setLabel] = useState(""); const [color, setColor] = useState("#ea5252"); + const onSubmit = () => { setModalOpen(false); const title = encodeURIComponent(`Plugin: ${form.name}`).replace( @@ -103,6 +110,10 @@ ${JSON.stringify(tags)} const delTag = (index: number) => { setTags(tags.filter((_, i) => i !== index)); }; + const insertTagType = (text: string) => { + setLabel(text + label); + ref.current.value = text + label; + }; return ( <> @@ -132,114 +143,127 @@ ${JSON.stringify(tags)}
-
-
-
- 插件信息 -
-
-
-
- - - - - -
-
-
- -
-
+ + +
+
+
+ + + +
-
- +
+
+ +
-
+ + + + + ); diff --git a/website/src/components/Tag/index.tsx b/website/src/components/Tag/index.tsx new file mode 100644 index 00000000..303923ef --- /dev/null +++ b/website/src/components/Tag/index.tsx @@ -0,0 +1,38 @@ +import clsx from "clsx"; +import React from "react"; + +import { Tag as TagType } from "../../libs/store"; + +function pickTextColor(bgColor, lightColor, darkColor) { + var color = bgColor.charAt(0) === "#" ? bgColor.substring(1, 7) : bgColor; + var r = parseInt(color.substring(0, 2), 16); // hexToR + var g = parseInt(color.substring(2, 4), 16); // hexToG + var b = parseInt(color.substring(4, 6), 16); // hexToB + return r * 0.299 + g * 0.587 + b * 0.114 > 186 ? darkColor : lightColor; +} + +export default function Tag({ + label, + color, + className, + onClick, +}: TagType & { + className?: string; + onClick?: React.MouseEventHandler; +}): JSX.Element { + return ( + + {label} + + ); +} From ec35f292bdfc4842746dc8f92ecd0e6f8b720a15 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 31 Dec 2021 22:43:29 +0800 Subject: [PATCH 158/174] :bug: fix matcher got receive type error --- nonebot/dependencies/__init__.py | 15 ++++-- nonebot/matcher.py | 1 - nonebot/params.py | 84 ++++++++++++++++++++++++++------ poetry.lock | 44 ++++++++--------- tests/plugins/matcher.py | 21 +++++++- tests/test_matcher.py | 8 +++ 6 files changed, 130 insertions(+), 43 deletions(-) diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py index 6040401a..42e02b9f 100644 --- a/nonebot/dependencies/__init__.py +++ b/nonebot/dependencies/__init__.py @@ -49,11 +49,13 @@ class Dependent(Generic[R]): self, *, call: Callable[..., Any], + pre_checkers: Optional[List[Param]] = None, params: Optional[List[ModelField]] = None, parameterless: Optional[List[Param]] = None, allow_types: Optional[List[Type[Param]]] = None, ) -> None: self.call = call + self.pre_checkers = pre_checkers or [] self.params = params or [] self.parameterless = parameterless or [] self.allow_types = allow_types or [] @@ -116,11 +118,6 @@ class Dependent(Generic[R]): allow_types=allow_types, ) - parameterless_params = [ - dependent.parse_parameterless(param) for param in (parameterless or []) - ] - dependent.parameterless.extend(parameterless_params) - for param_name, param in params.items(): default_value = Required if param.default != param.empty: @@ -152,6 +149,11 @@ class Dependent(Generic[R]): ) ) + parameterless_params = [ + dependent.parse_parameterless(param) for param in (parameterless or []) + ] + dependent.parameterless.extend(parameterless_params) + logger.trace( f"Parsed dependent with call={call}, " f"params={[param.field_info for param in dependent.params]}, " @@ -166,6 +168,9 @@ class Dependent(Generic[R]): ) -> Dict[str, Any]: values: Dict[str, Any] = {} + for checker in self.pre_checkers: + await checker._solve(**params) + for param in self.parameterless: await param._solve(**params) diff --git a/nonebot/matcher.py b/nonebot/matcher.py index af7cd8d2..43e9b253 100644 --- a/nonebot/matcher.py +++ b/nonebot/matcher.py @@ -484,7 +484,6 @@ class Matcher(metaclass=MatcherMeta): """ async def _key_getter(event: Event, matcher: "Matcher"): - print(key, matcher.state) matcher.set_target(ARG_KEY.format(key=key)) if matcher.get_target() == ARG_KEY.format(key=key): matcher.set_arg(key, event.get_message()) diff --git a/nonebot/params.py b/nonebot/params.py index 1e62d039..61548e13 100644 --- a/nonebot/params.py +++ b/nonebot/params.py @@ -4,10 +4,12 @@ from typing_extensions import Literal from typing import Any, Dict, List, Tuple, Callable, Optional, cast from contextlib import AsyncExitStack, contextmanager, asynccontextmanager -from pydantic.fields import Required, Undefined +from pydantic.fields import Required, Undefined, ModelField +from nonebot.log import logger +from nonebot.exception import TypeMisMatch from nonebot.adapters import Bot, Event, Message -from nonebot.dependencies import Param, Dependent +from nonebot.dependencies import Param, Dependent, CustomConfig from nonebot.typing import T_State, T_Handler, T_DependencyCache from nonebot.consts import ( CMD_KEY, @@ -94,11 +96,15 @@ class DependParam(Param): dependency = param.annotation else: dependency = param.default.dependency - dependent = Dependent[Any].parse( + sub_dependent = Dependent[Any].parse( call=dependency, allow_types=dependent.allow_types, ) - return cls(Required, use_cache=param.default.use_cache, dependent=dependent) + dependent.pre_checkers.extend(sub_dependent.pre_checkers) + sub_dependent.pre_checkers.clear() + return cls( + Required, use_cache=param.default.use_cache, dependent=sub_dependent + ) @classmethod def _check_parameterless( @@ -158,31 +164,81 @@ class DependParam(Param): return solved +class _BotChecker(Param): + async def _solve(self, bot: Bot, **kwargs: Any) -> Any: + field: ModelField = self.extra["field"] + _, errs_ = field.validate(bot, {}, loc=("bot",)) + if errs_: + logger.debug( + f"Bot type {type(bot)} not match " + f"annotation {field._type_display()}, ignored" + ) + raise TypeMisMatch(field, bot) + + class BotParam(Param): @classmethod def _check_param( cls, dependent: Dependent, name: str, param: inspect.Parameter ) -> Optional["BotParam"]: - if param.default == param.empty and ( - generic_check_issubclass(param.annotation, Bot) - or (param.annotation == param.empty and name == "bot") - ): - return cls(Required) + if param.default == param.empty: + if generic_check_issubclass(param.annotation, Bot): + dependent.pre_checkers.append( + _BotChecker( + Required, + field=ModelField( + name="", + type_=param.annotation, + class_validators=None, + model_config=CustomConfig, + default=None, + required=True, + ), + ) + ) + return cls(Required) + elif param.annotation == param.empty and name == "bot": + return cls(Required) async def _solve(self, bot: Bot, **kwargs: Any) -> Any: return bot +class _EventChecker(Param): + async def _solve(self, event: Event, **kwargs: Any) -> Any: + field: ModelField = self.extra["field"] + _, errs_ = field.validate(event, {}, loc=("event",)) + if errs_: + logger.debug( + f"Event type {type(event)} not match " + f"annotation {field._type_display()}, ignored" + ) + raise TypeMisMatch(field, event) + + class EventParam(Param): @classmethod def _check_param( cls, dependent: Dependent, name: str, param: inspect.Parameter ) -> Optional["EventParam"]: - if param.default == param.empty and ( - generic_check_issubclass(param.annotation, Event) - or (param.annotation == param.empty and name == "event") - ): - return cls(Required) + if param.default == param.empty: + if generic_check_issubclass(param.annotation, Event): + dependent.pre_checkers.append( + _EventChecker( + Required, + field=ModelField( + name="", + type_=param.annotation, + class_validators=None, + model_config=CustomConfig, + default=None, + required=True, + ), + ) + ) + return cls(Required) + elif param.annotation == param.empty and name == "event": + return cls(Required) async def _solve(self, event: Event, **kwargs: Any) -> Any: return event diff --git a/poetry.lock b/poetry.lock index e2611985..ea3d58c7 100644 --- a/poetry.lock +++ b/poetry.lock @@ -134,17 +134,17 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "attrs" -version = "21.2.0" +version = "21.4.0" description = "Classes Without Boilerplate" category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [package.extras] -dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit"] +dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"] docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"] -tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface"] -tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins"] +tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "cloudpickle"] +tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "cloudpickle"] [[package]] name = "babel" @@ -555,7 +555,7 @@ pytest-asyncio = "^0.16.0" type = "git" url = "https://github.com/nonebot/nonebug.git" reference = "master" -resolved_reference = "afc3c3fe2cf6300cdf1b5e1a897867a03a17e278" +resolved_reference = "e198b56be8f9ccf53c0d6de38e40fb9c0831c890" [[package]] name = "packaging" @@ -578,11 +578,11 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" [[package]] name = "platformdirs" -version = "2.4.0" +version = "2.4.1" description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." category = "dev" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" [package.extras] docs = ["Sphinx (>=4)", "furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)"] @@ -670,7 +670,7 @@ dev = ["black", "coverage", "docformatter", "flake8", "flake8-black", "flake8-bu [[package]] name = "pygments" -version = "2.10.0" +version = "2.11.0" description = "Pygments is a syntax highlighting package written in Python." category = "dev" optional = false @@ -1143,7 +1143,7 @@ h11 = ">=0.9.0,<1" [[package]] name = "yapf" -version = "0.31.0" +version = "0.32.0" description = "A formatter for Python code." category = "dev" optional = false @@ -1164,15 +1164,15 @@ typing-extensions = {version = ">=3.7.4", markers = "python_version < \"3.8\""} [[package]] name = "zipp" -version = "3.6.0" +version = "3.7.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "main" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" [package.extras] docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"] -testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] +testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-cov", "pytest-enabler (>=1.0.1)", "jaraco.itertools", "func-timeout", "pytest-black (>=0.3.7)", "pytest-mypy"] [extras] aiohttp = ["aiohttp"] @@ -1301,8 +1301,8 @@ atomicwrites = [ {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"}, ] attrs = [ - {file = "attrs-21.2.0-py2.py3-none-any.whl", hash = "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1"}, - {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"}, + {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"}, + {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"}, ] babel = [ {file = "Babel-2.9.1-py2.py3-none-any.whl", hash = "sha256:ab49e12b91d937cd11f0b67cb259a57ab4ad2b59ac7a3b41d6c06c0ac5b0def9"}, @@ -1834,8 +1834,8 @@ pathspec = [ {file = "pathspec-0.9.0.tar.gz", hash = "sha256:e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"}, ] platformdirs = [ - {file = "platformdirs-2.4.0-py3-none-any.whl", hash = "sha256:8868bbe3c3c80d42f20156f22e7131d2fb321f5bc86a2a345375c6481a67021d"}, - {file = "platformdirs-2.4.0.tar.gz", hash = "sha256:367a5e80b3d04d2428ffa76d33f124cf11e8fff2acdaa9b43d545f5c7d661ef2"}, + {file = "platformdirs-2.4.1-py3-none-any.whl", hash = "sha256:1d7385c7db91728b83efd0ca99a5afb296cab9d0ed8313a45ed8ba17967ecfca"}, + {file = "platformdirs-2.4.1.tar.gz", hash = "sha256:440633ddfebcc36264232365d7840a970e75e1018d15b4327d11f91909045fda"}, ] pluggy = [ {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, @@ -1915,8 +1915,8 @@ pydash = [ {file = "pydash-5.1.0.tar.gz", hash = "sha256:1b2b050ac1bae049cd07f5920b14fabbe52638f485d9ada1eb115a9eebff6835"}, ] pygments = [ - {file = "Pygments-2.10.0-py3-none-any.whl", hash = "sha256:b8e67fe6af78f492b3c4b3e2970c0624cbf08beb1e493b2c99b9fa1b67a20380"}, - {file = "Pygments-2.10.0.tar.gz", hash = "sha256:f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"}, + {file = "Pygments-2.11.0-py3-none-any.whl", hash = "sha256:ac8098bfc40b8e1091ad7c13490c7f4797e401d0972e8fcfadde90ffb3ed4ea9"}, + {file = "Pygments-2.11.0.tar.gz", hash = "sha256:51130f778a028f2d19c143fce00ced6f8b10f726e17599d7e91b290f6cbcda0c"}, ] pygtrie = [ {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, @@ -2169,8 +2169,8 @@ wsproto = [ {file = "wsproto-1.0.0.tar.gz", hash = "sha256:868776f8456997ad0d9720f7322b746bbe9193751b5b290b7f924659377c8c38"}, ] yapf = [ - {file = "yapf-0.31.0-py2.py3-none-any.whl", hash = "sha256:e3a234ba8455fe201eaa649cdac872d590089a18b661e39bbac7020978dd9c2e"}, - {file = "yapf-0.31.0.tar.gz", hash = "sha256:408fb9a2b254c302f49db83c59f9aa0b4b0fd0ec25be3a5c51181327922ff63d"}, + {file = "yapf-0.32.0-py2.py3-none-any.whl", hash = "sha256:8fea849025584e486fd06d6ba2bed717f396080fd3cc236ba10cb97c4c51cf32"}, + {file = "yapf-0.32.0.tar.gz", hash = "sha256:a3f5085d37ef7e3e004c4ba9f9b3e40c54ff1901cd111f05145ae313a7c67d1b"}, ] yarl = [ {file = "yarl-1.7.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:f2a8508f7350512434e41065684076f640ecce176d262a7d54f0da41d99c5a95"}, @@ -2247,6 +2247,6 @@ yarl = [ {file = "yarl-1.7.2.tar.gz", hash = "sha256:45399b46d60c253327a460e99856752009fcee5f5d3c80b2f7c0cae1c38d56dd"}, ] zipp = [ - {file = "zipp-3.6.0-py3-none-any.whl", hash = "sha256:9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc"}, - {file = "zipp-3.6.0.tar.gz", hash = "sha256:71c644c5369f4a6e07636f0aa966270449561fcea2e3d6747b8d23efaa9d7832"}, + {file = "zipp-3.7.0-py3-none-any.whl", hash = "sha256:b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375"}, + {file = "zipp-3.7.0.tar.gz", hash = "sha256:9f50f446828eb9d45b267433fd3e9da8d801f614129124863f9c51ebceafb87d"}, ] diff --git a/tests/plugins/matcher.py b/tests/plugins/matcher.py index 3621b850..016e2238 100644 --- a/tests/plugins/matcher.py +++ b/tests/plugins/matcher.py @@ -66,8 +66,27 @@ async def preset(matcher: Matcher, message: Message = EventMessage()): @test_preset.got("a") -async def reject_preset(a: str = ArgStr()): +@test_preset.got("b") +async def reject_preset(a: str = ArgStr(), b: str = ArgStr()): if a == "text": await test_preset.reject_arg("a") assert a == "text_next" + assert b == "text" + + +test_overload = on_message() + + +class FakeEvent(Event): + ... + + +@test_overload.got("a") +async def overload(event: FakeEvent): + await test_overload.reject_arg("a") + + +@test_overload.handle() +async def finish(): + await test_overload.finish() diff --git a/tests/test_matcher.py b/tests/test_matcher.py index 403aeab1..61f8c73c 100644 --- a/tests/test_matcher.py +++ b/tests/test_matcher.py @@ -12,6 +12,7 @@ async def test_matcher(app: App, load_plugin): test_preset, test_combine, test_receive, + test_overload, ) message = make_fake_message()("text") @@ -64,5 +65,12 @@ async def test_matcher(app: App, load_plugin): async with app.test_matcher(test_preset) as ctx: bot = ctx.create_bot() ctx.receive_event(bot, event) + ctx.receive_event(bot, event) ctx.should_rejected() ctx.receive_event(bot, event_next) + + assert len(test_overload.handlers) == 2 + async with app.test_matcher(test_overload) as ctx: + bot = ctx.create_bot() + ctx.receive_event(bot, event) + ctx.should_finished() From 78d0ec847edb5e09570e22813bdba149155e3acb Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Fri, 31 Dec 2021 23:58:59 +0800 Subject: [PATCH 159/174] :construction: add handler di example --- docs/.vuepress/components/Adapter.vue | 228 ---------------- docs/.vuepress/components/Bot.vue | 194 -------------- docs/.vuepress/components/Messenger.vue | 219 --------------- docs/.vuepress/components/Plugin.vue | 230 ---------------- docs/.vuepress/components/PublishCard.vue | 84 ------ docs/.vuepress/components/Store.vue | 70 ----- nonebot/params.py | 50 ++-- .../docs/tutorial/plugin/create-handler.md | 249 ++++++++++++++++++ website/src/components/Adapter.tsx | 227 +++++++++++++++- website/src/components/Bot.tsx | 196 +++++++++++++- website/static/bots.json | 8 + website/static/plugins.json | 80 ++++++ 12 files changed, 780 insertions(+), 1055 deletions(-) delete mode 100644 docs/.vuepress/components/Adapter.vue delete mode 100644 docs/.vuepress/components/Bot.vue delete mode 100644 docs/.vuepress/components/Messenger.vue delete mode 100644 docs/.vuepress/components/Plugin.vue delete mode 100644 docs/.vuepress/components/PublishCard.vue delete mode 100644 docs/.vuepress/components/Store.vue diff --git a/docs/.vuepress/components/Adapter.vue b/docs/.vuepress/components/Adapter.vue deleted file mode 100644 index 7d7bf7f2..00000000 --- a/docs/.vuepress/components/Adapter.vue +++ /dev/null @@ -1,228 +0,0 @@ - - - diff --git a/docs/.vuepress/components/Bot.vue b/docs/.vuepress/components/Bot.vue deleted file mode 100644 index b2d797d6..00000000 --- a/docs/.vuepress/components/Bot.vue +++ /dev/null @@ -1,194 +0,0 @@ - - - diff --git a/docs/.vuepress/components/Messenger.vue b/docs/.vuepress/components/Messenger.vue deleted file mode 100644 index 9e694df2..00000000 --- a/docs/.vuepress/components/Messenger.vue +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - diff --git a/docs/.vuepress/components/Plugin.vue b/docs/.vuepress/components/Plugin.vue deleted file mode 100644 index 771e0705..00000000 --- a/docs/.vuepress/components/Plugin.vue +++ /dev/null @@ -1,230 +0,0 @@ - - - diff --git a/docs/.vuepress/components/PublishCard.vue b/docs/.vuepress/components/PublishCard.vue deleted file mode 100644 index b6c0a5ac..00000000 --- a/docs/.vuepress/components/PublishCard.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - diff --git a/docs/.vuepress/components/Store.vue b/docs/.vuepress/components/Store.vue deleted file mode 100644 index b672b1aa..00000000 --- a/docs/.vuepress/components/Store.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - diff --git a/nonebot/params.py b/nonebot/params.py index 61548e13..1aa7715f 100644 --- a/nonebot/params.py +++ b/nonebot/params.py @@ -183,19 +183,20 @@ class BotParam(Param): ) -> Optional["BotParam"]: if param.default == param.empty: if generic_check_issubclass(param.annotation, Bot): - dependent.pre_checkers.append( - _BotChecker( - Required, - field=ModelField( - name="", - type_=param.annotation, - class_validators=None, - model_config=CustomConfig, - default=None, - required=True, - ), + if param.annotation is not Bot: + dependent.pre_checkers.append( + _BotChecker( + Required, + field=ModelField( + name="", + type_=param.annotation, + class_validators=None, + model_config=CustomConfig, + default=None, + required=True, + ), + ) ) - ) return cls(Required) elif param.annotation == param.empty and name == "bot": return cls(Required) @@ -223,19 +224,20 @@ class EventParam(Param): ) -> Optional["EventParam"]: if param.default == param.empty: if generic_check_issubclass(param.annotation, Event): - dependent.pre_checkers.append( - _EventChecker( - Required, - field=ModelField( - name="", - type_=param.annotation, - class_validators=None, - model_config=CustomConfig, - default=None, - required=True, - ), + if param.annotation is not Event: + dependent.pre_checkers.append( + _EventChecker( + Required, + field=ModelField( + name="", + type_=param.annotation, + class_validators=None, + model_config=CustomConfig, + default=None, + required=True, + ), + ) ) - ) return cls(Required) elif param.annotation == param.empty and name == "event": return cls(Required) diff --git a/website/docs/tutorial/plugin/create-handler.md b/website/docs/tutorial/plugin/create-handler.md index 7504aa42..95b29b20 100644 --- a/website/docs/tutorial/plugin/create-handler.md +++ b/website/docs/tutorial/plugin/create-handler.md @@ -15,3 +15,252 @@ options: ## 添加一个处理依赖 ## 事件处理流程 + +## 获取上下文信息 + +### Bot + +```python {7-9} +from typing import Union + +from nonebot.adapters import Bot +from nonebot.adapters.ding import Bot as DingBot +from nonebot.adapters.onebot.v11 import Bot as OneBotV11Bot + +async def _(foo: Bot): ... +async def _(foo: Union[DingBot, OneBotV11Bot]): ... +async def _(bot): ... # 兼容性处理 +``` + +### Event + +```python {6-8} +from typing import Union + +from nonebot.adapters import Event +from nonebot.adapters.onebot.v11 import PrivateMessageEvent, GroupMessageEvent + +async def _(foo: Event): ... +async def _(foo: Union[PrivateMessageEvent, GroupMessageEvent]): ... +async def _(event): ... # 兼容性处理 +``` + +### EventType + +```python {3} +from nonebot.params import EventType + +async def _(foo: str = EventType()): ... +``` + +### EventMessage + +```python {4} +from nonebot.adapters import Message +from nonebot.params import EventMessage + +async def _(foo: str = EventMessage()): ... +``` + +### EventPlainText + +```python {3} +from nonebot.params import EventPlainText + +async def _(foo: str = EventPlainText()): ... +``` + +### EventToMe + +```python {3} +from nonebot.params import EventToMe + +async def _(foo: bool = EventToMe()): ... +``` + +### State + +```python {4} +from nonebot.params import State +from nonebot.typing import T_State + +async def _(foo: T_State = State()): ... +``` + +### Command + +```python {7} +from nonebot import on_command +from nonebot.params import Command + +matcher = on_command("cmd") + +@matcher.handle() +async def _(foo: Tuple[str, ...] = Command()): ... +``` + +### CommandArg + +```python {8} +from nonebot import on_command +from nonebot.adapters import Message +from nonebot.params import CommandArg + +matcher = on_command("cmd") + +@matcher.handle() +async def _(foo: Message = CommandArg()): ... +``` + +### ShellCommandArgs + +```python {7} +from nonebot import on_command +from nonebot.params import ShellCommandArgs + +matcher = on_shell_command("cmd", parser) + +@matcher.handle() +async def _(foo: Dict[str, Any] = ShellCommandArgs()): ... +``` + +### ShellCommandArgv + +```python {7} +from nonebot import on_command +from nonebot.params import ShellCommandArgs + +matcher = on_shell_command("cmd") + +@matcher.handle() +async def _(foo: List[str] = ShellCommandArgv()): ... +``` + +### RegexMatched + +```python {7} +from nonebot import on_regex +from nonebot.params import RegexMatched + +matcher = on_regex("regex") + +@matcher.handle() +async def _(foo: str = RegexMatched()): ... +``` + +### RegexGroup + +```python {7} +from nonebot import on_regex +from nonebot.params import RegexGroup + +matcher = on_regex("regex") + +@matcher.handle() +async def _(foo: Tuple[Any, ...] = RegexGroup()): ... +``` + +### RegexDict + +```python {7} +from nonebot import on_regex +from nonebot.params import RegexDict + +matcher = on_regex("regex") + +@matcher.handle() +async def _(foo: Dict[str, Any] = RegexDict()): ... +``` + +### Matcher + +```python {7} +from nonebot import on_message +from nonebot.matcher import Matcher + +foo = on_message() + +@foo.handle() +async def _(matcher: Matcher): ... +``` + +### Received + +```python {8} +from nonebot import on_message +from nonebot.adapters import Event +from nonebot.params import Received + +matcher = on_message() + +@matcher.receive("id") +async def _(foo: Event = Received("id")): ... +``` + +### LastReceived + +```python {8} +from nonebot import on_message +from nonebot.adapters import Event +from nonebot.params import LastReceived + +matcher = on_message() + +@matcher.receive("any") +async def _(foo: Event = LastReceived()): ... +``` + +### Arg + +```python {8-9} +from nonebot.params import Arg +from nonebot import on_message +from nonebot.adapters import Message + +matcher = on_message() + +@matcher.got("key") +async def _(key: Message = Arg()): ... +async def _(foo: Message = Arg("key")): ... +``` + +### ArgStr + +```python {7-8} +from nonebot import on_message +from nonebot.params import ArgStr + +matcher = on_message() + +@matcher.got("key") +async def _(key: str = ArgStr()): ... +async def _(foo: str = ArgStr("key")): ... +``` + +### ArgPlainText + +```python {7-8} +from nonebot import on_message +from nonebot.params import ArgPlainText + +matcher = on_message() + +@matcher.got("key") +async def _(key: str = ArgPlainText()): ... +async def _(foo: str = ArgPlainText("key")): ... +``` + +### Exception + +```python {4} +from nonebot.message import run_postprocessor + +@run_postprocessor +async def _(e: Exception): ... +``` + +### Default + +```python {1} +async def _(foo="bar"): ... +``` diff --git a/website/src/components/Adapter.tsx b/website/src/components/Adapter.tsx index d72305b1..ba0b257d 100644 --- a/website/src/components/Adapter.tsx +++ b/website/src/components/Adapter.tsx @@ -1,12 +1,20 @@ -import React from "react"; +import clsx from "clsx"; +import React, { useRef, useState } from "react"; +import { ChromePicker } from "react-color"; import { usePagination } from "react-use-pagination"; import adapters from "../../static/adapters.json"; -import { useFilteredObjs } from "../libs/store"; +import { Tag, useFilteredObjs } from "../libs/store"; import Card from "./Card"; +import Modal from "./Modal"; +import ModalAction from "./ModalAction"; +import ModalContent from "./ModalContent"; +import ModalTitle from "./ModalTitle"; import Paginate from "./Paginate"; +import TagComponent from "./Tag"; export default function Adapter(): JSX.Element { + const [modalOpen, setModalOpen] = useState(false); const { filter, setFilter, @@ -20,6 +28,93 @@ export default function Adapter(): JSX.Element { const { startIndex, endIndex } = props; const currentAdapters = filteredAdapters.slice(startIndex, endIndex + 1); + const [form, setForm] = useState<{ + name: string; + desc: string; + projectLink: string; + moduleName: string; + homepage: string; + }>({ name: "", desc: "", projectLink: "", moduleName: "", homepage: "" }); + + const ref = useRef(null); + const [tags, setTags] = useState([]); + const [label, setLabel] = useState(""); + const [color, setColor] = useState("#ea5252"); + + const onSubmit = () => { + setModalOpen(false); + const title = encodeURIComponent(`Adapter: ${form.name}`).replace( + /%2B/gi, + "+" + ); + const body = encodeURIComponent( + ` +**协议名称：** + +${form.name} + +**协议功能：** + +${form.desc} + +**PyPI 项目名：** + +${form.projectLink} + +**协议 import 包名：** + +${form.moduleName} + +**协议项目仓库/主页链接：** + +${form.homepage} + +**标签：** + +${JSON.stringify(tags)} +`.trim() + ).replace(/%2B/gi, "+"); + window.open( + `https://github.com/nonebot/nonebot2/issues/new?title=${title}&body=${body}&labels=Adapter` + ); + }; + const onChange = (event) => { + const target = event.target; + const value = target.type === "checkbox" ? target.checked : target.value; + const name = target.name; + + setForm({ + ...form, + [name]: value, + }); + event.preventDefault(); + }; + const onChangeLabel = (event) => { + setLabel(event.target.value); + }; + const onChangeColor = (color) => { + setColor(color.hex); + }; + const validateTag = () => { + return label.length >= 1 && label.length <= 10; + }; + const newTag = () => { + if (tags.length >= 3) { + return; + } + if (validateTag()) { + const tag = { label, color }; + setTags([...tags, tag]); + } + }; + const delTag = (index: number) => { + setTags(tags.filter((_, i) => i !== index)); + }; + const insertTagType = (text: string) => { + setLabel(text + label); + ref.current.value = text + label; + }; + return ( <>
@@ -29,7 +124,10 @@ export default function Adapter(): JSX.Element { placeholder="搜索适配器" onChange={(event) => setFilter(event.target.value)} /> -
@@ -44,6 +142,129 @@ export default function Adapter(): JSX.Element {
+ + + +
+
+ + + + + +
+
+
+ +
+
+ + +
+ Type: + + +
+
+ + +
+
+ + + + + + ); } diff --git a/website/src/components/Bot.tsx b/website/src/components/Bot.tsx index 3994f14e..86bbb625 100644 --- a/website/src/components/Bot.tsx +++ b/website/src/components/Bot.tsx @@ -1,12 +1,20 @@ -import React from "react"; +import clsx from "clsx"; +import React, { useRef, useState } from "react"; +import { ChromePicker } from "react-color"; import { usePagination } from "react-use-pagination"; import bots from "../../static/bots.json"; -import { useFilteredObjs } from "../libs/store"; +import { Tag, useFilteredObjs } from "../libs/store"; import Card from "./Card"; +import Modal from "./Modal"; +import ModalAction from "./ModalAction"; +import ModalContent from "./ModalContent"; +import ModalTitle from "./ModalTitle"; import Paginate from "./Paginate"; +import TagComponent from "./Tag"; export default function Adapter(): JSX.Element { + const [modalOpen, setModalOpen] = useState(false); const { filter, setFilter, @@ -20,6 +28,80 @@ export default function Adapter(): JSX.Element { const { startIndex, endIndex } = props; const currentBots = filteredBots.slice(startIndex, endIndex + 1); + const [form, setForm] = useState<{ + name: string; + desc: string; + homepage: string; + }>({ name: "", desc: "", homepage: "" }); + + const ref = useRef(null); + const [tags, setTags] = useState([]); + const [label, setLabel] = useState(""); + const [color, setColor] = useState("#ea5252"); + + const onSubmit = () => { + setModalOpen(false); + const title = encodeURIComponent(`Bot: ${form.name}`).replace(/%2B/gi, "+"); + const body = encodeURIComponent( + ` +**机器人名称：** + +${form.name} + +**机器人功能：** + +${form.desc} + +**机器人项目仓库/主页链接：** + +${form.homepage} + +**标签：** + +${JSON.stringify(tags)} +`.trim() + ).replace(/%2B/gi, "+"); + window.open( + `https://github.com/nonebot/nonebot2/issues/new?title=${title}&body=${body}&labels=Bot` + ); + }; + const onChange = (event) => { + const target = event.target; + const value = target.type === "checkbox" ? target.checked : target.value; + const name = target.name; + + setForm({ + ...form, + [name]: value, + }); + event.preventDefault(); + }; + const onChangeLabel = (event) => { + setLabel(event.target.value); + }; + const onChangeColor = (color) => { + setColor(color.hex); + }; + const validateTag = () => { + return label.length >= 1 && label.length <= 10; + }; + const newTag = () => { + if (tags.length >= 3) { + return; + } + if (validateTag()) { + const tag = { label, color }; + setTags([...tags, tag]); + } + }; + const delTag = (index: number) => { + setTags(tags.filter((_, i) => i !== index)); + }; + const insertTagType = (text: string) => { + setLabel(text + label); + ref.current.value = text + label; + }; + return ( <>
@@ -29,7 +111,10 @@ export default function Adapter(): JSX.Element { placeholder="搜索机器人" onChange={(event) => setFilter(event.target.value)} /> -
@@ -44,6 +129,111 @@ export default function Adapter(): JSX.Element {
+ + + +
+
+ + + +
+
+
+ +
+
+ + +
+ Type: + + +
+
+ + +
+
+ + + + + + ); } diff --git a/website/static/bots.json b/website/static/bots.json index 5eeca3ae..4b9f7086 100644 --- a/website/static/bots.json +++ b/website/static/bots.json @@ -94,5 +94,13 @@ "homepage": "https://github.com/ssttkkl/PixivBot", "tags": [], "is_official": false + }, + { + "name": "SeaBot_QQ", + "desc": "一个能够获取新闻资讯并推送至QQ的群聊机器人。", + "author": "B1ue1nWh1te", + "homepage": "https://github.com/B1ue1nWh1te/SeaBot_QQ", + "tags": [], + "is_official": false } ] diff --git a/website/static/plugins.json b/website/static/plugins.json index ad3a2c33..604cb930 100644 --- a/website/static/plugins.json +++ b/website/static/plugins.json @@ -688,5 +688,85 @@ "homepage": "https://github.com/yzyyz1387/nonebot_plugin_heisi", "tags": [], "is_official": false + }, + { + "module_name": "nonebot_plugin_picsbank", + "project_link": "nonebot-plugin-picsbank", + "name": "picsbank", + "desc": "匹配图片进行回答", + "author": "Diaosi1111", + "homepage": "https://github.com/Diaosi1111/nonebot_plugin_picsbank", + "tags": [], + "is_official": false + }, + { + "module_name": "nonebot_plugin_tvseries", + "project_link": "nonebot-plugin-tvseries", + "name": "剧集更新列表", + "desc": "获取聚集更新", + "author": "kexue-z", + "homepage": "https://github.com/kexue-z/nonebot-plugin-tvseries", + "tags": [], + "is_official": false + }, + { + "module_name": "nonebot_plugin_lolmatch", + "project_link": "nonebot-plugin-lolmatch", + "name": "lol比赛信息", + "desc": "简单的lol比赛信息插件，订阅后会定时推送当日比赛结果", + "author": "Diaosi1111", + "homepage": "https://github.com/Diaosi1111/nonebot_plugin_lolmatch", + "tags": [], + "is_official": false + }, + { + "module_name": "OlivOS", + "project_link": "olivos.nb2", + "name": "OlivOS.nb2", + "desc": "在 NoneBot2 中加载 OlivOS 插件", + "author": "j1g5awi", + "homepage": "https://github.com/nonepkg/OlivOS.nb2", + "tags": [], + "is_official": false + }, + { + "module_name": "nonebot_plugin_htmlrender", + "project_link": "nonebot-plugin-htmlrender", + "name": "通过浏览器来生成图片", + "desc": "通过playwright加一点点前端知识来简单的生成图片", + "author": "kexue-z", + "homepage": "https://github.com/kexue-z/nonebot-plugin-htmlrender", + "tags": [], + "is_official": false + }, + { + "module_name": "nonebot_plugin_admin", + "project_link": "nonebot-plugin-admin", + "name": "简易群管", + "desc": "简易群管 踢 禁 改", + "author": "yzyyz1387", + "homepage": "https://github.com/yzyyz1387/nonebot_plugin_admin", + "tags": [], + "is_official": false + }, + { + "module_name": "nonebot_plugin_logo", + "project_link": "nonebot-plugin-logo", + "name": "nonebot-plugin-logo", + "desc": "PornHub、Youtube 等风格logo生成", + "author": "MeetWq", + "homepage": "https://github.com/MeetWq/nonebot-plugin-logo", + "tags": [], + "is_official": false + }, + { + "module_name": "nonebot_plugin_memes", + "project_link": "nonebot-plugin-memes", + "name": "Memes generator", + "desc": "表情包制作", + "author": "MeetWq", + "homepage": "https://github.com/MeetWq/nonebot-plugin-memes", + "tags": [], + "is_official": false } ] From 574d4366a6bcebeddffc835c77d9aa43629391df Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sat, 1 Jan 2022 12:07:33 +0800 Subject: [PATCH 160/174] :art: improve tag style --- website/src/components/Tag/index.tsx | 2 +- website/static/plugins.json | 32 ++++++++++++++++++++++++---- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/website/src/components/Tag/index.tsx b/website/src/components/Tag/index.tsx index 303923ef..bebe1312 100644 --- a/website/src/components/Tag/index.tsx +++ b/website/src/components/Tag/index.tsx @@ -23,7 +23,7 @@ export default function Tag({ return ( Date: Sat, 1 Jan 2022 16:43:35 +0800 Subject: [PATCH 161/174] :arrow_up: upgrade nonepress --- yarn.lock | 2212 ++++++++++++++++++++++++++--------------------------- 1 file changed, 1103 insertions(+), 1109 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3c66aac3..5ab23e40 100644 --- a/yarn.lock +++ b/yarn.lock @@ -130,16 +130,16 @@ "@algolia/logger-common" "4.11.0" "@algolia/requester-common" "4.11.0" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.8.3": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/code-frame/download/@babel/code-frame-7.16.0.tgz?cache=0&sync_timestamp=1635560657003&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcode-frame%2Fdownload%2F%40babel%2Fcode-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" - integrity sha1-DfyAMJvuyEEeZecGRhxAiwu5tDE= +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/code-frame/download/@babel/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" + integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== dependencies: - "@babel/highlight" "^7.16.0" + "@babel/highlight" "^7.16.7" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.0", "@babel/compat-data@^7.16.4": +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4": version "7.16.4" - resolved "https://registry.npmmirror.com/@babel/compat-data/download/@babel/compat-data-7.16.4.tgz?cache=0&sync_timestamp=1637102860099&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcompat-data%2Fdownload%2F%40babel%2Fcompat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" + resolved "https://registry.npmmirror.com/@babel/compat-data/download/@babel/compat-data-7.16.4.tgz?cache=0&sync_timestamp=1637102917946&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fcompat-data%2Fdownload%2F%40babel%2Fcompat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q== "@babel/core@7.12.9": @@ -165,19 +165,19 @@ source-map "^0.5.0" "@babel/core@^7.12.16", "@babel/core@^7.12.3": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/core/download/@babel/core-7.16.5.tgz#924aa9e1ae56e1e55f7184c8bf073a50d8677f5c" - integrity sha512-wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ== + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/core/download/@babel/core-7.16.7.tgz#db990f931f6d40cb9b87a0dc7d2adc749f1dcbcf" + integrity sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA== dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/generator" "^7.16.5" - "@babel/helper-compilation-targets" "^7.16.3" - "@babel/helper-module-transforms" "^7.16.5" - "@babel/helpers" "^7.16.5" - "@babel/parser" "^7.16.5" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.5" - "@babel/types" "^7.16.0" + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.16.7" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helpers" "^7.16.7" + "@babel/parser" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.16.7" + "@babel/types" "^7.16.7" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -185,64 +185,64 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.12.15", "@babel/generator@^7.12.5", "@babel/generator@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/generator/download/@babel/generator-7.16.5.tgz#26e1192eb8f78e0a3acaf3eede3c6fc96d22bedf" - integrity sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA== +"@babel/generator@^7.12.15", "@babel/generator@^7.12.5", "@babel/generator@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/generator/download/@babel/generator-7.16.7.tgz#b42bf46a3079fa65e1544135f32e7958f048adbb" + integrity sha512-/ST3Sg8MLGY5HVYmrjOgL60ENux/HfO/CsUh7y4MalThufhE/Ff/6EibFDHi4jiDCaWfJKoqbE6oTh21c5hrRg== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" - integrity sha1-mh8OvNpT2aLQAQjEzqzmpdXx8I0= +"@babel/helper-annotate-as-pure@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/download/@babel/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862" + integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/download/@babel/helper-builder-binary-assignment-operator-visitor-7.16.5.tgz#a8429d064dce8207194b8bf05a70a9ea828746af" - integrity sha512-3JEA9G5dmmnIWdzaT9d0NmFRgYnWUThLsDaL7982H0XqqWr56lRrsmwheXFMjR+TMl7QMBb6mzy9kvgr1lRLUA== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/download/@babel/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b" + integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA== dependencies: - "@babel/helper-explode-assignable-expression" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/helper-explode-assignable-expression" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.3": - version "7.16.3" - resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/download/@babel/helper-compilation-targets-7.16.3.tgz?cache=0&sync_timestamp=1636496295030&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-compilation-targets%2Fdownload%2F%40babel%2Fhelper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" - integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA== +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-compilation-targets/download/@babel/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b" + integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA== dependencies: - "@babel/compat-data" "^7.16.0" - "@babel/helper-validator-option" "^7.14.5" + "@babel/compat-data" "^7.16.4" + "@babel/helper-validator-option" "^7.16.7" browserslist "^4.17.5" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.16.0", "@babel/helper-create-class-features-plugin@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/download/@babel/helper-create-class-features-plugin-7.16.5.tgz#5d1bcd096792c1ebec6249eebc6358eec55d0cad" - integrity sha512-NEohnYA7mkB8L5JhU7BLwcBdU3j83IziR9aseMueWGeAjblbul3zzb8UvJ3a1zuBiqCMObzCJHFqKIQE6hTVmg== +"@babel/helper-create-class-features-plugin@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/download/@babel/helper-create-class-features-plugin-7.16.7.tgz#9c5b34b53a01f2097daf10678d65135c1b9f84ba" + integrity sha512-kIFozAvVfK05DM4EVQYKK+zteWvY85BFdGBRQBytRyY3y+6PX0DkDOn/CZ3lEuczCfrCxEzwt0YtP/87YPTWSw== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-environment-visitor" "^7.16.5" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-member-expression-to-functions" "^7.16.5" - "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/helper-replace-supers" "^7.16.5" - "@babel/helper-split-export-declaration" "^7.16.0" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-member-expression-to-functions" "^7.16.7" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/helper-replace-supers" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" -"@babel/helper-create-regexp-features-plugin@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/download/@babel/helper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" - integrity sha1-BrI0jON/zMT14Y3NjXUFPyp8RP8= +"@babel/helper-create-regexp-features-plugin@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/download/@babel/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48" + integrity sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" + "@babel/helper-annotate-as-pure" "^7.16.7" regexpu-core "^4.7.1" "@babel/helper-define-polyfill-provider@^0.3.0": version "0.3.0" - resolved "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/download/@babel/helper-define-polyfill-provider-0.3.0.tgz?cache=0&sync_timestamp=1636799795992&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-define-polyfill-provider%2Fdownload%2F%40babel%2Fhelper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971" + resolved "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/download/@babel/helper-define-polyfill-provider-0.3.0.tgz?cache=0&sync_timestamp=1636802677759&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-define-polyfill-provider%2Fdownload%2F%40babel%2Fhelper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971" integrity sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg== dependencies: "@babel/helper-compilation-targets" "^7.13.0" @@ -254,260 +254,260 @@ resolve "^1.14.2" semver "^6.1.2" -"@babel/helper-environment-visitor@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/helper-environment-visitor/download/@babel/helper-environment-visitor-7.16.5.tgz#f6a7f38b3c6d8b07c88faea083c46c09ef5451b8" - integrity sha512-ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg== +"@babel/helper-environment-visitor@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-environment-visitor/download/@babel/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7" + integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-explode-assignable-expression@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-explode-assignable-expression/download/@babel/helper-explode-assignable-expression-7.16.0.tgz?cache=0&sync_timestamp=1635567269941&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-explode-assignable-expression%2Fdownload%2F%40babel%2Fhelper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778" - integrity sha1-dTAXM3oV9G+cCfZ0z/EM7pudd3g= +"@babel/helper-explode-assignable-expression@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-explode-assignable-expression/download/@babel/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a" + integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-function-name@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-function-name/download/@babel/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481" - integrity sha1-t90Hl9ALv+5PB+nE6lsOMMi7FIE= +"@babel/helper-function-name@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-function-name/download/@babel/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f" + integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA== dependencies: - "@babel/helper-get-function-arity" "^7.16.0" - "@babel/template" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/helper-get-function-arity" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-get-function-arity@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-get-function-arity/download/@babel/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa" - integrity sha1-AIjHSGspqctdlIsaHeRttm4InPo= +"@babel/helper-get-function-arity@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-get-function-arity/download/@babel/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" + integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-hoist-variables@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-hoist-variables/download/@babel/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" - integrity sha1-TJAjwvHe9+KP9G/B2802o5vqqBo= +"@babel/helper-hoist-variables@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-hoist-variables/download/@babel/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246" + integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-member-expression-to-functions@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/download/@babel/helper-member-expression-to-functions-7.16.5.tgz#1bc9f7e87354e86f8879c67b316cb03d3dc2caab" - integrity sha512-7fecSXq7ZrLE+TWshbGT+HyCLkxloWNhTbU2QM1NTI/tDqyf0oZiMcEfYtDuUDCo528EOlt39G1rftea4bRZIw== +"@babel/helper-member-expression-to-functions@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/download/@babel/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0" + integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-module-imports/download/@babel/helper-module-imports-7.16.0.tgz?cache=0&sync_timestamp=1635560941965&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-module-imports%2Fdownload%2F%40babel%2Fhelper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" - integrity sha1-kFOOYLZy7PG0SPX09UM9N+eaPsM= +"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-module-imports/download/@babel/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437" + integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/helper-module-transforms/download/@babel/helper-module-transforms-7.16.5.tgz#530ebf6ea87b500f60840578515adda2af470a29" - integrity sha512-CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ== +"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-module-transforms/download/@babel/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41" + integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng== dependencies: - "@babel/helper-environment-visitor" "^7.16.5" - "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-simple-access" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" - "@babel/helper-validator-identifier" "^7.15.7" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.5" - "@babel/types" "^7.16.0" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-simple-access" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/helper-validator-identifier" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-optimise-call-expression@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-optimise-call-expression/download/@babel/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338" - integrity sha1-zs2xRdcMVAlrFWT46fEM19GTszg= +"@babel/helper-optimise-call-expression@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-optimise-call-expression/download/@babel/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2" + integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" "@babel/helper-plugin-utils@7.10.4": version "7.10.4" resolved "https://registry.npmmirror.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" integrity sha1-L3WoMSadT2d95JmG3/WZJ1M883U= -"@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.14.5", "@babel/helper-plugin-utils@^7.16.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.16.5.tgz#afe37a45f39fce44a3d50a7958129ea5b1a5c074" - integrity sha512-59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ== +"@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.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" + integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== -"@babel/helper-remap-async-to-generator@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/download/@babel/helper-remap-async-to-generator-7.16.5.tgz#e706646dc4018942acb4b29f7e185bc246d65ac3" - integrity sha512-X+aAJldyxrOmN9v3FKp+Hu1NO69VWgYgDGq6YDykwRPzxs5f2N+X988CBXS7EQahDU+Vpet5QYMqLk+nsp+Qxw== +"@babel/helper-remap-async-to-generator@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/download/@babel/helper-remap-async-to-generator-7.16.7.tgz#5ce2416990d55eb6e099128338848ae8ffa58a9a" + integrity sha512-C3o117GnP/j/N2OWo+oepeWbFEKRfNaay+F1Eo5Mj3A1SRjyx+qaFhm23nlipub7Cjv2azdUUiDH+VlpdwUFRg== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-wrap-function" "^7.16.5" - "@babel/types" "^7.16.0" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-wrap-function" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-replace-supers@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/helper-replace-supers/download/@babel/helper-replace-supers-7.16.5.tgz#96d3988bd0ab0a2d22c88c6198c3d3234ca25326" - integrity sha512-ao3seGVa/FZCMCCNDuBcqnBFSbdr8N2EW35mzojx3TwfIbdPmNK+JV6+2d5bR0Z71W5ocLnQp9en/cTF7pBJiQ== +"@babel/helper-replace-supers@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-replace-supers/download/@babel/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1" + integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw== dependencies: - "@babel/helper-environment-visitor" "^7.16.5" - "@babel/helper-member-expression-to-functions" "^7.16.5" - "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/traverse" "^7.16.5" - "@babel/types" "^7.16.0" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-member-expression-to-functions" "^7.16.7" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/traverse" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helper-simple-access@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-simple-access/download/@babel/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" - integrity sha1-IdaidiDjg+N1NM9sELugGab5BRc= +"@babel/helper-simple-access@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-simple-access/download/@babel/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7" + integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/download/@babel/helper-skip-transparent-expression-wrappers-7.16.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-skip-transparent-expression-wrappers%2Fdownload%2F%40babel%2Fhelper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" + resolved "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/download/@babel/helper-skip-transparent-expression-wrappers-7.16.0.tgz?cache=0&sync_timestamp=1635567004674&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fhelper-skip-transparent-expression-wrappers%2Fdownload%2F%40babel%2Fhelper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" integrity sha1-DuM4gHAUfDrgUeSH7KPrsOLouwk= dependencies: "@babel/types" "^7.16.0" -"@babel/helper-split-export-declaration@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/helper-split-export-declaration/download/@babel/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" - integrity sha1-KWcvQ2Y+k23zcKrrIr7ds7rsdDg= +"@babel/helper-split-export-declaration@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-split-export-declaration/download/@babel/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b" + integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" -"@babel/helper-validator-identifier@^7.15.7": - version "7.15.7" - resolved "https://registry.nlark.com/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.15.7.tgz?cache=0&sync_timestamp=1631920857390&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fhelper-validator-identifier%2Fdownload%2F%40babel%2Fhelper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" - integrity sha1-Ig35k7/pBKSmsCq08zhaXr9uI4k= +"@babel/helper-validator-identifier@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-validator-identifier/download/@babel/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" + integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== -"@babel/helper-validator-option@^7.14.5": - version "7.14.5" - resolved "https://registry.nlark.com/@babel/helper-validator-option/download/@babel/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" - integrity sha1-bnKh//GNXfy4eOHmLxoCHEty1aM= +"@babel/helper-validator-option@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-validator-option/download/@babel/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23" + integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ== -"@babel/helper-wrap-function@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/helper-wrap-function/download/@babel/helper-wrap-function-7.16.5.tgz#0158fca6f6d0889c3fee8a6ed6e5e07b9b54e41f" - integrity sha512-2J2pmLBqUqVdJw78U0KPNdeE2qeuIyKoG4mKV7wAq3mc4jJG282UgjZw4ZYDnqiWQuS3Y3IYdF/AQ6CpyBV3VA== +"@babel/helper-wrap-function@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helper-wrap-function/download/@babel/helper-wrap-function-7.16.7.tgz#8ddf9eaa770ed43de4bc3687f3f3b0d6d5ecf014" + integrity sha512-7a9sABeVwcunnztZZ7WTgSw6jVYLzM1wua0Z4HIXm9S3/HC96WKQTkFgGEaj5W06SHHihPJ6Le6HzS5cGOQMNw== dependencies: - "@babel/helper-function-name" "^7.16.0" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.5" - "@babel/types" "^7.16.0" + "@babel/helper-function-name" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/helpers@^7.12.5", "@babel/helpers@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/helpers/download/@babel/helpers-7.16.5.tgz#29a052d4b827846dd76ece16f565b9634c554ebd" - integrity sha512-TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw== +"@babel/helpers@^7.12.5", "@babel/helpers@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/helpers/download/@babel/helpers-7.16.7.tgz#7e3504d708d50344112767c3542fc5e357fffefc" + integrity sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw== dependencies: - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.5" - "@babel/types" "^7.16.0" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/highlight@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/highlight/download/@babel/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" - integrity sha1-bOsysspLj182H7f9gh4/3fShclo= +"@babel/highlight@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/highlight/download/@babel/highlight-7.16.7.tgz#81a01d7d675046f0d96f82450d9d9578bdfd6b0b" + integrity sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw== dependencies: - "@babel/helper-validator-identifier" "^7.15.7" + "@babel/helper-validator-identifier" "^7.16.7" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.12.16", "@babel/parser@^7.12.7", "@babel/parser@^7.16.0", "@babel/parser@^7.16.5": - version "7.16.6" - resolved "https://registry.npmmirror.com/@babel/parser/download/@babel/parser-7.16.6.tgz#8f194828193e8fa79166f34a4b4e52f3e769a314" - integrity sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ== +"@babel/parser@^7.12.16", "@babel/parser@^7.12.7", "@babel/parser@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/parser/download/@babel/parser-7.16.7.tgz#d372dda9c89fcec340a82630a9f533f2fe15877e" + integrity sha512-sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA== -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.2": - version "7.16.2" - resolved "https://registry.npmmirror.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/download/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2.tgz?cache=0&sync_timestamp=1635837362783&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fplugin-bugfix-safari-id-destructuring-collision-in-function-expression%2Fdownload%2F%40babel%2Fplugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2.tgz#2977fca9b212db153c195674e57cfab807733183" - integrity sha1-KXf8qbIS2xU8GVZ05Xz6uAdzMYM= +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/download/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050" + integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/download/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz#358972eaab006f5eb0826183b0c93cbcaf13e1e2" - integrity sha1-NYly6qsAb16wgmGDsMk8vK8T4eI= +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/download/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9" + integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" - "@babel/plugin-proposal-optional-chaining" "^7.16.0" + "@babel/plugin-proposal-optional-chaining" "^7.16.7" -"@babel/plugin-proposal-async-generator-functions@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-async-generator-functions/download/@babel/plugin-proposal-async-generator-functions-7.16.5.tgz#fd3bd7e0d98404a3d4cbca15a72d533f8c9a2f67" - integrity sha512-C/FX+3HNLV6sz7AqbTQqEo1L9/kfrKjxcVtgyBCmvIgOjvuBVUWooDoi7trsLxOzCEo5FccjRvKHkfDsJFZlfA== +"@babel/plugin-proposal-async-generator-functions@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-async-generator-functions/download/@babel/plugin-proposal-async-generator-functions-7.16.7.tgz#739adc1212a9e4892de440cd7dfffb06172df78d" + integrity sha512-TTXBT3A5c11eqRzaC6beO6rlFT3Mo9C2e8eB44tTr52ESXSK2CIc2fOp1ynpAwQA8HhBMho+WXhMHWlAe3xkpw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/helper-remap-async-to-generator" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-remap-async-to-generator" "^7.16.7" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-proposal-class-properties@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-class-properties/download/@babel/plugin-proposal-class-properties-7.16.5.tgz#3269f44b89122110f6339806e05d43d84106468a" - integrity sha512-pJD3HjgRv83s5dv1sTnDbZOaTjghKEz8KUn1Kbh2eAIRhGuyQ1XSeI4xVXU3UlIEVA3DAyIdxqT1eRn7Wcn55A== +"@babel/plugin-proposal-class-properties@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-class-properties/download/@babel/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0" + integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-create-class-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-proposal-class-static-block@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-class-static-block/download/@babel/plugin-proposal-class-static-block-7.16.5.tgz#df58ab015a7d3b0963aafc8f20792dcd834952a9" - integrity sha512-EEFzuLZcm/rNJ8Q5krK+FRKdVkd6FjfzT9tuSZql9sQn64K0hHA2KLJ0DqVot9/iV6+SsuadC5yI39zWnm+nmQ== +"@babel/plugin-proposal-class-static-block@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-class-static-block/download/@babel/plugin-proposal-class-static-block-7.16.7.tgz#712357570b612106ef5426d13dc433ce0f200c2a" + integrity sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-create-class-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-proposal-dynamic-import@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-dynamic-import/download/@babel/plugin-proposal-dynamic-import-7.16.5.tgz#2e0d19d5702db4dcb9bc846200ca02f2e9d60e9e" - integrity sha512-P05/SJZTTvHz79LNYTF8ff5xXge0kk5sIIWAypcWgX4BTRUgyHc8wRxJ/Hk+mU0KXldgOOslKaeqnhthcDJCJQ== +"@babel/plugin-proposal-dynamic-import@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-dynamic-import/download/@babel/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2" + integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-proposal-export-namespace-from@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-export-namespace-from/download/@babel/plugin-proposal-export-namespace-from-7.16.5.tgz#3b4dd28378d1da2fea33e97b9f25d1c2f5bf1ac9" - integrity sha512-i+sltzEShH1vsVydvNaTRsgvq2vZsfyrd7K7vPLUU/KgS0D5yZMe6uipM0+izminnkKrEfdUnz7CxMRb6oHZWw== +"@babel/plugin-proposal-export-namespace-from@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-export-namespace-from/download/@babel/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163" + integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-proposal-json-strings@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-json-strings/download/@babel/plugin-proposal-json-strings-7.16.5.tgz#1e726930fca139caab6b084d232a9270d9d16f9c" - integrity sha512-QQJueTFa0y9E4qHANqIvMsuxM/qcLQmKttBACtPCQzGUEizsXDACGonlPiSwynHfOa3vNw0FPMVvQzbuXwh4SQ== +"@babel/plugin-proposal-json-strings@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-json-strings/download/@babel/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8" + integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-logical-assignment-operators/download/@babel/plugin-proposal-logical-assignment-operators-7.16.5.tgz#df1f2e4b5a0ec07abf061d2c18e53abc237d3ef5" - integrity sha512-xqibl7ISO2vjuQM+MzR3rkd0zfNWltk7n9QhaD8ghMmMceVguYrNDt7MikRyj4J4v3QehpnrU8RYLnC7z/gZLA== +"@babel/plugin-proposal-logical-assignment-operators@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-logical-assignment-operators/download/@babel/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea" + integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-nullish-coalescing-operator/download/@babel/plugin-proposal-nullish-coalescing-operator-7.16.5.tgz#652555bfeeeee2d2104058c6225dc6f75e2d0f07" - integrity sha512-YwMsTp/oOviSBhrjwi0vzCUycseCYwoXnLiXIL3YNjHSMBHicGTz7GjVU/IGgz4DtOEXBdCNG72pvCX22ehfqg== +"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-nullish-coalescing-operator/download/@babel/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99" + integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-proposal-numeric-separator@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-numeric-separator/download/@babel/plugin-proposal-numeric-separator-7.16.5.tgz#edcb6379b6cf4570be64c45965d8da7a2debf039" - integrity sha512-DvB9l/TcsCRvsIV9v4jxR/jVP45cslTVC0PMVHvaJhhNuhn2Y1SOhCSFlPK777qLB5wb8rVDaNoqMTyOqtY5Iw== +"@babel/plugin-proposal-numeric-separator@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-numeric-separator/download/@babel/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9" + integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-numeric-separator" "^7.10.4" "@babel/plugin-proposal-object-rest-spread@7.12.1": @@ -519,91 +519,91 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.0" "@babel/plugin-transform-parameters" "^7.12.1" -"@babel/plugin-proposal-object-rest-spread@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-object-rest-spread/download/@babel/plugin-proposal-object-rest-spread-7.16.5.tgz#f30f80dacf7bc1404bf67f99c8d9c01665e830ad" - integrity sha512-UEd6KpChoyPhCoE840KRHOlGhEZFutdPDMGj+0I56yuTTOaT51GzmnEl/0uT41fB/vD2nT+Pci2KjezyE3HmUw== +"@babel/plugin-proposal-object-rest-spread@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-object-rest-spread/download/@babel/plugin-proposal-object-rest-spread-7.16.7.tgz#94593ef1ddf37021a25bdcb5754c4a8d534b01d8" + integrity sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA== dependencies: "@babel/compat-data" "^7.16.4" - "@babel/helper-compilation-targets" "^7.16.3" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.16.5" + "@babel/plugin-transform-parameters" "^7.16.7" -"@babel/plugin-proposal-optional-catch-binding@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-optional-catch-binding/download/@babel/plugin-proposal-optional-catch-binding-7.16.5.tgz#1a5405765cf589a11a33a1fd75b2baef7d48b74e" - integrity sha512-ihCMxY1Iljmx4bWy/PIMJGXN4NS4oUj1MKynwO07kiKms23pNvIn1DMB92DNB2R0EA882sw0VXIelYGdtF7xEQ== +"@babel/plugin-proposal-optional-catch-binding@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-optional-catch-binding/download/@babel/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf" + integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.16.0", "@babel/plugin-proposal-optional-chaining@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-optional-chaining/download/@babel/plugin-proposal-optional-chaining-7.16.5.tgz#a5fa61056194d5059366c0009cb9a9e66ed75c1f" - integrity sha512-kzdHgnaXRonttiTfKYnSVafbWngPPr2qKw9BWYBESl91W54e+9R5pP70LtWxV56g0f05f/SQrwHYkfvbwcdQ/A== +"@babel/plugin-proposal-optional-chaining@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-optional-chaining/download/@babel/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a" + integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-proposal-private-methods@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-private-methods/download/@babel/plugin-proposal-private-methods-7.16.5.tgz#2086f7d78c1b0c712d49b5c3fbc2d1ca21a7ee12" - integrity sha512-+yFMO4BGT3sgzXo+lrq7orX5mAZt57DwUK6seqII6AcJnJOIhBJ8pzKH47/ql/d426uQ7YhN8DpUFirQzqYSUA== +"@babel/plugin-proposal-private-methods@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-private-methods/download/@babel/plugin-proposal-private-methods-7.16.7.tgz#e418e3aa6f86edd6d327ce84eff188e479f571e0" + integrity sha512-7twV3pzhrRxSwHeIvFE6coPgvo+exNDOiGUMg39o2LiLo1Y+4aKpfkcLGcg1UHonzorCt7SNXnoMyCnnIOA8Sw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-create-class-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-proposal-private-property-in-object@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-private-property-in-object/download/@babel/plugin-proposal-private-property-in-object-7.16.5.tgz#a42d4b56005db3d405b12841309dbca647e7a21b" - integrity sha512-+YGh5Wbw0NH3y/E5YMu6ci5qTDmAEVNoZ3I54aB6nVEOZ5BQ7QJlwKq5pYVucQilMByGn/bvX0af+uNaPRCabA== +"@babel/plugin-proposal-private-property-in-object@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-private-property-in-object/download/@babel/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce" + integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-create-class-features-plugin" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-create-class-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-proposal-unicode-property-regex@^7.16.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-proposal-unicode-property-regex/download/@babel/plugin-proposal-unicode-property-regex-7.16.5.tgz#35fe753afa7c572f322bd068ff3377bde0f37080" - integrity sha512-s5sKtlKQyFSatt781HQwv1hoM5BQ9qRH30r+dK56OLDsHmV74mzwJNX7R1yMuE7VZKG5O6q/gmOGSAO6ikTudg== +"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-proposal-unicode-property-regex/download/@babel/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2" + integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" - resolved "https://registry.nlark.com/@babel/plugin-syntax-async-generators/download/@babel/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-async-generators/download/@babel/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" integrity sha1-qYP7Gusuw/btBCohD2QOkOeG/g0= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-class-properties@^7.12.13": version "7.12.13" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-class-properties/download/@babel/plugin-syntax-class-properties-7.12.13.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-syntax-class-properties%2Fdownload%2F%40babel%2Fplugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" + resolved "https://registry.nlark.com/@babel/plugin-syntax-class-properties/download/@babel/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" integrity sha1-tcmHJ0xKOoK4lxR5aTGmtTVErhA= dependencies: "@babel/helper-plugin-utils" "^7.12.13" "@babel/plugin-syntax-class-static-block@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-class-static-block/download/@babel/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" + resolved "https://registry.npmmirror.com/@babel/plugin-syntax-class-static-block/download/@babel/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" integrity sha1-GV34mxRrS3izv4l/16JXyEZZ1AY= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-dynamic-import@^7.8.3": version "7.8.3" - resolved "https://registry.nlark.com/@babel/plugin-syntax-dynamic-import/download/@babel/plugin-syntax-dynamic-import-7.8.3.tgz?cache=0&sync_timestamp=1618847125283&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-dynamic-import%2Fdownload%2F%40babel%2Fplugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" + resolved "https://registry.nlark.com/@babel/plugin-syntax-dynamic-import/download/@babel/plugin-syntax-dynamic-import-7.8.3.tgz?cache=0&sync_timestamp=1631633193355&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-dynamic-import%2Fdownload%2F%40babel%2Fplugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" integrity sha1-Yr+Ysto80h1iYVT8lu5bPLaOrLM= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-export-namespace-from@^7.8.3": version "7.8.3" - resolved "https://registry.nlark.com/@babel/plugin-syntax-export-namespace-from/download/@babel/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-export-namespace-from/download/@babel/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" integrity sha1-AolkqbqA28CUyRXEh618TnpmRlo= dependencies: "@babel/helper-plugin-utils" "^7.8.3" @@ -622,12 +622,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-syntax-jsx@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-syntax-jsx/download/@babel/plugin-syntax-jsx-7.16.5.tgz#bf255d252f78bc8b77a17cadc37d1aa5b8ed4394" - integrity sha512-42OGssv9NPk4QHKVgIHlzeLgPOW5rGgfV5jzG90AhcXXIv6hu/eqj63w4VgvRxdvZY3AlYeDgPiSJ3BqAd1Y6Q== +"@babel/plugin-syntax-jsx@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-syntax-jsx/download/@babel/plugin-syntax-jsx-7.16.7.tgz#50b6571d13f764266a113d77c82b4a6508bbe665" + integrity sha512-Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-logical-assignment-operators@^7.10.4": version "7.10.4" @@ -645,389 +645,390 @@ "@babel/plugin-syntax-numeric-separator@^7.10.4": version "7.10.4" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-numeric-separator/download/@babel/plugin-syntax-numeric-separator-7.10.4.tgz?cache=0&sync_timestamp=1593522054358&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fplugin-syntax-numeric-separator%2Fdownload%2F%40babel%2Fplugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-numeric-separator/download/@babel/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" integrity sha1-ubBws+M1cM2f0Hun+pHA3Te5r5c= dependencies: "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-object-rest-spread@7.8.3", "@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3": version "7.8.3" - resolved "https://registry.nlark.com/@babel/plugin-syntax-object-rest-spread/download/@babel/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-object-rest-spread/download/@babel/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" integrity sha1-YOIl7cvZimQDMqLnLdPmbxr1WHE= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-optional-catch-binding@^7.8.3": version "7.8.3" - resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-optional-catch-binding/download/@babel/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + resolved "https://registry.nlark.com/@babel/plugin-syntax-optional-catch-binding/download/@babel/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" integrity sha1-YRGiZbz7Ag6579D9/X0mQCue1sE= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-optional-chaining@^7.8.3": version "7.8.3" - resolved "https://registry.nlark.com/@babel/plugin-syntax-optional-chaining/download/@babel/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + resolved "https://registry.npm.taobao.org/@babel/plugin-syntax-optional-chaining/download/@babel/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" integrity sha1-T2nCq5UWfgGAzVM2YT+MV4j31Io= dependencies: "@babel/helper-plugin-utils" "^7.8.0" "@babel/plugin-syntax-private-property-in-object@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-private-property-in-object/download/@babel/plugin-syntax-private-property-in-object-7.14.5.tgz?cache=0&sync_timestamp=1623280423879&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-private-property-in-object%2Fdownload%2F%40babel%2Fplugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" + resolved "https://registry.nlark.com/@babel/plugin-syntax-private-property-in-object/download/@babel/plugin-syntax-private-property-in-object-7.14.5.tgz?cache=0&sync_timestamp=1623280462994&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-private-property-in-object%2Fdownload%2F%40babel%2Fplugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" integrity sha1-DcZnHsDqIrbpShEU+FeXDNOd4a0= dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-top-level-await@^7.14.5": version "7.14.5" - resolved "https://registry.nlark.com/@babel/plugin-syntax-top-level-await/download/@babel/plugin-syntax-top-level-await-7.14.5.tgz?cache=0&sync_timestamp=1623280427172&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-top-level-await%2Fdownload%2F%40babel%2Fplugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" + resolved "https://registry.nlark.com/@babel/plugin-syntax-top-level-await/download/@babel/plugin-syntax-top-level-await-7.14.5.tgz?cache=0&sync_timestamp=1623280464882&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40babel%2Fplugin-syntax-top-level-await%2Fdownload%2F%40babel%2Fplugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" integrity sha1-wc/a3DWmRiQAAfBhOCR7dBw02Uw= dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.16.0": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-syntax-typescript/download/@babel/plugin-syntax-typescript-7.16.5.tgz#f47a33e4eee38554f00fb6b2f894fa1f5649b0b3" - integrity sha512-/d4//lZ1Vqb4mZ5xTep3dDK888j7BGM/iKqBmndBaoYAFPlPKrGU608VVBz5JeyAb6YQDjRu1UKqj86UhwWVgw== +"@babel/plugin-syntax-typescript@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-syntax-typescript/download/@babel/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8" + integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-arrow-functions@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-arrow-functions/download/@babel/plugin-transform-arrow-functions-7.16.5.tgz#04c18944dd55397b521d9d7511e791acea7acf2d" - integrity sha512-8bTHiiZyMOyfZFULjsCnYOWG059FVMes0iljEHSfARhNgFfpsqE92OrCffv3veSw9rwMkYcFe9bj0ZoXU2IGtQ== +"@babel/plugin-transform-arrow-functions@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-arrow-functions/download/@babel/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154" + integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-async-to-generator@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-async-to-generator/download/@babel/plugin-transform-async-to-generator-7.16.5.tgz#89c9b501e65bb14c4579a6ce9563f859de9b34e4" - integrity sha512-TMXgfioJnkXU+XRoj7P2ED7rUm5jbnDWwlCuFVTpQboMfbSya5WrmubNBAMlk7KXvywpo8rd8WuYZkis1o2H8w== +"@babel/plugin-transform-async-to-generator@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-async-to-generator/download/@babel/plugin-transform-async-to-generator-7.16.7.tgz#646e1262ac341b587ff5449844d4492dbb10ac4b" + integrity sha512-pFEfjnK4DfXCfAlA5I98BYdDJD8NltMzx19gt6DAmfE+2lXRfPUoa0/5SUjT4+TDE1W/rcxU/1lgN55vpAjjdg== dependencies: - "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/helper-remap-async-to-generator" "^7.16.5" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-remap-async-to-generator" "^7.16.7" -"@babel/plugin-transform-block-scoped-functions@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/download/@babel/plugin-transform-block-scoped-functions-7.16.5.tgz#af087494e1c387574260b7ee9b58cdb5a4e9b0b0" - integrity sha512-BxmIyKLjUGksJ99+hJyL/HIxLIGnLKtw772zYDER7UuycDZ+Xvzs98ZQw6NGgM2ss4/hlFAaGiZmMNKvValEjw== +"@babel/plugin-transform-block-scoped-functions@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/download/@babel/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620" + integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-block-scoping@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/download/@babel/plugin-transform-block-scoping-7.16.5.tgz#b91f254fe53e210eabe4dd0c40f71c0ed253c5e7" - integrity sha512-JxjSPNZSiOtmxjX7PBRBeRJTUKTyJ607YUYeT0QJCNdsedOe+/rXITjP08eG8xUpsLfPirgzdCFN+h0w6RI+pQ== +"@babel/plugin-transform-block-scoping@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/download/@babel/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87" + integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-classes@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-classes/download/@babel/plugin-transform-classes-7.16.5.tgz#6acf2ec7adb50fb2f3194dcd2909dbd056dcf216" - integrity sha512-DzJ1vYf/7TaCYy57J3SJ9rV+JEuvmlnvvyvYKFbk5u46oQbBvuB9/0w+YsVsxkOv8zVWKpDmUoj4T5ILHoXevA== +"@babel/plugin-transform-classes@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-classes/download/@babel/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00" + integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-environment-visitor" "^7.16.5" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/helper-replace-supers" "^7.16.5" - "@babel/helper-split-export-declaration" "^7.16.0" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-replace-supers" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-computed-properties/download/@babel/plugin-transform-computed-properties-7.16.5.tgz#2af91ebf0cceccfcc701281ada7cfba40a9b322a" - integrity sha512-n1+O7xtU5lSLraRzX88CNcpl7vtGdPakKzww74bVwpAIRgz9JVLJJpOLb0uYqcOaXVM0TL6X0RVeIJGD2CnCkg== +"@babel/plugin-transform-computed-properties@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-computed-properties/download/@babel/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470" + integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-destructuring@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/download/@babel/plugin-transform-destructuring-7.16.5.tgz#89ebc87499ac4a81b897af53bb5d3eed261bd568" - integrity sha512-GuRVAsjq+c9YPK6NeTkRLWyQskDC099XkBSVO+6QzbnOnH2d/4mBVXYStaPrZD3dFRfg00I6BFJ9Atsjfs8mlg== +"@babel/plugin-transform-destructuring@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/download/@babel/plugin-transform-destructuring-7.16.7.tgz#ca9588ae2d63978a4c29d3f33282d8603f618e23" + integrity sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-dotall-regex@^7.16.5", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-dotall-regex/download/@babel/plugin-transform-dotall-regex-7.16.5.tgz#b40739c00b6686820653536d6d143e311de67936" - integrity sha512-iQiEMt8Q4/5aRGHpGVK2Zc7a6mx7qEAO7qehgSug3SDImnuMzgmm/wtJALXaz25zUj1PmnNHtShjFgk4PDx4nw== +"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-dotall-regex/download/@babel/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241" + integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-duplicate-keys@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/download/@babel/plugin-transform-duplicate-keys-7.16.5.tgz#2450f2742325412b746d7d005227f5e8973b512a" - integrity sha512-81tijpDg2a6I1Yhj4aWY1l3O1J4Cg/Pd7LfvuaH2VVInAkXtzibz9+zSPdUM1WvuUi128ksstAP0hM5w48vQgg== +"@babel/plugin-transform-duplicate-keys@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/download/@babel/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9" + integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-exponentiation-operator@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/download/@babel/plugin-transform-exponentiation-operator-7.16.5.tgz#36e261fa1ab643cfaf30eeab38e00ed1a76081e2" - integrity sha512-12rba2HwemQPa7BLIKCzm1pT2/RuQHtSFHdNl41cFiC6oi4tcrp7gjB07pxQvFpcADojQywSjblQth6gJyE6CA== +"@babel/plugin-transform-exponentiation-operator@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/download/@babel/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b" + integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-for-of@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-for-of/download/@babel/plugin-transform-for-of-7.16.5.tgz#9b544059c6ca11d565457c0ff1f08e13ce225261" - integrity sha512-+DpCAJFPAvViR17PIMi9x2AE34dll5wNlXO43wagAX2YcRGgEVHCNFC4azG85b4YyyFarvkc/iD5NPrz4Oneqw== +"@babel/plugin-transform-for-of@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-for-of/download/@babel/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c" + integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-function-name@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-function-name/download/@babel/plugin-transform-function-name-7.16.5.tgz#6896ebb6a5538a75d6a4086a277752f655a7bd15" - integrity sha512-Fuec/KPSpVLbGo6z1RPw4EE1X+z9gZk1uQmnYy7v4xr4TO9p41v1AoUuXEtyqAI7H+xNJYSICzRqZBhDEkd3kQ== +"@babel/plugin-transform-function-name@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-function-name/download/@babel/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf" + integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA== dependencies: - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-literals@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-literals/download/@babel/plugin-transform-literals-7.16.5.tgz#af392b90e3edb2bd6dc316844cbfd6b9e009d320" - integrity sha512-B1j9C/IfvshnPcklsc93AVLTrNVa69iSqztylZH6qnmiAsDDOmmjEYqOm3Ts2lGSgTSywnBNiqC949VdD0/gfw== +"@babel/plugin-transform-literals@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-literals/download/@babel/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1" + integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-member-expression-literals@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-member-expression-literals/download/@babel/plugin-transform-member-expression-literals-7.16.5.tgz#4bd6ecdc11932361631097b779ca5c7570146dd5" - integrity sha512-d57i3vPHWgIde/9Y8W/xSFUndhvhZN5Wu2TjRrN1MVz5KzdUihKnfDVlfP1U7mS5DNj/WHHhaE4/tTi4hIyHwQ== +"@babel/plugin-transform-member-expression-literals@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-member-expression-literals/download/@babel/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384" + integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-modules-amd@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/download/@babel/plugin-transform-modules-amd-7.16.5.tgz#92c0a3e83f642cb7e75fada9ab497c12c2616527" - integrity sha512-oHI15S/hdJuSCfnwIz+4lm6wu/wBn7oJ8+QrkzPPwSFGXk8kgdI/AIKcbR/XnD1nQVMg/i6eNaXpszbGuwYDRQ== +"@babel/plugin-transform-modules-amd@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/download/@babel/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186" + integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g== dependencies: - "@babel/helper-module-transforms" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/download/@babel/plugin-transform-modules-commonjs-7.16.5.tgz#4ee03b089536f076b2773196529d27c32b9d7bde" - integrity sha512-ABhUkxvoQyqhCWyb8xXtfwqNMJD7tx+irIRnUh6lmyFud7Jln1WzONXKlax1fg/ey178EXbs4bSGNd6PngO+SQ== +"@babel/plugin-transform-modules-commonjs@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/download/@babel/plugin-transform-modules-commonjs-7.16.7.tgz#fd119e6a433c527d368425b45df361e1e95d3c1a" + integrity sha512-h2RP2kE7He1ZWKyAlanMZrAbdv+Acw1pA8dQZhE025WJZE2z0xzFADAinXA9fxd5bn7JnM+SdOGcndGx1ARs9w== dependencies: - "@babel/helper-module-transforms" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/helper-simple-access" "^7.16.0" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-simple-access" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-systemjs@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/download/@babel/plugin-transform-modules-systemjs-7.16.5.tgz#07078ba2e3cc94fbdd06836e355c246e98ad006b" - integrity sha512-53gmLdScNN28XpjEVIm7LbWnD/b/TpbwKbLk6KV4KqC9WyU6rq1jnNmVG6UgAdQZVVGZVoik3DqHNxk4/EvrjA== +"@babel/plugin-transform-modules-systemjs@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/download/@babel/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7" + integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw== dependencies: - "@babel/helper-hoist-variables" "^7.16.0" - "@babel/helper-module-transforms" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/helper-validator-identifier" "^7.15.7" + "@babel/helper-hoist-variables" "^7.16.7" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-validator-identifier" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-umd@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/download/@babel/plugin-transform-modules-umd-7.16.5.tgz#caa9c53d636fb4e3c99fd35a4c9ba5e5cd7e002e" - integrity sha512-qTFnpxHMoenNHkS3VoWRdwrcJ3FhX567GvDA3hRZKF0Dj8Fmg0UzySZp3AP2mShl/bzcywb/UWAMQIjA1bhXvw== +"@babel/plugin-transform-modules-umd@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/download/@babel/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618" + integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ== dependencies: - "@babel/helper-module-transforms" "^7.16.5" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-named-capturing-groups-regex@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-named-capturing-groups-regex/download/@babel/plugin-transform-named-capturing-groups-regex-7.16.5.tgz#4afd8cdee377ce3568f4e8a9ee67539b69886a3c" - integrity sha512-/wqGDgvFUeKELW6ex6QB7dLVRkd5ehjw34tpXu1nhKC0sFfmaLabIswnpf8JgDyV2NeDmZiwoOb0rAmxciNfjA== +"@babel/plugin-transform-named-capturing-groups-regex@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-named-capturing-groups-regex/download/@babel/plugin-transform-named-capturing-groups-regex-7.16.7.tgz#749d90d94e73cf62c60a0cc8d6b94d29305a81f2" + integrity sha512-kFy35VwmwIQwCjwrAQhl3+c/kr292i4KdLPKp5lPH03Ltc51qnFlIADoyPxc/6Naz3ok3WdYKg+KK6AH+D4utg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.0" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" -"@babel/plugin-transform-new-target@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-new-target/download/@babel/plugin-transform-new-target-7.16.5.tgz#759ea9d6fbbc20796056a5d89d13977626384416" - integrity sha512-ZaIrnXF08ZC8jnKR4/5g7YakGVL6go6V9ql6Jl3ecO8PQaQqFE74CuM384kezju7Z9nGCCA20BqZaR1tJ/WvHg== +"@babel/plugin-transform-new-target@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-new-target/download/@babel/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244" + integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-object-super@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-object-super/download/@babel/plugin-transform-object-super-7.16.5.tgz#8ccd9a1bcd3e7732ff8aa1702d067d8cd70ce380" - integrity sha512-tded+yZEXuxt9Jdtkc1RraW1zMF/GalVxaVVxh41IYwirdRgyAxxxCKZ9XB7LxZqmsjfjALxupNE1MIz9KH+Zg== +"@babel/plugin-transform-object-super@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-object-super/download/@babel/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94" + integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/helper-replace-supers" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-replace-supers" "^7.16.7" -"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-parameters/download/@babel/plugin-transform-parameters-7.16.5.tgz#4fc74b18a89638bd90aeec44a11793ecbe031dde" - integrity sha512-B3O6AL5oPop1jAVg8CV+haeUte9oFuY85zu0jwnRNZZi3tVAbJriu5tag/oaO2kGaQM/7q7aGPBlTI5/sr9enA== +"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-parameters/download/@babel/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f" + integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-property-literals@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/download/@babel/plugin-transform-property-literals-7.16.5.tgz#58f1465a7202a2bb2e6b003905212dd7a79abe3f" - integrity sha512-+IRcVW71VdF9pEH/2R/Apab4a19LVvdVsr/gEeotH00vSDVlKD+XgfSIw+cgGWsjDB/ziqGv/pGoQZBIiQVXHg== +"@babel/plugin-transform-property-literals@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/download/@babel/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55" + integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-react-constant-elements@^7.12.1": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-constant-elements/download/@babel/plugin-transform-react-constant-elements-7.16.5.tgz#4b01ea6b14bd4e55ca92bb2d6c28dd9957118924" - integrity sha512-fdc1s5npHMZ9A+w9bYbrZu4499WyYPVaTTsRO8bU0GJcMuK4ejIX4lyjnpvi+YGLK/EhFQxWszqylO0vaMciFw== + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-constant-elements/download/@babel/plugin-transform-react-constant-elements-7.16.7.tgz#19e9e4c2df2f6c3e6b3aea11778297d81db8df62" + integrity sha512-lF+cfsyTgwWkcw715J88JhMYJ5GpysYNLhLP1PkvkhTRN7B3e74R/1KsDxFxhRpSn0UUD3IWM4GvdBR2PEbbQQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-react-display-name@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-display-name/download/@babel/plugin-transform-react-display-name-7.16.5.tgz#d5e910327d7931fb9f8f9b6c6999473ceae5a286" - integrity sha512-dHYCOnzSsXFz8UcdNQIHGvg94qPL/teF7CCiCEMRxmA1G2p5Mq4JnKVowCDxYfiQ9D7RstaAp9kwaSI+sXbnhw== +"@babel/plugin-transform-react-display-name@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-display-name/download/@babel/plugin-transform-react-display-name-7.16.7.tgz#7b6d40d232f4c0f550ea348593db3b21e2404340" + integrity sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-react-jsx-development@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-jsx-development/download/@babel/plugin-transform-react-jsx-development-7.16.5.tgz#87da9204c275ffb57f45d192a1120cf104bc1e86" - integrity sha512-uQSLacMZSGLCxOw20dzo1dmLlKkd+DsayoV54q3MHXhbqgPzoiGerZQgNPl/Ro8/OcXV2ugfnkx+rxdS0sN5Uw== +"@babel/plugin-transform-react-jsx-development@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-jsx-development/download/@babel/plugin-transform-react-jsx-development-7.16.7.tgz#43a00724a3ed2557ed3f276a01a929e6686ac7b8" + integrity sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A== dependencies: - "@babel/plugin-transform-react-jsx" "^7.16.5" + "@babel/plugin-transform-react-jsx" "^7.16.7" -"@babel/plugin-transform-react-jsx@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-jsx/download/@babel/plugin-transform-react-jsx-7.16.5.tgz#5298aedc5f81e02b1cb702e597e8d6a346675765" - integrity sha512-+arLIz1d7kmwX0fKxTxbnoeG85ONSnLpvdODa4P3pc1sS7CV1hfmtYWufkW/oYsPnkDrEeQFxhUWcFnrXW7jQQ== +"@babel/plugin-transform-react-jsx@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-jsx/download/@babel/plugin-transform-react-jsx-7.16.7.tgz#86a6a220552afd0e4e1f0388a68a372be7add0d4" + integrity sha512-8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/plugin-syntax-jsx" "^7.16.5" - "@babel/types" "^7.16.0" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/plugin-syntax-jsx" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/plugin-transform-react-pure-annotations@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-pure-annotations/download/@babel/plugin-transform-react-pure-annotations-7.16.5.tgz#6535d0fe67c7a3a26c5105f92c8cbcbe844cd94b" - integrity sha512-0nYU30hCxnCVCbRjSy9ahlhWZ2Sn6khbY4FqR91W+2RbSqkWEbVu2gXh45EqNy4Bq7sRU+H4i0/6YKwOSzh16A== +"@babel/plugin-transform-react-pure-annotations@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-react-pure-annotations/download/@babel/plugin-transform-react-pure-annotations-7.16.7.tgz#232bfd2f12eb551d6d7d01d13fe3f86b45eb9c67" + integrity sha512-hs71ToC97k3QWxswh2ElzMFABXHvGiJ01IB1TbYQDGeWRKWz/MPUTh5jGExdHvosYKpnJW5Pm3S4+TA3FyX+GA== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-regenerator@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/download/@babel/plugin-transform-regenerator-7.16.5.tgz#704cc6d8dd3dd4758267621ab7b36375238cef13" - integrity sha512-2z+it2eVWU8TtQQRauvGUqZwLy4+7rTfo6wO4npr+fvvN1SW30ZF3O/ZRCNmTuu4F5MIP8OJhXAhRV5QMJOuYg== +"@babel/plugin-transform-regenerator@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/download/@babel/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb" + integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q== dependencies: regenerator-transform "^0.14.2" -"@babel/plugin-transform-reserved-words@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/download/@babel/plugin-transform-reserved-words-7.16.5.tgz#db95e98799675e193dc2b47d3e72a7c0651d0c30" - integrity sha512-aIB16u8lNcf7drkhXJRoggOxSTUAuihTSTfAcpynowGJOZiGf+Yvi7RuTwFzVYSYPmWyARsPqUGoZWWWxLiknw== +"@babel/plugin-transform-reserved-words@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/download/@babel/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586" + integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-transform-runtime@^7.15.0": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-runtime/download/@babel/plugin-transform-runtime-7.16.5.tgz#0cc3f01d69f299d5a42cd9ec43b92ea7a777b8db" - integrity sha512-gxpfS8XQWDbQ8oP5NcmpXxtEgCJkbO+W9VhZlOhr0xPyVaRjAQPOv7ZDj9fg0d5s9+NiVvMCE6gbkEkcsxwGRw== + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-runtime/download/@babel/plugin-transform-runtime-7.16.7.tgz#1da184cb83a2287a01956c10c60e66dd503c18aa" + integrity sha512-2FoHiSAWkdq4L06uaDN3rS43i6x28desUVxq+zAFuE6kbWYQeiLPJI5IC7Sg9xKYVcrBKSQkVUfH6aeQYbl9QA== dependencies: - "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" babel-plugin-polyfill-corejs2 "^0.3.0" babel-plugin-polyfill-corejs3 "^0.4.0" babel-plugin-polyfill-regenerator "^0.3.0" semver "^6.3.0" -"@babel/plugin-transform-shorthand-properties@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/download/@babel/plugin-transform-shorthand-properties-7.16.5.tgz#ccb60b1a23b799f5b9a14d97c5bc81025ffd96d7" - integrity sha512-ZbuWVcY+MAXJuuW7qDoCwoxDUNClfZxoo7/4swVbOW1s/qYLOMHlm9YRWMsxMFuLs44eXsv4op1vAaBaBaDMVg== +"@babel/plugin-transform-shorthand-properties@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/download/@babel/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a" + integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-spread@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-spread/download/@babel/plugin-transform-spread-7.16.5.tgz#912b06cff482c233025d3e69cf56d3e8fa166c29" - integrity sha512-5d6l/cnG7Lw4tGHEoga4xSkYp1euP7LAtrah1h1PgJ3JY7yNsjybsxQAnVK4JbtReZ/8z6ASVmd3QhYYKLaKZw== +"@babel/plugin-transform-spread@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-spread/download/@babel/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44" + integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" -"@babel/plugin-transform-sticky-regex@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-sticky-regex/download/@babel/plugin-transform-sticky-regex-7.16.5.tgz#593579bb2b5a8adfbe02cb43823275d9098f75f9" - integrity sha512-usYsuO1ID2LXxzuUxifgWtJemP7wL2uZtyrTVM4PKqsmJycdS4U4mGovL5xXkfUheds10Dd2PjoQLXw6zCsCbg== +"@babel/plugin-transform-sticky-regex@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-sticky-regex/download/@babel/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660" + integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-template-literals@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/download/@babel/plugin-transform-template-literals-7.16.5.tgz#343651385fd9923f5aa2275ca352c5d9183e1773" - integrity sha512-gnyKy9RyFhkovex4BjKWL3BVYzUDG6zC0gba7VMLbQoDuqMfJ1SDXs8k/XK41Mmt1Hyp4qNAvGFb9hKzdCqBRQ== +"@babel/plugin-transform-template-literals@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/download/@babel/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab" + integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-typeof-symbol@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/download/@babel/plugin-transform-typeof-symbol-7.16.5.tgz#a1d1bf2c71573fe30965d0e4cd6a3291202e20ed" - integrity sha512-ldxCkW180qbrvyCVDzAUZqB0TAeF8W/vGJoRcaf75awm6By+PxfJKvuqVAnq8N9wz5Xa6mSpM19OfVKKVmGHSQ== +"@babel/plugin-transform-typeof-symbol@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/download/@babel/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e" + integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-typescript@^7.16.1": - version "7.16.1" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-typescript/download/@babel/plugin-transform-typescript-7.16.1.tgz#cc0670b2822b0338355bc1b3d2246a42b8166409" - integrity sha1-zAZwsoIrAzg1W8Gz0iRqQrgWZAk= +"@babel/plugin-transform-typescript@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-typescript/download/@babel/plugin-transform-typescript-7.16.7.tgz#33f8c2c890fbfdc4ef82446e9abb8de8211a3ff3" + integrity sha512-Hzx1lvBtOCWuCEwMmYOfpQpO7joFeXLgoPuzZZBtTxXqSqUGUubvFGZv2ygo1tB5Bp9q6PXV3H0E/kf7KM0RLA== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/plugin-syntax-typescript" "^7.16.0" + "@babel/helper-create-class-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/plugin-syntax-typescript" "^7.16.7" -"@babel/plugin-transform-unicode-escapes@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/download/@babel/plugin-transform-unicode-escapes-7.16.5.tgz#80507c225af49b4f4ee647e2a0ce53d2eeff9e85" - integrity sha512-shiCBHTIIChGLdyojsKQjoAyB8MBwat25lKM7MJjbe1hE0bgIppD+LX9afr41lLHOhqceqeWl4FkLp+Bgn9o1Q== +"@babel/plugin-transform-unicode-escapes@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/download/@babel/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3" + integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-unicode-regex@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-regex/download/@babel/plugin-transform-unicode-regex-7.16.5.tgz#ac84d6a1def947d71ffb832426aa53b83d7ed49e" - integrity sha512-GTJ4IW012tiPEMMubd7sD07iU9O/LOo8Q/oU4xNhcaq0Xn8+6TcUQaHtC8YxySo1T+ErQ8RaWogIEeFhKGNPzw== +"@babel/plugin-transform-unicode-regex@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/plugin-transform-unicode-regex/download/@babel/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2" + integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.16.5" + "@babel/helper-create-regexp-features-plugin" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.15.6": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/preset-env/download/@babel/preset-env-7.16.5.tgz#2e94d922f4a890979af04ffeb6a6b4e44ba90847" - integrity sha512-MiJJW5pwsktG61NDxpZ4oJ1CKxM1ncam9bzRtx9g40/WkLRkxFP6mhpkYV0/DxcciqoiHicx291+eUQrXb/SfQ== + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/preset-env/download/@babel/preset-env-7.16.7.tgz#c491088856d0b3177822a2bf06cb74d76327aa56" + integrity sha512-urX3Cee4aOZbRWOSa3mKPk0aqDikfILuo+C7qq7HY0InylGNZ1fekq9jmlr3pLWwZHF4yD7heQooc2Pow2KMyQ== dependencies: "@babel/compat-data" "^7.16.4" - "@babel/helper-compilation-targets" "^7.16.3" - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/helper-validator-option" "^7.14.5" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.2" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.0" - "@babel/plugin-proposal-async-generator-functions" "^7.16.5" - "@babel/plugin-proposal-class-properties" "^7.16.5" - "@babel/plugin-proposal-class-static-block" "^7.16.5" - "@babel/plugin-proposal-dynamic-import" "^7.16.5" - "@babel/plugin-proposal-export-namespace-from" "^7.16.5" - "@babel/plugin-proposal-json-strings" "^7.16.5" - "@babel/plugin-proposal-logical-assignment-operators" "^7.16.5" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.5" - "@babel/plugin-proposal-numeric-separator" "^7.16.5" - "@babel/plugin-proposal-object-rest-spread" "^7.16.5" - "@babel/plugin-proposal-optional-catch-binding" "^7.16.5" - "@babel/plugin-proposal-optional-chaining" "^7.16.5" - "@babel/plugin-proposal-private-methods" "^7.16.5" - "@babel/plugin-proposal-private-property-in-object" "^7.16.5" - "@babel/plugin-proposal-unicode-property-regex" "^7.16.5" + "@babel/helper-compilation-targets" "^7.16.7" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-validator-option" "^7.16.7" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7" + "@babel/plugin-proposal-async-generator-functions" "^7.16.7" + "@babel/plugin-proposal-class-properties" "^7.16.7" + "@babel/plugin-proposal-class-static-block" "^7.16.7" + "@babel/plugin-proposal-dynamic-import" "^7.16.7" + "@babel/plugin-proposal-export-namespace-from" "^7.16.7" + "@babel/plugin-proposal-json-strings" "^7.16.7" + "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7" + "@babel/plugin-proposal-numeric-separator" "^7.16.7" + "@babel/plugin-proposal-object-rest-spread" "^7.16.7" + "@babel/plugin-proposal-optional-catch-binding" "^7.16.7" + "@babel/plugin-proposal-optional-chaining" "^7.16.7" + "@babel/plugin-proposal-private-methods" "^7.16.7" + "@babel/plugin-proposal-private-property-in-object" "^7.16.7" + "@babel/plugin-proposal-unicode-property-regex" "^7.16.7" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" "@babel/plugin-syntax-class-static-block" "^7.14.5" @@ -1042,40 +1043,40 @@ "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.16.5" - "@babel/plugin-transform-async-to-generator" "^7.16.5" - "@babel/plugin-transform-block-scoped-functions" "^7.16.5" - "@babel/plugin-transform-block-scoping" "^7.16.5" - "@babel/plugin-transform-classes" "^7.16.5" - "@babel/plugin-transform-computed-properties" "^7.16.5" - "@babel/plugin-transform-destructuring" "^7.16.5" - "@babel/plugin-transform-dotall-regex" "^7.16.5" - "@babel/plugin-transform-duplicate-keys" "^7.16.5" - "@babel/plugin-transform-exponentiation-operator" "^7.16.5" - "@babel/plugin-transform-for-of" "^7.16.5" - "@babel/plugin-transform-function-name" "^7.16.5" - "@babel/plugin-transform-literals" "^7.16.5" - "@babel/plugin-transform-member-expression-literals" "^7.16.5" - "@babel/plugin-transform-modules-amd" "^7.16.5" - "@babel/plugin-transform-modules-commonjs" "^7.16.5" - "@babel/plugin-transform-modules-systemjs" "^7.16.5" - "@babel/plugin-transform-modules-umd" "^7.16.5" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.5" - "@babel/plugin-transform-new-target" "^7.16.5" - "@babel/plugin-transform-object-super" "^7.16.5" - "@babel/plugin-transform-parameters" "^7.16.5" - "@babel/plugin-transform-property-literals" "^7.16.5" - "@babel/plugin-transform-regenerator" "^7.16.5" - "@babel/plugin-transform-reserved-words" "^7.16.5" - "@babel/plugin-transform-shorthand-properties" "^7.16.5" - "@babel/plugin-transform-spread" "^7.16.5" - "@babel/plugin-transform-sticky-regex" "^7.16.5" - "@babel/plugin-transform-template-literals" "^7.16.5" - "@babel/plugin-transform-typeof-symbol" "^7.16.5" - "@babel/plugin-transform-unicode-escapes" "^7.16.5" - "@babel/plugin-transform-unicode-regex" "^7.16.5" + "@babel/plugin-transform-arrow-functions" "^7.16.7" + "@babel/plugin-transform-async-to-generator" "^7.16.7" + "@babel/plugin-transform-block-scoped-functions" "^7.16.7" + "@babel/plugin-transform-block-scoping" "^7.16.7" + "@babel/plugin-transform-classes" "^7.16.7" + "@babel/plugin-transform-computed-properties" "^7.16.7" + "@babel/plugin-transform-destructuring" "^7.16.7" + "@babel/plugin-transform-dotall-regex" "^7.16.7" + "@babel/plugin-transform-duplicate-keys" "^7.16.7" + "@babel/plugin-transform-exponentiation-operator" "^7.16.7" + "@babel/plugin-transform-for-of" "^7.16.7" + "@babel/plugin-transform-function-name" "^7.16.7" + "@babel/plugin-transform-literals" "^7.16.7" + "@babel/plugin-transform-member-expression-literals" "^7.16.7" + "@babel/plugin-transform-modules-amd" "^7.16.7" + "@babel/plugin-transform-modules-commonjs" "^7.16.7" + "@babel/plugin-transform-modules-systemjs" "^7.16.7" + "@babel/plugin-transform-modules-umd" "^7.16.7" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.7" + "@babel/plugin-transform-new-target" "^7.16.7" + "@babel/plugin-transform-object-super" "^7.16.7" + "@babel/plugin-transform-parameters" "^7.16.7" + "@babel/plugin-transform-property-literals" "^7.16.7" + "@babel/plugin-transform-regenerator" "^7.16.7" + "@babel/plugin-transform-reserved-words" "^7.16.7" + "@babel/plugin-transform-shorthand-properties" "^7.16.7" + "@babel/plugin-transform-spread" "^7.16.7" + "@babel/plugin-transform-sticky-regex" "^7.16.7" + "@babel/plugin-transform-template-literals" "^7.16.7" + "@babel/plugin-transform-typeof-symbol" "^7.16.7" + "@babel/plugin-transform-unicode-escapes" "^7.16.7" + "@babel/plugin-transform-unicode-regex" "^7.16.7" "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.16.0" + "@babel/types" "^7.16.7" babel-plugin-polyfill-corejs2 "^0.3.0" babel-plugin-polyfill-corejs3 "^0.4.0" babel-plugin-polyfill-regenerator "^0.3.0" @@ -1084,7 +1085,7 @@ "@babel/preset-modules@^0.1.5": version "0.1.5" - resolved "https://registry.npmmirror.com/@babel/preset-modules/download/@babel/preset-modules-0.1.5.tgz?cache=0&sync_timestamp=1635094844477&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40babel%2Fpreset-modules%2Fdownload%2F%40babel%2Fpreset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" + resolved "https://registry.npmmirror.com/@babel/preset-modules/download/@babel/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" integrity sha1-75Odbn8miCfhhBY43G/5VRXhFdk= dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -1094,72 +1095,72 @@ esutils "^2.0.2" "@babel/preset-react@^7.12.13", "@babel/preset-react@^7.12.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/preset-react/download/@babel/preset-react-7.16.5.tgz#09df3b7a6522cb3e6682dc89b4dfebb97d22031b" - integrity sha512-3kzUOQeaxY/2vhPDS7CX/KGEGu/1bOYGvdRDJ2U5yjEz5o5jmIeTPLoiQBPGjfhPascLuW5OlMiPzwOOuB6txg== + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/preset-react/download/@babel/preset-react-7.16.7.tgz#4c18150491edc69c183ff818f9f2aecbe5d93852" + integrity sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/helper-validator-option" "^7.14.5" - "@babel/plugin-transform-react-display-name" "^7.16.5" - "@babel/plugin-transform-react-jsx" "^7.16.5" - "@babel/plugin-transform-react-jsx-development" "^7.16.5" - "@babel/plugin-transform-react-pure-annotations" "^7.16.5" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-validator-option" "^7.16.7" + "@babel/plugin-transform-react-display-name" "^7.16.7" + "@babel/plugin-transform-react-jsx" "^7.16.7" + "@babel/plugin-transform-react-jsx-development" "^7.16.7" + "@babel/plugin-transform-react-pure-annotations" "^7.16.7" "@babel/preset-typescript@^7.12.16": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/preset-typescript/download/@babel/preset-typescript-7.16.5.tgz#b86a5b0ae739ba741347d2f58c52f52e63cf1ba1" - integrity sha512-lmAWRoJ9iOSvs3DqOndQpj8XqXkzaiQs50VG/zESiI9D3eoZhGriU675xNCr0UwvsuXrhMAGvyk1w+EVWF3u8Q== + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/preset-typescript/download/@babel/preset-typescript-7.16.7.tgz#ab114d68bb2020afc069cd51b37ff98a046a70b9" + integrity sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ== dependencies: - "@babel/helper-plugin-utils" "^7.16.5" - "@babel/helper-validator-option" "^7.14.5" - "@babel/plugin-transform-typescript" "^7.16.1" + "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-validator-option" "^7.16.7" + "@babel/plugin-transform-typescript" "^7.16.7" "@babel/runtime-corejs3@^7.15.4": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/runtime-corejs3/download/@babel/runtime-corejs3-7.16.5.tgz#9057d879720c136193f0440bc400088212a74894" - integrity sha512-F1pMwvTiUNSAM8mc45kccMQxj31x3y3P+tA/X8hKNWp3/hUsxdGxZ3D3H8JIkxtfA8qGkaBTKvcmvStaYseAFw== + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/runtime-corejs3/download/@babel/runtime-corejs3-7.16.7.tgz#a762745fe8b4d61a26444a9151e6586d36044dde" + integrity sha512-MiYR1yk8+TW/CpOD0CyX7ve9ffWTKqLk/L6pk8TPl0R8pNi+1pFY8fH9yET55KlvukQ4PAWfXsGr2YHVjcI4Pw== dependencies: core-js-pure "^3.19.0" regenerator-runtime "^0.13.4" "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.15.4", "@babel/runtime@^7.8.4": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/runtime/download/@babel/runtime-7.16.5.tgz#7f3e34bf8bdbbadf03fbb7b1ea0d929569c9487a" - integrity sha512-TXWihFIS3Pyv5hzR7j6ihmeLkZfrXGxAr5UfSl8CHf+6q/wpiYDkUau0czckpYG8QmnCIuPpdLtuA9VmuGGyMA== + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/runtime/download/@babel/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa" + integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ== dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.12.7", "@babel/template@^7.16.0": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/template/download/@babel/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" - integrity sha1-0Wo16/TNdOICCDNW+rId2JNj3dY= +"@babel/template@^7.12.7", "@babel/template@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/template/download/@babel/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155" + integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w== dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/parser" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/code-frame" "^7.16.7" + "@babel/parser" "^7.16.7" + "@babel/types" "^7.16.7" -"@babel/traverse@^7.12.13", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.5": - version "7.16.5" - resolved "https://registry.npmmirror.com/@babel/traverse/download/@babel/traverse-7.16.5.tgz#d7d400a8229c714a59b87624fc67b0f1fbd4b2b3" - integrity sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ== +"@babel/traverse@^7.12.13", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/traverse/download/@babel/traverse-7.16.7.tgz#dac01236a72c2560073658dd1a285fe4e0865d76" + integrity sha512-8KWJPIb8c2VvY8AJrydh6+fVRo2ODx1wYBU2398xJVq0JomuLBZmVQzLPBblJgHIGYG4znCpUZUZ0Pt2vdmVYQ== dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/generator" "^7.16.5" - "@babel/helper-environment-visitor" "^7.16.5" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-hoist-variables" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" - "@babel/parser" "^7.16.5" - "@babel/types" "^7.16.0" + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.16.7" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.16.7" + "@babel/helper-hoist-variables" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/parser" "^7.16.7" + "@babel/types" "^7.16.7" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.16.0", "@babel/types@^7.4.4": - version "7.16.0" - resolved "https://registry.npmmirror.com/@babel/types/download/@babel/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" - integrity sha1-2zsxOAT5aq3Qt3bEgj4SetZyibo= +"@babel/types@^7.12.6", "@babel/types@^7.12.7", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.4.4": + version "7.16.7" + resolved "https://registry.npmmirror.com/@babel/types/download/@babel/types-7.16.7.tgz#4ed19d51f840ed4bd5645be6ce40775fecf03159" + integrity sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg== dependencies: - "@babel/helper-validator-identifier" "^7.15.7" + "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" "@docsearch/css@3.0.0-alpha.42": @@ -1484,7 +1485,7 @@ "@hapi/hoek@^9.0.0": version "9.2.1" - resolved "https://registry.npmmirror.com/@hapi/hoek/download/@hapi/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" + resolved "https://registry.npmmirror.com/@hapi/hoek/download/@hapi/hoek-9.2.1.tgz?cache=0&sync_timestamp=1632777883600&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40hapi%2Fhoek%2Fdownload%2F%40hapi%2Fhoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" integrity sha1-lVEUKhmAUDdSU2tQUP2Z9KfxOxc= "@hapi/topo@^5.0.0": @@ -1526,7 +1527,7 @@ "@mdx-js/react@1.6.22", "@mdx-js/react@^1.6.21": version "1.6.22" - resolved "https://registry.npmmirror.com/@mdx-js/react/download/@mdx-js/react-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573" + resolved "https://registry.npmmirror.com/@mdx-js/react/download/@mdx-js/react-1.6.22.tgz?cache=0&sync_timestamp=1637010066448&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40mdx-js%2Freact%2Fdownload%2F%40mdx-js%2Freact-1.6.22.tgz#ae09b4744fddc74714ee9f9d6f17a66e77c43573" integrity sha1-rgm0dE/dx0cU7p+dbxembnfENXM= "@mdx-js/runtime@^1.6.22": @@ -1540,12 +1541,12 @@ "@mdx-js/util@1.6.22": version "1.6.22" - resolved "https://registry.npm.taobao.org/@mdx-js/util/download/@mdx-js/util-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40mdx-js%2Futil%2Fdownload%2F%40mdx-js%2Futil-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" + resolved "https://registry.npm.taobao.org/@mdx-js/util/download/@mdx-js/util-1.6.22.tgz#219dfd89ae5b97a8801f015323ffa4b62f45718b" integrity sha1-IZ39ia5bl6iAHwFTI/+kti9FcYs= "@nodelib/fs.scandir@2.1.5": version "2.1.5" - resolved "https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz?cache=0&sync_timestamp=1622792738877&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.scandir%2Fdownload%2F%40nodelib%2Ffs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + resolved "https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" integrity sha1-dhnC6yGyVIP20WdUi0z9WnSIw9U= dependencies: "@nodelib/fs.stat" "2.0.5" @@ -1553,7 +1554,7 @@ "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" - resolved "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&sync_timestamp=1622792616417&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + resolved "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha1-W9Jir5Tp0lvR5xsF3u1Eh2oiLos= "@nodelib/fs.walk@^1.2.3": @@ -1566,12 +1567,12 @@ "@polka/url@^1.0.0-next.20": version "1.0.0-next.21" - resolved "https://registry.npmmirror.com/@polka/url/download/@polka/url-1.0.0-next.21.tgz?cache=0&sync_timestamp=1633093101880&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40polka%2Furl%2Fdownload%2F%40polka%2Furl-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" + resolved "https://registry.npmmirror.com/@polka/url/download/@polka/url-1.0.0-next.21.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40polka%2Furl%2Fdownload%2F%40polka%2Furl-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha1-XeWiOFo1MJQn9gEZkrVEUU1VmqE= "@seznam/compose-react-refs@^1.0.6": version "1.0.6" - resolved "https://registry.npm.taobao.org/@seznam/compose-react-refs/download/@seznam/compose-react-refs-1.0.6.tgz#6ec4e70bdd6e32f8e70b4100f27267cf306bd8df" + resolved "https://registry.nlark.com/@seznam/compose-react-refs/download/@seznam/compose-react-refs-1.0.6.tgz#6ec4e70bdd6e32f8e70b4100f27267cf306bd8df" integrity sha1-bsTnC91uMvjnC0EA8nJnzzBr2N8= "@sideway/address@^4.1.3": @@ -1583,7 +1584,7 @@ "@sideway/formula@^3.0.0": version "3.0.0" - resolved "https://registry.npm.taobao.org/@sideway/formula/download/@sideway/formula-3.0.0.tgz?cache=0&sync_timestamp=1603525579815&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40sideway%2Fformula%2Fdownload%2F%40sideway%2Fformula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" + resolved "https://registry.npm.taobao.org/@sideway/formula/download/@sideway/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" integrity sha1-/hWK7jLmvV3oUES+YVvAhHigoTw= "@sideway/pinpoint@^2.0.0": @@ -1712,7 +1713,7 @@ "@szmarczak/http-timer@^1.1.2": version "1.1.2" - resolved "https://registry.nlark.com/@szmarczak/http-timer/download/@szmarczak/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" + resolved "https://registry.nlark.com/@szmarczak/http-timer/download/@szmarczak/http-timer-1.1.2.tgz?cache=0&sync_timestamp=1629502165113&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40szmarczak%2Fhttp-timer%2Fdownload%2F%40szmarczak%2Fhttp-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" integrity sha1-sWZeLEYaLNkvTBu/UNVFTeDUtCE= dependencies: defer-to-connect "^1.0.1" @@ -1734,12 +1735,12 @@ "@tsconfig/docusaurus@^1.0.4": version "1.0.4" - resolved "https://registry.npmmirror.com/@tsconfig/docusaurus/download/@tsconfig/docusaurus-1.0.4.tgz#fc40f87a672568678d83533dd4031a09d75877ca" + resolved "https://registry.nlark.com/@tsconfig/docusaurus/download/@tsconfig/docusaurus-1.0.4.tgz#fc40f87a672568678d83533dd4031a09d75877ca" integrity sha1-/ED4emclaGeNg1M91AMaCddYd8o= "@types/body-parser@*": version "1.19.2" - resolved "https://registry.npmmirror.com/@types/body-parser/download/@types/body-parser-1.19.2.tgz?cache=0&sync_timestamp=1637265159940&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fbody-parser%2Fdownload%2F%40types%2Fbody-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" + resolved "https://registry.npmmirror.com/@types/body-parser/download/@types/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== dependencies: "@types/connect" "*" @@ -1754,7 +1755,7 @@ "@types/connect-history-api-fallback@^1.3.5": version "1.3.5" - resolved "https://registry.npmmirror.com/@types/connect-history-api-fallback/download/@types/connect-history-api-fallback-1.3.5.tgz?cache=0&sync_timestamp=1637265708376&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fconnect-history-api-fallback%2Fdownload%2F%40types%2Fconnect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" + resolved "https://registry.npmmirror.com/@types/connect-history-api-fallback/download/@types/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" integrity sha1-0feooJ0O1aV67lrpwYq5uAMgXa4= dependencies: "@types/express-serve-static-core" "*" @@ -1762,7 +1763,7 @@ "@types/connect@*": version "3.4.35" - resolved "https://registry.npmmirror.com/@types/connect/download/@types/connect-3.4.35.tgz?cache=0&sync_timestamp=1637265718046&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fconnect%2Fdownload%2F%40types%2Fconnect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" + resolved "https://registry.npmmirror.com/@types/connect/download/@types/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" integrity sha1-X89q5EXkAh0fwiGaSHPMc6O7KtE= dependencies: "@types/node" "*" @@ -1785,7 +1786,7 @@ "@types/estree@*", "@types/estree@^0.0.50": version "0.0.50" - resolved "https://registry.npmmirror.com/@types/estree/download/@types/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" + resolved "https://registry.npmmirror.com/@types/estree/download/@types/estree-0.0.50.tgz?cache=0&sync_timestamp=1637264753186&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Festree%2Fdownload%2F%40types%2Festree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" integrity sha1-Hgyqk2TT/M0pMcPtlv2+ql1MyoM= "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": @@ -1799,7 +1800,7 @@ "@types/express@*": version "4.17.13" - resolved "https://registry.npmmirror.com/@types/express/download/@types/express-4.17.13.tgz?cache=0&sync_timestamp=1637265378123&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fexpress%2Fdownload%2F%40types%2Fexpress-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + resolved "https://registry.npmmirror.com/@types/express/download/@types/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" integrity sha1-p24plXKJmbq1GjP6vOHXBaNwkDQ= dependencies: "@types/body-parser" "*" @@ -1838,7 +1839,7 @@ "@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.9" - resolved "https://registry.npmmirror.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz?cache=0&sync_timestamp=1637266073261&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fjson-schema%2Fdownload%2F%40types%2Fjson-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + resolved "https://registry.npmmirror.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha1-l+3JA36gw4WFMgsolk3eOznkZg0= "@types/mdast@^3.0.0": @@ -1850,7 +1851,7 @@ "@types/mime@^1": version "1.3.2" - resolved "https://registry.npmmirror.com/@types/mime/download/@types/mime-1.3.2.tgz?cache=0&sync_timestamp=1637267530748&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fmime%2Fdownload%2F%40types%2Fmime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" + resolved "https://registry.npmmirror.com/@types/mime/download/@types/mime-1.3.2.tgz?cache=0&sync_timestamp=1637267348464&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fmime%2Fdownload%2F%40types%2Fmime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" integrity sha1-k+Jb+e51/g/YC1lLxP6w6GIRG1o= "@types/node@*": @@ -1870,13 +1871,13 @@ "@types/prop-types@*": version "15.7.4" - resolved "https://registry.npmmirror.com/@types/prop-types/download/@types/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + resolved "https://registry.npmmirror.com/@types/prop-types/download/@types/prop-types-15.7.4.tgz?cache=0&sync_timestamp=1637270164807&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fprop-types%2Fdownload%2F%40types%2Fprop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" integrity sha1-/PcgXCXf95Xuea8eMNosl5CAjxE= "@types/q@^1.5.1": version "1.5.5" - resolved "https://registry.npmmirror.com/@types/q/download/@types/q-1.5.5.tgz?cache=0&sync_timestamp=1637268455272&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fq%2Fdownload%2F%40types%2Fq-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" - integrity sha1-daKo59irSyMEFFBdkjNdHctTpt8= + resolved "https://registry.npmmirror.com/@types/q/download/@types/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" + integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ== "@types/qs@*": version "6.9.7" @@ -1885,7 +1886,7 @@ "@types/range-parser@*": version "1.2.4" - resolved "https://registry.npmmirror.com/@types/range-parser/download/@types/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" + resolved "https://registry.npmmirror.com/@types/range-parser/download/@types/range-parser-1.2.4.tgz?cache=0&sync_timestamp=1637268455466&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Frange-parser%2Fdownload%2F%40types%2Frange-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" integrity sha1-zWZ7z90CUhOq+3ylkVqTJZCs3Nw= "@types/react-helmet@*": @@ -1906,7 +1907,7 @@ "@types/react-router-dom@*": version "5.3.2" - resolved "https://registry.npmmirror.com/@types/react-router-dom/download/@types/react-router-dom-5.3.2.tgz?cache=0&sync_timestamp=1637449508387&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Freact-router-dom%2Fdownload%2F%40types%2Freact-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee" + resolved "https://registry.npmmirror.com/@types/react-router-dom/download/@types/react-router-dom-5.3.2.tgz#ebd8e145cf056db5c66eb1dac63c72f52e8542ee" integrity sha1-69jhRc8FbbXGbrHaxjxy9S6FQu4= dependencies: "@types/history" "*" @@ -1932,12 +1933,12 @@ "@types/retry@^0.12.0": version "0.12.1" - resolved "https://registry.npmmirror.com/@types/retry/download/@types/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" + resolved "https://registry.npmmirror.com/@types/retry/download/@types/retry-0.12.1.tgz?cache=0&sync_timestamp=1637270319130&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fretry%2Fdownload%2F%40types%2Fretry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065" integrity sha1-2PHA0Nwjr61twWqemToIZXdLQGU= "@types/scheduler@*": version "0.16.2" - resolved "https://registry.npmmirror.com/@types/scheduler/download/@types/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + resolved "https://registry.npmmirror.com/@types/scheduler/download/@types/scheduler-0.16.2.tgz?cache=0&sync_timestamp=1637270322974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fscheduler%2Fdownload%2F%40types%2Fscheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" integrity sha1-GmL4lSVyPd4kuhsBsJK/XfitTTk= "@types/serve-index@^1.9.1": @@ -1949,7 +1950,7 @@ "@types/serve-static@*": version "1.13.10" - resolved "https://registry.npmmirror.com/@types/serve-static/download/@types/serve-static-1.13.10.tgz?cache=0&sync_timestamp=1637270770552&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fserve-static%2Fdownload%2F%40types%2Fserve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" + resolved "https://registry.npmmirror.com/@types/serve-static/download/@types/serve-static-1.13.10.tgz?cache=0&sync_timestamp=1637270658875&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fserve-static%2Fdownload%2F%40types%2Fserve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" integrity sha1-9eDOh5fS18xevtpIpSyWxPpHqNk= dependencies: "@types/mime" "^1" @@ -1964,7 +1965,7 @@ "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3": version "2.0.6" - resolved "https://registry.npmmirror.com/@types/unist/download/@types/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" + resolved "https://registry.npmmirror.com/@types/unist/download/@types/unist-2.0.6.tgz?cache=0&sync_timestamp=1637272115806&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Funist%2Fdownload%2F%40types%2Funist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" integrity sha1-JQp7FsO5H2cqJFUuxkZ47rHToI0= "@types/ws@^8.2.2": @@ -1976,7 +1977,7 @@ "@webassemblyjs/ast@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.1.tgz?cache=0&sync_timestamp=1625473420080&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fast%2Fdownload%2F%40webassemblyjs%2Fast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" + resolved "https://registry.nlark.com/@webassemblyjs/ast/download/@webassemblyjs/ast-1.11.1.tgz?cache=0&sync_timestamp=1625473466238&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fast%2Fdownload%2F%40webassemblyjs%2Fast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" integrity sha1-K/12fq4aaZb0Mv9+jX/HVnnAtqc= dependencies: "@webassemblyjs/helper-numbers" "1.11.1" @@ -1984,17 +1985,17 @@ "@webassemblyjs/floating-point-hex-parser@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" + resolved "https://registry.npmmirror.com/@webassemblyjs/floating-point-hex-parser/download/@webassemblyjs/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" integrity sha1-9sYacF8P16auyqToGY8j2dwXnk8= "@webassemblyjs/helper-api-error@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.11.1.tgz?cache=0&sync_timestamp=1625473412127&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-api-error%2Fdownload%2F%40webassemblyjs%2Fhelper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" + resolved "https://registry.nlark.com/@webassemblyjs/helper-api-error/download/@webassemblyjs/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" integrity sha1-GmMZLYeI5cASgAump6RscFKI/RY= "@webassemblyjs/helper-buffer@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.11.1.tgz?cache=0&sync_timestamp=1625473414638&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-buffer%2Fdownload%2F%40webassemblyjs%2Fhelper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" + resolved "https://registry.nlark.com/@webassemblyjs/helper-buffer/download/@webassemblyjs/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" integrity sha1-gyqQDrREiEzemnytRn+BUA9eWrU= "@webassemblyjs/helper-numbers@1.11.1": @@ -2008,12 +2009,12 @@ "@webassemblyjs/helper-wasm-bytecode@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.11.1.tgz?cache=0&sync_timestamp=1625473415013&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-wasm-bytecode%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" + resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-bytecode/download/@webassemblyjs/helper-wasm-bytecode-1.11.1.tgz?cache=0&sync_timestamp=1625473463016&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-wasm-bytecode%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" integrity sha1-8ygkHkHnsZnQsgwY6IQpxEMyleE= "@webassemblyjs/helper-wasm-section@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-section/download/@webassemblyjs/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" + resolved "https://registry.nlark.com/@webassemblyjs/helper-wasm-section/download/@webassemblyjs/helper-wasm-section-1.11.1.tgz?cache=0&sync_timestamp=1625473466570&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fhelper-wasm-section%2Fdownload%2F%40webassemblyjs%2Fhelper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" integrity sha1-Ie4GWntjXzGec48N1zv72igcCXo= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2037,12 +2038,12 @@ "@webassemblyjs/utf8@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.11.1.tgz?cache=0&sync_timestamp=1625473462317&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Futf8%2Fdownload%2F%40webassemblyjs%2Futf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" + resolved "https://registry.nlark.com/@webassemblyjs/utf8/download/@webassemblyjs/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" integrity sha1-0fi3ZDaefG5rrjUOhU3smlnwo/8= "@webassemblyjs/wasm-edit@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.11.1.tgz?cache=0&sync_timestamp=1625473490556&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-edit%2Fdownload%2F%40webassemblyjs%2Fwasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-edit/download/@webassemblyjs/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" integrity sha1-rSBuv0v5WgWM6YgKjAksXeyBk9Y= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2056,7 +2057,7 @@ "@webassemblyjs/wasm-gen@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.11.1.tgz?cache=0&sync_timestamp=1625473361759&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-gen%2Fdownload%2F%40webassemblyjs%2Fwasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" + resolved "https://registry.npmmirror.com/@webassemblyjs/wasm-gen/download/@webassemblyjs/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" integrity sha1-hsXqMEhJdZt9iMR6MvTwOa48j3Y= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2067,7 +2068,7 @@ "@webassemblyjs/wasm-opt@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wasm-opt/download/@webassemblyjs/wasm-opt-1.11.1.tgz?cache=0&sync_timestamp=1625473467198&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwasm-opt%2Fdownload%2F%40webassemblyjs%2Fwasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" + resolved "https://registry.nlark.com/@webassemblyjs/wasm-opt/download/@webassemblyjs/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" integrity sha1-ZXtMIgL0zzs0X4pMZGHIwkGJhfI= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2089,7 +2090,7 @@ "@webassemblyjs/wast-printer@1.11.1": version "1.11.1" - resolved "https://registry.nlark.com/@webassemblyjs/wast-printer/download/@webassemblyjs/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" + resolved "https://registry.nlark.com/@webassemblyjs/wast-printer/download/@webassemblyjs/wast-printer-1.11.1.tgz?cache=0&sync_timestamp=1625473465901&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40webassemblyjs%2Fwast-printer%2Fdownload%2F%40webassemblyjs%2Fwast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" integrity sha1-0Mc77ajuxUJvEK6O9VzuXnCEwvA= dependencies: "@webassemblyjs/ast" "1.11.1" @@ -2097,7 +2098,7 @@ "@xtuc/ieee754@^1.2.0": version "1.2.0" - resolved "https://registry.nlark.com/@xtuc/ieee754/download/@xtuc/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" + resolved "https://registry.npm.taobao.org/@xtuc/ieee754/download/@xtuc/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" integrity sha1-7vAUoxRa5Hehy8AM0eVSM23Ot5A= "@xtuc/long@4.2.2": @@ -2115,12 +2116,12 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: acorn-dynamic-import@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/acorn-dynamic-import/download/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" + resolved "https://registry.nlark.com/acorn-dynamic-import/download/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948" integrity sha1-SCIQFAWCo2uDw+NC4c/ryqkkCUg= acorn-import-assertions@^1.7.6: version "1.8.0" - resolved "https://registry.npmmirror.com/acorn-import-assertions/download/acorn-import-assertions-1.8.0.tgz?cache=0&sync_timestamp=1633349407828&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Facorn-import-assertions%2Fdownload%2Facorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" + resolved "https://registry.npmmirror.com/acorn-import-assertions/download/acorn-import-assertions-1.8.0.tgz?cache=0&sync_timestamp=1633349301882&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Facorn-import-assertions%2Fdownload%2Facorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" integrity sha1-uitZOc5iwjjbbZPYHJsRGym4Vek= acorn-jsx@^5.0.1: @@ -2139,12 +2140,12 @@ acorn-node@^1.6.1: acorn-walk@^7.0.0: version "7.2.0" - resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-7.2.0.tgz?cache=0&sync_timestamp=1630916608758&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-7.2.0.tgz?cache=0&sync_timestamp=1630916588767&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha1-DeiJpgEgOQmw++B7iTjcIdLpZ7w= acorn-walk@^8.0.0: version "8.2.0" - resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-8.2.0.tgz?cache=0&sync_timestamp=1630916608758&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-8.2.0.tgz?cache=0&sync_timestamp=1630916588767&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha1-dBIQ8uJCZFRQiFOi9E0KuDt/acE= acorn@^6.1.1: @@ -2169,7 +2170,7 @@ address@^1.0.1, address@^1.1.2: aggregate-error@^3.0.0: version "3.1.0" - resolved "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.1.0.tgz?cache=0&sync_timestamp=1618681553608&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faggregate-error%2Fdownload%2Faggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + resolved "https://registry.nlark.com/aggregate-error/download/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" integrity sha1-kmcP9Q9TWb23o+DUDQ7DDFc3aHo= dependencies: clean-stack "^2.0.0" @@ -2184,12 +2185,12 @@ ajv-formats@^2.1.1: ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: version "3.5.2" - resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1637523824664&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha1-MfKdpatuANHC0yms97WSlhTVAU0= ajv-keywords@^5.0.0: version "5.1.0" - resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-5.1.0.tgz?cache=0&sync_timestamp=1637523824664&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + resolved "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== dependencies: fast-deep-equal "^3.1.3" @@ -2197,7 +2198,7 @@ ajv-keywords@^5.0.0: ajv@^6.12.2, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.npmmirror.com/ajv/download/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha1-uvWmLoArB9l3A0WG+MO69a3ybfQ= + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== dependencies: fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" @@ -2223,7 +2224,7 @@ algoliasearch-helper@^3.5.5: algoliasearch@^4.0.0, algoliasearch@^4.11.0: version "4.11.0" - resolved "https://registry.npmmirror.com/algoliasearch/download/algoliasearch-4.11.0.tgz?cache=0&sync_timestamp=1634738335372&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Falgoliasearch%2Fdownload%2Falgoliasearch-4.11.0.tgz#234befb3ac355c094077f0edf3777240b1ee013c" + resolved "https://registry.npmmirror.com/algoliasearch/download/algoliasearch-4.11.0.tgz?cache=0&sync_timestamp=1634739569076&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Falgoliasearch%2Fdownload%2Falgoliasearch-4.11.0.tgz#234befb3ac355c094077f0edf3777240b1ee013c" integrity sha1-I0vvs6w1XAlAd/Dt83dyQLHuATw= dependencies: "@algolia/cache-browser-local-storage" "4.11.0" @@ -2248,7 +2249,7 @@ alphanum-sort@^1.0.2: ansi-align@^3.0.0: version "3.0.1" - resolved "https://registry.npmmirror.com/ansi-align/download/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" + resolved "https://registry.npmmirror.com/ansi-align/download/ansi-align-3.0.1.tgz?cache=0&sync_timestamp=1632743737823&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fansi-align%2Fdownload%2Fansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" integrity sha1-DN8S4RGs53OobpofrRIlxDyxmlk= dependencies: string-width "^4.1.0" @@ -2260,12 +2261,12 @@ ansi-html-community@^0.0.8: ansi-regex@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-5.0.1.tgz?cache=0&sync_timestamp=1631634988487&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-regex%2Fdownload%2Fansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha1-CCyyyJyf6GWaMRpTvWpNxTAdswQ= ansi-regex@^6.0.1: version "6.0.1" - resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + resolved "https://registry.nlark.com/ansi-regex/download/ansi-regex-6.0.1.tgz?cache=0&sync_timestamp=1631634988487&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-regex%2Fdownload%2Fansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" integrity sha1-MYPjj66aZdfLXlOUXNWJfQJgoGo= ansi-styles@^3.2.1: @@ -2284,7 +2285,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: anymatch@~3.1.2: version "3.1.2" - resolved "https://registry.nlark.com/anymatch/download/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + resolved "https://registry.npm.taobao.org/anymatch/download/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" integrity sha1-wFV8CWrzLxBhmPT04qODU343hxY= dependencies: normalize-path "^3.0.0" @@ -2297,29 +2298,29 @@ arg@^5.0.1: argparse@^1.0.7: version "1.0.10" - resolved "https://registry.nlark.com/argparse/download/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + resolved "https://registry.npmmirror.com/argparse/download/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE= dependencies: sprintf-js "~1.0.2" argparse@^2.0.1: version "2.0.1" - resolved "https://registry.nlark.com/argparse/download/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + resolved "https://registry.npmmirror.com/argparse/download/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha1-JG9Q88p4oyQPbJl+ipvR6sSeSzg= array-flatten@1.1.1: version "1.1.1" - resolved "https://registry.npm.taobao.org/array-flatten/download/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + resolved "https://registry.npmmirror.com/array-flatten/download/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= array-flatten@^2.1.0: version "2.1.2" - resolved "https://registry.npm.taobao.org/array-flatten/download/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" + resolved "https://registry.npmmirror.com/array-flatten/download/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha1-JO+AoowaiTYX4hSbDG0NeIKTsJk= array-union@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/array-union/download/array-union-2.1.0.tgz?cache=0&sync_timestamp=1614624262896&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Farray-union%2Fdownload%2Farray-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + resolved "https://registry.npm.taobao.org/array-union/download/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha1-t5hCCtvrHego2ErNii4j0+/oXo0= async@^2.6.2: @@ -2331,20 +2332,20 @@ async@^2.6.2: at-least-node@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/at-least-node/download/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + resolved "https://registry.npm.taobao.org/at-least-node/download/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha1-YCzUtG6EStTv/JKoARo8RuAjjcI= autoprefixer@^10.3.1, autoprefixer@^10.3.5, autoprefixer@^10.3.7: - version "10.4.0" - resolved "https://registry.npmmirror.com/autoprefixer/download/autoprefixer-10.4.0.tgz#c3577eb32a1079a440ec253e404eaf1eb21388c8" - integrity sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA== + version "10.4.1" + resolved "https://registry.npmmirror.com/autoprefixer/download/autoprefixer-10.4.1.tgz#1735959d6462420569bc42408016acbc56861c12" + integrity sha512-B3ZEG7wtzXDRCEFsan7HmR2AeNsxdJB0+sEC0Hc5/c2NbhJqPwuZm+tn233GBVw82L+6CtD6IPSfVruwKjfV3A== dependencies: - browserslist "^4.17.5" - caniuse-lite "^1.0.30001272" - fraction.js "^4.1.1" + browserslist "^4.19.1" + caniuse-lite "^1.0.30001294" + fraction.js "^4.1.2" normalize-range "^0.1.2" picocolors "^1.0.0" - postcss-value-parser "^4.1.0" + postcss-value-parser "^4.2.0" axios@^0.21.1: version "0.21.4" @@ -2355,7 +2356,7 @@ axios@^0.21.1: babel-loader@^8.2.2: version "8.2.3" - resolved "https://registry.npmmirror.com/babel-loader/download/babel-loader-8.2.3.tgz?cache=0&sync_timestamp=1634769533620&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-loader%2Fdownload%2Fbabel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" + resolved "https://registry.npmmirror.com/babel-loader/download/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d" integrity sha1-iYa0Dxpkys/LS4QpMgCF72ixNC0= dependencies: find-cache-dir "^3.3.1" @@ -2365,7 +2366,7 @@ babel-loader@^8.2.2: babel-plugin-apply-mdx-type-prop@1.6.22: version "1.6.22" - resolved "https://registry.npm.taobao.org/babel-plugin-apply-mdx-type-prop/download/babel-plugin-apply-mdx-type-prop-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-apply-mdx-type-prop%2Fdownload%2Fbabel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b" + resolved "https://registry.npm.taobao.org/babel-plugin-apply-mdx-type-prop/download/babel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b" integrity sha1-0hbo/Q3pHePxR47zIx4FRGvIcFs= dependencies: "@babel/helper-plugin-utils" "7.10.4" @@ -2373,28 +2374,28 @@ babel-plugin-apply-mdx-type-prop@1.6.22: babel-plugin-dynamic-import-node@2.3.0: version "2.3.0" - resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.0.tgz?cache=0&sync_timestamp=1618846958717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" + resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.0.tgz?cache=0&sync_timestamp=1618846790496&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f" integrity sha1-8A9Qe9qjw+P/bn5emNkKesq5b38= dependencies: object.assign "^4.1.0" babel-plugin-dynamic-import-node@^2.3.3: version "2.3.3" - resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.3.tgz?cache=0&sync_timestamp=1618846958717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" + resolved "https://registry.nlark.com/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.3.tgz?cache=0&sync_timestamp=1618846790496&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbabel-plugin-dynamic-import-node%2Fdownload%2Fbabel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" integrity sha1-hP2hnJduxcbe/vV/lCez3vZuF6M= dependencies: object.assign "^4.1.0" babel-plugin-extract-import-names@1.6.22: version "1.6.22" - resolved "https://registry.npm.taobao.org/babel-plugin-extract-import-names/download/babel-plugin-extract-import-names-1.6.22.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-plugin-extract-import-names%2Fdownload%2Fbabel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc" + resolved "https://registry.npm.taobao.org/babel-plugin-extract-import-names/download/babel-plugin-extract-import-names-1.6.22.tgz#de5f9a28eb12f3eb2578bf74472204e66d1a13dc" integrity sha1-3l+aKOsS8+sleL90RyIE5m0aE9w= dependencies: "@babel/helper-plugin-utils" "7.10.4" babel-plugin-polyfill-corejs2@^0.3.0: version "0.3.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/download/babel-plugin-polyfill-corejs2-0.3.0.tgz?cache=0&sync_timestamp=1636799843170&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs2%2Fdownload%2Fbabel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/download/babel-plugin-polyfill-corejs2-0.3.0.tgz?cache=0&sync_timestamp=1636802678201&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs2%2Fdownload%2Fbabel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd" integrity sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA== dependencies: "@babel/compat-data" "^7.13.11" @@ -2403,7 +2404,7 @@ babel-plugin-polyfill-corejs2@^0.3.0: babel-plugin-polyfill-corejs3@^0.4.0: version "0.4.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/download/babel-plugin-polyfill-corejs3-0.4.0.tgz?cache=0&sync_timestamp=1636799842810&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-corejs3%2Fdownload%2Fbabel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/download/babel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087" integrity sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.0" @@ -2411,19 +2412,19 @@ babel-plugin-polyfill-corejs3@^0.4.0: babel-plugin-polyfill-regenerator@^0.3.0: version "0.3.0" - resolved "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/download/babel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be" + resolved "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/download/babel-plugin-polyfill-regenerator-0.3.0.tgz?cache=0&sync_timestamp=1636802677257&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbabel-plugin-polyfill-regenerator%2Fdownload%2Fbabel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be" integrity sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg== dependencies: "@babel/helper-define-polyfill-provider" "^0.3.0" bail@^1.0.0: version "1.0.5" - resolved "https://registry.npmmirror.com/bail/download/bail-1.0.5.tgz?cache=0&sync_timestamp=1636274632406&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbail%2Fdownload%2Fbail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" + resolved "https://registry.npmmirror.com/bail/download/bail-1.0.5.tgz?cache=0&sync_timestamp=1636274668154&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fbail%2Fdownload%2Fbail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" integrity sha1-tvoTNASjksvB+MS/Y/WVM1Hnp3Y= balanced-match@^1.0.0: version "1.0.2" - resolved "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.2.tgz?cache=0&sync_timestamp=1617714233441&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbalanced-match%2Fdownload%2Fbalanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + resolved "https://registry.nlark.com/balanced-match/download/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4= batch@0.6.1: @@ -2443,7 +2444,7 @@ binary-extensions@^2.0.0: bluebird@^3.7.1: version "3.7.2" - resolved "https://registry.npm.taobao.org/bluebird/download/bluebird-3.7.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbluebird%2Fdownload%2Fbluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + resolved "https://registry.npm.taobao.org/bluebird/download/bluebird-3.7.2.tgz?cache=0&sync_timestamp=1615984338230&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbluebird%2Fdownload%2Fbluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha1-nyKcFb4nJFT/qXOs4NvueaGww28= body-parser@1.19.1: @@ -2476,12 +2477,12 @@ bonjour@^3.5.0: boolbase@^1.0.0, boolbase@~1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/boolbase/download/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" + resolved "https://registry.npm.taobao.org/boolbase/download/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= boxen@^5.0.0, boxen@^5.0.1: version "5.1.2" - resolved "https://registry.npmmirror.com/boxen/download/boxen-5.1.2.tgz?cache=0&sync_timestamp=1634028659618&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fboxen%2Fdownload%2Fboxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" + resolved "https://registry.npmmirror.com/boxen/download/boxen-5.1.2.tgz?cache=0&sync_timestamp=1634028569091&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fboxen%2Fdownload%2Fboxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" integrity sha1-eIy2hvyDwfSG36ikDGj8K4MdK1A= dependencies: ansi-align "^3.0.0" @@ -2503,7 +2504,7 @@ brace-expansion@^1.1.7: braces@^3.0.1, braces@~3.0.2: version "3.0.2" - resolved "https://registry.nlark.com/braces/download/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + resolved "https://registry.npm.taobao.org/braces/download/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha1-NFThpGLujVmeI23zNs2epPiv4Qc= dependencies: fill-range "^7.0.1" @@ -2534,7 +2535,7 @@ buble-jsx-only@^0.19.8: buffer-from@^1.0.0: version "1.1.2" - resolved "https://registry.nlark.com/buffer-from/download/buffer-from-1.1.2.tgz?cache=0&sync_timestamp=1627578450949&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fbuffer-from%2Fdownload%2Fbuffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + resolved "https://registry.nlark.com/buffer-from/download/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" integrity sha1-KxRqb9cugLT1XSVfNe1Zo6mkG9U= buffer-indexof@^1.0.0: @@ -2554,7 +2555,7 @@ bytes@3.1.1: cacheable-request@^6.0.0: version "6.1.0" - resolved "https://registry.nlark.com/cacheable-request/download/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" + resolved "https://registry.nlark.com/cacheable-request/download/cacheable-request-6.1.0.tgz?cache=0&sync_timestamp=1623237504263&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcacheable-request%2Fdownload%2Fcacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" integrity sha1-IP+4vRYrpL4R6VZ9gj22UQUsqRI= dependencies: clone-response "^1.0.2" @@ -2567,7 +2568,7 @@ cacheable-request@^6.0.0: call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/call-bind/download/call-bind-1.0.2.tgz?cache=0&sync_timestamp=1610403020286&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcall-bind%2Fdownload%2Fcall-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + resolved "https://registry.npm.taobao.org/call-bind/download/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha1-sdTonmiBGcPJqQOtMKuy9qkZvjw= dependencies: function-bind "^1.1.1" @@ -2575,12 +2576,12 @@ call-bind@^1.0.0, call-bind@^1.0.2: callsites@^3.0.0: version "3.1.0" - resolved "https://registry.nlark.com/callsites/download/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + resolved "https://registry.nlark.com/callsites/download/callsites-3.1.0.tgz?cache=0&sync_timestamp=1628464722297&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcallsites%2Fdownload%2Fcallsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha1-s2MKvYlDQy9Us/BRkjjjPNffL3M= camel-case@^4.1.2: version "4.1.2" - resolved "https://registry.nlark.com/camel-case/download/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" + resolved "https://registry.npmmirror.com/camel-case/download/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" integrity sha1-lygHKpVPgFIoIlpt7qazhGHhvVo= dependencies: pascal-case "^3.1.2" @@ -2588,12 +2589,12 @@ camel-case@^4.1.2: camelcase-css@2.0.1, camelcase-css@^2.0.1: version "2.0.1" - resolved "https://registry.npm.taobao.org/camelcase-css/download/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" + resolved "https://registry.nlark.com/camelcase-css/download/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" integrity sha1-7pePaUeRTMMMa0R0G27R338EP9U= camelcase@^6.2.0: version "6.2.1" - resolved "https://registry.npmmirror.com/camelcase/download/camelcase-6.2.1.tgz?cache=0&sync_timestamp=1636945130104&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" + resolved "https://registry.npmmirror.com/camelcase/download/camelcase-6.2.1.tgz?cache=0&sync_timestamp=1636945141024&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== caniuse-api@^3.0.0: @@ -2606,7 +2607,7 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001286: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001294: version "1.0.30001294" resolved "https://registry.npmmirror.com/caniuse-lite/download/caniuse-lite-1.0.30001294.tgz#4849f27b101fd59ddee3751598c663801032533d" integrity sha512-LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g== @@ -2635,22 +2636,22 @@ chalk@^4.1.0, chalk@^4.1.2: character-entities-legacy@^1.0.0: version "1.1.4" - resolved "https://registry.npmmirror.com/character-entities-legacy/download/character-entities-legacy-1.1.4.tgz?cache=0&sync_timestamp=1635911807340&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities-legacy%2Fdownload%2Fcharacter-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" + resolved "https://registry.npmmirror.com/character-entities-legacy/download/character-entities-legacy-1.1.4.tgz?cache=0&sync_timestamp=1635911965002&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities-legacy%2Fdownload%2Fcharacter-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" integrity sha1-lLwYRdznClu50uzHSHJWYSk9j8E= character-entities@^1.0.0: version "1.2.4" - resolved "https://registry.npmmirror.com/character-entities/download/character-entities-1.2.4.tgz?cache=0&sync_timestamp=1635868930605&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities%2Fdownload%2Fcharacter-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" + resolved "https://registry.npmmirror.com/character-entities/download/character-entities-1.2.4.tgz?cache=0&sync_timestamp=1635869130345&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-entities%2Fdownload%2Fcharacter-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" integrity sha1-4Sw5Obfq9OWxXnrUxeKOHUjFsWs= character-reference-invalid@^1.0.0: version "1.1.4" - resolved "https://registry.npmmirror.com/character-reference-invalid/download/character-reference-invalid-1.1.4.tgz?cache=0&sync_timestamp=1636446304022&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-reference-invalid%2Fdownload%2Fcharacter-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" + resolved "https://registry.npmmirror.com/character-reference-invalid/download/character-reference-invalid-1.1.4.tgz?cache=0&sync_timestamp=1636446564128&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcharacter-reference-invalid%2Fdownload%2Fcharacter-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" integrity sha1-CDMpzaDq4nKrPbvzfpo4LBOvFWA= cheerio@^0.22.0: version "0.22.0" - resolved "https://registry.nlark.com/cheerio/download/cheerio-0.22.0.tgz?cache=0&sync_timestamp=1623167648923&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcheerio%2Fdownload%2Fcheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" + resolved "https://registry.nlark.com/cheerio/download/cheerio-0.22.0.tgz?cache=0&sync_timestamp=1631634750458&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcheerio%2Fdownload%2Fcheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4= dependencies: css-select "~1.2.0" @@ -2687,7 +2688,7 @@ chokidar@^3.4.2, chokidar@^3.5.2: chrome-trace-event@^1.0.2: version "1.0.3" - resolved "https://registry.nlark.com/chrome-trace-event/download/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + resolved "https://registry.npm.taobao.org/chrome-trace-event/download/chrome-trace-event-1.0.3.tgz?cache=0&sync_timestamp=1617906586875&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchrome-trace-event%2Fdownload%2Fchrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" integrity sha1-EBXs7UdB4V0GZkqVfbv1DQQeJqw= ci-info@^2.0.0: @@ -2702,7 +2703,7 @@ ci-info@^3.1.1: clean-css@^5.1.5, clean-css@^5.2.2: version "5.2.2" - resolved "https://registry.npmmirror.com/clean-css/download/clean-css-5.2.2.tgz?cache=0&sync_timestamp=1634992314911&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fclean-css%2Fdownload%2Fclean-css-5.2.2.tgz#d3a7c6ee2511011e051719838bdcf8314dc4548d" + resolved "https://registry.npmmirror.com/clean-css/download/clean-css-5.2.2.tgz?cache=0&sync_timestamp=1634992859960&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fclean-css%2Fdownload%2Fclean-css-5.2.2.tgz#d3a7c6ee2511011e051719838bdcf8314dc4548d" integrity sha1-06fG7iURAR4FFxmDi9z4MU3EVI0= dependencies: source-map "~0.6.0" @@ -2714,7 +2715,7 @@ clean-stack@^2.0.0: cli-boxes@^2.2.1: version "2.2.1" - resolved "https://registry.nlark.com/cli-boxes/download/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" + resolved "https://registry.npm.taobao.org/cli-boxes/download/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" integrity sha1-3dUDXSUJT84iDpyrQKRYQKRAMY8= clone-deep@^4.0.1: @@ -2783,7 +2784,7 @@ colord@^2.9.1: colorette@^2.0.10: version "2.0.16" - resolved "https://registry.npmmirror.com/colorette/download/colorette-2.0.16.tgz?cache=0&sync_timestamp=1633673160250&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcolorette%2Fdownload%2Fcolorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" + resolved "https://registry.npmmirror.com/colorette/download/colorette-2.0.16.tgz?cache=0&sync_timestamp=1633673138036&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcolorette%2Fdownload%2Fcolorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" integrity sha1-cTua+E/bAAE58EVGvUqT9ipQhdo= combine-promises@^1.1.0: @@ -2818,19 +2819,19 @@ commander@^8.3.0: commondir@^1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/commondir/download/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" + resolved "https://registry.npm.taobao.org/commondir/download/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= compressible@~2.0.16: version "2.0.18" - resolved "https://registry.npm.taobao.org/compressible/download/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" + resolved "https://registry.npmmirror.com/compressible/download/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" integrity sha1-r1PMprBw1MPAdQ+9dyhqbXzEb7o= dependencies: mime-db ">= 1.43.0 < 2" compression@^1.7.4: version "1.7.4" - resolved "https://registry.nlark.com/compression/download/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" + resolved "https://registry.npm.taobao.org/compression/download/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" integrity sha1-lVI+/xcMpXwpoMpB5v4TH0Hlu48= dependencies: accepts "~1.3.5" @@ -2848,7 +2849,7 @@ concat-map@0.0.1: configstore@^5.0.1: version "5.0.1" - resolved "https://registry.npm.taobao.org/configstore/download/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" + resolved "https://registry.nlark.com/configstore/download/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" integrity sha1-02UCG130uYzdGH1qOw4/anzF7ZY= dependencies: dot-prop "^5.2.0" @@ -2860,7 +2861,7 @@ configstore@^5.0.1: connect-history-api-fallback@^1.6.0: version "1.6.0" - resolved "https://registry.npm.taobao.org/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" + resolved "https://registry.nlark.com/connect-history-api-fallback/download/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha1-izIIk1kwjRERFdgcrT/Oq4iPl7w= consola@^2.15.3: @@ -2882,19 +2883,19 @@ content-disposition@0.5.4: content-type@~1.0.4: version "1.0.4" - resolved "https://registry.nlark.com/content-type/download/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + resolved "https://registry.npm.taobao.org/content-type/download/content-type-1.0.4.tgz?cache=0&sync_timestamp=1615984448548&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcontent-type%2Fdownload%2Fcontent-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha1-4TjMdeBAxyexlm/l5fjJruJW/js= convert-source-map@^1.7.0: version "1.8.0" - resolved "https://registry.nlark.com/convert-source-map/download/convert-source-map-1.8.0.tgz?cache=0&sync_timestamp=1624045420970&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fconvert-source-map%2Fdownload%2Fconvert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + resolved "https://registry.nlark.com/convert-source-map/download/convert-source-map-1.8.0.tgz?cache=0&sync_timestamp=1624045304679&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fconvert-source-map%2Fdownload%2Fconvert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" integrity sha1-8zc8MtIbTXgN2ABFFGhPt5HKQ2k= dependencies: safe-buffer "~5.1.1" cookie-signature@1.0.6: version "1.0.6" - resolved "https://registry.nlark.com/cookie-signature/download/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + resolved "https://registry.npm.taobao.org/cookie-signature/download/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= cookie@0.4.1: @@ -2944,7 +2945,7 @@ core-util-is@~1.0.0: cosmiconfig@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-6.0.0.tgz?cache=0&sync_timestamp=1629586119976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" + resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-6.0.0.tgz?cache=0&sync_timestamp=1629585969900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" integrity sha1-2k/uhTxS9rHmk19BwaL8UL1KmYI= dependencies: "@types/parse-json" "^4.0.0" @@ -2955,7 +2956,7 @@ cosmiconfig@^6.0.0: cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: version "7.0.1" - resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz?cache=0&sync_timestamp=1629586119976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + resolved "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz?cache=0&sync_timestamp=1629585969900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" integrity sha1-cU11ZSLKzoZ4Z8y0R0xdAbuuXW0= dependencies: "@types/parse-json" "^4.0.0" @@ -2973,7 +2974,7 @@ cross-env@^7.0.3: cross-spawn@^7.0.1, cross-spawn@^7.0.3: version "7.0.3" - resolved "https://registry.nlark.com/cross-spawn/download/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + resolved "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-7.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcross-spawn%2Fdownload%2Fcross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha1-9zqFudXUHQRVUcF34ogtSshXKKY= dependencies: path-key "^3.1.0" @@ -2982,7 +2983,7 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.3: crypto-random-string@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/crypto-random-string/download/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" + resolved "https://registry.npm.taobao.org/crypto-random-string/download/crypto-random-string-2.0.0.tgz?cache=0&sync_timestamp=1617610467993&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcrypto-random-string%2Fdownload%2Fcrypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" integrity sha1-7yp6lm7BEIM4g2m6oC6+rSKbMNU= css-declaration-sorter@^6.0.3: @@ -2994,7 +2995,7 @@ css-declaration-sorter@^6.0.3: css-loader@^5.1.1: version "5.2.7" - resolved "https://registry.npmmirror.com/css-loader/download/css-loader-5.2.7.tgz?cache=0&sync_timestamp=1635967924209&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-loader%2Fdownload%2Fcss-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" + resolved "https://registry.npmmirror.com/css-loader/download/css-loader-5.2.7.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-loader%2Fdownload%2Fcss-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" integrity sha1-m58RHt9vsr5dxiUlZEy8nCMgZK4= dependencies: icss-utils "^5.1.0" @@ -3089,7 +3090,7 @@ css-what@^5.1.0: cssesc@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/cssesc/download/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" + resolved "https://registry.npm.taobao.org/cssesc/download/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4= cssnano-preset-advanced@^5.1.4: @@ -3195,7 +3196,7 @@ decompress-response@^3.3.0: deep-equal@^1.0.1: version "1.1.1" - resolved "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz?cache=0&sync_timestamp=1606860754950&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeep-equal%2Fdownload%2Fdeep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + resolved "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" integrity sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o= dependencies: is-arguments "^1.0.4" @@ -3207,12 +3208,12 @@ deep-equal@^1.0.1: deep-extend@^0.6.0: version "0.6.0" - resolved "https://registry.nlark.com/deep-extend/download/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + resolved "https://registry.npm.taobao.org/deep-extend/download/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha1-xPp8lUBKF6nD6Mp+FTcxK3NjMKw= deepmerge@^4.2.2: version "4.2.2" - resolved "https://registry.nlark.com/deepmerge/download/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + resolved "https://registry.npm.taobao.org/deepmerge/download/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha1-RNLqNnm49NT/ujPwPYZfwee/SVU= default-gateway@^6.0.3: @@ -3229,7 +3230,7 @@ defer-to-connect@^1.0.1: define-lazy-prop@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/define-lazy-prop/download/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" + resolved "https://registry.npm.taobao.org/define-lazy-prop/download/define-lazy-prop-2.0.0.tgz?cache=0&sync_timestamp=1618387627365&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdefine-lazy-prop%2Fdownload%2Fdefine-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha1-P3rkIRKbyqrJvHSQXJigAJ7J7n8= define-properties@^1.1.3: @@ -3246,7 +3247,7 @@ defined@^1.0.0: del@^6.0.0: version "6.0.0" - resolved "https://registry.npm.taobao.org/del/download/del-6.0.0.tgz?cache=0&sync_timestamp=1618321540358&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdel%2Fdownload%2Fdel-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" + resolved "https://registry.nlark.com/del/download/del-6.0.0.tgz?cache=0&sync_timestamp=1631633199174&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdel%2Fdownload%2Fdel-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952" integrity sha1-C0DQMyzqdD8WFPgYvk/rcXcUyVI= dependencies: globby "^11.0.1" @@ -3260,7 +3261,7 @@ del@^6.0.0: depd@~1.1.2: version "1.1.2" - resolved "https://registry.nlark.com/depd/download/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" + resolved "https://registry.npm.taobao.org/depd/download/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= destroy@~1.0.4: @@ -3270,14 +3271,14 @@ destroy@~1.0.4: detab@2.0.4: version "2.0.4" - resolved "https://registry.nlark.com/detab/download/detab-2.0.4.tgz?cache=0&sync_timestamp=1629724300992&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdetab%2Fdownload%2Fdetab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43" + resolved "https://registry.nlark.com/detab/download/detab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43" integrity sha1-uSeJIGmv9AX7uaGG/pekSpKpS0M= dependencies: repeat-string "^1.5.4" detect-node@^2.0.4: version "2.1.0" - resolved "https://registry.nlark.com/detect-node/download/detect-node-2.1.0.tgz?cache=0&sync_timestamp=1621146902208&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdetect-node%2Fdownload%2Fdetect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + resolved "https://registry.nlark.com/detect-node/download/detect-node-2.1.0.tgz?cache=0&sync_timestamp=1621146954463&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdetect-node%2Fdownload%2Fdetect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha1-yccHdaScPQO8LAbZpzvlUPl4+LE= detect-port-alt@^1.1.6: @@ -3290,7 +3291,7 @@ detect-port-alt@^1.1.6: detect-port@^1.3.0: version "1.3.0" - resolved "https://registry.nlark.com/detect-port/download/detect-port-1.3.0.tgz#d9c40e9accadd4df5cac6a782aefd014d573d1f1" + resolved "https://registry.npm.taobao.org/detect-port/download/detect-port-1.3.0.tgz?cache=0&sync_timestamp=1615984907558&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdetect-port%2Fdownload%2Fdetect-port-1.3.0.tgz#d9c40e9accadd4df5cac6a782aefd014d573d1f1" integrity sha1-2cQOmsyt1N9crGp4Ku/QFNVz0fE= dependencies: address "^1.0.1" @@ -3307,7 +3308,7 @@ detective@^5.2.0: didyoumean@^1.2.2: version "1.2.2" - resolved "https://registry.nlark.com/didyoumean/download/didyoumean-1.2.2.tgz?cache=0&sync_timestamp=1624543452248&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdidyoumean%2Fdownload%2Fdidyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" + resolved "https://registry.nlark.com/didyoumean/download/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" integrity sha1-mJNG/+noObRVXs9WZu3qDT6K0Dc= dir-glob@^3.0.1: @@ -3319,12 +3320,12 @@ dir-glob@^3.0.1: dlv@^1.1.3: version "1.1.3" - resolved "https://registry.npm.taobao.org/dlv/download/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" + resolved "https://registry.nlark.com/dlv/download/dlv-1.1.3.tgz?cache=0&sync_timestamp=1631636192892&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdlv%2Fdownload%2Fdlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" integrity sha1-XBmKihFFNZbnUUlNSYdLx3MvLnk= dns-equal@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/dns-equal/download/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" + resolved "https://registry.nlark.com/dns-equal/download/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= dns-packet@^1.3.1: @@ -3337,25 +3338,25 @@ dns-packet@^1.3.1: dns-txt@^2.0.2: version "2.0.2" - resolved "https://registry.nlark.com/dns-txt/download/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" + resolved "https://registry.npm.taobao.org/dns-txt/download/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY= dependencies: buffer-indexof "^1.0.0" docusaurus-preset-nonepress@canary: - version "0.0.0-125" - resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-125.tgz#4f53ae052b20486e0a4d0f76634d703683b3a98d" - integrity sha512-V6H4JULwlAyc4tkff+ptvPXjhuMftiJILQr3mOshMq6/be7bkMNGX/0nJRqf+gAtj7ddmRAiuZBgfMF7pkTiXA== + version "0.0.0-129" + resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-129.tgz#8aebd61840ae1a07a59c487559e3390a9902e2fa" + integrity sha512-sI5UdYlm9Xcaz70UyBJU9m8ERpw28UQyPYq/iCeohuQbFd8npdJXPgnklf4xN4+4N/oM+8M49auo7omnoJCNHg== dependencies: "@docusaurus/core" "2.0.0-beta.9" "@docusaurus/plugin-content-docs" "2.0.0-beta.9" "@docusaurus/plugin-content-pages" "2.0.0-beta.9" - docusaurus-theme-nonepress "0.0.0-125" + docusaurus-theme-nonepress "0.0.0-129" -docusaurus-theme-nonepress@0.0.0-125: - version "0.0.0-125" - resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-125.tgz#2213d7f0942ddc1e993b2873c3467643d521a7a4" - integrity sha512-cE8+WQgJAaQu5rFz01ZQT6uXx5SgMa3YrY7xNG5l0O++ejEefpYufX5KClzx3fDcNPTjFFAefjWgQk6rMTPjfw== +docusaurus-theme-nonepress@0.0.0-129: + version "0.0.0-129" + resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-129.tgz#58ae7151518318bb041a586b2f23d0b4043480b9" + integrity sha512-ETg0XuYpVQU8qIeTfPFj2V99oqbv5tyc4uLzYoO9t4YQ+PK7G8rMpVve6QxpMRCAiNyICWMqg9A6BkROf+z1bQ== dependencies: "@docsearch/react" "^3.0.0-alpha.39" "@docusaurus/core" "2.0.0-beta.9" @@ -3426,12 +3427,12 @@ dom-serializer@~0.1.0: domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: version "1.3.1" - resolved "https://registry.nlark.com/domelementtype/download/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" + resolved "https://registry.npm.taobao.org/domelementtype/download/domelementtype-1.3.1.tgz?cache=0&sync_timestamp=1617298545989&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomelementtype%2Fdownload%2Fdomelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha1-0EjESzew0Qp/Kj1f7j9DM9eQSB8= domelementtype@^2.0.1, domelementtype@^2.2.0: version "2.2.0" - resolved "https://registry.nlark.com/domelementtype/download/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + resolved "https://registry.npm.taobao.org/domelementtype/download/domelementtype-2.2.0.tgz?cache=0&sync_timestamp=1617298545989&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdomelementtype%2Fdownload%2Fdomelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" integrity sha1-mgtsJ4LtahxzI9QiZxg9+b2LHVc= domhandler@^2.3.0: @@ -3450,7 +3451,7 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.0: domutils@1.5.1: version "1.5.1" - resolved "https://registry.nlark.com/domutils/download/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" + resolved "https://registry.npmmirror.com/domutils/download/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8= dependencies: dom-serializer "0" @@ -3458,7 +3459,7 @@ domutils@1.5.1: domutils@^1.5.1, domutils@^1.7.0: version "1.7.0" - resolved "https://registry.nlark.com/domutils/download/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" + resolved "https://registry.npmmirror.com/domutils/download/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" integrity sha1-Vuo0HoNOBuZ0ivehyyXaZ+qfjCo= dependencies: dom-serializer "0" @@ -3466,7 +3467,7 @@ domutils@^1.5.1, domutils@^1.7.0: domutils@^2.5.2, domutils@^2.8.0: version "2.8.0" - resolved "https://registry.nlark.com/domutils/download/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" + resolved "https://registry.npmmirror.com/domutils/download/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" integrity sha1-RDfe9dtuLR9dbuhZvZXKfQIEgTU= dependencies: dom-serializer "^1.0.1" @@ -3483,7 +3484,7 @@ dot-case@^3.0.4: dot-prop@^5.2.0: version "5.3.0" - resolved "https://registry.npm.taobao.org/dot-prop/download/dot-prop-5.3.0.tgz?cache=0&sync_timestamp=1605778245785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdot-prop%2Fdownload%2Fdot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + resolved "https://registry.npm.taobao.org/dot-prop/download/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" integrity sha1-kMzOcIzZzYLMTcjD3dmr3VWyDog= dependencies: is-obj "^2.0.0" @@ -3495,7 +3496,7 @@ duplexer3@^0.1.4: duplexer@^0.1.1, duplexer@^0.1.2: version "0.1.2" - resolved "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fduplexer%2Fdownload%2Fduplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" + resolved "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha1-Or5DrvODX4rgd9E23c4PJ2sEAOY= ee-first@1.1.1: @@ -3504,28 +3505,28 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.4.17: - version "1.4.29" - resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.29.tgz#a9b85ab888d0122124c9647c04d8dd246fae94b6" - integrity sha512-N2Jbwxo5Rum8G2YXeUxycs1sv4Qme/ry71HG73bv8BvZl+I/4JtRgK/En+ST/Wh/yF1fqvVCY4jZBgMxnhjtBA== + version "1.4.31" + resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.31.tgz#8d5ccc3f8253cd142b07afaa84f200fd33a7f2a6" + integrity sha512-t3XVQtk+Frkv6aTD4RRk0OqosU+VLe1dQFW83MDer78ZD6a52frgXuYOIsLYTQiH2Lm+JB2OKYcn7zrX+YGAiQ== emoji-regex@^8.0.0: version "8.0.0" - resolved "https://registry.npmmirror.com/emoji-regex/download/emoji-regex-8.0.0.tgz?cache=0&sync_timestamp=1632751333727&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Femoji-regex%2Fdownload%2Femoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + resolved "https://registry.npmmirror.com/emoji-regex/download/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha1-6Bj9ac5cz8tARZT4QpY79TFkzDc= emojis-list@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/emojis-list/download/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + resolved "https://registry.npm.taobao.org/emojis-list/download/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" integrity sha1-VXBmIEatKeLpFucariYKvf9Pang= emoticon@^3.2.0: version "3.2.0" - resolved "https://registry.npmmirror.com/emoticon/download/emoticon-3.2.0.tgz?cache=0&sync_timestamp=1636290949842&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Femoticon%2Fdownload%2Femoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f" + resolved "https://registry.npmmirror.com/emoticon/download/emoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f" integrity sha1-wAjKfXYg+sdC/hv0r4/4/tFUrn8= encodeurl@~1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/encodeurl/download/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + resolved "https://registry.npm.taobao.org/encodeurl/download/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= end-of-stream@^1.1.0: @@ -3537,7 +3538,7 @@ end-of-stream@^1.1.0: enhanced-resolve@^5.8.3: version "5.8.3" - resolved "https://registry.nlark.com/enhanced-resolve/download/enhanced-resolve-5.8.3.tgz?cache=0&sync_timestamp=1632130840337&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" + resolved "https://registry.nlark.com/enhanced-resolve/download/enhanced-resolve-5.8.3.tgz?cache=0&sync_timestamp=1632130769099&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0" integrity sha1-bVUtRlzOBCP1s9cYUR6lOCansvA= dependencies: graceful-fs "^4.2.4" @@ -3562,7 +3563,7 @@ error-ex@^1.3.1: es-abstract@^1.17.2, es-abstract@^1.19.1: version "1.19.1" - resolved "https://registry.npmmirror.com/es-abstract/download/es-abstract-1.19.1.tgz?cache=0&sync_timestamp=1633234313248&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-abstract%2Fdownload%2Fes-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" + resolved "https://registry.npmmirror.com/es-abstract/download/es-abstract-1.19.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-abstract%2Fdownload%2Fes-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" integrity sha1-1IhXlodpFpWd547aoN9FZicRXsM= dependencies: call-bind "^1.0.2" @@ -3588,12 +3589,12 @@ es-abstract@^1.17.2, es-abstract@^1.19.1: es-module-lexer@^0.9.0: version "0.9.3" - resolved "https://registry.npmmirror.com/es-module-lexer/download/es-module-lexer-0.9.3.tgz?cache=0&sync_timestamp=1633646154044&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-module-lexer%2Fdownload%2Fes-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" + resolved "https://registry.npmmirror.com/es-module-lexer/download/es-module-lexer-0.9.3.tgz?cache=0&sync_timestamp=1633649003753&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fes-module-lexer%2Fdownload%2Fes-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" integrity sha1-bxPbAMw4QXE32vdDZvU1yOtDjxk= es-to-primitive@^1.2.1: version "1.2.1" - resolved "https://registry.npm.taobao.org/es-to-primitive/download/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + resolved "https://registry.nlark.com/es-to-primitive/download/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" integrity sha1-5VzUyc3BiLzvsDs2bHNjI/xciYo= dependencies: is-callable "^1.1.4" @@ -3602,37 +3603,37 @@ es-to-primitive@^1.2.1: escalade@^3.1.1: version "3.1.1" - resolved "https://registry.npm.taobao.org/escalade/download/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + resolved "https://registry.nlark.com/escalade/download/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha1-2M/ccACWXFoBdLSoLqpcBVJ0LkA= escape-goat@^2.0.0: version "2.1.1" - resolved "https://registry.npm.taobao.org/escape-goat/download/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" + resolved "https://registry.nlark.com/escape-goat/download/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" integrity sha1-Gy3HcANnbEV+x2Cy3GjttkgYhnU= escape-html@^1.0.3, escape-html@~1.0.3: version "1.0.3" - resolved "https://registry.nlark.com/escape-html/download/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + resolved "https://registry.npmmirror.com/escape-html/download/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= escape-string-regexp@^1.0.5: version "1.0.5" - resolved "https://registry.nlark.com/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + resolved "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz?cache=0&sync_timestamp=1618677243201&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fescape-string-regexp%2Fdownload%2Fescape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= escape-string-regexp@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/escape-string-regexp/download/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + resolved "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-2.0.0.tgz?cache=0&sync_timestamp=1618677243201&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fescape-string-regexp%2Fdownload%2Fescape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha1-owME6Z2qMuI7L9IPUbq9B8/8o0Q= escape-string-regexp@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/escape-string-regexp/download/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + resolved "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-4.0.0.tgz?cache=0&sync_timestamp=1618677243201&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fescape-string-regexp%2Fdownload%2Fescape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha1-FLqDpdNz49MR5a/KKc9b+tllvzQ= eslint-scope@5.1.1: version "5.1.1" - resolved "https://registry.npmmirror.com/eslint-scope/download/eslint-scope-5.1.1.tgz?cache=0&sync_timestamp=1637466913662&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Feslint-scope%2Fdownload%2Feslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + resolved "https://registry.npmmirror.com/eslint-scope/download/eslint-scope-5.1.1.tgz?cache=0&sync_timestamp=1637466929956&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Feslint-scope%2Fdownload%2Feslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha1-54blmmbLkrP2wfsNUIqrF0hI9Iw= dependencies: esrecurse "^4.3.0" @@ -3652,17 +3653,17 @@ esrecurse@^4.3.0: estraverse@^4.1.1: version "4.3.0" - resolved "https://registry.npmmirror.com/estraverse/download/estraverse-4.3.0.tgz?cache=0&sync_timestamp=1635237716974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + resolved "https://registry.npmmirror.com/estraverse/download/estraverse-4.3.0.tgz?cache=0&sync_timestamp=1635237907922&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha1-OYrT88WiSUi+dyXoPRGn3ijNvR0= estraverse@^5.2.0: version "5.3.0" - resolved "https://registry.npmmirror.com/estraverse/download/estraverse-5.3.0.tgz?cache=0&sync_timestamp=1635237716974&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + resolved "https://registry.npmmirror.com/estraverse/download/estraverse-5.3.0.tgz?cache=0&sync_timestamp=1635237907922&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Festraverse%2Fdownload%2Festraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" integrity sha1-LupSkHAvJquP5TcDcP+GyWXSESM= esutils@^2.0.2: version "2.0.3" - resolved "https://registry.npm.taobao.org/esutils/download/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + resolved "https://registry.nlark.com/esutils/download/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q= eta@^1.12.3: @@ -3672,29 +3673,29 @@ eta@^1.12.3: etag@~1.8.1: version "1.8.1" - resolved "https://registry.nlark.com/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + resolved "https://registry.npm.taobao.org/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= eval@^0.1.4: version "0.1.6" - resolved "https://registry.npm.taobao.org/eval/download/eval-0.1.6.tgz#9620d7d8c85515e97e6b47c5814f46ae381cb3cc" + resolved "https://registry.nlark.com/eval/download/eval-0.1.6.tgz#9620d7d8c85515e97e6b47c5814f46ae381cb3cc" integrity sha1-liDX2MhVFel+a0fFgU9Grjgcs8w= dependencies: require-like ">= 0.1.1" eventemitter3@^4.0.0: version "4.0.7" - resolved "https://registry.nlark.com/eventemitter3/download/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + resolved "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha1-Lem2j2Uo1WRO9cWVJqG0oHMGFp8= events@^3.2.0: version "3.3.0" - resolved "https://registry.npmmirror.com/events/download/events-3.3.0.tgz?cache=0&sync_timestamp=1636449286836&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fevents%2Fdownload%2Fevents-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + resolved "https://registry.npmmirror.com/events/download/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" integrity sha1-Mala0Kkk4tLEGagTrrLE6HjqdAA= execa@^5.0.0: version "5.1.1" - resolved "https://registry.npmmirror.com/execa/download/execa-5.1.1.tgz?cache=0&sync_timestamp=1637147188673&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fexeca%2Fdownload%2Fexeca-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + resolved "https://registry.npmmirror.com/execa/download/execa-5.1.1.tgz?cache=0&sync_timestamp=1637147207309&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fexeca%2Fdownload%2Fexeca-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" integrity sha1-+ArZy/Qpj3vR1MlVXCHpN0HEEd0= dependencies: cross-spawn "^7.0.3" @@ -3745,7 +3746,7 @@ express@^4.17.1: extend-shallow@^2.0.1: version "2.0.1" - resolved "https://registry.nlark.com/extend-shallow/download/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + resolved "https://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= dependencies: is-extendable "^0.1.0" @@ -3778,7 +3779,7 @@ fast-json-stable-stringify@^2.0.0: fast-url-parser@1.1.3: version "1.1.3" - resolved "https://registry.nlark.com/fast-url-parser/download/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" + resolved "https://registry.npm.taobao.org/fast-url-parser/download/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" integrity sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0= dependencies: punycode "^1.3.2" @@ -3806,7 +3807,7 @@ feed@^4.2.2: file-loader@^6.2.0: version "6.2.0" - resolved "https://registry.nlark.com/file-loader/download/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" + resolved "https://registry.npm.taobao.org/file-loader/download/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" integrity sha1-uu98+OGEDfMl5DkLRISHlIDuvk0= dependencies: loader-utils "^2.0.0" @@ -3814,7 +3815,7 @@ file-loader@^6.2.0: filesize@^6.1.0: version "6.4.0" - resolved "https://registry.npmmirror.com/filesize/download/filesize-6.4.0.tgz?cache=0&sync_timestamp=1635763993879&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffilesize%2Fdownload%2Ffilesize-6.4.0.tgz#914f50471dd66fdca3cefe628bd0cde4ef769bcd" + resolved "https://registry.npmmirror.com/filesize/download/filesize-6.4.0.tgz#914f50471dd66fdca3cefe628bd0cde4ef769bcd" integrity sha1-kU9QRx3Wb9yjzv5ii9DN5O92m80= fill-range@^7.0.1: @@ -3826,7 +3827,7 @@ fill-range@^7.0.1: finalhandler@~1.1.2: version "1.1.2" - resolved "https://registry.nlark.com/finalhandler/download/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + resolved "https://registry.npm.taobao.org/finalhandler/download/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" integrity sha1-t+fQAP/RGTjQ/bBTUG9uur6fWH0= dependencies: debug "2.6.9" @@ -3839,7 +3840,7 @@ finalhandler@~1.1.2: find-cache-dir@^3.3.1: version "3.3.2" - resolved "https://registry.nlark.com/find-cache-dir/download/find-cache-dir-3.3.2.tgz?cache=0&sync_timestamp=1630259965392&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffind-cache-dir%2Fdownload%2Ffind-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + resolved "https://registry.nlark.com/find-cache-dir/download/find-cache-dir-3.3.2.tgz?cache=0&sync_timestamp=1630260009898&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffind-cache-dir%2Fdownload%2Ffind-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" integrity sha1-swxbbv8HMHMa6pu9nb7L2AJW1ks= dependencies: commondir "^1.0.1" @@ -3848,14 +3849,14 @@ find-cache-dir@^3.3.1: find-up@^3.0.0: version "3.0.0" - resolved "https://registry.npmmirror.com/find-up/download/find-up-3.0.0.tgz?cache=0&sync_timestamp=1633620747957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffind-up%2Fdownload%2Ffind-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + resolved "https://registry.npmmirror.com/find-up/download/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" integrity sha1-SRafHXmTQwZG2mHsxa41XCHJe3M= dependencies: locate-path "^3.0.0" find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" - resolved "https://registry.npmmirror.com/find-up/download/find-up-4.1.0.tgz?cache=0&sync_timestamp=1633620747957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffind-up%2Fdownload%2Ffind-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + resolved "https://registry.npmmirror.com/find-up/download/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" integrity sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk= dependencies: locate-path "^5.0.0" @@ -3890,7 +3891,7 @@ forwarded@0.2.0: resolved "https://registry.nlark.com/forwarded/download/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" integrity sha1-ImmTZCiq1MFcfr6XeahL8LKoGBE= -fraction.js@^4.1.1: +fraction.js@^4.1.2: version "4.1.2" resolved "https://registry.npmmirror.com/fraction.js/download/fraction.js-4.1.2.tgz#13e420a92422b6cf244dff8690ed89401029fbe8" integrity sha512-o2RiJQ6DZaR/5+Si0qJUIy637QMRudSi9kU/FFzx9EZazrIdnBgpU+3sEWCxAVhH2RtxW2Oz+T4p2o8uOPVcgA== @@ -3921,12 +3922,12 @@ fs-extra@^9.0.0: fs-monkey@1.0.3: version "1.0.3" - resolved "https://registry.npm.taobao.org/fs-monkey/download/fs-monkey-1.0.3.tgz?cache=0&sync_timestamp=1617593422622&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffs-monkey%2Fdownload%2Ffs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" + resolved "https://registry.npm.taobao.org/fs-monkey/download/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" integrity sha1-rjrJLVO7Mo7+DpodlUH2rY1I4tM= fs.realpath@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/fs.realpath/download/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + resolved "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= fsevents@~2.3.2: @@ -3936,7 +3937,7 @@ fsevents@~2.3.2: function-bind@^1.1.1: version "1.1.1" - resolved "https://registry.nlark.com/function-bind/download/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + resolved "https://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0= gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2: @@ -3955,7 +3956,7 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: get-own-enumerable-property-symbols@^3.0.0: version "3.0.2" - resolved "https://registry.npm.taobao.org/get-own-enumerable-property-symbols/download/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" + resolved "https://registry.nlark.com/get-own-enumerable-property-symbols/download/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" integrity sha1-tf3nfyLL4185C04ImSLFC85u9mQ= get-stream@^4.1.0: @@ -3987,26 +3988,26 @@ get-symbol-description@^1.0.0: github-slugger@^1.4.0: version "1.4.0" - resolved "https://registry.nlark.com/github-slugger/download/github-slugger-1.4.0.tgz?cache=0&sync_timestamp=1629817837468&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fgithub-slugger%2Fdownload%2Fgithub-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" + resolved "https://registry.nlark.com/github-slugger/download/github-slugger-1.4.0.tgz#206eb96cdb22ee56fdc53a28d5a302338463444e" integrity sha1-IG65bNsi7lb9xToo1aMCM4RjRE4= glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" - resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-5.1.2.tgz?cache=0&sync_timestamp=1632954501757&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha1-hpgyxYA0/mikCTwX3BXoNA2EAcQ= dependencies: is-glob "^4.0.1" glob-parent@^6.0.1, glob-parent@^6.0.2: version "6.0.2" - resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + resolved "https://registry.npmmirror.com/glob-parent/download/glob-parent-6.0.2.tgz?cache=0&sync_timestamp=1632954501757&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" integrity sha1-bSN9mQg5UMeSkPJMdkKj3poo+eM= dependencies: is-glob "^4.0.3" glob-to-regexp@^0.4.1: version "0.4.1" - resolved "https://registry.nlark.com/glob-to-regexp/download/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" + resolved "https://registry.npm.taobao.org/glob-to-regexp/download/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha1-x1KXCHyFG5pXi9IX3VmpL1n+VG4= glob@^7.0.0, glob@^7.1.3, glob@^7.1.6: @@ -4023,21 +4024,21 @@ glob@^7.0.0, glob@^7.1.3, glob@^7.1.6: global-dirs@^3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/global-dirs/download/global-dirs-3.0.0.tgz?cache=0&sync_timestamp=1610454716901&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglobal-dirs%2Fdownload%2Fglobal-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" + resolved "https://registry.npm.taobao.org/global-dirs/download/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" integrity sha1-cKdv6E6jFas3sfVXbL3n1I73JoY= dependencies: ini "2.0.0" global-modules@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/global-modules/download/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" + resolved "https://registry.npm.taobao.org/global-modules/download/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" integrity sha1-mXYFrSNF8n9RU5vqJldEISFcd4A= dependencies: global-prefix "^3.0.0" global-prefix@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/global-prefix/download/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" + resolved "https://registry.npm.taobao.org/global-prefix/download/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" integrity sha1-/IX3MGTfafUEIfR/iD/luRO6m5c= dependencies: ini "^1.3.5" @@ -4110,27 +4111,27 @@ gzip-size@^6.0.0: handle-thing@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/handle-thing/download/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" + resolved "https://registry.npm.taobao.org/handle-thing/download/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" integrity sha1-hX95zjWVgMNA1DCBzGSJcNC7I04= has-bigints@^1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/has-bigints/download/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + resolved "https://registry.npm.taobao.org/has-bigints/download/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" integrity sha1-ZP5qywIGc+O3jbA1pa9pqp0HsRM= has-flag@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/has-flag/download/has-flag-3.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + resolved "https://registry.nlark.com/has-flag/download/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= has-flag@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + resolved "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s= has-symbols@^1.0.1, has-symbols@^1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.2.tgz?cache=0&sync_timestamp=1614443557459&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhas-symbols%2Fdownload%2Fhas-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + resolved "https://registry.nlark.com/has-symbols/download/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha1-Fl0wcMADCXUqEjakeTMeOsVvFCM= has-tostringtag@^1.0.0: @@ -4147,7 +4148,7 @@ has-yarn@^2.1.0: has@^1.0.3: version "1.0.3" - resolved "https://registry.nlark.com/has/download/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + resolved "https://registry.npm.taobao.org/has/download/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" integrity sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y= dependencies: function-bind "^1.1.1" @@ -4167,7 +4168,7 @@ hast-to-hyperscript@^9.0.0: hast-util-from-parse5@^5.0.0: version "5.0.3" - resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" + resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-5.0.3.tgz?cache=0&sync_timestamp=1627032098094&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-util-from-parse5%2Fdownload%2Fhast-util-from-parse5-5.0.3.tgz#3089dc0ee2ccf6ec8bc416919b51a54a589e097c" integrity sha1-MIncDuLM9uyLxBaRm1GlSlieCXw= dependencies: ccount "^1.0.3" @@ -4178,7 +4179,7 @@ hast-util-from-parse5@^5.0.0: hast-util-from-parse5@^6.0.0: version "6.0.1" - resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" + resolved "https://registry.nlark.com/hast-util-from-parse5/download/hast-util-from-parse5-6.0.1.tgz?cache=0&sync_timestamp=1627032098094&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhast-util-from-parse5%2Fdownload%2Fhast-util-from-parse5-6.0.1.tgz#554e34abdeea25ac76f5bd950a1f0180e0b3bc2a" integrity sha1-VU40q97qJax29b2VCh8BgOCzvCo= dependencies: "@types/parse5" "^5.0.0" @@ -4195,7 +4196,7 @@ hast-util-parse-selector@^2.0.0: hast-util-raw@6.0.1: version "6.0.1" - resolved "https://registry.npmmirror.com/hast-util-raw/download/hast-util-raw-6.0.1.tgz?cache=0&sync_timestamp=1636450214370&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhast-util-raw%2Fdownload%2Fhast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977" + resolved "https://registry.npmmirror.com/hast-util-raw/download/hast-util-raw-6.0.1.tgz#973b15930b7529a7b66984c98148b46526885977" integrity sha1-lzsVkwt1Kae2aYTJgUi0ZSaIWXc= dependencies: "@types/hast" "^2.0.0" @@ -4222,7 +4223,7 @@ hast-util-to-parse5@^6.0.0: hastscript@^5.0.0: version "5.1.2" - resolved "https://registry.nlark.com/hastscript/download/hastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a" + resolved "https://registry.nlark.com/hastscript/download/hastscript-5.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhastscript%2Fdownload%2Fhastscript-5.1.2.tgz#bde2c2e56d04c62dd24e8c5df288d050a355fb8a" integrity sha1-veLC5W0Exi3SToxd8ojQUKNV+4o= dependencies: comma-separated-tokens "^1.0.0" @@ -4232,7 +4233,7 @@ hastscript@^5.0.0: hastscript@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/hastscript/download/hastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" + resolved "https://registry.nlark.com/hastscript/download/hastscript-6.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhastscript%2Fdownload%2Fhastscript-6.0.0.tgz#e8768d7eac56c3fdeac8a92830d58e811e5bf640" integrity sha1-6HaNfqxWw/3qyKkoMNWOgR5b9kA= dependencies: "@types/hast" "^2.0.0" @@ -4277,7 +4278,7 @@ hpack.js@^2.1.6: html-entities@^2.3.2: version "2.3.2" - resolved "https://registry.npm.taobao.org/html-entities/download/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" + resolved "https://registry.nlark.com/html-entities/download/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488" integrity sha1-dgtARoXLHXlOT0t0QzLjsA3P5Ig= html-minifier-terser@^6.0.2: @@ -4295,7 +4296,7 @@ html-minifier-terser@^6.0.2: html-tags@^3.1.0: version "3.1.0" - resolved "https://registry.nlark.com/html-tags/download/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" + resolved "https://registry.npmmirror.com/html-tags/download/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140" integrity sha1-e15vfmZen7QfMAB+2eDUHpf7IUA= html-void-elements@^1.0.0: @@ -4316,7 +4317,7 @@ html-webpack-plugin@^5.4.0: htmlparser2@^3.9.1: version "3.10.1" - resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-3.10.1.tgz?cache=0&sync_timestamp=1636640841489&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" + resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-3.10.1.tgz?cache=0&sync_timestamp=1636641539121&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" integrity sha1-vWedw/WYl7ajS7EHSchVu1OpOS8= dependencies: domelementtype "^1.3.1" @@ -4328,7 +4329,7 @@ htmlparser2@^3.9.1: htmlparser2@^6.1.0: version "6.1.0" - resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-6.1.0.tgz?cache=0&sync_timestamp=1636640841489&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" + resolved "https://registry.npmmirror.com/htmlparser2/download/htmlparser2-6.1.0.tgz?cache=0&sync_timestamp=1636641539121&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fhtmlparser2%2Fdownload%2Fhtmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" integrity sha1-xNditsM3GgXb5l6UrkOp+EX7j7c= dependencies: domelementtype "^2.0.1" @@ -4374,7 +4375,7 @@ http-parser-js@>=0.5.1: http-proxy-middleware@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/http-proxy-middleware/download/http-proxy-middleware-2.0.1.tgz?cache=0&sync_timestamp=1625172260511&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhttp-proxy-middleware%2Fdownload%2Fhttp-proxy-middleware-2.0.1.tgz#7ef3417a479fb7666a571e09966c66a39bd2c15f" + resolved "https://registry.nlark.com/http-proxy-middleware/download/http-proxy-middleware-2.0.1.tgz#7ef3417a479fb7666a571e09966c66a39bd2c15f" integrity sha1-fvNBekeft2ZqVx4Jlmxmo5vSwV8= dependencies: "@types/http-proxy" "^1.17.5" @@ -4385,7 +4386,7 @@ http-proxy-middleware@^2.0.0: http-proxy@^1.18.1: version "1.18.1" - resolved "https://registry.npm.taobao.org/http-proxy/download/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + resolved "https://registry.npmmirror.com/http-proxy/download/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" integrity sha1-QBVB8FNIhLv5UmAzTnL4juOXZUk= dependencies: eventemitter3 "^4.0.0" @@ -4394,7 +4395,7 @@ http-proxy@^1.18.1: human-signals@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/human-signals/download/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + resolved "https://registry.nlark.com/human-signals/download/human-signals-2.1.0.tgz?cache=0&sync_timestamp=1624364695595&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhuman-signals%2Fdownload%2Fhuman-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha1-3JH8ukLk0G5Kuu0zs+ejwC9RTqA= iconv-lite@0.4.24: @@ -4406,7 +4407,7 @@ iconv-lite@0.4.24: icss-utils@^5.0.0, icss-utils@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/icss-utils/download/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" + resolved "https://registry.npm.taobao.org/icss-utils/download/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" integrity sha1-xr5oWKvQE9do6YNmrkfiXViHsa4= ignore@^5.1.4: @@ -4421,14 +4422,14 @@ immer@^9.0.6: import-cwd@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/import-cwd/download/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92" + resolved "https://registry.npm.taobao.org/import-cwd/download/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92" integrity sha1-IIRVR3GAFRJuqbNna3WS+4vUz5I= dependencies: import-from "^3.0.0" import-fresh@^3.1.0, import-fresh@^3.2.1, import-fresh@^3.2.2, import-fresh@^3.3.0: version "3.3.0" - resolved "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz?cache=0&sync_timestamp=1608469579940&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimport-fresh%2Fdownload%2Fimport-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + resolved "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" integrity sha1-NxYsJfy566oublPVtNiM4X2eDCs= dependencies: parent-module "^1.0.0" @@ -4443,17 +4444,17 @@ import-from@^3.0.0: import-lazy@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/import-lazy/download/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + resolved "https://registry.nlark.com/import-lazy/download/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= imurmurhash@^0.1.4: version "0.1.4" - resolved "https://registry.nlark.com/imurmurhash/download/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + resolved "https://registry.npm.taobao.org/imurmurhash/download/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= indent-string@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/indent-string/download/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + resolved "https://registry.npm.taobao.org/indent-string/download/indent-string-4.0.0.tgz?cache=0&sync_timestamp=1618679561483&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Findent-string%2Fdownload%2Findent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha1-Yk+PRJfWGbLZdoUx1Y9BIoVNclE= inflight@^1.0.4: @@ -4491,7 +4492,7 @@ inline-style-parser@0.1.1: internal-slot@^1.0.3: version "1.0.3" - resolved "https://registry.nlark.com/internal-slot/download/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + resolved "https://registry.npm.taobao.org/internal-slot/download/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" integrity sha1-c0fjB97uovqsKsYgXUvH00ln9Zw= dependencies: get-intrinsic "^1.1.0" @@ -4500,12 +4501,12 @@ internal-slot@^1.0.3: interpret@^1.0.0: version "1.4.0" - resolved "https://registry.nlark.com/interpret/download/interpret-1.4.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Finterpret%2Fdownload%2Finterpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" + resolved "https://registry.npm.taobao.org/interpret/download/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha1-Zlq4vE2iendKQFhOgS4+D6RbGh4= ip@^1.1.0: version "1.1.5" - resolved "https://registry.nlark.com/ip/download/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" + resolved "https://registry.npm.taobao.org/ip/download/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= ipaddr.js@1.9.1: @@ -4533,7 +4534,7 @@ is-alphanumerical@^1.0.0: is-arguments@^1.0.4: version "1.1.1" - resolved "https://registry.nlark.com/is-arguments/download/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + resolved "https://registry.nlark.com/is-arguments/download/is-arguments-1.1.1.tgz?cache=0&sync_timestamp=1628201919104&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-arguments%2Fdownload%2Fis-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" integrity sha1-FbP4j9oB8ql/7ITKdhpWDxI++ps= dependencies: call-bind "^1.0.2" @@ -4546,14 +4547,14 @@ is-arrayish@^0.2.1: is-bigint@^1.0.1: version "1.0.4" - resolved "https://registry.nlark.com/is-bigint/download/is-bigint-1.0.4.tgz?cache=0&sync_timestamp=1628747504782&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-bigint%2Fdownload%2Fis-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + resolved "https://registry.npmmirror.com/is-bigint/download/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" integrity sha1-CBR6GHW8KzIAXUHM2Ckd/8ZpHfM= dependencies: has-bigints "^1.0.1" is-binary-path@~2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/is-binary-path/download/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + resolved "https://registry.npm.taobao.org/is-binary-path/download/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" integrity sha1-6h9/O4DwZCNug0cPhsCcJU+0Wwk= dependencies: binary-extensions "^2.0.0" @@ -4568,53 +4569,53 @@ is-boolean-object@^1.1.0: is-buffer@^2.0.0: version "2.0.5" - resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.5.tgz?cache=0&sync_timestamp=1604429876103&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-buffer%2Fdownload%2Fis-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" + resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha1-68JS5ADSL/jXf6CYiIIaJKZYwZE= is-callable@^1.1.4, is-callable@^1.2.4: version "1.2.4" - resolved "https://registry.nlark.com/is-callable/download/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + resolved "https://registry.nlark.com/is-callable/download/is-callable-1.2.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-callable%2Fdownload%2Fis-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha1-RzAdWN0CWUB4ZVR4U99tYf5HGUU= is-ci@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/is-ci/download/is-ci-2.0.0.tgz?cache=0&sync_timestamp=1635261114993&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-ci%2Fdownload%2Fis-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + resolved "https://registry.npmmirror.com/is-ci/download/is-ci-2.0.0.tgz?cache=0&sync_timestamp=1635261984879&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-ci%2Fdownload%2Fis-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" integrity sha1-a8YzQYGBDgS1wis9WJ/cpVAmQEw= dependencies: ci-info "^2.0.0" is-core-module@^2.2.0: version "2.8.0" - resolved "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" + resolved "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz?cache=0&sync_timestamp=1634236731601&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-core-module%2Fdownload%2Fis-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" integrity sha1-AyEzbD0JJeSX/Zf12VyxFKXM1Ug= dependencies: has "^1.0.3" is-date-object@^1.0.1: version "1.0.5" - resolved "https://registry.nlark.com/is-date-object/download/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + resolved "https://registry.nlark.com/is-date-object/download/is-date-object-1.0.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-date-object%2Fdownload%2Fis-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" integrity sha1-CEHVU25yTCVZe/bqYuG9OCmN8x8= dependencies: has-tostringtag "^1.0.0" is-decimal@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-decimal/download/is-decimal-1.0.4.tgz?cache=0&sync_timestamp=1636008960795&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-decimal%2Fdownload%2Fis-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" + resolved "https://registry.npmmirror.com/is-decimal/download/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" integrity sha1-ZaOllYocW2OnBuGzM9fNn2MNP6U= is-docker@^2.0.0, is-docker@^2.1.1: version "2.2.1" - resolved "https://registry.nlark.com/is-docker/download/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + resolved "https://registry.nlark.com/is-docker/download/is-docker-2.2.1.tgz?cache=0&sync_timestamp=1630451108035&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-docker%2Fdownload%2Fis-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha1-M+6r4jz+hvFL3kQIoCwM+4U6zao= is-extendable@^0.1.0: version "0.1.1" - resolved "https://registry.npm.taobao.org/is-extendable/download/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + resolved "https://registry.nlark.com/is-extendable/download/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= is-extglob@^2.1.1: version "2.1.1" - resolved "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + resolved "https://registry.nlark.com/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= is-fullwidth-code-point@^3.0.0: @@ -4624,19 +4625,19 @@ is-fullwidth-code-point@^3.0.0: is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" - resolved "https://registry.npmmirror.com/is-glob/download/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + resolved "https://registry.npmmirror.com/is-glob/download/is-glob-4.0.3.tgz?cache=0&sync_timestamp=1632934512076&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-glob%2Fdownload%2Fis-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha1-ZPYeQsu7LuwgcanawLKLoeZdUIQ= dependencies: is-extglob "^2.1.1" is-hexadecimal@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-hexadecimal/download/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" + resolved "https://registry.npmmirror.com/is-hexadecimal/download/is-hexadecimal-1.0.4.tgz?cache=0&sync_timestamp=1636011905161&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-hexadecimal%2Fdownload%2Fis-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" integrity sha1-zDXJdYjaS9Saju3WvECC1E3LI6c= is-installed-globally@^0.4.0: version "0.4.0" - resolved "https://registry.npm.taobao.org/is-installed-globally/download/is-installed-globally-0.4.0.tgz?cache=0&sync_timestamp=1610875398433&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-installed-globally%2Fdownload%2Fis-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" + resolved "https://registry.npm.taobao.org/is-installed-globally/download/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" integrity sha1-mg/UB5ScMPhutpWe8beZTtC3tSA= dependencies: global-dirs "^3.0.0" @@ -4666,12 +4667,12 @@ is-number@^7.0.0: is-obj@^1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/is-obj/download/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" + resolved "https://registry.npm.taobao.org/is-obj/download/is-obj-1.0.1.tgz?cache=0&sync_timestamp=1618600919478&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-obj%2Fdownload%2Fis-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= is-obj@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/is-obj/download/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + resolved "https://registry.npm.taobao.org/is-obj/download/is-obj-2.0.0.tgz?cache=0&sync_timestamp=1618600919478&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-obj%2Fdownload%2Fis-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha1-Rz+wXZc3BeP9liBUUBjKjiLvSYI= is-path-cwd@^2.2.0: @@ -4686,24 +4687,24 @@ is-path-inside@^3.0.2: is-plain-obj@^2.0.0: version "2.1.0" - resolved "https://registry.nlark.com/is-plain-obj/download/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" + resolved "https://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" integrity sha1-ReQuN/zPH0Dajl927iFRWEDAkoc= is-plain-obj@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/is-plain-obj/download/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" + resolved "https://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" integrity sha1-r28uoUrFpkYYOlu9tbqrvBVq2dc= is-plain-object@^2.0.4: version "2.0.4" - resolved "https://registry.npm.taobao.org/is-plain-object/download/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + resolved "https://registry.npmmirror.com/is-plain-object/download/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" integrity sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc= dependencies: isobject "^3.0.1" is-regex@^1.0.4, is-regex@^1.1.4: version "1.1.4" - resolved "https://registry.nlark.com/is-regex/download/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + resolved "https://registry.nlark.com/is-regex/download/is-regex-1.1.4.tgz?cache=0&sync_timestamp=1628221853554&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-regex%2Fdownload%2Fis-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" integrity sha1-7vVmPNWfpMCuM5UFMj32hUuxWVg= dependencies: call-bind "^1.0.2" @@ -4716,7 +4717,7 @@ is-regexp@^1.0.0: is-root@^2.1.0: version "2.1.0" - resolved "https://registry.npm.taobao.org/is-root/download/is-root-2.1.0.tgz?cache=0&sync_timestamp=1617783382597&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-root%2Fdownload%2Fis-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" + resolved "https://registry.npm.taobao.org/is-root/download/is-root-2.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-root%2Fdownload%2Fis-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" integrity sha1-gJ4YEpzxEpZEMCpPhUQDXVGYSpw= is-shared-array-buffer@^1.0.1: @@ -4738,14 +4739,14 @@ is-string@^1.0.5, is-string@^1.0.7: is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" - resolved "https://registry.nlark.com/is-symbol/download/is-symbol-1.0.4.tgz?cache=0&sync_timestamp=1620501182675&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-symbol%2Fdownload%2Fis-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + resolved "https://registry.nlark.com/is-symbol/download/is-symbol-1.0.4.tgz?cache=0&sync_timestamp=1620501174327&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-symbol%2Fdownload%2Fis-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" integrity sha1-ptrJO2NbBjymhyI23oiRClevE5w= dependencies: has-symbols "^1.0.2" is-typedarray@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/is-typedarray/download/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + resolved "https://registry.npmmirror.com/is-typedarray/download/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= is-weakref@^1.0.1: @@ -4757,7 +4758,7 @@ is-weakref@^1.0.1: is-whitespace-character@^1.0.0: version "1.0.4" - resolved "https://registry.npmmirror.com/is-whitespace-character/download/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7" + resolved "https://registry.npmmirror.com/is-whitespace-character/download/is-whitespace-character-1.0.4.tgz?cache=0&sync_timestamp=1636008961129&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-whitespace-character%2Fdownload%2Fis-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7" integrity sha1-CFjt2UqVWUx8ndC1wXTsbkXuSqc= is-word-character@^1.0.0: @@ -4767,34 +4768,34 @@ is-word-character@^1.0.0: is-wsl@^2.1.1, is-wsl@^2.2.0: version "2.2.0" - resolved "https://registry.npm.taobao.org/is-wsl/download/is-wsl-2.2.0.tgz?cache=0&sync_timestamp=1592843177178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-wsl%2Fdownload%2Fis-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + resolved "https://registry.npm.taobao.org/is-wsl/download/is-wsl-2.2.0.tgz?cache=0&sync_timestamp=1615984417335&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-wsl%2Fdownload%2Fis-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" integrity sha1-dKTHbnfKn9P5MvKQwX6jJs0VcnE= dependencies: is-docker "^2.0.0" is-yarn-global@^0.3.0: version "0.3.0" - resolved "https://registry.nlark.com/is-yarn-global/download/is-yarn-global-0.3.0.tgz?cache=0&sync_timestamp=1619356824740&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fis-yarn-global%2Fdownload%2Fis-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" + resolved "https://registry.nlark.com/is-yarn-global/download/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" integrity sha1-1QLTOCWQ6jAEiTdGdUyJE5lz4jI= isarray@0.0.1: version "0.0.1" - resolved "https://registry.nlark.com/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + resolved "https://registry.npm.taobao.org/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= isarray@~1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + resolved "https://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= isexe@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + resolved "https://registry.nlark.com/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= isobject@^3.0.1: version "3.0.1" - resolved "https://registry.nlark.com/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + resolved "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= jest-worker@^27.0.2, jest-worker@^27.4.1: @@ -4824,37 +4825,37 @@ joi@^17.4.0, joi@^17.4.2: js-yaml@^3.13.1: version "3.14.1" - resolved "https://registry.nlark.com/js-yaml/download/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha1-2ugS/bOCX6MGYJqHFzg8UMNqBTc= + resolved "https://registry.npmmirror.com/js-yaml/download/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== dependencies: argparse "^1.0.7" esprima "^4.0.0" js-yaml@^4.0.0: version "4.1.0" - resolved "https://registry.nlark.com/js-yaml/download/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha1-wftl+PUBeQHN0slRhkuhhFihBgI= + resolved "https://registry.npmmirror.com/js-yaml/download/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== dependencies: argparse "^2.0.1" jsesc@^2.5.1: version "2.5.2" - resolved "https://registry.nlark.com/jsesc/download/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + resolved "https://registry.npm.taobao.org/jsesc/download/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha1-gFZNLkg9rPbo7yCWUKZ98/DCg6Q= jsesc@~0.5.0: version "0.5.0" - resolved "https://registry.nlark.com/jsesc/download/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + resolved "https://registry.npm.taobao.org/jsesc/download/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= json-buffer@3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/json-buffer/download/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" + resolved "https://registry.nlark.com/json-buffer/download/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= json-parse-better-errors@^1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/json-parse-better-errors/download/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" + resolved "https://registry.npm.taobao.org/json-parse-better-errors/download/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk= json-parse-even-better-errors@^2.3.0: @@ -4874,21 +4875,21 @@ json-schema-traverse@^1.0.0: json5@^1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/json5/download/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" + resolved "https://registry.nlark.com/json5/download/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" integrity sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4= dependencies: minimist "^1.2.0" json5@^2.1.2: version "2.2.0" - resolved "https://registry.npm.taobao.org/json5/download/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + resolved "https://registry.nlark.com/json5/download/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" integrity sha1-Lf7+cgxrpSXZ69kJlQ8FFTFsiaM= dependencies: minimist "^1.2.5" jsonfile@^6.0.1: version "6.1.0" - resolved "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + resolved "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" integrity sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4= dependencies: universalify "^2.0.0" @@ -4914,24 +4915,24 @@ kleur@^3.0.3: klona@^2.0.5: version "2.0.5" - resolved "https://registry.npmmirror.com/klona/download/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" + resolved "https://registry.npmmirror.com/klona/download/klona-2.0.5.tgz?cache=0&sync_timestamp=1635386077088&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fklona%2Fdownload%2Fklona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" integrity sha1-0WZXTZAHY5XZljqnqSj6u412r7w= latest-version@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/latest-version/download/latest-version-5.1.0.tgz?cache=0&sync_timestamp=1626951682795&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flatest-version%2Fdownload%2Flatest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + resolved "https://registry.nlark.com/latest-version/download/latest-version-5.1.0.tgz?cache=0&sync_timestamp=1626951703884&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flatest-version%2Fdownload%2Flatest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" integrity sha1-EZ3+kI/jjRXfpD7NE/oS7Igy+s4= dependencies: package-json "^6.3.0" leven@^3.1.0: version "3.1.0" - resolved "https://registry.nlark.com/leven/download/leven-3.1.0.tgz?cache=0&sync_timestamp=1628597917913&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fleven%2Fdownload%2Fleven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + resolved "https://registry.npmmirror.com/leven/download/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" integrity sha1-d4kd6DQGTMy6gq54QrtrFKE+1/I= lilconfig@^2.0.3: version "2.0.4" - resolved "https://registry.npmmirror.com/lilconfig/download/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" + resolved "https://registry.npmmirror.com/lilconfig/download/lilconfig-2.0.4.tgz?cache=0&sync_timestamp=1636150747257&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flilconfig%2Fdownload%2Flilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" integrity sha1-9FB9BD1wWLOAtqj1y3vNSzTO4II= lines-and-columns@^1.1.6: @@ -4941,7 +4942,7 @@ lines-and-columns@^1.1.6: loader-runner@^4.2.0: version "4.2.0" - resolved "https://registry.nlark.com/loader-runner/download/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" + resolved "https://registry.npm.taobao.org/loader-runner/download/loader-runner-4.2.0.tgz?cache=0&sync_timestamp=1610027852811&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Floader-runner%2Fdownload%2Floader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" integrity sha1-1wIjgNZtFMX7HUlriYZOvP1Hg4Q= loader-utils@^1.4.0: @@ -4964,7 +4965,7 @@ loader-utils@^2.0.0: locate-path@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/locate-path/download/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + resolved "https://registry.nlark.com/locate-path/download/locate-path-3.0.0.tgz?cache=0&sync_timestamp=1629895618224&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flocate-path%2Fdownload%2Flocate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" integrity sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4= dependencies: p-locate "^3.0.0" @@ -4972,19 +4973,19 @@ locate-path@^3.0.0: locate-path@^5.0.0: version "5.0.0" - resolved "https://registry.nlark.com/locate-path/download/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + resolved "https://registry.nlark.com/locate-path/download/locate-path-5.0.0.tgz?cache=0&sync_timestamp=1629895618224&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flocate-path%2Fdownload%2Flocate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" integrity sha1-Gvujlq/WdqbUJQTQpno6frn2KqA= dependencies: p-locate "^4.1.0" lodash-es@^4.17.15: version "4.17.21" - resolved "https://registry.nlark.com/lodash-es/download/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" - integrity sha1-Q+YmxG5lkbd1C+srUBFzkMYJ4+4= + resolved "https://registry.npmmirror.com/lodash-es/download/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" + integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== lodash.assignin@^4.0.9: version "4.2.0" - resolved "https://registry.npm.taobao.org/lodash.assignin/download/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" + resolved "https://registry.nlark.com/lodash.assignin/download/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI= lodash.bind@^4.1.4: @@ -4994,32 +4995,32 @@ lodash.bind@^4.1.4: lodash.castarray@^4.4.0: version "4.4.0" - resolved "https://registry.npm.taobao.org/lodash.castarray/download/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" + resolved "https://registry.nlark.com/lodash.castarray/download/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU= lodash.debounce@^4.0.8: version "4.0.8" - resolved "https://registry.nlark.com/lodash.debounce/download/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" + resolved "https://registry.npm.taobao.org/lodash.debounce/download/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= lodash.defaults@^4.0.1: version "4.2.0" - resolved "https://registry.npm.taobao.org/lodash.defaults/download/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" + resolved "https://registry.nlark.com/lodash.defaults/download/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= lodash.filter@^4.4.0: version "4.6.0" - resolved "https://registry.npm.taobao.org/lodash.filter/download/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" + resolved "https://registry.npmmirror.com/lodash.filter/download/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4= lodash.flatten@^4.2.0: version "4.4.0" - resolved "https://registry.npm.taobao.org/lodash.flatten/download/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" + resolved "https://registry.nlark.com/lodash.flatten/download/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= lodash.foreach@^4.3.0: version "4.5.0" - resolved "https://registry.npm.taobao.org/lodash.foreach/download/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" + resolved "https://registry.npmmirror.com/lodash.foreach/download/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM= lodash.isplainobject@^4.0.6: @@ -5029,12 +5030,12 @@ lodash.isplainobject@^4.0.6: lodash.map@^4.4.0: version "4.6.0" - resolved "https://registry.npm.taobao.org/lodash.map/download/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" + resolved "https://registry.nlark.com/lodash.map/download/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= lodash.memoize@^4.1.2: version "4.1.2" - resolved "https://registry.nlark.com/lodash.memoize/download/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" + resolved "https://registry.npm.taobao.org/lodash.memoize/download/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= lodash.merge@^4.4.0, lodash.merge@^4.6.2: @@ -5054,7 +5055,7 @@ lodash.reduce@^4.4.0: lodash.reject@^4.4.0: version "4.6.0" - resolved "https://registry.npm.taobao.org/lodash.reject/download/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415" + resolved "https://registry.nlark.com/lodash.reject/download/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415" integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU= lodash.some@^4.4.0: @@ -5074,31 +5075,31 @@ lodash@^4.0.1, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2 loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" - resolved "https://registry.nlark.com/loose-envify/download/loose-envify-1.4.0.tgz?cache=0&sync_timestamp=1627566748051&other_urls=https%3A%2F%2Fregistry.nlark.com%2Floose-envify%2Fdownload%2Floose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + resolved "https://registry.nlark.com/loose-envify/download/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8= dependencies: js-tokens "^3.0.0 || ^4.0.0" lower-case@^2.0.2: version "2.0.2" - resolved "https://registry.npm.taobao.org/lower-case/download/lower-case-2.0.2.tgz?cache=0&sync_timestamp=1606867514181&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flower-case%2Fdownload%2Flower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" + resolved "https://registry.npmmirror.com/lower-case/download/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" integrity sha1-b6I3xj29xKgsoP2ILkci3F5jTig= dependencies: tslib "^2.0.3" lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-1.0.1.tgz?cache=0&sync_timestamp=1634552902598&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flowercase-keys%2Fdownload%2Flowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" integrity sha1-b54wtHCE2XGnyCD/FabFFnt0wm8= lowercase-keys@^2.0.0: version "2.0.0" - resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + resolved "https://registry.npmmirror.com/lowercase-keys/download/lowercase-keys-2.0.0.tgz?cache=0&sync_timestamp=1634552902598&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flowercase-keys%2Fdownload%2Flowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha1-JgPni3tLAAbLyi+8yKMgJVislHk= lru-cache@^6.0.0: version "6.0.0" - resolved "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + resolved "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz?cache=0&sync_timestamp=1615982572805&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flru-cache%2Fdownload%2Flru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" integrity sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ= dependencies: yallist "^4.0.0" @@ -5112,7 +5113,7 @@ magic-string@^0.25.3: make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" - resolved "https://registry.nlark.com/make-dir/download/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + resolved "https://registry.nlark.com/make-dir/download/make-dir-3.1.0.tgz?cache=0&sync_timestamp=1631633087440&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmake-dir%2Fdownload%2Fmake-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha1-QV6WcEazp/HRhSd9hKpYIDcmoT8= dependencies: semver "^6.0.0" @@ -5157,7 +5158,7 @@ mdast-util-to-hast@10.0.1: mdast-util-to-string@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/mdast-util-to-string/download/mdast-util-to-string-2.0.0.tgz?cache=0&sync_timestamp=1619426190900&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmdast-util-to-string%2Fdownload%2Fmdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" + resolved "https://registry.nlark.com/mdast-util-to-string/download/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" integrity sha1-uM/mpxPhCRy1tyj8SIhaR2f4uXs= mdn-data@2.0.14: @@ -5177,24 +5178,24 @@ mdurl@^1.0.0: media-typer@0.3.0: version "0.3.0" - resolved "https://registry.nlark.com/media-typer/download/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" + resolved "https://registry.npm.taobao.org/media-typer/download/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= memfs@^3.1.2, memfs@^3.2.2: - version "3.4.0" - resolved "https://registry.npmmirror.com/memfs/download/memfs-3.4.0.tgz#8bc12062b973be6b295d4340595736a656f0a257" - integrity sha512-o/RfP0J1d03YwsAxyHxAYs2kyJp55AFkMazlFAZFR2I2IXkxiUTXRabJ6RmNNCQ83LAD2jy52Khj0m3OffpNdA== + version "3.4.1" + resolved "https://registry.npmmirror.com/memfs/download/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305" + integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw== dependencies: fs-monkey "1.0.3" merge-descriptors@1.0.1: version "1.0.1" - resolved "https://registry.nlark.com/merge-descriptors/download/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + resolved "https://registry.npm.taobao.org/merge-descriptors/download/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= merge-stream@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/merge-stream/download/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + resolved "https://registry.npm.taobao.org/merge-stream/download/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha1-UoI2KaFN0AyXcPtq1H3GMQ8sH2A= merge2@^1.3.0: @@ -5204,12 +5205,12 @@ merge2@^1.3.0: methods@~1.1.2: version "1.1.2" - resolved "https://registry.nlark.com/methods/download/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" + resolved "https://registry.npm.taobao.org/methods/download/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= micromatch@^4.0.2, micromatch@^4.0.4: version "4.0.4" - resolved "https://registry.nlark.com/micromatch/download/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + resolved "https://registry.npm.taobao.org/micromatch/download/micromatch-4.0.4.tgz?cache=0&sync_timestamp=1618054787196&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmicromatch%2Fdownload%2Fmicromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" integrity sha1-iW1Rnf6dsl/OlM63pQCRm/iB6/k= dependencies: braces "^3.0.1" @@ -5217,24 +5218,24 @@ micromatch@^4.0.2, micromatch@^4.0.4: mime-db@1.51.0, "mime-db@>= 1.43.0 < 2": version "1.51.0" - resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.51.0.tgz?cache=0&sync_timestamp=1636425932298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.51.0.tgz?cache=0&sync_timestamp=1636425960744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== mime-db@~1.33.0: version "1.33.0" - resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.33.0.tgz?cache=0&sync_timestamp=1636425932298&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" + resolved "https://registry.npmmirror.com/mime-db/download/mime-db-1.33.0.tgz?cache=0&sync_timestamp=1636425960744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-db%2Fdownload%2Fmime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" integrity sha1-o0kgUKXLm2NFBUHjnZeI0icng9s= mime-types@2.1.18: version "2.1.18" - resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.18.tgz?cache=0&sync_timestamp=1636432275511&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" + resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.18.tgz?cache=0&sync_timestamp=1636432342687&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" integrity sha1-bzI/YKg9ERRvgx/xH9ZuL+VQO7g= dependencies: mime-db "~1.33.0" mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24: version "2.1.34" - resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.34.tgz?cache=0&sync_timestamp=1636432275511&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" + resolved "https://registry.npmmirror.com/mime-types/download/mime-types-2.1.34.tgz?cache=0&sync_timestamp=1636432342687&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmime-types%2Fdownload%2Fmime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== dependencies: mime-db "1.51.0" @@ -5246,7 +5247,7 @@ mime@1.6.0: mimic-fn@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/mimic-fn/download/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + resolved "https://registry.npm.taobao.org/mimic-fn/download/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs= mimic-response@^1.0.0, mimic-response@^1.0.1: @@ -5256,7 +5257,7 @@ mimic-response@^1.0.0, mimic-response@^1.0.1: mini-create-react-context@^0.4.0: version "0.4.1" - resolved "https://registry.nlark.com/mini-create-react-context/download/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" + resolved "https://registry.npm.taobao.org/mini-create-react-context/download/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" integrity sha1-ByFxVhv9ySLaCKYMIZekl8wtHV4= dependencies: "@babel/runtime" "^7.12.1" @@ -5264,7 +5265,7 @@ mini-create-react-context@^0.4.0: mini-css-extract-plugin@^1.6.0: version "1.6.2" - resolved "https://registry.npmmirror.com/mini-css-extract-plugin/download/mini-css-extract-plugin-1.6.2.tgz?cache=0&sync_timestamp=1637170529830&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" + resolved "https://registry.npmmirror.com/mini-css-extract-plugin/download/mini-css-extract-plugin-1.6.2.tgz?cache=0&sync_timestamp=1637170561761&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmini-css-extract-plugin%2Fdownload%2Fmini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" integrity sha1-gxcrT9gS+PxKCdb20W+ST1OZDKg= dependencies: loader-utils "^2.0.0" @@ -5285,7 +5286,7 @@ minimatch@3.0.4, minimatch@^3.0.4: minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" - resolved "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + resolved "https://registry.nlark.com/minimist/download/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI= mkdirp@^0.5.5, mkdirp@~0.5.1: @@ -5322,7 +5323,7 @@ multicast-dns-service-types@^1.1.0: multicast-dns@^6.0.1: version "6.2.3" - resolved "https://registry.npmmirror.com/multicast-dns/download/multicast-dns-6.2.3.tgz?cache=0&sync_timestamp=1633354862495&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmulticast-dns%2Fdownload%2Fmulticast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" + resolved "https://registry.npmmirror.com/multicast-dns/download/multicast-dns-6.2.3.tgz?cache=0&sync_timestamp=1633354925402&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmulticast-dns%2Fdownload%2Fmulticast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" integrity sha1-oOx72QVcQoL3kMPIL04o2zsxsik= dependencies: dns-packet "^1.3.1" @@ -5353,24 +5354,24 @@ no-case@^3.0.4: node-emoji@^1.10.0: version "1.11.0" - resolved "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz?cache=0&sync_timestamp=1628672555671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-emoji%2Fdownload%2Fnode-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" + resolved "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" integrity sha1-aaAVDmlG4vEV6dfqTfeXHiYoMBw= dependencies: lodash "^4.17.21" node-forge@^0.10.0: version "0.10.0" - resolved "https://registry.npm.taobao.org/node-forge/download/node-forge-0.10.0.tgz?cache=0&sync_timestamp=1599010726129&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-forge%2Fdownload%2Fnode-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" + resolved "https://registry.nlark.com/node-forge/download/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" integrity sha1-Mt6ir7Ppkm8C7lzoeUkCaRpna/M= node-releases@^2.0.1: version "2.0.1" - resolved "https://registry.npmmirror.com/node-releases/download/node-releases-2.0.1.tgz?cache=0&sync_timestamp=1634806914912&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnode-releases%2Fdownload%2Fnode-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" + resolved "https://registry.npmmirror.com/node-releases/download/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" integrity sha1-PR05XyBPHy8ppUNYuftnh2WtL8U= normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" - resolved "https://registry.npm.taobao.org/normalize-path/download/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + resolved "https://registry.nlark.com/normalize-path/download/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU= normalize-range@^0.1.2: @@ -5380,12 +5381,12 @@ normalize-range@^0.1.2: normalize-url@^4.1.0: version "4.5.1" - resolved "https://registry.nlark.com/normalize-url/download/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" + resolved "https://registry.nlark.com/normalize-url/download/normalize-url-4.5.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnormalize-url%2Fdownload%2Fnormalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" integrity sha1-DdkM8SiO4dExO4cIHJpZMu5IUYo= normalize-url@^6.0.1: version "6.1.0" - resolved "https://registry.nlark.com/normalize-url/download/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + resolved "https://registry.nlark.com/normalize-url/download/normalize-url-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnormalize-url%2Fdownload%2Fnormalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" integrity sha1-QNCIW1Nd7/4/MUe+yHfQX+TFZoo= npm-run-path@^4.0.1: @@ -5402,14 +5403,14 @@ nprogress@^0.2.0: nth-check@^1.0.2, nth-check@~1.0.1: version "1.0.2" - resolved "https://registry.nlark.com/nth-check/download/nth-check-1.0.2.tgz?cache=0&sync_timestamp=1631793617973&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" + resolved "https://registry.nlark.com/nth-check/download/nth-check-1.0.2.tgz?cache=0&sync_timestamp=1631793807802&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" integrity sha1-sr0pXDfj3VijvwcAN2Zjuk2c8Fw= dependencies: boolbase "~1.0.0" nth-check@^2.0.1: version "2.0.1" - resolved "https://registry.nlark.com/nth-check/download/nth-check-2.0.1.tgz?cache=0&sync_timestamp=1631793617973&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" + resolved "https://registry.nlark.com/nth-check/download/nth-check-2.0.1.tgz?cache=0&sync_timestamp=1631793807802&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnth-check%2Fdownload%2Fnth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2" integrity sha1-Lv4WL1w9oGoolZ+9PbddvuqfD8I= dependencies: boolbase "^1.0.0" @@ -5431,7 +5432,7 @@ object-inspect@^1.11.0, object-inspect@^1.9.0: object-is@^1.0.1: version "1.1.5" - resolved "https://registry.nlark.com/object-is/download/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + resolved "https://registry.npm.taobao.org/object-is/download/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" integrity sha1-ud7qpfx/GEag+uzc7sE45XePU6w= dependencies: call-bind "^1.0.2" @@ -5439,12 +5440,12 @@ object-is@^1.0.1: object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" - resolved "https://registry.nlark.com/object-keys/download/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + resolved "https://registry.npm.taobao.org/object-keys/download/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha1-HEfyct8nfzsdrwYWd9nILiMixg4= object.assign@^4.1.0, object.assign@^4.1.2: version "4.1.2" - resolved "https://registry.nlark.com/object.assign/download/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + resolved "https://registry.npmmirror.com/object.assign/download/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" integrity sha1-DtVKNC7Os3s4/3brgxoOeIy2OUA= dependencies: call-bind "^1.0.0" @@ -5454,7 +5455,7 @@ object.assign@^4.1.0, object.assign@^4.1.2: object.getownpropertydescriptors@^2.1.0: version "2.1.3" - resolved "https://registry.npmmirror.com/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.1.3.tgz?cache=0&sync_timestamp=1633321822200&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" + resolved "https://registry.npmmirror.com/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.1.3.tgz?cache=0&sync_timestamp=1633321729644&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.getownpropertydescriptors%2Fdownload%2Fobject.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" integrity sha1-siPPOOF/77l6Y8EMkd9yzLOG354= dependencies: call-bind "^1.0.2" @@ -5463,7 +5464,7 @@ object.getownpropertydescriptors@^2.1.0: object.values@^1.1.0: version "1.1.5" - resolved "https://registry.npmmirror.com/object.values/download/object.values-1.1.5.tgz?cache=0&sync_timestamp=1633326898457&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fobject.values%2Fdownload%2Fobject.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" + resolved "https://registry.npmmirror.com/object.values/download/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" integrity sha1-lZ9j486e8QhyAzMIITHkpFm3Fqw= dependencies: call-bind "^1.0.2" @@ -5472,7 +5473,7 @@ object.values@^1.1.0: obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" - resolved "https://registry.npm.taobao.org/obuf/download/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" + resolved "https://registry.nlark.com/obuf/download/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha1-Cb6jND1BhZ69RGKS0RydTbYZCE4= on-finished@~2.3.0: @@ -5496,7 +5497,7 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: onetime@^5.1.2: version "5.1.2" - resolved "https://registry.nlark.com/onetime/download/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + resolved "https://registry.npm.taobao.org/onetime/download/onetime-5.1.2.tgz?cache=0&sync_timestamp=1617889724435&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fonetime%2Fdownload%2Fonetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha1-0Oluu1awdHbfHdnEgG5SN5hcpF4= dependencies: mimic-fn "^2.1.0" @@ -5525,40 +5526,40 @@ opener@^1.5.2: p-cancelable@^1.0.0: version "1.1.0" - resolved "https://registry.nlark.com/p-cancelable/download/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" + resolved "https://registry.nlark.com/p-cancelable/download/p-cancelable-1.1.0.tgz?cache=0&sync_timestamp=1622467988667&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-cancelable%2Fdownload%2Fp-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" integrity sha1-0HjRWjr0CSIMiG8dmgyi5EGrJsw= p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" - resolved "https://registry.nlark.com/p-limit/download/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + resolved "https://registry.nlark.com/p-limit/download/p-limit-2.3.0.tgz?cache=0&sync_timestamp=1628812721654&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-limit%2Fdownload%2Fp-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" integrity sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE= dependencies: p-try "^2.0.0" p-locate@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/p-locate/download/p-locate-3.0.0.tgz?cache=0&sync_timestamp=1629892721671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-locate%2Fdownload%2Fp-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + resolved "https://registry.nlark.com/p-locate/download/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" integrity sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ= dependencies: p-limit "^2.0.0" p-locate@^4.1.0: version "4.1.0" - resolved "https://registry.nlark.com/p-locate/download/p-locate-4.1.0.tgz?cache=0&sync_timestamp=1629892721671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fp-locate%2Fdownload%2Fp-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + resolved "https://registry.nlark.com/p-locate/download/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" integrity sha1-o0KLtwiLOmApL2aRkni3wpetTwc= dependencies: p-limit "^2.2.0" p-map@^4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/p-map/download/p-map-4.0.0.tgz?cache=0&sync_timestamp=1635931861684&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-map%2Fdownload%2Fp-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + resolved "https://registry.npmmirror.com/p-map/download/p-map-4.0.0.tgz?cache=0&sync_timestamp=1635931906744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-map%2Fdownload%2Fp-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" integrity sha1-uy+Vpe2i7BaOySdOBqdHw+KQTSs= dependencies: aggregate-error "^3.0.0" p-retry@^4.5.0: version "4.6.1" - resolved "https://registry.npmmirror.com/p-retry/download/p-retry-4.6.1.tgz?cache=0&sync_timestamp=1635967027504&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-retry%2Fdownload%2Fp-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" + resolved "https://registry.npmmirror.com/p-retry/download/p-retry-4.6.1.tgz?cache=0&sync_timestamp=1635967279748&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fp-retry%2Fdownload%2Fp-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c" integrity sha1-j83dXN96Z6CRGpzy7w5d9/YCMWw= dependencies: "@types/retry" "^0.12.0" @@ -5571,7 +5572,7 @@ p-try@^2.0.0: package-json@^6.3.0: version "6.5.0" - resolved "https://registry.nlark.com/package-json/download/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" + resolved "https://registry.nlark.com/package-json/download/package-json-6.5.0.tgz?cache=0&sync_timestamp=1624549851966&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpackage-json%2Fdownload%2Fpackage-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" integrity sha1-b+7ayjXnVyWHbQsOZJdGl/7RRbA= dependencies: got "^9.6.0" @@ -5581,7 +5582,7 @@ package-json@^6.3.0: param-case@^3.0.4: version "3.0.4" - resolved "https://registry.nlark.com/param-case/download/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" + resolved "https://registry.npm.taobao.org/param-case/download/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" integrity sha1-fRf+SqEr3jTUp32RrPtiGcqtAcU= dependencies: dot-case "^3.0.4" @@ -5623,17 +5624,17 @@ parse-numeric-range@^1.2.0: parse5@^5.0.0: version "5.1.1" - resolved "https://registry.nlark.com/parse5/download/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" + resolved "https://registry.npm.taobao.org/parse5/download/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" integrity sha1-9o5OW6GFKsLK3AD0VV//bCq7YXg= parse5@^6.0.0: version "6.0.1" - resolved "https://registry.nlark.com/parse5/download/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + resolved "https://registry.npm.taobao.org/parse5/download/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha1-4aHAhcVps9wIMhGE8Zo5zCf3wws= parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" - resolved "https://registry.npm.taobao.org/parseurl/download/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + resolved "https://registry.nlark.com/parseurl/download/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ= pascal-case@^3.1.2: @@ -5646,12 +5647,12 @@ pascal-case@^3.1.2: path-exists@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/path-exists/download/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + resolved "https://registry.nlark.com/path-exists/download/path-exists-3.0.0.tgz?cache=0&sync_timestamp=1631633114211&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpath-exists%2Fdownload%2Fpath-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= path-exists@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/path-exists/download/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + resolved "https://registry.nlark.com/path-exists/download/path-exists-4.0.0.tgz?cache=0&sync_timestamp=1631633114211&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpath-exists%2Fdownload%2Fpath-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" integrity sha1-UTvb4tO5XXdi6METfvoZXGxhtbM= path-is-absolute@^1.0.0: @@ -5666,7 +5667,7 @@ path-is-inside@1.0.2: path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" - resolved "https://registry.nlark.com/path-key/download/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + resolved "https://registry.npmmirror.com/path-key/download/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha1-WB9q3mWMu6ZaDTOA3ndTKVBU83U= path-parse@^1.0.6: @@ -5676,34 +5677,34 @@ path-parse@^1.0.6: path-to-regexp@0.1.7: version "0.1.7" - resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + resolved "https://registry.npmmirror.com/path-to-regexp/download/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= path-to-regexp@2.2.1: version "2.2.1" - resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" + resolved "https://registry.npmmirror.com/path-to-regexp/download/path-to-regexp-2.2.1.tgz#90b617025a16381a879bc82a38d4e8bdeb2bcf45" integrity sha1-kLYXAloWOBqHm8gqONTovesrz0U= path-to-regexp@^1.7.0: version "1.8.0" - resolved "https://registry.nlark.com/path-to-regexp/download/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" + resolved "https://registry.npmmirror.com/path-to-regexp/download/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" integrity sha1-iHs7qdhDk+h6CgufTLdWGYtTVIo= dependencies: isarray "0.0.1" path-type@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/path-type/download/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + resolved "https://registry.npm.taobao.org/path-type/download/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs= picocolors@^1.0.0: version "1.0.0" - resolved "https://registry.npmmirror.com/picocolors/download/picocolors-1.0.0.tgz?cache=0&sync_timestamp=1634093378416&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + resolved "https://registry.npmmirror.com/picocolors/download/picocolors-1.0.0.tgz?cache=0&sync_timestamp=1634093415681&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpicocolors%2Fdownload%2Fpicocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha1-y1vcdP8/UYkiNur3nWi8RFZKuBw= picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: version "2.3.0" - resolved "https://registry.nlark.com/picomatch/download/picomatch-2.3.0.tgz?cache=0&sync_timestamp=1621648246651&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpicomatch%2Fdownload%2Fpicomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + resolved "https://registry.nlark.com/picomatch/download/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" integrity sha1-8fBh3o9qS/AiiS4tEoI0+5gwKXI= pify@^2.3.0: @@ -5718,14 +5719,14 @@ pify@^4.0.1: pkg-dir@^4.1.0: version "4.2.0" - resolved "https://registry.npmmirror.com/pkg-dir/download/pkg-dir-4.2.0.tgz?cache=0&sync_timestamp=1633498133295&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-dir%2Fdownload%2Fpkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + resolved "https://registry.npmmirror.com/pkg-dir/download/pkg-dir-4.2.0.tgz?cache=0&sync_timestamp=1633498116014&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-dir%2Fdownload%2Fpkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" integrity sha1-8JkTPfft5CLoHR2ESCcO6z5CYfM= dependencies: find-up "^4.0.0" pkg-up@^3.1.0: version "3.1.0" - resolved "https://registry.npmmirror.com/pkg-up/download/pkg-up-3.1.0.tgz?cache=0&sync_timestamp=1636035118070&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-up%2Fdownload%2Fpkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" + resolved "https://registry.npmmirror.com/pkg-up/download/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" integrity sha1-EA7CNcwVDk/UJRlBJZaihRKg3vU= dependencies: find-up "^3.0.0" @@ -5741,7 +5742,7 @@ portfinder@^1.0.28: postcss-calc@^8.0.0: version "8.0.0" - resolved "https://registry.nlark.com/postcss-calc/download/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a" + resolved "https://registry.npmmirror.com/postcss-calc/download/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a" integrity sha1-oFuHqs0TJ0Cl2wlGKjYSRT5d+Qo= dependencies: postcss-selector-parser "^6.0.2" @@ -5759,24 +5760,24 @@ postcss-colormin@^5.2.2: postcss-convert-values@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-convert-values/download/postcss-convert-values-5.0.2.tgz?cache=0&sync_timestamp=1635857664165&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-convert-values%2Fdownload%2Fpostcss-convert-values-5.0.2.tgz#879b849dc3677c7d6bc94b6a2c1a3f0808798059" + resolved "https://registry.npmmirror.com/postcss-convert-values/download/postcss-convert-values-5.0.2.tgz#879b849dc3677c7d6bc94b6a2c1a3f0808798059" integrity sha1-h5uEncNnfH1ryUtqLBo/CAh5gFk= dependencies: postcss-value-parser "^4.1.0" postcss-discard-comments@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-comments/download/postcss-discard-comments-5.0.1.tgz?cache=0&sync_timestamp=1621449592883&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-comments%2Fdownload%2Fpostcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" + resolved "https://registry.nlark.com/postcss-discard-comments/download/postcss-discard-comments-5.0.1.tgz?cache=0&sync_timestamp=1621449558287&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-comments%2Fdownload%2Fpostcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" integrity sha1-nq5LdHz3YNMfJEfCfwYZ1XGJAf4= postcss-discard-duplicates@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-duplicates/download/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" + resolved "https://registry.nlark.com/postcss-discard-duplicates/download/postcss-discard-duplicates-5.0.1.tgz?cache=0&sync_timestamp=1621449558296&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-duplicates%2Fdownload%2Fpostcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" integrity sha1-aPfMZFj+a6suRsn1WuUoafaA5m0= postcss-discard-empty@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-empty/download/postcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8" + resolved "https://registry.nlark.com/postcss-discard-empty/download/postcss-discard-empty-5.0.1.tgz?cache=0&sync_timestamp=1621449733074&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-empty%2Fdownload%2Fpostcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8" integrity sha1-7hNsOeJ9XS7U2g7l7QK8ip+L9tg= postcss-discard-overridden@^5.0.1: @@ -5786,14 +5787,14 @@ postcss-discard-overridden@^5.0.1: postcss-discard-unused@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-discard-unused/download/postcss-discard-unused-5.0.1.tgz#63e35a74a154912f93d4e75a1e6ff3cc146f934b" + resolved "https://registry.nlark.com/postcss-discard-unused/download/postcss-discard-unused-5.0.1.tgz?cache=0&sync_timestamp=1621449732186&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-discard-unused%2Fdownload%2Fpostcss-discard-unused-5.0.1.tgz#63e35a74a154912f93d4e75a1e6ff3cc146f934b" integrity sha1-Y+NadKFUkS+T1OdaHm/zzBRvk0s= dependencies: postcss-selector-parser "^6.0.5" postcss-import@^14.0.2: version "14.0.2" - resolved "https://registry.nlark.com/postcss-import/download/postcss-import-14.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-import%2Fdownload%2Fpostcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1" + resolved "https://registry.nlark.com/postcss-import/download/postcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1" integrity sha1-YO/3fmvpLntn/kaex5fZQkyuGqE= dependencies: postcss-value-parser "^4.0.0" @@ -5802,7 +5803,7 @@ postcss-import@^14.0.2: postcss-js@^3.0.3: version "3.0.3" - resolved "https://registry.nlark.com/postcss-js/download/postcss-js-3.0.3.tgz#2f0bd370a2e8599d45439f6970403b5873abda33" + resolved "https://registry.npm.taobao.org/postcss-js/download/postcss-js-3.0.3.tgz#2f0bd370a2e8599d45439f6970403b5873abda33" integrity sha1-LwvTcKLoWZ1FQ59pcEA7WHOr2jM= dependencies: camelcase-css "^2.0.1" @@ -5836,7 +5837,7 @@ postcss-merge-idents@^5.0.1: postcss-merge-longhand@^5.0.4: version "5.0.4" - resolved "https://registry.npmmirror.com/postcss-merge-longhand/download/postcss-merge-longhand-5.0.4.tgz#41f4f3270282ea1a145ece078b7679f0cef21c32" + resolved "https://registry.npmmirror.com/postcss-merge-longhand/download/postcss-merge-longhand-5.0.4.tgz?cache=0&sync_timestamp=1637084835421&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-longhand%2Fdownload%2Fpostcss-merge-longhand-5.0.4.tgz#41f4f3270282ea1a145ece078b7679f0cef21c32" integrity sha512-2lZrOVD+d81aoYkZDpWu6+3dTAAGkCKbV5DoRhnIR7KOULVrI/R7bcMjhrH9KTRy6iiHKqmtG+n/MMj1WmqHFw== dependencies: postcss-value-parser "^4.1.0" @@ -5844,7 +5845,7 @@ postcss-merge-longhand@^5.0.4: postcss-merge-rules@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-merge-rules/download/postcss-merge-rules-5.0.3.tgz?cache=0&sync_timestamp=1637085394901&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-rules%2Fdownload%2Fpostcss-merge-rules-5.0.3.tgz#b5cae31f53129812a77e3eb1eeee448f8cf1a1db" + resolved "https://registry.npmmirror.com/postcss-merge-rules/download/postcss-merge-rules-5.0.3.tgz?cache=0&sync_timestamp=1637085530842&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-merge-rules%2Fdownload%2Fpostcss-merge-rules-5.0.3.tgz#b5cae31f53129812a77e3eb1eeee448f8cf1a1db" integrity sha512-cEKTMEbWazVa5NXd8deLdCnXl+6cYG7m2am+1HzqH0EnTdy8fRysatkaXb2dEnR+fdaDxTvuZ5zoBdv6efF6hg== dependencies: browserslist "^4.16.6" @@ -5854,7 +5855,7 @@ postcss-merge-rules@^5.0.3: postcss-minify-font-values@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-minify-font-values/download/postcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf" + resolved "https://registry.nlark.com/postcss-minify-font-values/download/postcss-minify-font-values-5.0.1.tgz?cache=0&sync_timestamp=1621449734134&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-minify-font-values%2Fdownload%2Fpostcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf" integrity sha1-qQzvv9qgdb09uqGzNYi7TcJord8= dependencies: postcss-value-parser "^4.1.0" @@ -5870,7 +5871,7 @@ postcss-minify-gradients@^5.0.3: postcss-minify-params@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-minify-params/download/postcss-minify-params-5.0.2.tgz#1b644da903473fbbb18fbe07b8e239883684b85c" + resolved "https://registry.npmmirror.com/postcss-minify-params/download/postcss-minify-params-5.0.2.tgz?cache=0&sync_timestamp=1637084835630&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-minify-params%2Fdownload%2Fpostcss-minify-params-5.0.2.tgz#1b644da903473fbbb18fbe07b8e239883684b85c" integrity sha512-qJAPuBzxO1yhLad7h2Dzk/F7n1vPyfHfCCh5grjGfjhi1ttCnq4ZXGIW77GSrEbh9Hus9Lc/e/+tB4vh3/GpDg== dependencies: alphanum-sort "^1.0.2" @@ -5880,7 +5881,7 @@ postcss-minify-params@^5.0.2: postcss-minify-selectors@^5.1.0: version "5.1.0" - resolved "https://registry.nlark.com/postcss-minify-selectors/download/postcss-minify-selectors-5.1.0.tgz?cache=0&sync_timestamp=1621449593365&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-minify-selectors%2Fdownload%2Fpostcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" + resolved "https://registry.nlark.com/postcss-minify-selectors/download/postcss-minify-selectors-5.1.0.tgz?cache=0&sync_timestamp=1621449558355&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-minify-selectors%2Fdownload%2Fpostcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" integrity sha1-Q4XIRdOXn/FgKRd0Uj/6VOr9WlQ= dependencies: alphanum-sort "^1.0.2" @@ -5893,7 +5894,7 @@ postcss-modules-extract-imports@^3.0.0: postcss-modules-local-by-default@^4.0.0: version "4.0.0" - resolved "https://registry.npm.taobao.org/postcss-modules-local-by-default/download/postcss-modules-local-by-default-4.0.0.tgz?cache=0&sync_timestamp=1602587625149&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules-local-by-default%2Fdownload%2Fpostcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" + resolved "https://registry.npm.taobao.org/postcss-modules-local-by-default/download/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" integrity sha1-67tU+uFZjuz99pGgKz/zs5ClpRw= dependencies: icss-utils "^5.0.0" @@ -5909,26 +5910,26 @@ postcss-modules-scope@^3.0.0: postcss-modules-values@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/postcss-modules-values/download/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" + resolved "https://registry.npm.taobao.org/postcss-modules-values/download/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" integrity sha1-18Xn5ow7s8myfL9Iyguz/7RgLJw= dependencies: icss-utils "^5.0.0" postcss-nested@5.0.6: version "5.0.6" - resolved "https://registry.nlark.com/postcss-nested/download/postcss-nested-5.0.6.tgz?cache=0&sync_timestamp=1627468122159&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-nested%2Fdownload%2Fpostcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" + resolved "https://registry.nlark.com/postcss-nested/download/postcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" integrity sha1-RmND9/yNPUavPn26P81H0FKpRbw= dependencies: postcss-selector-parser "^6.0.6" postcss-normalize-charset@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-charset/download/postcss-normalize-charset-5.0.1.tgz?cache=0&sync_timestamp=1621449593655&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-charset%2Fdownload%2Fpostcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" + resolved "https://registry.nlark.com/postcss-normalize-charset/download/postcss-normalize-charset-5.0.1.tgz?cache=0&sync_timestamp=1621449558308&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-charset%2Fdownload%2Fpostcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" integrity sha1-EhVZ0b68VayNJK839nvU2p79kdA= postcss-normalize-display-values@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-display-values/download/postcss-normalize-display-values-5.0.1.tgz?cache=0&sync_timestamp=1621449599414&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-display-values%2Fdownload%2Fpostcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" + resolved "https://registry.nlark.com/postcss-normalize-display-values/download/postcss-normalize-display-values-5.0.1.tgz?cache=0&sync_timestamp=1621449652268&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-display-values%2Fdownload%2Fpostcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" integrity sha1-YmULllmBqVXf/ugzY0U9uC9q0f0= dependencies: cssnano-utils "^2.0.1" @@ -5943,7 +5944,7 @@ postcss-normalize-positions@^5.0.1: postcss-normalize-repeat-style@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-repeat-style/download/postcss-normalize-repeat-style-5.0.1.tgz?cache=0&sync_timestamp=1621449596114&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-repeat-style%2Fdownload%2Fpostcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" + resolved "https://registry.nlark.com/postcss-normalize-repeat-style/download/postcss-normalize-repeat-style-5.0.1.tgz?cache=0&sync_timestamp=1621449651580&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-repeat-style%2Fdownload%2Fpostcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" integrity sha1-y8DeE4O1f1u2Hd1qhGU7XoZlsrU= dependencies: cssnano-utils "^2.0.1" @@ -5951,14 +5952,14 @@ postcss-normalize-repeat-style@^5.0.1: postcss-normalize-string@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-string/download/postcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0" + resolved "https://registry.nlark.com/postcss-normalize-string/download/postcss-normalize-string-5.0.1.tgz?cache=0&sync_timestamp=1621449646930&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-string%2Fdownload%2Fpostcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0" integrity sha1-2er6pN94x6O5c640bvDkfFVJhbA= dependencies: postcss-value-parser "^4.1.0" postcss-normalize-timing-functions@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-timing-functions/download/postcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c" + resolved "https://registry.nlark.com/postcss-normalize-timing-functions/download/postcss-normalize-timing-functions-5.0.1.tgz?cache=0&sync_timestamp=1621449827577&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-timing-functions%2Fdownload%2Fpostcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c" integrity sha1-juQRA7kTBCnGy7pzaTK3XF4ssIw= dependencies: cssnano-utils "^2.0.1" @@ -5966,7 +5967,7 @@ postcss-normalize-timing-functions@^5.0.1: postcss-normalize-unicode@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-unicode/download/postcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37" + resolved "https://registry.nlark.com/postcss-normalize-unicode/download/postcss-normalize-unicode-5.0.1.tgz?cache=0&sync_timestamp=1621449825612&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-unicode%2Fdownload%2Fpostcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37" integrity sha1-gtZy1kikEYFKpb865WU3nM2fXjc= dependencies: browserslist "^4.16.0" @@ -5982,14 +5983,14 @@ postcss-normalize-url@^5.0.4: postcss-normalize-whitespace@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-normalize-whitespace/download/postcss-normalize-whitespace-5.0.1.tgz?cache=0&sync_timestamp=1621449593892&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-whitespace%2Fdownload%2Fpostcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" + resolved "https://registry.nlark.com/postcss-normalize-whitespace/download/postcss-normalize-whitespace-5.0.1.tgz?cache=0&sync_timestamp=1621449646853&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-normalize-whitespace%2Fdownload%2Fpostcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" integrity sha1-sLQLW8rINYX/B+rS2vLc++7vjpo= dependencies: postcss-value-parser "^4.1.0" postcss-ordered-values@^5.0.2: version "5.0.2" - resolved "https://registry.nlark.com/postcss-ordered-values/download/postcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" + resolved "https://registry.nlark.com/postcss-ordered-values/download/postcss-ordered-values-5.0.2.tgz?cache=0&sync_timestamp=1623330460500&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-ordered-values%2Fdownload%2Fpostcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" integrity sha1-HzUUJpd74A4PdlsxZK11PayO0EQ= dependencies: cssnano-utils "^2.0.1" @@ -5997,7 +5998,7 @@ postcss-ordered-values@^5.0.2: postcss-reduce-idents@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-reduce-idents/download/postcss-reduce-idents-5.0.1.tgz#99b49ce8ee6f9c179447671cc9693e198e877bb7" + resolved "https://registry.nlark.com/postcss-reduce-idents/download/postcss-reduce-idents-5.0.1.tgz?cache=0&sync_timestamp=1621449563205&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-reduce-idents%2Fdownload%2Fpostcss-reduce-idents-5.0.1.tgz#99b49ce8ee6f9c179447671cc9693e198e877bb7" integrity sha1-mbSc6O5vnBeUR2ccyWk+GY6He7c= dependencies: postcss-value-parser "^4.1.0" @@ -6035,7 +6036,7 @@ postcss-sort-media-queries@^4.1.0: postcss-svgo@^5.0.3: version "5.0.3" - resolved "https://registry.npmmirror.com/postcss-svgo/download/postcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30" + resolved "https://registry.npmmirror.com/postcss-svgo/download/postcss-svgo-5.0.3.tgz?cache=0&sync_timestamp=1635857761721&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-svgo%2Fdownload%2Fpostcss-svgo-5.0.3.tgz#d945185756e5dfaae07f9edb0d3cae7ff79f9b30" integrity sha1-2UUYV1bl36rgf57bDTyuf/efmzA= dependencies: postcss-value-parser "^4.1.0" @@ -6043,7 +6044,7 @@ postcss-svgo@^5.0.3: postcss-unique-selectors@^5.0.2: version "5.0.2" - resolved "https://registry.npmmirror.com/postcss-unique-selectors/download/postcss-unique-selectors-5.0.2.tgz#5d6893daf534ae52626708e0d62250890108c0c1" + resolved "https://registry.npmmirror.com/postcss-unique-selectors/download/postcss-unique-selectors-5.0.2.tgz?cache=0&sync_timestamp=1637084835538&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss-unique-selectors%2Fdownload%2Fpostcss-unique-selectors-5.0.2.tgz#5d6893daf534ae52626708e0d62250890108c0c1" integrity sha512-w3zBVlrtZm7loQWRPVC0yjUwwpty7OM6DnEHkxcSQXO1bMS3RJ+JUS5LFMSDZHJcvGsRwhZinCWVqn8Kej4EDA== dependencies: alphanum-sort "^1.0.2" @@ -6056,7 +6057,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^ postcss-zindex@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/postcss-zindex/download/postcss-zindex-5.0.1.tgz#c585724beb69d356af8c7e68847b28d6298ece03" + resolved "https://registry.nlark.com/postcss-zindex/download/postcss-zindex-5.0.1.tgz?cache=0&sync_timestamp=1621449734732&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-zindex%2Fdownload%2Fpostcss-zindex-5.0.1.tgz#c585724beb69d356af8c7e68847b28d6298ece03" integrity sha1-xYVyS+tp01avjH5ohHso1imOzgM= postcss@^8.1.6, postcss@^8.2.15, postcss@^8.3.5, postcss@^8.3.7: @@ -6103,18 +6104,18 @@ prismjs@^1.23.0: process-nextick-args@~2.0.0: version "2.0.1" - resolved "https://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + resolved "https://registry.npmmirror.com/process-nextick-args/download/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha1-eCDZsWEgzFXKmud5JoCufbptf+I= prompts@^2.4.0, prompts@^2.4.1: version "2.4.2" - resolved "https://registry.npmmirror.com/prompts/download/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" + resolved "https://registry.npmmirror.com/prompts/download/prompts-2.4.2.tgz?cache=0&sync_timestamp=1633642560605&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fprompts%2Fdownload%2Fprompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" integrity sha1-e1fnOzpIAprRDr1E90sBcipMsGk= dependencies: kleur "^3.0.3" sisteransi "^1.0.5" -prop-types@^15.5.10, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@^15.5.10, prop-types@^15.6.2, prop-types@^15.7.2: version "15.8.0" resolved "https://registry.npmmirror.com/prop-types/download/prop-types-15.8.0.tgz#d237e624c45a9846e469f5f31117f970017ff588" integrity sha512-fDGekdaHh65eI3lMi5OnErU6a8Ighg2KjcjQxO7m8VHyWjcPyj5kiOgV1LQDOOOgVy3+5FgjXvdSSX7B8/5/4g== @@ -6125,14 +6126,14 @@ prop-types@^15.5.10, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: property-information@^5.0.0, property-information@^5.3.0: version "5.6.0" - resolved "https://registry.npmmirror.com/property-information/download/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69" + resolved "https://registry.npmmirror.com/property-information/download/property-information-5.6.0.tgz?cache=0&sync_timestamp=1636733749352&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fproperty-information%2Fdownload%2Fproperty-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69" integrity sha1-YWdVRfsjAC8kXGVA7EYHfU2j7Wk= dependencies: xtend "^4.0.0" proxy-addr@~2.0.7: version "2.0.7" - resolved "https://registry.nlark.com/proxy-addr/download/proxy-addr-2.0.7.tgz?cache=0&sync_timestamp=1622509170257&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fproxy-addr%2Fdownload%2Fproxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + resolved "https://registry.nlark.com/proxy-addr/download/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" integrity sha1-8Z/mnOqzEe65S0LnDowgcPm6ECU= dependencies: forwarded "0.2.0" @@ -6181,7 +6182,7 @@ qs@6.9.6: querystring@0.2.0: version "0.2.0" resolved "https://registry.npmmirror.com/querystring/download/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= + integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g== queue-microtask@^1.2.2: version "1.2.3" @@ -6190,29 +6191,29 @@ queue-microtask@^1.2.2: quick-lru@^5.1.1: version "5.1.1" - resolved "https://registry.npmmirror.com/quick-lru/download/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + resolved "https://registry.npmmirror.com/quick-lru/download/quick-lru-5.1.1.tgz?cache=0&sync_timestamp=1637478663596&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fquick-lru%2Fdownload%2Fquick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" integrity sha1-NmST5rPkKjpoheLpnRj4D7eoyTI= randombytes@^2.1.0: version "2.1.0" - resolved "https://registry.nlark.com/randombytes/download/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" + resolved "https://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" integrity sha1-32+ENy8CcNxlzfYpE0mrekc9Tyo= dependencies: safe-buffer "^5.1.0" range-parser@1.2.0: version "1.2.0" - resolved "https://registry.nlark.com/range-parser/download/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" + resolved "https://registry.npm.taobao.org/range-parser/download/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4= range-parser@^1.2.1, range-parser@~1.2.1: version "1.2.1" - resolved "https://registry.nlark.com/range-parser/download/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + resolved "https://registry.npm.taobao.org/range-parser/download/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE= raw-body@2.4.2: version "2.4.2" - resolved "https://registry.npmmirror.com/raw-body/download/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32" + resolved "https://registry.npmmirror.com/raw-body/download/raw-body-2.4.2.tgz?cache=0&sync_timestamp=1637116875777&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fraw-body%2Fdownload%2Fraw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32" integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ== dependencies: bytes "3.1.1" @@ -6222,7 +6223,7 @@ raw-body@2.4.2: rc@^1.2.8: version "1.2.8" - resolved "https://registry.nlark.com/rc/download/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + resolved "https://registry.npm.taobao.org/rc/download/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha1-zZJL9SAKB1uDwYjNa54hG3/A0+0= dependencies: deep-extend "^0.6.0" @@ -6299,7 +6300,7 @@ react-error-overlay@^6.0.9: react-fast-compare@^3.1.1: version "3.2.0" - resolved "https://registry.nlark.com/react-fast-compare/download/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" + resolved "https://registry.npmmirror.com/react-fast-compare/download/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" integrity sha1-ZBqdqBtqYyDycOiXJPtFoLOeQ7s= react-helmet@^6.1.0: @@ -6324,16 +6325,9 @@ react-loadable-ssr-addon-v5-slorber@^1.0.1: dependencies: "@babel/runtime" "^7.10.3" -react-paginate@^8.1.0: - version "8.1.0" - resolved "https://registry.npmmirror.com/react-paginate/download/react-paginate-8.1.0.tgz#8c4c6c5b7d90e8a4f33653262204fd32c5dfd207" - integrity sha512-XK8cgcX8Zk4De6F4Iozd91a2xm/U+mdD4SB5k4xcBabqZj86U20N7kMiMzOFk1AEGCj6Kg1374xXK03dz7BTRA== - dependencies: - prop-types "^15.6.1" - react-router-config@^5.1.1: version "5.1.1" - resolved "https://registry.nlark.com/react-router-config/download/react-router-config-5.1.1.tgz#0f4263d1a80c6b2dc7b9c1902c9526478194a988" + resolved "https://registry.npm.taobao.org/react-router-config/download/react-router-config-5.1.1.tgz#0f4263d1a80c6b2dc7b9c1902c9526478194a988" integrity sha1-D0Jj0agMay3HucGQLJUmR4GUqYg= dependencies: "@babel/runtime" "^7.1.2" @@ -6394,14 +6388,14 @@ reactcss@^1.2.0: read-cache@^1.0.0: version "1.0.0" - resolved "https://registry.npm.taobao.org/read-cache/download/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" + resolved "https://registry.npmmirror.com/read-cache/download/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q= dependencies: pify "^2.3.0" readable-stream@^2.0.1: version "2.3.7" - resolved "https://registry.nlark.com/readable-stream/download/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + resolved "https://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha1-Hsoc9xGu+BTAT2IlKjamL2yyO1c= dependencies: core-util-is "~1.0.0" @@ -6414,7 +6408,7 @@ readable-stream@^2.0.1: readable-stream@^3.0.6, readable-stream@^3.1.1: version "3.6.0" - resolved "https://registry.nlark.com/readable-stream/download/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + resolved "https://registry.npm.taobao.org/readable-stream/download/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha1-M3u9o63AcGvT4CRCaihtS0sskZg= dependencies: inherits "^2.0.3" @@ -6449,14 +6443,14 @@ recursive-readdir@^2.2.2: regenerate-unicode-properties@^9.0.0: version "9.0.0" - resolved "https://registry.nlark.com/regenerate-unicode-properties/download/regenerate-unicode-properties-9.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregenerate-unicode-properties%2Fdownload%2Fregenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" + resolved "https://registry.npmmirror.com/regenerate-unicode-properties/download/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" integrity sha1-VNCccRXh9T3CMUqXSzLBw0Tv4yY= dependencies: regenerate "^1.4.2" regenerate@^1.4.2: version "1.4.2" - resolved "https://registry.nlark.com/regenerate/download/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" + resolved "https://registry.npm.taobao.org/regenerate/download/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha1-uTRtiCfo9aMve6KWN9OYtpAUhIo= regenerator-runtime@^0.13.4: @@ -6481,7 +6475,7 @@ regexp.prototype.flags@^1.2.0: regexpu-core@^4.5.4, regexpu-core@^4.7.1: version "4.8.0" - resolved "https://registry.nlark.com/regexpu-core/download/regexpu-core-4.8.0.tgz?cache=0&sync_timestamp=1631619103170&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregexpu-core%2Fdownload%2Fregexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" + resolved "https://registry.nlark.com/regexpu-core/download/regexpu-core-4.8.0.tgz?cache=0&sync_timestamp=1631619113277&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fregexpu-core%2Fdownload%2Fregexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" integrity sha1-5WBbo2G2excYR4UBMnUC9EeamPA= dependencies: regenerate "^1.4.2" @@ -6493,14 +6487,14 @@ regexpu-core@^4.5.4, regexpu-core@^4.7.1: registry-auth-token@^4.0.0: version "4.2.1" - resolved "https://registry.npm.taobao.org/registry-auth-token/download/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" + resolved "https://registry.nlark.com/registry-auth-token/download/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" integrity sha1-bXtABkQZGJcszV/tzUHcMix5slA= dependencies: rc "^1.2.8" registry-url@^5.0.0: version "5.1.0" - resolved "https://registry.npm.taobao.org/registry-url/download/registry-url-5.1.0.tgz?cache=0&sync_timestamp=1618681893788&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregistry-url%2Fdownload%2Fregistry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + resolved "https://registry.npm.taobao.org/registry-url/download/registry-url-5.1.0.tgz?cache=0&sync_timestamp=1618682318998&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregistry-url%2Fdownload%2Fregistry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" integrity sha1-6YM0tQ1UNLgRNrROxjjZwgCcUAk= dependencies: rc "^1.2.8" @@ -6519,7 +6513,7 @@ regjsparser@^0.7.0: rehype-parse@^6.0.2: version "6.0.2" - resolved "https://registry.nlark.com/rehype-parse/download/rehype-parse-6.0.2.tgz?cache=0&sync_timestamp=1630413716153&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frehype-parse%2Fdownload%2Frehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" + resolved "https://registry.nlark.com/rehype-parse/download/rehype-parse-6.0.2.tgz#aeb3fdd68085f9f796f1d3137ae2b85a98406964" integrity sha1-rrP91oCF+feW8dMTeuK4WphAaWQ= dependencies: hast-util-from-parse5 "^5.0.0" @@ -6528,12 +6522,12 @@ rehype-parse@^6.0.2: relateurl@^0.2.7: version "0.2.7" - resolved "https://registry.nlark.com/relateurl/download/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" + resolved "https://registry.npm.taobao.org/relateurl/download/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= remark-admonitions@^1.2.1: version "1.2.1" - resolved "https://registry.npm.taobao.org/remark-admonitions/download/remark-admonitions-1.2.1.tgz#87caa1a442aa7b4c0cafa04798ed58a342307870" + resolved "https://registry.nlark.com/remark-admonitions/download/remark-admonitions-1.2.1.tgz#87caa1a442aa7b4c0cafa04798ed58a342307870" integrity sha1-h8qhpEKqe0wMr6BHmO1Yo0IweHA= dependencies: rehype-parse "^6.0.2" @@ -6542,7 +6536,7 @@ remark-admonitions@^1.2.1: remark-emoji@^2.1.0: version "2.2.0" - resolved "https://registry.npmmirror.com/remark-emoji/download/remark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" + resolved "https://registry.npmmirror.com/remark-emoji/download/remark-emoji-2.2.0.tgz?cache=0&sync_timestamp=1636044582007&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-emoji%2Fdownload%2Fremark-emoji-2.2.0.tgz#1c702090a1525da5b80e15a8f963ef2c8236cac7" integrity sha1-HHAgkKFSXaW4DhWo+WPvLII2ysc= dependencies: emoticon "^3.2.0" @@ -6570,7 +6564,7 @@ remark-mdx-remove-imports@^1.6.22: remark-mdx@1.6.22: version "1.6.22" - resolved "https://registry.npmmirror.com/remark-mdx/download/remark-mdx-1.6.22.tgz?cache=0&sync_timestamp=1637012565094&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-mdx%2Fdownload%2Fremark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd" + resolved "https://registry.npmmirror.com/remark-mdx/download/remark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd" integrity sha1-BqjasH3P3VfzNzr3+GvQ6ZIQi70= dependencies: "@babel/core" "7.12.9" @@ -6584,7 +6578,7 @@ remark-mdx@1.6.22: remark-parse@8.0.3: version "8.0.3" - resolved "https://registry.npmmirror.com/remark-parse/download/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1" + resolved "https://registry.npmmirror.com/remark-parse/download/remark-parse-8.0.3.tgz?cache=0&sync_timestamp=1637259967297&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fremark-parse%2Fdownload%2Fremark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1" integrity sha1-nGKqOzW3mkhkVMaQRykGB19Ax+E= dependencies: ccount "^1.0.0" @@ -6624,22 +6618,22 @@ renderkid@^3.0.0: repeat-string@^1.5.4: version "1.6.1" - resolved "https://registry.nlark.com/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + resolved "https://registry.npmmirror.com/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= require-from-string@^2.0.2: version "2.0.2" - resolved "https://registry.nlark.com/require-from-string/download/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + resolved "https://registry.npmmirror.com/require-from-string/download/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha1-iaf92TgmEmcxjq/hT5wy5ZjDaQk= "require-like@>= 0.1.1": version "0.1.2" - resolved "https://registry.npm.taobao.org/require-like/download/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa" + resolved "https://registry.nlark.com/require-like/download/require-like-0.1.2.tgz#ad6f30c13becd797010c468afa775c0c0a6b47fa" integrity sha1-rW8wwTvs15cBDEaK+ndcDAprR/o= requires-port@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/requires-port/download/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + resolved "https://registry.npm.taobao.org/requires-port/download/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= resize-observer-polyfill@^1.5.1: @@ -6649,12 +6643,12 @@ resize-observer-polyfill@^1.5.1: resolve-from@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + resolved "https://registry.npm.taobao.org/resolve-from/download/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY= resolve-from@^5.0.0: version "5.0.0" - resolved "https://registry.nlark.com/resolve-from/download/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + resolved "https://registry.npm.taobao.org/resolve-from/download/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha1-w1IlhD3493bfIcV1V7wIfp39/Gk= resolve-pathname@^3.0.0: @@ -6664,7 +6658,7 @@ resolve-pathname@^3.0.0: resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2: version "1.20.0" - resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.20.0.tgz?cache=0&sync_timestamp=1615982599966&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fresolve%2Fdownload%2Fresolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha1-YpoBP7P3B1XW8LeTXMHCxTeLGXU= dependencies: is-core-module "^2.2.0" @@ -6672,7 +6666,7 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2 responselike@^1.0.2: version "1.0.2" - resolved "https://registry.npm.taobao.org/responselike/download/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + resolved "https://registry.nlark.com/responselike/download/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= dependencies: lowercase-keys "^1.0.0" @@ -6701,7 +6695,7 @@ rtl-detect@^1.0.4: run-parallel@^1.1.9: version "1.2.0" - resolved "https://registry.nlark.com/run-parallel/download/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + resolved "https://registry.npm.taobao.org/run-parallel/download/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" integrity sha1-ZtE2jae9+SHrnZW9GpIp5/IaQ+4= dependencies: queue-microtask "^1.2.2" @@ -6715,17 +6709,17 @@ rxjs@^7.1.0: safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" - resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + resolved "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha1-mR7GnSluAxN0fVm9/St0XDX4go0= safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: version "5.2.1" - resolved "https://registry.nlark.com/safe-buffer/download/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + resolved "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha1-Hq+fqb2x/dTsdfWPnNtOa3gn7sY= "safer-buffer@>= 2.1.2 < 3": version "2.1.2" - resolved "https://registry.nlark.com/safer-buffer/download/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + resolved "https://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo= sax@^1.2.4, sax@~1.2.4: @@ -6743,7 +6737,7 @@ scheduler@^0.20.2: schema-utils@2.7.0: version "2.7.0" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7" integrity sha1-FxUfdtjq5n+793lgwzxnatn078c= dependencies: "@types/json-schema" "^7.0.4" @@ -6752,7 +6746,7 @@ schema-utils@2.7.0: schema-utils@^2.6.5: version "2.7.1" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-2.7.1.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha1-HKTzLRskxZDCA7jnpQvw6kzTlNc= dependencies: "@types/json-schema" "^7.0.5" @@ -6761,7 +6755,7 @@ schema-utils@^2.6.5: schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: version "3.1.1" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-3.1.1.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-3.1.1.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" integrity sha1-vHTEtraZXB2I92qLd76nIZ4MgoE= dependencies: "@types/json-schema" "^7.0.8" @@ -6770,7 +6764,7 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: schema-utils@^4.0.0: version "4.0.0" - resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-4.0.0.tgz?cache=0&sync_timestamp=1637076072004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" + resolved "https://registry.npmmirror.com/schema-utils/download/schema-utils-4.0.0.tgz?cache=0&sync_timestamp=1637075995216&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fschema-utils%2Fdownload%2Fschema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== dependencies: "@types/json-schema" "^7.0.9" @@ -6788,7 +6782,7 @@ section-matter@^1.0.0: select-hose@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" + resolved "https://registry.nlark.com/select-hose/download/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= selfsigned@^1.10.11: @@ -6800,29 +6794,29 @@ selfsigned@^1.10.11: semver-diff@^3.1.1: version "3.1.1" - resolved "https://registry.nlark.com/semver-diff/download/semver-diff-3.1.1.tgz?cache=0&sync_timestamp=1620044887257&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver-diff%2Fdownload%2Fsemver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" + resolved "https://registry.nlark.com/semver-diff/download/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" integrity sha1-Bfd85Z8yXgDicGr9Z7tQbdscoys= dependencies: semver "^6.3.0" semver@7.0.0: version "7.0.0" - resolved "https://registry.nlark.com/semver/download/semver-7.0.0.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + resolved "https://registry.npm.taobao.org/semver/download/semver-7.0.0.tgz?cache=0&sync_timestamp=1616463641178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha1-XzyjV2HkfgWyBsba/yz4FPAxa44= semver@^5.4.1: version "5.7.1" - resolved "https://registry.nlark.com/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + resolved "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz?cache=0&sync_timestamp=1616463641178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha1-qVT5Ma66UI0we78Gnv8MAclhFvc= semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: version "6.3.0" - resolved "https://registry.nlark.com/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + resolved "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz?cache=0&sync_timestamp=1616463641178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0= semver@^7.3.2, semver@^7.3.4, semver@^7.3.5: version "7.3.5" - resolved "https://registry.nlark.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + resolved "https://registry.npm.taobao.org/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1616463641178&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc= dependencies: lru-cache "^6.0.0" @@ -6848,7 +6842,7 @@ send@0.17.2: serialize-javascript@^6.0.0: version "6.0.0" - resolved "https://registry.nlark.com/serialize-javascript/download/serialize-javascript-6.0.0.tgz?cache=0&sync_timestamp=1624284111898&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + resolved "https://registry.nlark.com/serialize-javascript/download/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" integrity sha1-765diPRdeSQUHai1w6en5mP+/rg= dependencies: randombytes "^2.1.0" @@ -6892,12 +6886,12 @@ serve-static@1.14.2: setprototypeof@1.1.0: version "1.1.0" - resolved "https://registry.nlark.com/setprototypeof/download/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" + resolved "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" integrity sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY= setprototypeof@1.2.0: version "1.2.0" - resolved "https://registry.nlark.com/setprototypeof/download/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + resolved "https://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" integrity sha1-ZsmiSnP5/CjL5msJ/tPTPcrxtCQ= shallow-clone@^3.0.0: @@ -6909,7 +6903,7 @@ shallow-clone@^3.0.0: shebang-command@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/shebang-command/download/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + resolved "https://registry.npm.taobao.org/shebang-command/download/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" integrity sha1-zNCvT4g1+9wmW4JGGq8MNmY/NOo= dependencies: shebang-regex "^3.0.0" @@ -6926,7 +6920,7 @@ shell-quote@^1.7.2: shelljs@^0.8.4: version "0.8.4" - resolved "https://registry.npm.taobao.org/shelljs/download/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2" + resolved "https://registry.npm.taobao.org/shelljs/download/shelljs-0.8.4.tgz?cache=0&sync_timestamp=1615984409294&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fshelljs%2Fdownload%2Fshelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2" integrity sha1-3naE/ut2f4cWsyYHiooAh1iQ48I= dependencies: glob "^7.0.0" @@ -6944,7 +6938,7 @@ side-channel@^1.0.4: signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.6" - resolved "https://registry.npmmirror.com/signal-exit/download/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" + resolved "https://registry.npmmirror.com/signal-exit/download/signal-exit-3.0.6.tgz?cache=0&sync_timestamp=1637255687504&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsignal-exit%2Fdownload%2Fsignal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af" integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ== sirv@^1.0.7: @@ -6963,7 +6957,7 @@ sisteransi@^1.0.5: slash@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/slash/download/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + resolved "https://registry.npm.taobao.org/slash/download/slash-3.0.0.tgz?cache=0&sync_timestamp=1618384496016&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fslash%2Fdownload%2Fslash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha1-ZTm+hwwWWtvVJAIg2+Nh8bxNRjQ= sockjs@^0.3.21: @@ -6982,17 +6976,17 @@ sort-css-media-queries@2.0.4: source-list-map@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" + resolved "https://registry.npm.taobao.org/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha1-OZO9hzv8SEecyp6jpUeDXHwVSzQ= source-map-js@^1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/source-map-js/download/source-map-js-1.0.1.tgz?cache=0&sync_timestamp=1636400753943&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-js%2Fdownload%2Fsource-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" + resolved "https://registry.npmmirror.com/source-map-js/download/source-map-js-1.0.1.tgz?cache=0&sync_timestamp=1636400772640&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-js%2Fdownload%2Fsource-map-js-1.0.1.tgz#a1741c131e3c77d048252adfa24e23b908670caf" integrity sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA== source-map-support@~0.5.20: version "0.5.21" - resolved "https://registry.npmmirror.com/source-map-support/download/source-map-support-0.5.21.tgz?cache=0&sync_timestamp=1637320298732&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fsource-map-support%2Fdownload%2Fsource-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + resolved "https://registry.npmmirror.com/source-map-support/download/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" @@ -7000,22 +6994,22 @@ source-map-support@~0.5.20: source-map@^0.5.0: version "0.5.7" - resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + resolved "https://registry.nlark.com/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: version "0.6.1" - resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + resolved "https://registry.nlark.com/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM= source-map@~0.7.2: version "0.7.3" - resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + resolved "https://registry.nlark.com/source-map/download/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha1-UwL4FpAxc1ImVECS5kmB91F1A4M= sourcemap-codec@^1.4.4: version "1.4.8" - resolved "https://registry.npm.taobao.org/sourcemap-codec/download/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" + resolved "https://registry.nlark.com/sourcemap-codec/download/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" integrity sha1-6oBL2UhXQC5pktBaOO8a41qatMQ= space-separated-tokens@^1.0.0: @@ -7025,7 +7019,7 @@ space-separated-tokens@^1.0.0: spdy-transport@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/spdy-transport/download/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" + resolved "https://registry.npm.taobao.org/spdy-transport/download/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" integrity sha1-ANSGOmQArXXfkzYaFghgXl3NzzE= dependencies: debug "^4.1.0" @@ -7048,7 +7042,7 @@ spdy@^4.0.2: sprintf-js@~1.0.2: version "1.0.3" - resolved "https://registry.nlark.com/sprintf-js/download/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + resolved "https://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= stable@^0.1.8: @@ -7058,29 +7052,29 @@ stable@^0.1.8: state-toggle@^1.0.0: version "1.0.3" - resolved "https://registry.npm.taobao.org/state-toggle/download/state-toggle-1.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstate-toggle%2Fdownload%2Fstate-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" + resolved "https://registry.npm.taobao.org/state-toggle/download/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" integrity sha1-4SOxaojhQxObCcaFIiG8mBWRff4= "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" - resolved "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz?cache=0&sync_timestamp=1609654090567&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstatuses%2Fdownload%2Fstatuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" + resolved "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= std-env@^2.2.1: version "2.3.1" - resolved "https://registry.npmmirror.com/std-env/download/std-env-2.3.1.tgz?cache=0&sync_timestamp=1636124771178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-2.3.1.tgz#d42271908819c243f8defc77a140fc1fcee336a1" + resolved "https://registry.npmmirror.com/std-env/download/std-env-2.3.1.tgz#d42271908819c243f8defc77a140fc1fcee336a1" integrity sha1-1CJxkIgZwkP43vx3oUD8H87jNqE= dependencies: ci-info "^3.1.1" std-env@^3.0.1: version "3.0.1" - resolved "https://registry.npmmirror.com/std-env/download/std-env-3.0.1.tgz?cache=0&sync_timestamp=1636124771178&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstd-env%2Fdownload%2Fstd-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" + resolved "https://registry.npmmirror.com/std-env/download/std-env-3.0.1.tgz#bc4cbc0e438610197e34c2d79c3df30b491f5182" integrity sha1-vEy8DkOGEBl+NMLXnD3zC0kfUYI= string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.2: version "4.2.3" - resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz?cache=0&sync_timestamp=1632421309919&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstring-width%2Fdownload%2Fstring-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha1-JpxxF9J7Ba0uU2gwqOyJXvnG0BA= dependencies: emoji-regex "^8.0.0" @@ -7089,7 +7083,7 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.2: string.prototype.trimend@^1.0.4: version "1.0.4" - resolved "https://registry.nlark.com/string.prototype.trimend/download/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" + resolved "https://registry.npm.taobao.org/string.prototype.trimend/download/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" integrity sha1-51rpDClCxjUEaGwYsoe0oLGkX4A= dependencies: call-bind "^1.0.2" @@ -7097,7 +7091,7 @@ string.prototype.trimend@^1.0.4: string.prototype.trimstart@^1.0.4: version "1.0.4" - resolved "https://registry.npm.taobao.org/string.prototype.trimstart/download/string.prototype.trimstart-1.0.4.tgz?cache=0&sync_timestamp=1614127232940&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring.prototype.trimstart%2Fdownload%2Fstring.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + resolved "https://registry.npm.taobao.org/string.prototype.trimstart/download/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" integrity sha1-s2OZr0qymZtMnGSL16P7K7Jv7u0= dependencies: call-bind "^1.0.2" @@ -7105,21 +7099,21 @@ string.prototype.trimstart@^1.0.4: string_decoder@^1.1.1: version "1.3.0" - resolved "https://registry.nlark.com/string_decoder/download/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + resolved "https://registry.npm.taobao.org/string_decoder/download/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" integrity sha1-QvEUWUpGzxqOMLCoT1bHjD7awh4= dependencies: safe-buffer "~5.2.0" string_decoder@~1.1.1: version "1.1.1" - resolved "https://registry.nlark.com/string_decoder/download/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + resolved "https://registry.npm.taobao.org/string_decoder/download/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" integrity sha1-nPFhG6YmhdcDCunkujQUnDrwP8g= dependencies: safe-buffer "~5.1.0" stringify-object@^3.3.0: version "3.3.0" - resolved "https://registry.nlark.com/stringify-object/download/stringify-object-3.3.0.tgz?cache=0&sync_timestamp=1629673547261&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstringify-object%2Fdownload%2Fstringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" + resolved "https://registry.nlark.com/stringify-object/download/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" integrity sha1-cDBlrvyhkwDTzoivT1s5VtdVZik= dependencies: get-own-enumerable-property-symbols "^3.0.0" @@ -7147,7 +7141,7 @@ strip-bom-string@^1.0.0: strip-final-newline@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/strip-final-newline/download/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + resolved "https://registry.nlark.com/strip-final-newline/download/strip-final-newline-2.0.0.tgz?cache=0&sync_timestamp=1620046435959&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstrip-final-newline%2Fdownload%2Fstrip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha1-ibhS+y/L6Tb29LMYevsKEsGrWK0= strip-json-comments@~2.0.1: @@ -7157,14 +7151,14 @@ strip-json-comments@~2.0.1: style-to-object@0.3.0, style-to-object@^0.3.0: version "0.3.0" - resolved "https://registry.nlark.com/style-to-object/download/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" + resolved "https://registry.npm.taobao.org/style-to-object/download/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" integrity sha1-sbeQ0gWZHMeDgBlnIUl57hmnbkY= dependencies: inline-style-parser "0.1.1" stylehacks@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/stylehacks/download/stylehacks-5.0.1.tgz?cache=0&sync_timestamp=1621449595596&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fstylehacks%2Fdownload%2Fstylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" + resolved "https://registry.nlark.com/stylehacks/download/stylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" integrity sha1-Mj7FVBmFIJhoBjiMf9rrw40sBvs= dependencies: browserslist "^4.16.0" @@ -7278,7 +7272,7 @@ terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.2.4: terser@^5.10.0, terser@^5.7.2: version "5.10.0" - resolved "https://registry.npmmirror.com/terser/download/terser-5.10.0.tgz?cache=0&sync_timestamp=1636988229781&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fterser%2Fdownload%2Fterser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" + resolved "https://registry.npmmirror.com/terser/download/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc" integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA== dependencies: commander "^2.20.0" @@ -7292,17 +7286,17 @@ text-table@^0.2.0: thunky@^1.0.2: version "1.1.0" - resolved "https://registry.nlark.com/thunky/download/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" + resolved "https://registry.npm.taobao.org/thunky/download/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" integrity sha1-Wrr3FKlAXbBQRzK7zNLO3Z75U30= timsort@^0.3.0: version "0.3.0" - resolved "https://registry.npm.taobao.org/timsort/download/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" + resolved "https://registry.nlark.com/timsort/download/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= tiny-invariant@^1.0.2: version "1.2.0" - resolved "https://registry.npmmirror.com/tiny-invariant/download/tiny-invariant-1.2.0.tgz?cache=0&sync_timestamp=1635822367356&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftiny-invariant%2Fdownload%2Ftiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" + resolved "https://registry.npmmirror.com/tiny-invariant/download/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9" integrity sha1-oRQfhrZyqRSMcul4oZpzublKFak= tiny-warning@^1.0.0, tiny-warning@^1.0.3: @@ -7312,12 +7306,12 @@ tiny-warning@^1.0.0, tiny-warning@^1.0.3: tinycolor2@^1.4.1: version "1.4.2" - resolved "https://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803" + resolved "https://registry.nlark.com/tinycolor2/download/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803" integrity sha1-P2pNEHGtB2dtf6Ry4frECnGdiAM= tmp@^0.2.1: version "0.2.1" - resolved "https://registry.nlark.com/tmp/download/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + resolved "https://registry.npm.taobao.org/tmp/download/tmp-0.2.1.tgz?cache=0&sync_timestamp=1615984440866&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftmp%2Fdownload%2Ftmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" integrity sha1-hFf8MDfc9HGcJRNnoa9lAO4czxQ= dependencies: rimraf "^3.0.0" @@ -7329,19 +7323,19 @@ to-fast-properties@^2.0.0: to-readable-stream@^1.0.0: version "1.0.0" - resolved "https://registry.nlark.com/to-readable-stream/download/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" + resolved "https://registry.nlark.com/to-readable-stream/download/to-readable-stream-1.0.0.tgz?cache=0&sync_timestamp=1619072442497&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fto-readable-stream%2Fdownload%2Fto-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" integrity sha1-zgqgwvPfat+FLvtASng+d8BHV3E= to-regex-range@^5.0.1: version "5.0.1" - resolved "https://registry.nlark.com/to-regex-range/download/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + resolved "https://registry.npm.taobao.org/to-regex-range/download/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" integrity sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ= dependencies: is-number "^7.0.0" toidentifier@1.0.1: version "1.0.1" - resolved "https://registry.npmmirror.com/toidentifier/download/toidentifier-1.0.1.tgz?cache=0&sync_timestamp=1636938467744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftoidentifier%2Fdownload%2Ftoidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + resolved "https://registry.npmmirror.com/toidentifier/download/toidentifier-1.0.1.tgz?cache=0&sync_timestamp=1636938512912&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftoidentifier%2Fdownload%2Ftoidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== totalist@^1.0.0: @@ -7351,12 +7345,12 @@ totalist@^1.0.0: trim-trailing-lines@^1.0.0: version "1.1.4" - resolved "https://registry.npm.taobao.org/trim-trailing-lines/download/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0" + resolved "https://registry.npmmirror.com/trim-trailing-lines/download/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0" integrity sha1-vUq77HzIgEYvELLItc4djR7HwsA= trim@0.0.1: version "0.0.1" - resolved "https://registry.npm.taobao.org/trim/download/trim-0.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftrim%2Fdownload%2Ftrim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" + resolved "https://registry.npm.taobao.org/trim/download/trim-0.0.1.tgz?cache=0&sync_timestamp=1617312392149&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftrim%2Fdownload%2Ftrim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd" integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0= trough@^1.0.0: @@ -7366,7 +7360,7 @@ trough@^1.0.0: tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1: version "2.3.1" - resolved "https://registry.nlark.com/tslib/download/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + resolved "https://registry.npmmirror.com/tslib/download/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha1-6KM1rdXOrlGqJh0ypJAVjvBC7wE= type-fest@^0.20.2: @@ -7396,7 +7390,7 @@ typescript@^4.3.5: unbox-primitive@^1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/unbox-primitive/download/unbox-primitive-1.0.1.tgz?cache=0&sync_timestamp=1616706302651&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funbox-primitive%2Fdownload%2Funbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + resolved "https://registry.npm.taobao.org/unbox-primitive/download/unbox-primitive-1.0.1.tgz?cache=0&sync_timestamp=1616706319488&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funbox-primitive%2Fdownload%2Funbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" integrity sha1-CF4hViXsMWJXTciFmr7nilmxRHE= dependencies: function-bind "^1.1.1" @@ -7406,7 +7400,7 @@ unbox-primitive@^1.0.1: unherit@^1.0.4: version "1.1.3" - resolved "https://registry.nlark.com/unherit/download/unherit-1.1.3.tgz?cache=0&sync_timestamp=1626423419302&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funherit%2Fdownload%2Funherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" + resolved "https://registry.nlark.com/unherit/download/unherit-1.1.3.tgz#6c9b503f2b41b262330c80e91c8614abdaa69c22" integrity sha1-bJtQPytBsmIzDIDpHIYUq9qmnCI= dependencies: inherits "^2.0.0" @@ -7414,12 +7408,12 @@ unherit@^1.0.4: unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631615505724&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-canonical-property-names-ecmascript%2Fdownload%2Funicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" + resolved "https://registry.nlark.com/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" integrity sha1-MBrNxSVjFnDTn2FG4Od/9rvevdw= unicode-match-property-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-match-property-ecmascript/download/unicode-match-property-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618607567&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-ecmascript%2Fdownload%2Funicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" + resolved "https://registry.nlark.com/unicode-match-property-ecmascript/download/unicode-match-property-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618696521&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-ecmascript%2Fdownload%2Funicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" integrity sha1-VP0W4OyxZ88Ezx91a9zJLrp5dsM= dependencies: unicode-canonical-property-names-ecmascript "^2.0.0" @@ -7427,7 +7421,7 @@ unicode-match-property-ecmascript@^2.0.0: unicode-match-property-value-ecmascript@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unicode-match-property-value-ecmascript/download/unicode-match-property-value-ecmascript-2.0.0.tgz?cache=0&sync_timestamp=1631618107717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funicode-match-property-value-ecmascript%2Fdownload%2Funicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" + resolved "https://registry.nlark.com/unicode-match-property-value-ecmascript/download/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" integrity sha1-GgGqVyR8FMVouJd1pUk4eIGJpxQ= unicode-property-aliases-ecmascript@^2.0.0: @@ -7437,7 +7431,7 @@ unicode-property-aliases-ecmascript@^2.0.0: unified@9.2.0: version "9.2.0" - resolved "https://registry.npmmirror.com/unified/download/unified-9.2.0.tgz?cache=0&sync_timestamp=1637256334405&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" + resolved "https://registry.npmmirror.com/unified/download/unified-9.2.0.tgz?cache=0&sync_timestamp=1637256247526&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8" integrity sha1-Z6YsYnxAWJ7eu/YPU+39TYIgJ/g= dependencies: bail "^1.0.0" @@ -7449,7 +7443,7 @@ unified@9.2.0: unified@^8.4.2: version "8.4.2" - resolved "https://registry.npmmirror.com/unified/download/unified-8.4.2.tgz?cache=0&sync_timestamp=1637256334405&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" + resolved "https://registry.npmmirror.com/unified/download/unified-8.4.2.tgz?cache=0&sync_timestamp=1637256247526&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funified%2Fdownload%2Funified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1" integrity sha1-E61YtKQ3+qJ1GkpMahb2gMUA//E= dependencies: bail "^1.0.0" @@ -7460,19 +7454,19 @@ unified@^8.4.2: unique-string@^2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unique-string/download/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" + resolved "https://registry.npmmirror.com/unique-string/download/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" integrity sha1-OcZFH4GvsnSd4rIz4/fF6IQ72J0= dependencies: crypto-random-string "^2.0.0" unist-builder@2.0.3, unist-builder@^2.0.0: version "2.0.3" - resolved "https://registry.nlark.com/unist-builder/download/unist-builder-2.0.3.tgz?cache=0&sync_timestamp=1618816093327&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-builder%2Fdownload%2Funist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436" + resolved "https://registry.nlark.com/unist-builder/download/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436" integrity sha1-d2SHEbXYavCULzNDl6M8XpFRZDY= unist-util-generated@^1.0.0: version "1.1.6" - resolved "https://registry.nlark.com/unist-util-generated/download/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" + resolved "https://registry.npm.taobao.org/unist-util-generated/download/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" integrity sha1-WrUfaJ4pkqRyvrGzXyzn/y8yTUs= unist-util-is@^4.0.0: @@ -7482,40 +7476,40 @@ unist-util-is@^4.0.0: unist-util-position@^3.0.0: version "3.1.0" - resolved "https://registry.nlark.com/unist-util-position/download/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" + resolved "https://registry.nlark.com/unist-util-position/download/unist-util-position-3.1.0.tgz?cache=0&sync_timestamp=1620915237724&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-position%2Fdownload%2Funist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" integrity sha1-HELuYwH41S9H0U9iu9t5ZXH6LUc= unist-util-remove-position@^2.0.0: version "2.0.1" - resolved "https://registry.nlark.com/unist-util-remove-position/download/unist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" + resolved "https://registry.nlark.com/unist-util-remove-position/download/unist-util-remove-position-2.0.1.tgz?cache=0&sync_timestamp=1627848251490&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-remove-position%2Fdownload%2Funist-util-remove-position-2.0.1.tgz#5d19ca79fdba712301999b2b73553ca8f3b352cc" integrity sha1-XRnKef26cSMBmZsrc1U8qPOzUsw= dependencies: unist-util-visit "^2.0.0" unist-util-remove@2.0.0: version "2.0.0" - resolved "https://registry.nlark.com/unist-util-remove/download/unist-util-remove-2.0.0.tgz#32c2ad5578802f2ca62ab808173d505b2c898488" + resolved "https://registry.nlark.com/unist-util-remove/download/unist-util-remove-2.0.0.tgz?cache=0&sync_timestamp=1627635399225&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-remove%2Fdownload%2Funist-util-remove-2.0.0.tgz#32c2ad5578802f2ca62ab808173d505b2c898488" integrity sha1-MsKtVXiALyymKrgIFz1QWyyJhIg= dependencies: unist-util-is "^4.0.0" unist-util-remove@^2.0.0: version "2.1.0" - resolved "https://registry.nlark.com/unist-util-remove/download/unist-util-remove-2.1.0.tgz#b0b4738aa7ee445c402fda9328d604a02d010588" + resolved "https://registry.nlark.com/unist-util-remove/download/unist-util-remove-2.1.0.tgz?cache=0&sync_timestamp=1627635399225&other_urls=https%3A%2F%2Fregistry.nlark.com%2Funist-util-remove%2Fdownload%2Funist-util-remove-2.1.0.tgz#b0b4738aa7ee445c402fda9328d604a02d010588" integrity sha1-sLRziqfuRFxAL9qTKNYEoC0BBYg= dependencies: unist-util-is "^4.0.0" unist-util-stringify-position@^2.0.0: version "2.0.3" - resolved "https://registry.nlark.com/unist-util-stringify-position/download/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" + resolved "https://registry.npm.taobao.org/unist-util-stringify-position/download/unist-util-stringify-position-2.0.3.tgz?cache=0&sync_timestamp=1618328228185&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funist-util-stringify-position%2Fdownload%2Funist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" integrity sha1-zOO/oc34W6c3XR1bF73Eytqb2do= dependencies: "@types/unist" "^2.0.2" unist-util-visit-parents@^3.0.0: version "3.1.1" - resolved "https://registry.nlark.com/unist-util-visit-parents/download/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6" + resolved "https://registry.npmmirror.com/unist-util-visit-parents/download/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6" integrity sha1-ZabOaY94prD1aqDojxOAGIbNrvY= dependencies: "@types/unist" "^2.0.0" @@ -7523,7 +7517,7 @@ unist-util-visit-parents@^3.0.0: unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist-util-visit@^2.0.2, unist-util-visit@^2.0.3: version "2.0.3" - resolved "https://registry.npmmirror.com/unist-util-visit/download/unist-util-visit-2.0.3.tgz?cache=0&sync_timestamp=1632405194557&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funist-util-visit%2Fdownload%2Funist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" + resolved "https://registry.npmmirror.com/unist-util-visit/download/unist-util-visit-2.0.3.tgz?cache=0&sync_timestamp=1632405961713&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Funist-util-visit%2Fdownload%2Funist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" integrity sha1-w3A4kxRt9HIDu4qXla9H17lxIIw= dependencies: "@types/unist" "^2.0.0" @@ -7532,7 +7526,7 @@ unist-util-visit@2.0.3, unist-util-visit@^2.0.0, unist-util-visit@^2.0.1, unist- universalify@^2.0.0: version "2.0.0" - resolved "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz?cache=0&sync_timestamp=1603180004159&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + resolved "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc= unpipe@1.0.0, unpipe@~1.0.0: @@ -7567,7 +7561,7 @@ update-notifier@^5.1.0: uri-js@^4.2.2: version "4.4.1" - resolved "https://registry.npm.taobao.org/uri-js/download/uri-js-4.4.1.tgz?cache=0&sync_timestamp=1610237641463&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Furi-js%2Fdownload%2Furi-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + resolved "https://registry.npm.taobao.org/uri-js/download/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" integrity sha1-mxpSWVIlhZ5V9mnZKPiMbFfyp34= dependencies: punycode "^2.1.0" @@ -7583,7 +7577,7 @@ url-loader@^4.1.1: url-parse-lax@^3.0.0: version "3.0.0" - resolved "https://registry.nlark.com/url-parse-lax/download/url-parse-lax-3.0.0.tgz?cache=0&sync_timestamp=1628548236896&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl-parse-lax%2Fdownload%2Furl-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + resolved "https://registry.nlark.com/url-parse-lax/download/url-parse-lax-3.0.0.tgz?cache=0&sync_timestamp=1628547550655&other_urls=https%3A%2F%2Fregistry.nlark.com%2Furl-parse-lax%2Fdownload%2Furl-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= dependencies: prepend-http "^2.0.0" @@ -7613,12 +7607,12 @@ util.promisify@~1.0.0: utila@~0.4: version "0.4.0" - resolved "https://registry.nlark.com/utila/download/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" + resolved "https://registry.npm.taobao.org/utila/download/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw= utility-types@^3.10.0: version "3.10.0" - resolved "https://registry.npm.taobao.org/utility-types/download/utility-types-3.10.0.tgz#ea4148f9a741015f05ed74fd615e1d20e6bed82b" + resolved "https://registry.nlark.com/utility-types/download/utility-types-3.10.0.tgz#ea4148f9a741015f05ed74fd615e1d20e6bed82b" integrity sha1-6kFI+adBAV8F7XT9YV4dIOa+2Cs= utils-merge@1.0.1: @@ -7633,7 +7627,7 @@ uuid@^8.3.2: value-equal@^1.0.1: version "1.0.1" - resolved "https://registry.npm.taobao.org/value-equal/download/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" + resolved "https://registry.nlark.com/value-equal/download/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" integrity sha1-Hgt5THNMXAyt4XnEN9NW2TGjTWw= vary@~1.1.2: @@ -7685,7 +7679,7 @@ watchpack@^2.3.1: wbuf@^1.1.0, wbuf@^1.7.3: version "1.7.3" - resolved "https://registry.nlark.com/wbuf/download/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" + resolved "https://registry.npm.taobao.org/wbuf/download/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" integrity sha1-wdjRSTFtPqhShIiVy2oL/oh7h98= dependencies: minimalistic-assert "^1.0.0" @@ -7697,7 +7691,7 @@ web-namespaces@^1.0.0, web-namespaces@^1.1.2: webpack-bundle-analyzer@^4.4.2: version "4.5.0" - resolved "https://registry.npmmirror.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" + resolved "https://registry.npmmirror.com/webpack-bundle-analyzer/download/webpack-bundle-analyzer-4.5.0.tgz?cache=0&sync_timestamp=1634019956604&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-bundle-analyzer%2Fdownload%2Fwebpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5" integrity sha1-Gw7qKUfnNSh1Sm+a8+kbK24PedU= dependencies: acorn "^8.0.4" @@ -7722,9 +7716,9 @@ webpack-dev-middleware@^5.3.0: schema-utils "^4.0.0" webpack-dev-server@^4.4.0: - version "4.7.1" - resolved "https://registry.npmmirror.com/webpack-dev-server/download/webpack-dev-server-4.7.1.tgz#4fe8f7435843dd2e676d687846f7a3d53f758c0d" - integrity sha512-bkoNgFyqlF/CT726Axtf/ELHHYsTZJWz3QJ6HqstWPbalhjAPunlPH9bwt/Lr5cLb+uoLmsta6svVplVzq8beA== + version "4.7.2" + resolved "https://registry.npmmirror.com/webpack-dev-server/download/webpack-dev-server-4.7.2.tgz#324b79046491f2cf0b9d9e275381198c8246b380" + integrity sha512-s6yEOSfPpB6g1T2+C5ZOUt5cQOMhjI98IVmmvMNb5cdiqHoxSUfACISHqU/wZy+q4ar/A9jW0pbNj7sa50XRVA== dependencies: "@types/bonjour" "^3.5.9" "@types/connect-history-api-fallback" "^1.3.5" @@ -7766,7 +7760,7 @@ webpack-merge@^5.8.0: webpack-sources@^1.1.0, webpack-sources@^1.4.3: version "1.4.3" - resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1636982701357&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" + resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-1.4.3.tgz?cache=0&sync_timestamp=1636982675275&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha1-7t2OwLko+/HL/plOItLYkPMwqTM= dependencies: source-list-map "^2.0.0" @@ -7774,7 +7768,7 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.3: webpack-sources@^3.2.2: version "3.2.2" - resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-3.2.2.tgz?cache=0&sync_timestamp=1636982701357&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260" + resolved "https://registry.npmmirror.com/webpack-sources/download/webpack-sources-3.2.2.tgz?cache=0&sync_timestamp=1636982675275&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpack-sources%2Fdownload%2Fwebpack-sources-3.2.2.tgz#d88e3741833efec57c4c789b6010db9977545260" integrity sha512-cp5qdmHnu5T8wRg2G3vZZHoJPN14aqQ89SyQ11NpGH5zEMDCclt49rzo+MaRazk7/UeILhAI+/sEtcM+7Fr0nw== webpack@^5.61.0: @@ -7809,8 +7803,8 @@ webpack@^5.61.0: webpackbar@^5.0.0-3: version "5.0.2" - resolved "https://registry.npmmirror.com/webpackbar/download/webpackbar-5.0.2.tgz?cache=0&sync_timestamp=1636124846959&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwebpackbar%2Fdownload%2Fwebpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" - integrity sha1-091GYhHHOFJ0HfyEK3VW3LwrBXA= + resolved "https://registry.npmmirror.com/webpackbar/download/webpackbar-5.0.2.tgz#d3dd466211c73852741dfc842b7556dcbc2b0570" + integrity sha512-BmFJo7veBDgQzfWXl/wwYXr/VFus0614qZ8i9znqcl9fnEdiVkdbi0TedLQ6xAK92HZHDJ0QmyQ0fmuZPAgCYQ== dependencies: chalk "^4.1.0" consola "^2.15.3" @@ -7828,12 +7822,12 @@ websocket-driver@>=0.5.1, websocket-driver@^0.7.4: websocket-extensions@>=0.1.1: version "0.1.4" - resolved "https://registry.nlark.com/websocket-extensions/download/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" + resolved "https://registry.npm.taobao.org/websocket-extensions/download/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha1-f4RzvIOd/YdgituV1+sHUhFXikI= which-boxed-primitive@^1.0.2: version "1.0.2" - resolved "https://registry.nlark.com/which-boxed-primitive/download/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + resolved "https://registry.npm.taobao.org/which-boxed-primitive/download/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" integrity sha1-E3V7yJsgmwSf5dhkMOIc9AqJqOY= dependencies: is-bigint "^1.0.1" @@ -7858,7 +7852,7 @@ which@^2.0.1: widest-line@^3.1.0: version "3.1.0" - resolved "https://registry.npmmirror.com/widest-line/download/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" + resolved "https://registry.npmmirror.com/widest-line/download/widest-line-3.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwidest-line%2Fdownload%2Fwidest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" integrity sha1-gpIzO79my0X/DeFgOxNreuFJbso= dependencies: string-width "^4.0.0" @@ -7870,7 +7864,7 @@ wildcard@^2.0.0: wrap-ansi@^7.0.0: version "7.0.0" - resolved "https://registry.nlark.com/wrap-ansi/download/wrap-ansi-7.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwrap-ansi%2Fdownload%2Fwrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + resolved "https://registry.nlark.com/wrap-ansi/download/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha1-Z+FFz/UQpqaYS98RUpEdadLrnkM= dependencies: ansi-styles "^4.0.0" @@ -7904,7 +7898,7 @@ ws@^8.1.0: xdg-basedir@^4.0.0: version "4.0.0" - resolved "https://registry.nlark.com/xdg-basedir/download/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" + resolved "https://registry.npmmirror.com/xdg-basedir/download/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" integrity sha1-S8jZmEQDaWIl74OhVzy7y0552xM= xml-js@^1.6.11: @@ -7926,10 +7920,10 @@ yallist@^4.0.0: yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: version "1.10.2" - resolved "https://registry.npmmirror.com/yaml/download/yaml-1.10.2.tgz?cache=0&sync_timestamp=1636797186957&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyaml%2Fdownload%2Fyaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + resolved "https://registry.npmmirror.com/yaml/download/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha1-IwHF/78StGfejaIzOkWeKeeSDks= zwitch@^1.0.0: version "1.0.5" - resolved "https://registry.npm.taobao.org/zwitch/download/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" + resolved "https://registry.npm.taobao.org/zwitch/download/zwitch-1.0.5.tgz?cache=0&sync_timestamp=1617357655901&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fzwitch%2Fdownload%2Fzwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" integrity sha1-0R1zgf/tFrdC9q97PyI9XNn+mSA= From 338c41abd58093a38429f23875940fc72f253184 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sat, 1 Jan 2022 16:43:48 +0800 Subject: [PATCH 162/174] :zap: improve const performance --- nonebot/consts.py | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/nonebot/consts.py b/nonebot/consts.py index 11e3feaa..5f6fa52b 100644 --- a/nonebot/consts.py +++ b/nonebot/consts.py @@ -1,20 +1,22 @@ +from sys import intern + # used by Matcher -RECEIVE_KEY = "_receive_{id}" -LAST_RECEIVE_KEY = "_last_receive" -ARG_KEY = "{key}" -REJECT_TARGET = "_current_target" -REJECT_CACHE_TARGET = "_next_target" +RECEIVE_KEY = intern("_receive_{id}") +LAST_RECEIVE_KEY = intern("_last_receive") +ARG_KEY = intern("{key}") +REJECT_TARGET = intern("_current_target") +REJECT_CACHE_TARGET = intern("_next_target") # used by Rule -PREFIX_KEY = "_prefix" +PREFIX_KEY = intern("_prefix") -CMD_KEY = "command" -RAW_CMD_KEY = "raw_command" -CMD_ARG_KEY = "command_arg" +CMD_KEY = intern("command") +RAW_CMD_KEY = intern("raw_command") +CMD_ARG_KEY = intern("command_arg") -SHELL_ARGS = "_args" -SHELL_ARGV = "_argv" +SHELL_ARGS = intern("_args") +SHELL_ARGV = intern("_argv") -REGEX_MATCHED = "_matched" -REGEX_GROUP = "_matched_groups" -REGEX_DICT = "_matched_dict" +REGEX_MATCHED = intern("_matched") +REGEX_GROUP = intern("_matched_groups") +REGEX_DICT = intern("_matched_dict") From 620938c26c964dac82263da4ceecdf1389142969 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sat, 1 Jan 2022 21:11:46 +0800 Subject: [PATCH 163/174] :bug: fix modal hidden --- nonebot/consts.py | 30 ++++++++++++-------------- website/src/components/Modal/index.tsx | 14 ++++++------ 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/nonebot/consts.py b/nonebot/consts.py index 5f6fa52b..11e3feaa 100644 --- a/nonebot/consts.py +++ b/nonebot/consts.py @@ -1,22 +1,20 @@ -from sys import intern - # used by Matcher -RECEIVE_KEY = intern("_receive_{id}") -LAST_RECEIVE_KEY = intern("_last_receive") -ARG_KEY = intern("{key}") -REJECT_TARGET = intern("_current_target") -REJECT_CACHE_TARGET = intern("_next_target") +RECEIVE_KEY = "_receive_{id}" +LAST_RECEIVE_KEY = "_last_receive" +ARG_KEY = "{key}" +REJECT_TARGET = "_current_target" +REJECT_CACHE_TARGET = "_next_target" # used by Rule -PREFIX_KEY = intern("_prefix") +PREFIX_KEY = "_prefix" -CMD_KEY = intern("command") -RAW_CMD_KEY = intern("raw_command") -CMD_ARG_KEY = intern("command_arg") +CMD_KEY = "command" +RAW_CMD_KEY = "raw_command" +CMD_ARG_KEY = "command_arg" -SHELL_ARGS = intern("_args") -SHELL_ARGV = intern("_argv") +SHELL_ARGS = "_args" +SHELL_ARGV = "_argv" -REGEX_MATCHED = intern("_matched") -REGEX_GROUP = intern("_matched_groups") -REGEX_DICT = intern("_matched_dict") +REGEX_MATCHED = "_matched" +REGEX_GROUP = "_matched_groups" +REGEX_DICT = "_matched_dict" diff --git a/website/src/components/Modal/index.tsx b/website/src/components/Modal/index.tsx index 70c75ca4..b6dc8dce 100644 --- a/website/src/components/Modal/index.tsx +++ b/website/src/components/Modal/index.tsx @@ -15,11 +15,8 @@ export default function Modal({ {/* overlay */}
setActive(false)} > @@ -28,11 +25,12 @@ export default function Modal({ {/* modal */}
-
+
{children}
From 983e5aefdb8a2b75ab469adf645d1f54ffd19e13 Mon Sep 17 00:00:00 2001 From: Mix <32300164+mnixry@users.noreply.github.com> Date: Sat, 1 Jan 2022 21:52:54 +0800 Subject: [PATCH 164/174] :sparkles: support user-defined format spec for message template --- nonebot/adapters/_template.py | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/nonebot/adapters/_template.py b/nonebot/adapters/_template.py index fad17d84..a4a762f9 100644 --- a/nonebot/adapters/_template.py +++ b/nonebot/adapters/_template.py @@ -4,6 +4,9 @@ from string import Formatter from typing import ( TYPE_CHECKING, Any, + Callable, + Dict, + Optional, Set, List, Type, @@ -23,6 +26,9 @@ if TYPE_CHECKING: TM = TypeVar("TM", bound="Message") TF = TypeVar("TF", str, "Message") +FormatSpecFunc = Callable[[Any], str] +FormatSpecFunc_T = TypeVar("FormatSpecFunc_T", bound=FormatSpecFunc) + class MessageTemplate(Formatter, Generic[TF]): """消息模板格式化实现类""" @@ -50,8 +56,18 @@ class MessageTemplate(Formatter, Generic[TF]): * ``template: Union[str, Message]``: 模板 * ``factory: Union[str, Message]``: 消息构造类型，默认为 `str` """ - self.template: Union[str, TF] = template + self.template: TF = template self.factory: Type[TF] = factory + self.format_specs: Dict[str, FormatSpecFunc] = {} + + def add_format_spec( + self, spec: FormatSpecFunc_T, name: Optional[str] = None + ) -> FormatSpecFunc_T: + name = name or spec.__name__ + if name in self.format_specs: + raise ValueError(f"Format spec {name} already exists!") + self.format_specs[name] = spec + return spec def format(self, *args: Any, **kwargs: Any) -> TF: """ @@ -69,7 +85,7 @@ class MessageTemplate(Formatter, Generic[TF]): else: raise TypeError("template must be a string or instance of Message!") - return msg + return msg # type:ignore def vformat( self, format_string: str, args: Sequence[Any], kwargs: Mapping[str, Any] @@ -165,12 +181,14 @@ class MessageTemplate(Formatter, Generic[TF]): ( super().format_field(value, format_spec) if ( - (method is None) - or ( - not isinstance(method_type, (classmethod, staticmethod)) - ) # Only Call staticmethod or classmethod + method is None + or not isinstance(method_type, (classmethod, staticmethod)) + ) + else ( + self.format_specs[format_spec](value) + if format_spec in self.format_specs + else method(value) ) - else method(value) ) if format_spec else value From 43938a004e10731eff4a20ce1c80afb15d248b89 Mon Sep 17 00:00:00 2001 From: Mix <32300164+mnixry@users.noreply.github.com> Date: Sun, 2 Jan 2022 13:13:43 +0800 Subject: [PATCH 165/174] :recycle: refactor template `format_field` to improve readability --- nonebot/adapters/_template.py | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/nonebot/adapters/_template.py b/nonebot/adapters/_template.py index a4a762f9..82903dc5 100644 --- a/nonebot/adapters/_template.py +++ b/nonebot/adapters/_template.py @@ -171,27 +171,16 @@ class MessageTemplate(Formatter, Generic[TF]): ) def format_field(self, value: Any, format_spec: str) -> Any: - if issubclass(self.factory, str): - return super().format_field(value, format_spec) - - segment_class: Type[MessageSegment] = self.factory.get_segment_class() - method = getattr(segment_class, format_spec, None) - method_type = inspect.getattr_static(segment_class, format_spec, None) + formatter: Optional[FormatSpecFunc] = self.format_specs.get(format_spec) + if (formatter is None) and (not issubclass(self.factory, str)): + segment_class: Type["MessageSegment"] = self.factory.get_segment_class() + method = getattr(segment_class, format_spec, None) + if inspect.ismethod(method): + formatter = getattr(segment_class, format_spec) return ( - ( - super().format_field(value, format_spec) - if ( - method is None - or not isinstance(method_type, (classmethod, staticmethod)) - ) - else ( - self.format_specs[format_spec](value) - if format_spec in self.format_specs - else method(value) - ) - ) - if format_spec - else value + super().format_field(value, format_spec) + if formatter is None + else formatter(value) ) def _add(self, a: Any, b: Any) -> Any: From be1915381eff6d4855287b6b88fdc9910266662d Mon Sep 17 00:00:00 2001 From: Mix <32300164+mnixry@users.noreply.github.com> Date: Sun, 2 Jan 2022 14:29:04 +0800 Subject: [PATCH 166/174] :white_check_mark: add tests for message template --- tests/adapters/test_template.py | 17 +++++++++++++++++ tests/utils.py | 8 ++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 tests/adapters/test_template.py diff --git a/tests/adapters/test_template.py b/tests/adapters/test_template.py new file mode 100644 index 00000000..3dbef541 --- /dev/null +++ b/tests/adapters/test_template.py @@ -0,0 +1,17 @@ +from utils import make_fake_message + + +def test_message_template(): + from nonebot.adapters import MessageTemplate + + Message = make_fake_message() + + template = MessageTemplate("{a:custom}{b:text}{c:image}", Message) + + @template.add_format_spec + def custom(input: str) -> str: + return input + "-custom!" + + formatted = template.format(a="test", b="test", c="https://example.com/test") + assert formatted.extract_plain_text() == "test-custom!test" + assert str(formatted) == "test-custom!test[fake:image]" diff --git a/tests/utils.py b/tests/utils.py index d516665f..a8d0c0ed 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -18,14 +18,18 @@ def make_fake_message() -> Type["Message"]: return FakeMessage def __str__(self) -> str: - return self.data["text"] + return self.data["text"] if self.type == "text" else f"[fake:{self.type}]" @classmethod def text(cls, text: str): return cls("text", {"text": text}) + @classmethod + def image(cls, url: str): + return cls("image", {"url": url}) + def is_text(self) -> bool: - return True + return self.type == "text" class FakeMessage(Message): @classmethod From 479952777b3d10e5b90963c8e1c4a89d92cab0c0 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 2 Jan 2022 18:18:37 +0800 Subject: [PATCH 167/174] :arrow_up: upgrade dependency --- nonebot/adapters/_template.py | 8 ++-- tests/test_init.py | 5 +- yarn.lock | 86 ++++++++++++++--------------------- 3 files changed, 38 insertions(+), 61 deletions(-) diff --git a/nonebot/adapters/_template.py b/nonebot/adapters/_template.py index 82903dc5..8460436e 100644 --- a/nonebot/adapters/_template.py +++ b/nonebot/adapters/_template.py @@ -4,10 +4,8 @@ from string import Formatter from typing import ( TYPE_CHECKING, Any, - Callable, - Dict, - Optional, Set, + Dict, List, Type, Tuple, @@ -15,6 +13,8 @@ from typing import ( Generic, Mapping, TypeVar, + Callable, + Optional, Sequence, cast, overload, @@ -172,7 +172,7 @@ class MessageTemplate(Formatter, Generic[TF]): def format_field(self, value: Any, format_spec: str) -> Any: formatter: Optional[FormatSpecFunc] = self.format_specs.get(format_spec) - if (formatter is None) and (not issubclass(self.factory, str)): + if formatter is None and not issubclass(self.factory, str): segment_class: Type["MessageSegment"] = self.factory.get_segment_class() method = getattr(segment_class, format_spec, None) if inspect.ismethod(method): diff --git a/tests/test_init.py b/tests/test_init.py index 44411fb4..84477236 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -16,14 +16,11 @@ os.environ["CONFIG_FROM_ENV"] = '{"test": "test"}' @pytest.mark.parametrize( "nonebug_init", [ - { - "config_from_init": "init", - "driver": "nonebot.drivers.fastapi+nonebot.drivers.httpx+nonebot.drivers.websockets", - }, { "config_from_init": "init", "driver": "~fastapi+~httpx+~websockets", }, + {"config_from_init": "init", "driver": "~fastapi+~aiohttp"}, ], indirect=True, ) diff --git a/yarn.lock b/yarn.lock index 5ab23e40..844ee38e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1855,9 +1855,9 @@ integrity sha1-k+Jb+e51/g/YC1lLxP6w6GIRG1o= "@types/node@*": - version "17.0.5" - resolved "https://registry.npmmirror.com/@types/node/download/@types/node-17.0.5.tgz#57ca67ec4e57ad9e4ef5a6bab48a15387a1c83e0" - integrity sha512-w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw== + version "17.0.6" + resolved "https://registry.npmmirror.com/@types/node/download/@types/node-17.0.6.tgz#cc1589c9ee853b389e67e8fb4384e0f250a139b9" + integrity sha512-+XBAjfZmmivILUzO0HwBJoYkAyyySSLg5KCGBDFLomJo0sV6szvVLAf4ANZZ0pfWzgEds5KmGLG9D5hfEqOhaA== "@types/parse-json@^4.0.0": version "4.0.0" @@ -2593,9 +2593,9 @@ camelcase-css@2.0.1, camelcase-css@^2.0.1: integrity sha1-7pePaUeRTMMMa0R0G27R338EP9U= camelcase@^6.2.0: - version "6.2.1" - resolved "https://registry.npmmirror.com/camelcase/download/camelcase-6.2.1.tgz?cache=0&sync_timestamp=1636945141024&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" - integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== + version "6.3.0" + resolved "https://registry.npmmirror.com/camelcase/download/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-api@^3.0.0: version "3.0.0" @@ -2608,9 +2608,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001294: - version "1.0.30001294" - resolved "https://registry.npmmirror.com/caniuse-lite/download/caniuse-lite-1.0.30001294.tgz#4849f27b101fd59ddee3751598c663801032533d" - integrity sha512-LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g== + version "1.0.30001295" + resolved "https://registry.npmmirror.com/caniuse-lite/download/caniuse-lite-1.0.30001295.tgz#68a60f8f0664f342b2835c5d8898b4faea7b3d51" + integrity sha512-lSP16vcyC0FEy0R4ECc9duSPoKoZy+YkpGkue9G4D81OfPnliopaZrU10+qtPdT8PbGXad/PNx43TIQrOmJZSQ== ccount@^1.0.0, ccount@^1.0.3: version "1.1.0" @@ -2921,22 +2921,22 @@ copy-webpack-plugin@^9.0.1: serialize-javascript "^6.0.0" core-js-compat@^3.18.0, core-js-compat@^3.19.1: - version "3.20.1" - resolved "https://registry.npmmirror.com/core-js-compat/download/core-js-compat-3.20.1.tgz#96917b4db634fbbbc7b36575b2e8fcbf7e4f9691" - integrity sha512-AVhKZNpqMV3Jz8hU0YEXXE06qoxtQGsAqU0u1neUngz5IusDJRX/ZJ6t3i7mS7QxNyEONbCo14GprkBrxPlTZA== + version "3.20.2" + resolved "https://registry.npmmirror.com/core-js-compat/download/core-js-compat-3.20.2.tgz#d1ff6936c7330959b46b2e08b122a8b14e26140b" + integrity sha512-qZEzVQ+5Qh6cROaTPFLNS4lkvQ6mBzE3R6A6EEpssj7Zr2egMHgsy4XapdifqJDGC9CBiNv7s+ejI96rLNQFdg== dependencies: browserslist "^4.19.1" semver "7.0.0" core-js-pure@^3.19.0: - version "3.20.1" - resolved "https://registry.npmmirror.com/core-js-pure/download/core-js-pure-3.20.1.tgz#f7a2c62f98de83e4da8fca7b78846d3a2f542145" - integrity sha512-yeNNr3L9cEBwNy6vhhIJ0nko7fE7uFO6PgawcacGt2VWep4WqQx0RiqlkgSP7kqUMC1IKdfO9qPeWXcUheHLVQ== + version "3.20.2" + resolved "https://registry.npmmirror.com/core-js-pure/download/core-js-pure-3.20.2.tgz#5d263565f0e34ceeeccdc4422fae3e84ca6b8c0f" + integrity sha512-CmWHvSKn2vNL6p6StNp1EmMIfVY/pqn3JLAjfZQ8WZGPOlGoO92EkX9/Mk81i6GxvoPXjUqEQnpM3rJ5QxxIOg== core-js@^3.18.0: - version "3.20.1" - resolved "https://registry.npmmirror.com/core-js/download/core-js-3.20.1.tgz#eb1598047b7813572f1dc24b7c6a95528c99eef3" - integrity sha512-btdpStYFQScnNVQ5slVcr858KP0YWYjV16eGJQw8Gg7CWtu/2qNvIM3qVRIR3n1pK2R9NNOrTevbvAYxajwEjg== + version "3.20.2" + resolved "https://registry.npmmirror.com/core-js/download/core-js-3.20.2.tgz#46468d8601eafc8b266bd2dd6bf9dee622779581" + integrity sha512-nuqhq11DcOAbFBV4zCbKeGbKQsUDRqTX0oqx7AttUBuqe3h20ixsE039QHelbL6P4h+9kytVqyEtyZ6gsiwEYw== core-util-is@~1.0.0: version "1.0.3" @@ -2995,8 +2995,8 @@ css-declaration-sorter@^6.0.3: css-loader@^5.1.1: version "5.2.7" - resolved "https://registry.npmmirror.com/css-loader/download/css-loader-5.2.7.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-loader%2Fdownload%2Fcss-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" - integrity sha1-m58RHt9vsr5dxiUlZEy8nCMgZK4= + resolved "https://registry.npmmirror.com/css-loader/download/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" + integrity sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg== dependencies: icss-utils "^5.1.0" loader-utils "^2.0.0" @@ -3344,19 +3344,19 @@ dns-txt@^2.0.2: buffer-indexof "^1.0.0" docusaurus-preset-nonepress@canary: - version "0.0.0-129" - resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-129.tgz#8aebd61840ae1a07a59c487559e3390a9902e2fa" - integrity sha512-sI5UdYlm9Xcaz70UyBJU9m8ERpw28UQyPYq/iCeohuQbFd8npdJXPgnklf4xN4+4N/oM+8M49auo7omnoJCNHg== + version "0.0.0-130" + resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-130.tgz#f2cebf94c4ea4bac4e63fb2e1439700b9a126a97" + integrity sha512-zJwEWkl1VCuXAP0YJcCCLkFpIXFl4YWoXAvm0smMsFPV9oYe6tV5Q1CXZAZNuUOFgMT4KAOYOis1fUNikV3c9Q== dependencies: "@docusaurus/core" "2.0.0-beta.9" "@docusaurus/plugin-content-docs" "2.0.0-beta.9" "@docusaurus/plugin-content-pages" "2.0.0-beta.9" - docusaurus-theme-nonepress "0.0.0-129" + docusaurus-theme-nonepress "0.0.0-130" -docusaurus-theme-nonepress@0.0.0-129: - version "0.0.0-129" - resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-129.tgz#58ae7151518318bb041a586b2f23d0b4043480b9" - integrity sha512-ETg0XuYpVQU8qIeTfPFj2V99oqbv5tyc4uLzYoO9t4YQ+PK7G8rMpVve6QxpMRCAiNyICWMqg9A6BkROf+z1bQ== +docusaurus-theme-nonepress@0.0.0-130: + version "0.0.0-130" + resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-130.tgz#26aaea857eb6c0c3061a632882e64a9b97269182" + integrity sha512-JlYLggAD/NB3FnoekiQuRHIdrznKSWcFKS/PJPGNtRNXgF603RLcsEwUlCuRwvHEMA6aqKGhvurlfDhqi/u6Ng== dependencies: "@docsearch/react" "^3.0.0-alpha.39" "@docusaurus/core" "2.0.0-beta.9" @@ -4420,13 +4420,6 @@ immer@^9.0.6: resolved "https://registry.npmmirror.com/immer/download/immer-9.0.7.tgz#b6156bd7db55db7abc73fd2fdadf4e579a701075" integrity sha512-KGllzpbamZDvOIxnmJ0jI840g7Oikx58lBPWV0hUh7dtAyZpFqqrBZdKka5GlTwMTZ1Tjc/bKKW4VSFAt6BqMA== -import-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.npm.taobao.org/import-cwd/download/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92" - integrity sha1-IIRVR3GAFRJuqbNna3WS+4vUz5I= - dependencies: - import-from "^3.0.0" - import-fresh@^3.1.0, import-fresh@^3.2.1, import-fresh@^3.2.2, import-fresh@^3.3.0: version "3.3.0" resolved "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" @@ -4435,13 +4428,6 @@ import-fresh@^3.1.0, import-fresh@^3.2.1, import-fresh@^3.2.2, import-fresh@^3.3 parent-module "^1.0.0" resolve-from "^4.0.0" -import-from@^3.0.0: - version "3.0.0" - resolved "https://registry.nlark.com/import-from/download/import-from-3.0.0.tgz#055cfec38cd5a27d8057ca51376d7d3bf0891966" - integrity sha1-BVz+w4zVon2AV8pRN219O/CJGWY= - dependencies: - resolve-from "^5.0.0" - import-lazy@^2.1.0: version "2.1.0" resolved "https://registry.nlark.com/import-lazy/download/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" @@ -4930,7 +4916,7 @@ leven@^3.1.0: resolved "https://registry.npmmirror.com/leven/download/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" integrity sha1-d4kd6DQGTMy6gq54QrtrFKE+1/I= -lilconfig@^2.0.3: +lilconfig@^2.0.3, lilconfig@^2.0.4: version "2.0.4" resolved "https://registry.npmmirror.com/lilconfig/download/lilconfig-2.0.4.tgz?cache=0&sync_timestamp=1636150747257&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Flilconfig%2Fdownload%2Flilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082" integrity sha1-9FB9BD1wWLOAtqj1y3vNSzTO4II= @@ -5810,12 +5796,11 @@ postcss-js@^3.0.3: postcss "^8.1.6" postcss-load-config@^3.1.0: - version "3.1.0" - resolved "https://registry.npmmirror.com/postcss-load-config/download/postcss-load-config-3.1.0.tgz#d39c47091c4aec37f50272373a6a648ef5e97829" - integrity sha1-05xHCRxK7Df1AnI3OmpkjvXpeCk= + version "3.1.1" + resolved "https://registry.npmmirror.com/postcss-load-config/download/postcss-load-config-3.1.1.tgz#2f53a17f2f543d9e63864460af42efdac0d41f87" + integrity sha512-c/9XYboIbSEUZpiD1UQD0IKiUe8n9WHYV7YFe7X7J+ZwCsEKkUJSFWjS9hBU1RR9THR7jMXst8sxiqP0jjo2mg== dependencies: - import-cwd "^3.0.0" - lilconfig "^2.0.3" + lilconfig "^2.0.4" yaml "^1.10.2" postcss-loader@^6.1.1: @@ -6646,11 +6631,6 @@ resolve-from@^4.0.0: resolved "https://registry.npm.taobao.org/resolve-from/download/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY= -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.npm.taobao.org/resolve-from/download/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha1-w1IlhD3493bfIcV1V7wIfp39/Gk= - resolve-pathname@^3.0.0: version "3.0.0" resolved "https://registry.npm.taobao.org/resolve-pathname/download/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" From 5fe5273f8f9e755697eb98439bf5b4a305d8a5f2 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Sun, 2 Jan 2022 20:21:08 +0800 Subject: [PATCH 168/174] :alembic: add card action --- website/package.json | 1 + website/src/components/Adapter.tsx | 7 ++++- website/src/components/Card/index.tsx | 40 +++++++++++++++++++++++++-- website/src/components/Driver.tsx | 7 ++++- website/src/components/Plugin.tsx | 7 ++++- website/static/drivers.json | 14 +++++----- website/static/plugins.json | 2 +- yarn.lock | 28 +++++++++++++------ 8 files changed, 84 insertions(+), 22 deletions(-) diff --git a/website/package.json b/website/package.json index 4533d091..059bee46 100644 --- a/website/package.json +++ b/website/package.json @@ -26,6 +26,7 @@ "@mdx-js/react": "^1.6.21", "@svgr/webpack": "^5.5.0", "clsx": "^1.1.1", + "copy-to-clipboard": "^3.3.1", "docusaurus-preset-nonepress": "canary", "file-loader": "^6.2.0", "prism-react-renderer": "^1.2.1", diff --git a/website/src/components/Adapter.tsx b/website/src/components/Adapter.tsx index ba0b257d..fd28affe 100644 --- a/website/src/components/Adapter.tsx +++ b/website/src/components/Adapter.tsx @@ -136,7 +136,12 @@ ${JSON.stringify(tags)}
{currentAdapters.map((adapter, index) => ( - + ))}
diff --git a/website/src/components/Card/index.tsx b/website/src/components/Card/index.tsx index 1f3c38f1..58fabfd8 100644 --- a/website/src/components/Card/index.tsx +++ b/website/src/components/Card/index.tsx @@ -1,6 +1,9 @@ -import React from "react"; +import clsx from "clsx"; +import copy from "copy-to-clipboard"; +import React, { useState } from "react"; import Link from "@docusaurus/Link"; +import type { IconName } from "@fortawesome/fontawesome-common-types"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import type { Obj } from "../../libs/store"; @@ -14,8 +17,22 @@ export default function Card({ homepage, tags, is_official, -}: Obj): JSX.Element { + action, + actionDisabled = false, + actionLabel = "点击复制安装命令", +}: Obj & { + action?: string; + actionLabel?: string; + actionDisabled?: boolean; +}): JSX.Element { const isGithub = /^https:\/\/github.com\/[^/]+\/[^/]+/.test(homepage); + const [copied, setCopied] = useState(false); + + const copyAction = () => { + copy(action); + setCopied(true); + setTimeout(() => setCopied(false), 2000); + }; return (
@@ -32,7 +49,7 @@ export default function Card({ {homepage && ( {isGithub ? ( @@ -64,6 +81,23 @@ export default function Card({ {author}
)} + {action && actionLabel && ( + + )}
); } diff --git a/website/src/components/Driver.tsx b/website/src/components/Driver.tsx index 4f646f48..85b648c7 100644 --- a/website/src/components/Driver.tsx +++ b/website/src/components/Driver.tsx @@ -38,7 +38,12 @@ export default function Driver(): JSX.Element {
{currentDrivers.map((driver, index) => ( - + ))}
diff --git a/website/src/components/Plugin.tsx b/website/src/components/Plugin.tsx index 28b669dc..7f3ddacf 100644 --- a/website/src/components/Plugin.tsx +++ b/website/src/components/Plugin.tsx @@ -136,7 +136,12 @@ ${JSON.stringify(tags)}
{currentPlugins.map((plugin, index) => ( - + ))}
diff --git a/website/static/drivers.json b/website/static/drivers.json index c9b28f1d..8eef4022 100644 --- a/website/static/drivers.json +++ b/website/static/drivers.json @@ -5,7 +5,7 @@ "name": "FastAPI", "desc": "FastAPI 驱动器", "author": "yanyongyu", - "homepage": "https://v2.nonebot.dev/docs/tutorial/choose-driver", + "homepage": "/docs/tutorial/choose-driver", "tags": [], "is_official": true }, @@ -15,17 +15,17 @@ "name": "Quart", "desc": "Quart 驱动器", "author": "yanyongyu", - "homepage": "https://v2.nonebot.dev/docs/tutorial/choose-driver", + "homepage": "/docs/tutorial/choose-driver", "tags": [], "is_official": true }, { "module_name": "nonebot.drivers.httpx", - "project_link": "", + "project_link": "httpx", "name": "HTTPX", "desc": "HTTPX 驱动器", "author": "yanyongyu", - "homepage": "https://v2.nonebot.dev/docs/tutorial/choose-driver", + "homepage": "/docs/tutorial/choose-driver", "tags": [], "is_official": true }, @@ -35,17 +35,17 @@ "name": "websockets", "desc": "websockets 驱动器", "author": "yanyongyu", - "homepage": "https://v2.nonebot.dev/docs/tutorial/choose-driver", + "homepage": "/docs/tutorial/choose-driver", "tags": [], "is_official": true }, { "module_name": "nonebot.drivers.aiohttp", - "project_link": "", + "project_link": "aiohttp", "name": "AIOHTTP", "desc": "AIOHTTP 驱动器", "author": "yanyongyu", - "homepage": "https://v2.nonebot.dev/docs/tutorial/choose-driver", + "homepage": "/docs/tutorial/choose-driver", "tags": [], "is_official": true } diff --git a/website/static/plugins.json b/website/static/plugins.json index 62830628..c01c8667 100644 --- a/website/static/plugins.json +++ b/website/static/plugins.json @@ -66,7 +66,7 @@ }, { "module_name": "nonebot_plugin_test", - "projectLink": "nonebot-plugin-test", + "project_link": "nonebot-plugin-test", "author": "yanyongyu", "desc": "在浏览器中测试你的 NoneBot 机器人", "name": "前端测试机器人插件", diff --git a/yarn.lock b/yarn.lock index 844ee38e..8f73a98c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2908,6 +2908,13 @@ copy-text-to-clipboard@^3.0.1: resolved "https://registry.nlark.com/copy-text-to-clipboard/download/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c" integrity sha1-jL+PkOCkfxLkokdDc2Jl0Ve85pw= +copy-to-clipboard@^3.3.1: + version "3.3.1" + resolved "https://registry.nlark.com/copy-to-clipboard/download/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae" + integrity sha1-EVqhqZmP+rYZb5MHatbaO5E2Yq4= + dependencies: + toggle-selection "^1.0.6" + copy-webpack-plugin@^9.0.1: version "9.1.0" resolved "https://registry.npmmirror.com/copy-webpack-plugin/download/copy-webpack-plugin-9.1.0.tgz#2d2c460c4c4695ec0a58afb2801a1205256c4e6b" @@ -3344,19 +3351,19 @@ dns-txt@^2.0.2: buffer-indexof "^1.0.0" docusaurus-preset-nonepress@canary: - version "0.0.0-130" - resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-130.tgz#f2cebf94c4ea4bac4e63fb2e1439700b9a126a97" - integrity sha512-zJwEWkl1VCuXAP0YJcCCLkFpIXFl4YWoXAvm0smMsFPV9oYe6tV5Q1CXZAZNuUOFgMT4KAOYOis1fUNikV3c9Q== + version "0.0.0-131" + resolved "https://registry.npmmirror.com/docusaurus-preset-nonepress/download/docusaurus-preset-nonepress-0.0.0-131.tgz#acdb2921ad7130e26124c4291ec200b70987f1c6" + integrity sha512-ooqLPSPBDQVe3HzWQ+C4RVHRb1xlyePDD6rGKPsgRwczubbJzDEJ/nci7MpTTaXMvfg7UjpW7sF0fcZr6k/LEg== dependencies: "@docusaurus/core" "2.0.0-beta.9" "@docusaurus/plugin-content-docs" "2.0.0-beta.9" "@docusaurus/plugin-content-pages" "2.0.0-beta.9" - docusaurus-theme-nonepress "0.0.0-130" + docusaurus-theme-nonepress "0.0.0-131" -docusaurus-theme-nonepress@0.0.0-130: - version "0.0.0-130" - resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-130.tgz#26aaea857eb6c0c3061a632882e64a9b97269182" - integrity sha512-JlYLggAD/NB3FnoekiQuRHIdrznKSWcFKS/PJPGNtRNXgF603RLcsEwUlCuRwvHEMA6aqKGhvurlfDhqi/u6Ng== +docusaurus-theme-nonepress@0.0.0-131: + version "0.0.0-131" + resolved "https://registry.npmmirror.com/docusaurus-theme-nonepress/download/docusaurus-theme-nonepress-0.0.0-131.tgz#615da60a6849cfa85a303f2b28de5bcd3b69dfe5" + integrity sha512-Od4fOTIEhe/VvdyxczPNDHiPhbyz3Zxn+DHcaOo8NWsJ5gcNTZhgXg1bXrhc4cVTXCEcdpM/HVEYm7JiAnKFgQ== dependencies: "@docsearch/react" "^3.0.0-alpha.39" "@docusaurus/core" "2.0.0-beta.9" @@ -7313,6 +7320,11 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" +toggle-selection@^1.0.6: + version "1.0.6" + resolved "https://registry.nlark.com/toggle-selection/download/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32" + integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI= + toidentifier@1.0.1: version "1.0.1" resolved "https://registry.npmmirror.com/toidentifier/download/toidentifier-1.0.1.tgz?cache=0&sync_timestamp=1636938512912&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftoidentifier%2Fdownload%2Ftoidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" From 6950e5b34de66ef7aacda47d5aaca279823cc82e Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Mon, 3 Jan 2022 20:30:04 +0800 Subject: [PATCH 169/174] :memo: add driver configs --- website/docs/tutorial/choose-driver.md | 94 +++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 2 deletions(-) diff --git a/website/docs/tutorial/choose-driver.md b/website/docs/tutorial/choose-driver.md index fea1dabb..b157b128 100644 --- a/website/docs/tutorial/choose-driver.md +++ b/website/docs/tutorial/choose-driver.md @@ -62,7 +62,60 @@ FastAPI: [文档](https://fastapi.tiangolo.com/), [仓库](https://github.com/ti DRIVER=~fastapi ``` - +#### FastAPI 配置项 + +##### `fastapi_openapi_url` + +类型: `Optional[str]` +默认值: `None` +说明: `FastAPI` 提供的 `OpenAPI` JSON 定义地址，如果为 `None`，则不提供 `OpenAPI` JSON 定义。 + +##### `fastapi_docs_url` + +类型: `Optional[str]` +默认值: `None` +说明: `FastAPI` 提供的 `Swagger` 文档地址，如果为 `None`，则不提供 `Swagger` 文档。 + +##### `fastapi_redoc_url` + +类型: `Optional[str]` +默认值: `None` +说明: `FastAPI` 提供的 `ReDoc` 文档地址，如果为 `None`，则不提供 `ReDoc` 文档。 + +##### `fastapi_reload` + +类型: `bool` +默认值: `False` +说明: 是否开启 `uvicorn` 的 `reload` 功能，需要提供 asgi 应用路径。 + +```python title=bot.py +app = nonebot.get_asgi() +nonebot.run(app="bot:app") +``` + +##### `fastapi_reload_dirs` + +类型: `Optional[List[str]]` +默认值: `None` +说明: 重载监控文件夹列表，默认为 uvicorn 默认值 + +##### `fastapi_reload_delay` + +类型: `Optional[float]` +默认值: `None` +说明: 重载延迟，默认为 uvicorn 默认值 + +##### `fastapi_reload_includes` + +类型: `Optional[List[str]]` +默认值: `None` +说明: 要监听的文件列表，支持 glob pattern，默认为 uvicorn 默认值 + +##### `fastapi_reload_excludes` + +类型: `Optional[List[str]]` +默认值: `None` +说明: 不要监听的文件列表，支持 glob pattern，默认为 uvicorn 默认值 ### Quart @@ -80,6 +133,43 @@ Quart: [文档](https://pgjones.gitlab.io/quart/), [仓库](https://gitlab.com/p DRIVER=~quart ``` +#### Quart 配置项 + +##### `quart_reload` + +类型: `bool` +默认值: `False` +说明: 是否开启 `uvicorn` 的 `reload` 功能，需要提供 asgi 应用路径。 + +```python title=bot.py +app = nonebot.get_asgi() +nonebot.run(app="bot:app") +``` + +##### `quart_reload_dirs` + +类型: `Optional[List[str]]` +默认值: `None` +说明: 重载监控文件夹列表，默认为 uvicorn 默认值 + +##### `quart_reload_delay` + +类型: `Optional[float]` +默认值: `None` +说明: 重载延迟，默认为 uvicorn 默认值 + +##### `quart_reload_includes` + +类型: `Optional[List[str]]` +默认值: `None` +说明: 要监听的文件列表，支持 glob pattern，默认为 uvicorn 默认值 + +##### `quart_reload_excludes` + +类型: `Optional[List[str]]` +默认值: `None` +说明: 不要监听的文件列表，支持 glob pattern，默认为 uvicorn 默认值 + ### HTTPX 类型: `ForwardDriver` @@ -135,7 +225,7 @@ AIOHTTP: [文档](https://docs.aiohttp.org/en/stable/), [仓库](https://github. 驱动器: [API](../api/drivers/aiohttp.md), [源码](https://github.com/nonebot/nonebot2/blob/master/nonebot/drivers/aiohttp.py) ```env -DRIVER=~httpx +DRIVER=~aiohttp ``` :::important 注意 From 7053f0ee7266369e8cb1e67b44a48f699ca91ec6 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 4 Jan 2022 13:18:22 +0800 Subject: [PATCH 170/174] :memo: update readme --- .github/ISSUE_TEMPLATE/config.yml | 2 +- README.md | 50 +++++++++++++++------------- website/docs/README.md | 54 ++++++++++++++++++++----------- 3 files changed, 64 insertions(+), 42 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 865a966d..d8a56a5d 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - name: Question - url: https://github.com/nonebot/discussions/discussions/new + url: https://discussions.nonebot.dev/ about: Ask questions about nonebot - name: Plugin Publish url: https://v2.nonebot.dev/store.html diff --git a/README.md b/README.md index 3b2da142..c101ed5e 100644 --- a/README.md +++ b/README.md @@ -70,34 +70,37 @@ _✨ 跨平台 Python 异步机器人框架 ✨_ ## 简介 -NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人收到的事件进行解析和处理，并以插件化的形式，按优先级分发给事件所对应的事件响应器，来完成具体的功能。 - -除了起到解析事件的作用，NoneBot 还为插件提供了大量实用的预设操作和权限控制机制。对于命令处理，它更是提供了完善且易用的会话机制和内部调用机制，以分别适应命令的连续交互和插件内部功能复用等需求。 - -得益于 Python 的 [asyncio](https://docs.python.org/3/library/asyncio.html) 机制，NoneBot 处理事件的吞吐量有了很大的保障，再配合 WebSocket 通信方式（也是最建议的通信方式），NoneBot 的性能可以达到 HTTP 通信方式的两倍以上，相较于传统同步 I/O 的 HTTP 通信，更是有质的飞跃。 +NoneBot2 是一个现代、跨平台、可扩展的 Python 聊天机器人框架，它基于 Python 的类型注解和异步特性，能够为你的需求实现提供便捷灵活的支持。 ## 特色 -NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义**，并且可以作为插件进行**替换/添加**！ +- 异步优先：基于 Python 的异步特性，即使是~~非常~~大量的消息，也能吞吐自如 +- 易于开发：配合 NB-CLI 脚手架，代码编写上手简单，没有过多的冗余代码，可以让开发者专注于业务逻辑 +- 生而可靠：100% 类型注解覆盖，配合编辑器的类型推导功能，能将绝大多数的 Bug 杜绝在编辑器中 ([编辑器支持](https://v2.nonebot.dev/docs/start/editor-support)) +- 社区丰富：社区用户众多，直接和间接用户超过十万人，每天都有大量的活跃用户 ([社区资源](#社区资源)) +- 海纳百川：一个框架，支持多个聊天软件平台，可自定义通信协议 + - [OneBot 协议](https://onebot.dev/) (QQ 等) + - [Mirai-API-HTTP 协议](https://github.com/project-mirai/mirai-api-http) + - [钉钉](https://ding-doc.dingtalk.com/document#/org-dev-guide/elzz1p) + - [Telegram](https://core.telegram.org/bots/api) + - [飞书](https://open.feishu.cn/document/home/index) + - [QQ 频道](https://bot.q.qq.com/wiki/) +- 坚实后盾：支持多种 web 框架，可自定义替换 + - [FastAPI](https://fastapi.tiangolo.com/) + - [Quart](https://pgjones.gitlab.io/quart/) (异步 Flask) + - [aiohttp](https://docs.aiohttp.org/en/stable/) + - [httpx](https://www.python-httpx.org/) + - [websockets](https://websockets.readthedocs.io/en/stable/) -目前 NoneBot2 内置的驱动框架： +更多：[概览](https://v2.nonebot.dev/docs/) -- [FastAPI](https://fastapi.tiangolo.com/) -- [Quart](https://pgjones.gitlab.io/quart/) (异步 Flask) -- [aiohttp](https://docs.aiohttp.org/en/stable/) -- [httpx](https://www.python-httpx.org/) -- [websockets](https://websockets.readthedocs.io/en/stable/) +## 什么不是 NoneBot2 -目前 NoneBot2 官方维护的协议适配： +NoneBot2 不是某个平台或者协议的具体实现，它只负责和已有协议适配器通信，并处理接收到的事件。所以，“NoneBot 有 blabla 平台的 blabla 功能吗？”这种问题是与 NoneBot2 无关的。请在相应平台的功能文档中确认，或与相应平台的协议适配开发者联系。 -- [OneBot 协议](https://onebot.dev/) (QQ 等) -- [Mirai-API-HTTP 协议](https://github.com/project-mirai/mirai-api-http) -- [钉钉](https://ding-doc.dingtalk.com/document#/org-dev-guide/elzz1p) -- [Telegram](https://core.telegram.org/bots/api) -- [飞书](https://open.feishu.cn/document/home/index) -- [QQ 频道](https://bot.q.qq.com/wiki/) +NoneBot2 不是 NoneBot1 的替代品。事实上，它们都在被积极的维护着。但是，如果你想尝试一些新功能，或者想要支持更多的平台，可以考虑使用 NoneBot2。 -更多：[商店](https://v2.nonebot.dev/store.html) +> ~~NoneBot2 和 NoneBot1 的区别，就像是 VisualStudio Code 和 VisualStudio 一样~~ ## 即刻开始 @@ -123,6 +126,7 @@ NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义 ### 常见问题 - [常见问题解答(FAQ)](https://faq.nonebot.dev/) +- [论坛(Discussion)](https://discussions.nonebot.dev/) ### 教程/实际项目/经验分享 @@ -132,7 +136,9 @@ NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义 此外，NoneBot2 还有丰富的官方以及第三方现成的插件供大家使用： -- [NoneBot-Plugin-Docs](https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-plugin-docs)：离线文档至本地使用(别再说文档打不开了！) +- [NoneBot-Plugin-Docs](https://github.com/nonebot/nonebot2/tree/master/packages/nonebot-plugin-docs)：离线文档至本地项目使用 (别再说文档打不开了！) + + 在项目目录下执行： ```bash nb plugin install nonebot_plugin_docs @@ -153,7 +159,7 @@ NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义 如果你在使用过程中发现任何问题，可以 [提交 Issue](https://github.com/nonebot/nonebot2/issues/new) 或自行 Fork 修改后提交 Pull Request。 -如果你要提交 Pull Request，请确保你的代码风格和项目已有的代码保持一致，遵循 [PEP 8](https://www.python.org/dev/peps/pep-0008/) 与 [PEP 484](https://www.python.org/dev/peps/pep-0484/)，变量命名清晰，有适当的注释，**并且请以 `dev` 分支作为 Pull Request 目标分支**。 +如果你要提交 Pull Request，请确保你的代码风格和项目已有的代码保持一致，遵循 [PEP 8](https://www.python.org/dev/peps/pep-0008/) 与 [PEP 484](https://www.python.org/dev/peps/pep-0484/)，变量命名清晰，有适当的注释与测试代码，**并且请以 `dev` 分支作为 Pull Request 目标分支**。 感谢以下开发者对 NoneBot2 的贡献： diff --git a/website/docs/README.md b/website/docs/README.md index 57fbb399..f630b109 100644 --- a/website/docs/README.md +++ b/website/docs/README.md @@ -6,28 +6,44 @@ slug: / # 概览 -:::tip 提示 -初次使用时可能会觉得这里的概览过于枯燥，可以先简单略读之后直接前往 [安装](./start/installation.md) 查看安装方法，并进行后续的基础使用教程。 -::: - -NoneBot2 是一个可扩展的 Python 异步机器人框架，它会对机器人收到的事件进行解析和处理，并以插件化的形式，按优先级分发给事件所对应的事件响应器，来完成具体的功能。 - -除了起到解析事件的作用，NoneBot 还为插件提供了大量实用的预设操作和权限控制机制。对于命令处理，它更是提供了完善且易用的会话机制和内部调用机制，以分别适应命令的连续交互和插件内部功能复用等需求。 - -得益于 Python 的 [asyncio](https://docs.python.org/3/library/asyncio.html) 机制，NoneBot 处理事件的吞吐量有了很大的保障，再配合 WebSocket 通信方式（也是最建议的通信方式），NoneBot 的性能可以达到 HTTP 通信方式的两倍以上，相较于传统同步 I/O 的 HTTP 通信，更是有质的飞跃。 +NoneBot2 是一个现代、跨平台、可扩展的 Python 聊天机器人框架，它基于 Python 的类型注解和异步特性，能够为你的需求实现提供便捷灵活的支持。 需要注意的是，NoneBot 仅支持 **Python 3.7.3 以上版本** ## 特色 -NoneBot2 的驱动框架 `Driver` 以及通信协议 `Adapter` 均可**自定义**，并且可以作为插件进行**替换/添加**！ +### 异步优先 -- 提供使用简易的脚手架 -- 提供丰富的官方插件 -- 提供可添加/替换的驱动以及协议选项 -- 基于异步 I/O -- 同时支持 HTTP 和反向 WebSocket 通信方式 -- 支持多个机器人账号负载均衡 -- 提供直观的交互式会话接口 -- 提供可自定义的权限控制机制 -- 多种方式渲染要发送的消息内容，使对话足够自然 +NoneBot2 基于 Python [asyncio](https://docs.python.org/3/library/asyncio.html) 编写，并在异步机制的基础上进行了一定程度的同步函数兼容。 + +### 完整的类型注解 + +NoneBot2 参考 [PEP 484](https://www.python.org/dev/peps/pep-0484/) 等 PEP 完整实现了类型注解，通过 `pyright`/`pylance` 检查。配合编辑器的类型推导功能，能将绝大多数的 Bug 杜绝在编辑器中 ([编辑器支持](./start/editor-support))。 + +### 开箱即用 + +NoneBot2 提供了使用便捷、具有交互式功能的命令行工具 -- `nb-cli`，使得初次接触 NoneBot 时更容易上手。详细使用方法请参考各文档章节以及 [使用脚手架](./start/nb-cli)。 + +### 插件系统 + +插件系统是 NoneBot 的核心，通过它可以实现机器人的模块化以及功能扩展，便于维护和管理。 + +### 依赖注入系统 + +NoneBot2 采用了一套自行定义的依赖注入系统，可以让事件的处理过程更加的简洁、清晰，增加代码的可读性，减少代码冗余。 + +#### 什么是依赖注入 + +[**"依赖注入"**](https://zh.m.wikipedia.org/wiki/%E6%8E%A7%E5%88%B6%E5%8F%8D%E8%BD%AC)意思是，在编程中，有一种方法可以让你的代码声明它工作和使用所需要的东西, 即"**依赖**"。 + +系统 (在这里是指 `NoneBot` ) 将负责做任何需要的事情，为你的代码提供这些必要依赖 (即"**注入**"依赖性) + +这在你有以下情形的需求时非常有用: + +- 这部分代码拥有共享的逻辑(同样的代码逻辑多次重复) +- 共享数据库以及网络请求连接会话 + - 比如 `httpx.AsyncClient`, `aiohttp.ClientSession` 和 `sqlalchemy.Session` +- 用户权限检查以及认证 +- 还有更多... + +它在完成上述工作的同时，还能尽量减少代码的耦合和重复 From bbbb5bbecdd07809c70b5ef6265925013d56480b Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 4 Jan 2022 14:36:32 +0800 Subject: [PATCH 171/174] :arrow_up: upgrade dependencies --- nonebot/config.py | 3 ++ poetry.lock | 73 ++++++++++++++++++++++++++++------------------- pyproject.toml | 2 +- yarn.lock | 68 +++++++++++++++++++++---------------------- 4 files changed, 80 insertions(+), 66 deletions(-) diff --git a/nonebot/config.py b/nonebot/config.py index d8b4b5e4..7421457e 100644 --- a/nonebot/config.py +++ b/nonebot/config.py @@ -157,6 +157,9 @@ class Config(BaseConfig): 这些配置将会在 json 反序列化后一起带入 ``Config`` 类中。 """ + _common_config: dict + _env_file: str + # nonebot configs driver: str = "~fastapi" """ diff --git a/poetry.lock b/poetry.lock index ea3d58c7..f59d469b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -643,7 +643,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "pydantic" -version = "1.8.2" +version = "1.9.0" description = "Data validation and settings management using python 3.6 type hinting" category = "main" optional = false @@ -670,7 +670,7 @@ dev = ["black", "coverage", "docformatter", "flake8", "flake8-black", "flake8-bu [[package]] name = "pygments" -version = "2.11.0" +version = "2.11.1" description = "Pygments is a syntax highlighting package written in Python." category = "dev" optional = false @@ -798,7 +798,7 @@ dotenv = ["python-dotenv"] [[package]] name = "requests" -version = "2.26.0" +version = "2.27.0" description = "Python HTTP for Humans." category = "dev" optional = false @@ -1184,7 +1184,7 @@ websockets = ["websockets"] [metadata] lock-version = "1.1" python-versions = "^3.7.3" -content-hash = "f917cb99a90280fb78a3d5e51410d89c364a05d917951a90c1c5af0bda1f08c3" +content-hash = "971e0c7ff39af96ea87d0281359f44d6cd29e514f974e47184c2c4aa27ad0061" [metadata.files] aiodns = [ @@ -1887,36 +1887,49 @@ pycparser = [ {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] pydantic = [ - {file = "pydantic-1.8.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:05ddfd37c1720c392f4e0d43c484217b7521558302e7069ce8d318438d297739"}, - {file = "pydantic-1.8.2-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a7c6002203fe2c5a1b5cbb141bb85060cbff88c2d78eccbc72d97eb7022c43e4"}, - {file = "pydantic-1.8.2-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:589eb6cd6361e8ac341db97602eb7f354551482368a37f4fd086c0733548308e"}, - {file = "pydantic-1.8.2-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:10e5622224245941efc193ad1d159887872776df7a8fd592ed746aa25d071840"}, - {file = "pydantic-1.8.2-cp36-cp36m-win_amd64.whl", hash = "sha256:99a9fc39470010c45c161a1dc584997f1feb13f689ecf645f59bb4ba623e586b"}, - {file = "pydantic-1.8.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a83db7205f60c6a86f2c44a61791d993dff4b73135df1973ecd9eed5ea0bda20"}, - {file = "pydantic-1.8.2-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:41b542c0b3c42dc17da70554bc6f38cbc30d7066d2c2815a94499b5684582ecb"}, - {file = "pydantic-1.8.2-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:ea5cb40a3b23b3265f6325727ddfc45141b08ed665458be8c6285e7b85bd73a1"}, - {file = "pydantic-1.8.2-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:18b5ea242dd3e62dbf89b2b0ec9ba6c7b5abaf6af85b95a97b00279f65845a23"}, - {file = "pydantic-1.8.2-cp37-cp37m-win_amd64.whl", hash = "sha256:234a6c19f1c14e25e362cb05c68afb7f183eb931dd3cd4605eafff055ebbf287"}, - {file = "pydantic-1.8.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:021ea0e4133e8c824775a0cfe098677acf6fa5a3cbf9206a376eed3fc09302cd"}, - {file = "pydantic-1.8.2-cp38-cp38-manylinux1_i686.whl", hash = "sha256:e710876437bc07bd414ff453ac8ec63d219e7690128d925c6e82889d674bb505"}, - {file = "pydantic-1.8.2-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:ac8eed4ca3bd3aadc58a13c2aa93cd8a884bcf21cb019f8cfecaae3b6ce3746e"}, - {file = "pydantic-1.8.2-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:4a03cbbe743e9c7247ceae6f0d8898f7a64bb65800a45cbdc52d65e370570820"}, - {file = "pydantic-1.8.2-cp38-cp38-win_amd64.whl", hash = "sha256:8621559dcf5afacf0069ed194278f35c255dc1a1385c28b32dd6c110fd6531b3"}, - {file = "pydantic-1.8.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8b223557f9510cf0bfd8b01316bf6dd281cf41826607eada99662f5e4963f316"}, - {file = "pydantic-1.8.2-cp39-cp39-manylinux1_i686.whl", hash = "sha256:244ad78eeb388a43b0c927e74d3af78008e944074b7d0f4f696ddd5b2af43c62"}, - {file = "pydantic-1.8.2-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:05ef5246a7ffd2ce12a619cbb29f3307b7c4509307b1b49f456657b43529dc6f"}, - {file = "pydantic-1.8.2-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:54cd5121383f4a461ff7644c7ca20c0419d58052db70d8791eacbbe31528916b"}, - {file = "pydantic-1.8.2-cp39-cp39-win_amd64.whl", hash = "sha256:4be75bebf676a5f0f87937c6ddb061fa39cbea067240d98e298508c1bda6f3f3"}, - {file = "pydantic-1.8.2-py3-none-any.whl", hash = "sha256:fec866a0b59f372b7e776f2d7308511784dace622e0992a0b59ea3ccee0ae833"}, - {file = "pydantic-1.8.2.tar.gz", hash = "sha256:26464e57ccaafe72b7ad156fdaa4e9b9ef051f69e175dbbb463283000c05ab7b"}, + {file = "pydantic-1.9.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:cb23bcc093697cdea2708baae4f9ba0e972960a835af22560f6ae4e7e47d33f5"}, + {file = "pydantic-1.9.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:1d5278bd9f0eee04a44c712982343103bba63507480bfd2fc2790fa70cd64cf4"}, + {file = "pydantic-1.9.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ab624700dc145aa809e6f3ec93fb8e7d0f99d9023b713f6a953637429b437d37"}, + {file = "pydantic-1.9.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c8d7da6f1c1049eefb718d43d99ad73100c958a5367d30b9321b092771e96c25"}, + {file = "pydantic-1.9.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3c3b035103bd4e2e4a28da9da7ef2fa47b00ee4a9cf4f1a735214c1bcd05e0f6"}, + {file = "pydantic-1.9.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:3011b975c973819883842c5ab925a4e4298dffccf7782c55ec3580ed17dc464c"}, + {file = "pydantic-1.9.0-cp310-cp310-win_amd64.whl", hash = "sha256:086254884d10d3ba16da0588604ffdc5aab3f7f09557b998373e885c690dd398"}, + {file = "pydantic-1.9.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:0fe476769acaa7fcddd17cadd172b156b53546ec3614a4d880e5d29ea5fbce65"}, + {file = "pydantic-1.9.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c8e9dcf1ac499679aceedac7e7ca6d8641f0193c591a2d090282aaf8e9445a46"}, + {file = "pydantic-1.9.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d1e4c28f30e767fd07f2ddc6f74f41f034d1dd6bc526cd59e63a82fe8bb9ef4c"}, + {file = "pydantic-1.9.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:c86229333cabaaa8c51cf971496f10318c4734cf7b641f08af0a6fbf17ca3054"}, + {file = "pydantic-1.9.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:c0727bda6e38144d464daec31dff936a82917f431d9c39c39c60a26567eae3ed"}, + {file = "pydantic-1.9.0-cp36-cp36m-win_amd64.whl", hash = "sha256:dee5ef83a76ac31ab0c78c10bd7d5437bfdb6358c95b91f1ba7ff7b76f9996a1"}, + {file = "pydantic-1.9.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:d9c9bdb3af48e242838f9f6e6127de9be7063aad17b32215ccc36a09c5cf1070"}, + {file = "pydantic-1.9.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2ee7e3209db1e468341ef41fe263eb655f67f5c5a76c924044314e139a1103a2"}, + {file = "pydantic-1.9.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0b6037175234850ffd094ca77bf60fb54b08b5b22bc85865331dd3bda7a02fa1"}, + {file = "pydantic-1.9.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b2571db88c636d862b35090ccf92bf24004393f85c8870a37f42d9f23d13e032"}, + {file = "pydantic-1.9.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8b5ac0f1c83d31b324e57a273da59197c83d1bb18171e512908fe5dc7278a1d6"}, + {file = "pydantic-1.9.0-cp37-cp37m-win_amd64.whl", hash = "sha256:bbbc94d0c94dd80b3340fc4f04fd4d701f4b038ebad72c39693c794fd3bc2d9d"}, + {file = "pydantic-1.9.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e0896200b6a40197405af18828da49f067c2fa1f821491bc8f5bde241ef3f7d7"}, + {file = "pydantic-1.9.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7bdfdadb5994b44bd5579cfa7c9b0e1b0e540c952d56f627eb227851cda9db77"}, + {file = "pydantic-1.9.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:574936363cd4b9eed8acdd6b80d0143162f2eb654d96cb3a8ee91d3e64bf4cf9"}, + {file = "pydantic-1.9.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c556695b699f648c58373b542534308922c46a1cda06ea47bc9ca45ef5b39ae6"}, + {file = "pydantic-1.9.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:f947352c3434e8b937e3aa8f96f47bdfe6d92779e44bb3f41e4c213ba6a32145"}, + {file = "pydantic-1.9.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5e48ef4a8b8c066c4a31409d91d7ca372a774d0212da2787c0d32f8045b1e034"}, + {file = "pydantic-1.9.0-cp38-cp38-win_amd64.whl", hash = "sha256:96f240bce182ca7fe045c76bcebfa0b0534a1bf402ed05914a6f1dadff91877f"}, + {file = "pydantic-1.9.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:815ddebb2792efd4bba5488bc8fde09c29e8ca3227d27cf1c6990fc830fd292b"}, + {file = "pydantic-1.9.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:6c5b77947b9e85a54848343928b597b4f74fc364b70926b3c4441ff52620640c"}, + {file = "pydantic-1.9.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c68c3bc88dbda2a6805e9a142ce84782d3930f8fdd9655430d8576315ad97ce"}, + {file = "pydantic-1.9.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5a79330f8571faf71bf93667d3ee054609816f10a259a109a0738dac983b23c3"}, + {file = "pydantic-1.9.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f5a64b64ddf4c99fe201ac2724daada8595ada0d102ab96d019c1555c2d6441d"}, + {file = "pydantic-1.9.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a733965f1a2b4090a5238d40d983dcd78f3ecea221c7af1497b845a9709c1721"}, + {file = "pydantic-1.9.0-cp39-cp39-win_amd64.whl", hash = "sha256:2cc6a4cb8a118ffec2ca5fcb47afbacb4f16d0ab8b7350ddea5e8ef7bcc53a16"}, + {file = "pydantic-1.9.0-py3-none-any.whl", hash = "sha256:085ca1de245782e9b46cefcf99deecc67d418737a1fd3f6a4f511344b613a5b3"}, + {file = "pydantic-1.9.0.tar.gz", hash = "sha256:742645059757a56ecd886faf4ed2441b9c0cd406079c2b4bee51bcc3fbcd510a"}, ] pydash = [ {file = "pydash-5.1.0-py3-none-any.whl", hash = "sha256:ced4fedb163eb07fbee376e474bca74029eb9fab215614449fe13164f71dd9e3"}, {file = "pydash-5.1.0.tar.gz", hash = "sha256:1b2b050ac1bae049cd07f5920b14fabbe52638f485d9ada1eb115a9eebff6835"}, ] pygments = [ - {file = "Pygments-2.11.0-py3-none-any.whl", hash = "sha256:ac8098bfc40b8e1091ad7c13490c7f4797e401d0972e8fcfadde90ffb3ed4ea9"}, - {file = "Pygments-2.11.0.tar.gz", hash = "sha256:51130f778a028f2d19c143fce00ced6f8b10f726e17599d7e91b290f6cbcda0c"}, + {file = "Pygments-2.11.1-py3-none-any.whl", hash = "sha256:9135c1af61eec0f650cd1ea1ed8ce298e54d56bcd8cc2ef46edd7702c171337c"}, + {file = "Pygments-2.11.1.tar.gz", hash = "sha256:59b895e326f0fb0d733fd28c6839bd18ad0687ba20efc26d4277fd1d30b971f4"}, ] pygtrie = [ {file = "pygtrie-2.4.2.tar.gz", hash = "sha256:43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"}, @@ -1985,8 +1998,8 @@ quart = [ {file = "Quart-0.16.2.tar.gz", hash = "sha256:356f4fd795fbf5a7a97bdeb7ca908b5051d0e6e4c0499b2b7c30b743a6938a7e"}, ] requests = [ - {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, - {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"}, + {file = "requests-2.27.0-py2.py3-none-any.whl", hash = "sha256:f71a09d7feba4a6b64ffd8e9d9bc60f9bf7d7e19fd0e04362acb1cfc2e3d98df"}, + {file = "requests-2.27.0.tar.gz", hash = "sha256:8e5643905bf20a308e25e4c1dd379117c09000bf8a82ebccc462cfb1b34a16b5"}, ] rfc3986 = [ {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"}, diff --git a/pyproject.toml b/pyproject.toml index c687ce18..2b4ce0a9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ fastapi = "^0.70.0" typing-extensions = ">=3.10.0,<5.0.0" Quart = { version = "^0.16.0", optional = true } websockets = { version=">=9.1", optional = true } -pydantic = { version = "~1.8.0", extras = ["dotenv"] } +pydantic = { version = "~1.9.0", extras = ["dotenv"] } uvicorn = { version = "^0.15.0", extras = ["standard"] } aiohttp = { version = "^3.7.4", extras = ["speedups"], optional = true } httpx = { version = ">=0.20.0, <1.0.0", extras = ["http2"], optional = true } diff --git a/yarn.lock b/yarn.lock index 8f73a98c..d1954285 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2608,9 +2608,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001286, caniuse-lite@^1.0.30001294: - version "1.0.30001295" - resolved "https://registry.npmmirror.com/caniuse-lite/download/caniuse-lite-1.0.30001295.tgz#68a60f8f0664f342b2835c5d8898b4faea7b3d51" - integrity sha512-lSP16vcyC0FEy0R4ECc9duSPoKoZy+YkpGkue9G4D81OfPnliopaZrU10+qtPdT8PbGXad/PNx43TIQrOmJZSQ== + version "1.0.30001296" + resolved "https://registry.npmmirror.com/caniuse-lite/download/caniuse-lite-1.0.30001296.tgz#d99f0f3bee66544800b93d261c4be55a35f1cec8" + integrity sha512-WfrtPEoNSoeATDlf4y3QvkwiELl9GyPLISV5GejTbbQRtQx4LhsXmc9IQ6XCL2d7UxCyEzToEZNMeqR79OUw8Q== ccount@^1.0.0, ccount@^1.0.3: version "1.1.0" @@ -3512,9 +3512,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.4.17: - version "1.4.31" - resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.31.tgz#8d5ccc3f8253cd142b07afaa84f200fd33a7f2a6" - integrity sha512-t3XVQtk+Frkv6aTD4RRk0OqosU+VLe1dQFW83MDer78ZD6a52frgXuYOIsLYTQiH2Lm+JB2OKYcn7zrX+YGAiQ== + version "1.4.33" + resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.33.tgz#1fe18961becb51c7db8ec739c655ef1b93d9349e" + integrity sha512-OVK1Ad3pHnmuXPhEfq85X8vUKr1UPNHryBnbKnyLcAfh8dPwoFjoDhDlP5KpPJIiymvSucZs48UBrE1250IxOw== emoji-regex@^8.0.0: version "8.0.0" @@ -4577,7 +4577,7 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.2.0: +is-core-module@^2.8.0: version "2.8.0" resolved "https://registry.npmmirror.com/is-core-module/download/is-core-module-2.8.0.tgz?cache=0&sync_timestamp=1634236731601&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fis-core-module%2Fdownload%2Fis-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" integrity sha1-AyEzbD0JJeSX/Zf12VyxFKXM1Ug= @@ -4788,8 +4788,8 @@ isexe@^2.0.0: isobject@^3.0.1: version "3.0.1" - resolved "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + resolved "https://registry.npmmirror.com/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== jest-worker@^27.0.2, jest-worker@^27.4.1: version "27.4.5" @@ -5663,7 +5663,7 @@ path-key@^3.0.0, path-key@^3.1.0: resolved "https://registry.npmmirror.com/path-key/download/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha1-WB9q3mWMu6ZaDTOA3ndTKVBU83U= -path-parse@^1.0.6: +path-parse@^1.0.7: version "1.0.7" resolved "https://registry.nlark.com/path-parse/download/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha1-+8EUtgykKzDZ2vWFjkvWi77bZzU= @@ -5696,9 +5696,9 @@ picocolors@^1.0.0: integrity sha1-y1vcdP8/UYkiNur3nWi8RFZKuBw= picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.3.0" - resolved "https://registry.nlark.com/picomatch/download/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" - integrity sha1-8fBh3o9qS/AiiS4tEoI0+5gwKXI= + version "2.3.1" + resolved "https://registry.npmmirror.com/picomatch/download/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== pify@^2.3.0: version "2.3.0" @@ -5734,9 +5734,9 @@ portfinder@^1.0.28: mkdirp "^0.5.5" postcss-calc@^8.0.0: - version "8.0.0" - resolved "https://registry.npmmirror.com/postcss-calc/download/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a" - integrity sha1-oFuHqs0TJ0Cl2wlGKjYSRT5d+Qo= + version "8.1.0" + resolved "https://registry.npmmirror.com/postcss-calc/download/postcss-calc-8.1.0.tgz#646a67bc47ef98d5b1ae3c2f944830d04a5fd6a7" + integrity sha512-XaJ+DArhRtRAzI+IqjRNTM0i4NFKkMK5StepwynfrF27UfO6/oMaELSVDE4f9ndLHyaO4aDKUwfQKVmje/BzCg== dependencies: postcss-selector-parser "^6.0.2" postcss-value-parser "^4.0.2" @@ -6373,8 +6373,8 @@ react@^17.0.1: reactcss@^1.2.0: version "1.2.3" - resolved "https://registry.npm.taobao.org/reactcss/download/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd" - integrity sha1-wAATh15Vexzw39mjaKHD2rO1SN0= + resolved "https://registry.npmmirror.com/reactcss/download/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd" + integrity sha512-KiwVUcFu1RErkI97ywr8nvx8dNOpT03rbnma0SSalTYjkrPYaEajR4a/MRt6DZ46K6arDRbWMNHF+xH7G7n/8A== dependencies: lodash "^4.0.1" @@ -6644,12 +6644,13 @@ resolve-pathname@^3.0.0: integrity sha1-mdAiJNPPJjaJvsuzk7xWAxMCXc0= resolve@^1.1.6, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.3.2: - version "1.20.0" - resolved "https://registry.npm.taobao.org/resolve/download/resolve-1.20.0.tgz?cache=0&sync_timestamp=1615982599966&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fresolve%2Fdownload%2Fresolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha1-YpoBP7P3B1XW8LeTXMHCxTeLGXU= + version "1.21.0" + resolved "https://registry.npmmirror.com/resolve/download/resolve-1.21.0.tgz#b51adc97f3472e6a5cf4444d34bc9d6b9037591f" + integrity sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA== dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" + is-core-module "^2.8.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" responselike@^1.0.2: version "1.0.2" @@ -6668,7 +6669,7 @@ reusify@^1.0.4: resolved "https://registry.npm.taobao.org/reusify/download/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha1-kNo4Kx4SbvwCFG6QhFqI2xKSXXY= -rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@^3.0.2: version "3.0.2" resolved "https://registry.npmmirror.com/rimraf/download/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha1-8aVAK6YiCtUswSgrrBrjqkn9Bho= @@ -7172,6 +7173,11 @@ supports-color@^8.0.0: dependencies: has-flag "^4.0.0" +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.npmmirror.com/supports-preserve-symlinks-flag/download/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + svg-parser@^2.0.2: version "2.0.4" resolved "https://registry.npm.taobao.org/svg-parser/download/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" @@ -7210,9 +7216,9 @@ svgo@^2.7.0: stable "^0.1.8" tailwindcss@^3.0.0: - version "3.0.8" - resolved "https://registry.npmmirror.com/tailwindcss/download/tailwindcss-3.0.8.tgz#6c751c3d2ee8e1fa18b108303b73f44a5e868992" - integrity sha512-Yww1eRYO1AxITJmW/KduZPxNvYdHuedeKwPju9Oakp7MdiixRi5xkpLhirsc81QCxHL0eoce6qKmxXwYGt4Cjw== + version "3.0.9" + resolved "https://registry.npmmirror.com/tailwindcss/download/tailwindcss-3.0.9.tgz#6755dba95dfa092d14f304ff47703a28c2c07138" + integrity sha512-X8TVifxDWfiNXInOeBofTteXAtZ5f0HnLs/uV4jDQNShc33Jb7qjYbk4VwI365rWAzcqYTks+9kesf3xH7Y35A== dependencies: arg "^5.0.1" chalk "^4.1.2" @@ -7234,7 +7240,6 @@ tailwindcss@^3.0.0: postcss-value-parser "^4.2.0" quick-lru "^5.1.1" resolve "^1.20.0" - tmp "^0.2.1" tapable@^1.0.0: version "1.1.3" @@ -7296,13 +7301,6 @@ tinycolor2@^1.4.1: resolved "https://registry.nlark.com/tinycolor2/download/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803" integrity sha1-P2pNEHGtB2dtf6Ry4frECnGdiAM= -tmp@^0.2.1: - version "0.2.1" - resolved "https://registry.npm.taobao.org/tmp/download/tmp-0.2.1.tgz?cache=0&sync_timestamp=1615984440866&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftmp%2Fdownload%2Ftmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity sha1-hFf8MDfc9HGcJRNnoa9lAO4czxQ= - dependencies: - rimraf "^3.0.0" - to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.nlark.com/to-fast-properties/download/to-fast-properties-2.0.0.tgz?cache=0&sync_timestamp=1628418893613&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fto-fast-properties%2Fdownload%2Fto-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" From 96749bde8307a89f48d7a312227e460fc8fbeebf Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 4 Jan 2022 15:19:59 +0800 Subject: [PATCH 172/174] :white_check_mark: add matcher updater tests --- tests/plugins/matcher/__init__.py | 7 +++ tests/plugins/matcher/matcher_permission.py | 13 +++++ .../matcher_process.py} | 0 tests/plugins/matcher/matcher_type.py | 10 ++++ tests/test_matcher.py | 57 ++++++++++++++++++- 5 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 tests/plugins/matcher/__init__.py create mode 100644 tests/plugins/matcher/matcher_permission.py rename tests/plugins/{matcher.py => matcher/matcher_process.py} (100%) create mode 100644 tests/plugins/matcher/matcher_type.py diff --git a/tests/plugins/matcher/__init__.py b/tests/plugins/matcher/__init__.py new file mode 100644 index 00000000..f084d7f1 --- /dev/null +++ b/tests/plugins/matcher/__init__.py @@ -0,0 +1,7 @@ +from pathlib import Path + +from nonebot import load_plugins + +_sub_plugins = set() + +_sub_plugins |= load_plugins(str(Path(__file__).parent)) diff --git a/tests/plugins/matcher/matcher_permission.py b/tests/plugins/matcher/matcher_permission.py new file mode 100644 index 00000000..27a105b3 --- /dev/null +++ b/tests/plugins/matcher/matcher_permission.py @@ -0,0 +1,13 @@ +from nonebot.matcher import Matcher +from nonebot.permission import Permission + +default_permission = Permission() + +test_permission_updater = Matcher.new(permission=default_permission) + +test_custom_updater = Matcher.new(permission=default_permission) + + +@test_custom_updater.permission_updater +async def _() -> Permission: + return default_permission diff --git a/tests/plugins/matcher.py b/tests/plugins/matcher/matcher_process.py similarity index 100% rename from tests/plugins/matcher.py rename to tests/plugins/matcher/matcher_process.py diff --git a/tests/plugins/matcher/matcher_type.py b/tests/plugins/matcher/matcher_type.py new file mode 100644 index 00000000..76db3a6f --- /dev/null +++ b/tests/plugins/matcher/matcher_type.py @@ -0,0 +1,10 @@ +from nonebot.matcher import Matcher + +test_type_updater = Matcher.new(type_="test") + +test_custom_updater = Matcher.new(type_="test") + + +@test_custom_updater.type_updater +async def _() -> str: + return "custom" diff --git a/tests/test_matcher.py b/tests/test_matcher.py index 61f8c73c..32a0ed3d 100644 --- a/tests/test_matcher.py +++ b/tests/test_matcher.py @@ -6,7 +6,7 @@ from utils import load_plugin, make_fake_event, make_fake_message @pytest.mark.asyncio async def test_matcher(app: App, load_plugin): - from plugins.matcher import ( + from plugins.matcher.matcher_process import ( test_got, test_handle, test_preset, @@ -74,3 +74,58 @@ async def test_matcher(app: App, load_plugin): bot = ctx.create_bot() ctx.receive_event(bot, event) ctx.should_finished() + + +@pytest.mark.asyncio +async def test_type_updater(app: App, load_plugin): + from plugins.matcher.matcher_type import ( + test_type_updater, + test_custom_updater, + ) + + event = make_fake_event()() + + assert test_type_updater.type == "test" + async with app.test_api() as ctx: + bot = ctx.create_bot() + matcher = test_type_updater() + new_type = await matcher.update_type(bot, event) + assert new_type == "message" + + assert test_custom_updater.type == "test" + async with app.test_api() as ctx: + bot = ctx.create_bot() + matcher = test_custom_updater() + new_type = await matcher.update_type(bot, event) + assert new_type == "custom" + + +@pytest.mark.asyncio +async def test_permission_updater(app: App, load_plugin): + from nonebot.permission import User + + from plugins.matcher.matcher_permission import ( + default_permission, + test_custom_updater, + test_permission_updater, + ) + + event = make_fake_event(_session_id="test")() + + assert test_permission_updater.permission is default_permission + async with app.test_api() as ctx: + bot = ctx.create_bot() + matcher = test_permission_updater() + new_perm = await matcher.update_permission(bot, event) + assert len(new_perm.checkers) == 1 + checker = list(new_perm.checkers)[0].call + assert isinstance(checker, User) + assert checker.users == ("test",) + assert checker.perm is default_permission + + assert test_custom_updater.permission is default_permission + async with app.test_api() as ctx: + bot = ctx.create_bot() + matcher = test_custom_updater() + new_perm = await matcher.update_permission(bot, event) + assert new_perm is default_permission From 07cb96864c6bbe83cbb72966f85b015a361590d6 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 4 Jan 2022 15:27:51 +0800 Subject: [PATCH 173/174] :memo: add alpha doc link --- website/docusaurus.config.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index bc8dce24..36674f17 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -76,6 +76,12 @@ const config = { href: "https://github.com/nonebot/nonebot2", }, ], + docsVersionItemAfter: [ + { + label: "2.0.0a16", + href: "https://61d3d9dbcadf413fd3238e89--nonebot2.netlify.app/", + }, + ], }, hideableSidebar: true, footer: { From 7f5446886805c4094aa17a7f893a63e0a0b1cb68 Mon Sep 17 00:00:00 2001 From: yanyongyu Date: Tue, 4 Jan 2022 16:04:30 +0800 Subject: [PATCH 174/174] :pencil2: fix typo --- nonebot/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nonebot/utils.py b/nonebot/utils.py index b8bc4af5..da03d690 100644 --- a/nonebot/utils.py +++ b/nonebot/utils.py @@ -155,7 +155,7 @@ def logger_wrapper(logger_name: str): :log 参数: - * ``level: Literal["CRETICAL", "WARNING", "INFO", "DEBUG", "TRACE"]``: 日志等级 + * ``level: Literal["CRITICAL", "WARNING", "INFO", "DEBUG", "TRACE"]``: 日志等级 * ``message: str``: 日志信息 * ``exception: Optional[Exception]``: 异常信息 """